github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 14:45:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10069 from lavalamp/sshLockingFix

Browse Source 
fix locking around ssh tunnels
This commit is contained in:
Satnam Singh
2015-06-18 17:50:06 -07:00
parent 3d8a3a809f 4126622388
commit d8e5225144
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/util/ssh.go
View File

@@ -81,8 +81,8 @@ func NewSSHTunnel(user, keyfile, host string) (*SSHTunnel, error) {
return makeSSHTunnel(user, signer, host)
}
func NewSSHTunnelFromBytes(user string, buffer []byte, host string) (*SSHTunnel, error) {
signer, err := MakePrivateKeySignerFromBytes(buffer)
func NewSSHTunnelFromBytes(user string, privateKey []byte, host string) (*SSHTunnel, error) {
signer, err := MakePrivateKeySignerFromBytes(privateKey)
if err != nil {
return nil, err
}
@@ -214,11 +214,13 @@ func ParsePublicKeyFromFile(keyFile string) (*rsa.PublicKey, error) {
return rsaKey, nil
}
// Should be thread safe.
type SSHTunnelEntry struct {
Address string
Tunnel *SSHTunnel
}
// Not thread safe!
type SSHTunnelList struct {
entries []SSHTunnelEntry
}
@@ -271,11 +273,23 @@ func (l *SSHTunnelList) Close() {
}
}
/* this will make sense if we move the lock into SSHTunnelList.
func (l *SSHTunnelList) Dial(network, addr string) (net.Conn, error) {
if len(l.entries) == 0 {
return nil, fmt.Errorf("Empty tunnel list.")
return nil, fmt.Errorf("empty tunnel list.")
}
return l.entries[mathrand.Int()%len(l.entries)].Tunnel.Dial(network, addr)
n := mathrand.Intn(len(l.entries))
return l.entries[n].Tunnel.Dial(network, addr)
}
*/
// Returns a random tunnel, xor an error if there are none.
func (l *SSHTunnelList) PickRandomTunnel() (SSHTunnelEntry, error) {
if len(l.entries) == 0 {
return SSHTunnelEntry{}, fmt.Errorf("empty tunnel list.")
}
n := mathrand.Intn(len(l.entries))
return l.entries[n], nil
}
func (l *SSHTunnelList) Has(addr string) bool {