rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-26 23:06:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1408 from joshwget/fix-docker-machine-ssh

Browse Source 
Fix SSH keys for Docker Machine
This commit is contained in:
Sven Dowideit 2016-11-21 09:10:50 +10:00 committed by GitHub
commit 4d9b2595b8
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cmd/cloudinitexecute/authorize_ssh_keys.go
View File

@ -11,9 +11,9 @@ import (
"github.com/rancher/os/util" "github.com/rancher/os/util"
) )
var ( const (
sshDir = ".ssh" sshDirName = ".ssh"
authorizedKeysFile = path.Join(sshDir, "authorized_keys") authorizedKeysFileName = "authorized_keys"
) )
func authorizeSSHKeys(username string, authorizedKeys []string, name string) error { func authorizeSSHKeys(username string, authorizedKeys []string, name string) error {
@ -44,19 +44,9 @@ func authorizeSSHKeys(username string, authorizedKeys []string, name string) err
} }
} }
sshDir = path.Join(homeDir, sshDir) sshDir := path.Join(homeDir, sshDirName)
authorizedKeysFile = path.Join(homeDir, authorizedKeysFile) authorizedKeysFile := path.Join(sshDir, authorizedKeysFileName)
for _, authorizedKey := range authorizedKeys {
if err = authorizeSSHKey(authorizedKey, uid, gid, homeDir); err != nil {
log.Errorf("Failed to authorize SSH key %s: %v", authorizedKey, err)
}
}
return nil
}
func authorizeSSHKey(authorizedKey string, uid, gid int, homeDir string) error {
if _, err := os.Stat(sshDir); os.IsNotExist(err) { if _, err := os.Stat(sshDir); os.IsNotExist(err) {
if err = os.Mkdir(sshDir, 0700); err != nil { if err = os.Mkdir(sshDir, 0700); err != nil {
return err return err
@ -65,6 +55,20 @@ func authorizeSSHKey(authorizedKey string, uid, gid int, homeDir string) error {
return err return err
} }
if err = os.Chown(sshDir, uid, gid); err != nil {
return err
}
for _, authorizedKey := range authorizedKeys {
if err = authorizeSSHKey(authorizedKey, authorizedKeysFile, uid, gid); err != nil {
log.Errorf("Failed to authorize SSH key %s: %v", authorizedKey, err)
}
}
return nil
}
func authorizeSSHKey(authorizedKey, authorizedKeysFile string, uid, gid int) error {
authorizedKeysFileInfo, err := os.Stat(authorizedKeysFile) authorizedKeysFileInfo, err := os.Stat(authorizedKeysFile)
if os.IsNotExist(err) { if os.IsNotExist(err) {
keysFile, err := os.Create(authorizedKeysFile) keysFile, err := os.Create(authorizedKeysFile)
@ -99,12 +103,6 @@ func authorizeSSHKey(authorizedKey string, uid, gid int, homeDir string) error {
if err = util.WriteFileAtomic(authorizedKeysFile, bytes, perm); err != nil { if err = util.WriteFileAtomic(authorizedKeysFile, bytes, perm); err != nil {
return err return err
} }
if err = os.Chown(sshDir, uid, gid); err != nil {
return err
}
if err = os.Chown(authorizedKeysFile, uid, gid); err != nil {
return err
}
return nil return os.Chown(authorizedKeysFile, uid, gid)
} }