opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7443 from wanyaoqi/automated-cherry-pick-of-#7441-upstream-release-3.2

Browse Source 
Automated cherry pick of #7441: fix deploy admin auth key
This commit is contained in:
Zexi Li
2020-08-01 00:06:33 +08:00
committed by GitHub
parent 3ca28cfcc7 d925cb080d
commit a3f71e8959
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/hostinfo/hostinfo.go
+18 -15
View File
@@ -1377,14 +1377,9 @@ func (h *SHostInfo) deployAdminAuthorizedKeys() {
}
sshDir := path.Join("/root", ".ssh")
if _, err := os.Stat(sshDir); err != nil {
if os.IsNotExist(err) {
if err := os.MkdirAll(sshDir, 0755); err != nil {
onErr("Create ssh dir %s: %v", sshDir, err)
}
} else {
onErr("Stat %s dir: %v", sshDir, err)
}
output, err := procutils.NewRemoteCommandAsFarAsPossible("mkdir", "-p", sshDir).Output()
if err != nil {
onErr("mkdir .ssh failed %s %s", output, err)
}
query := jsonutils.NewDict()
@@ -1400,15 +1395,23 @@ func (h *SHostInfo) deployAdminAuthorizedKeys() {
adminPublicKey, _ := keys.GetString("public_key")
pubKeys := &deployapi.SSHKeys{AdminPublicKey: adminPublicKey}
var oldKeys string
authFile := path.Join(sshDir, "authorized_keys")
oldKeysBytes, _ := fileutils2.FileGetContents(authFile)
oldKeys := string(oldKeysBytes)
newKeys := fsdriver.MergeAuthorizedKeys(oldKeys, pubKeys)
if err := fileutils2.FilePutContents(authFile, newKeys, false); err != nil {
onErr("Write public keys: %v", err)
if procutils.NewRemoteCommandAsFarAsPossible("test", "-f", authFile).Run() == nil {
output, err := procutils.NewRemoteCommandAsFarAsPossible("cat", authFile).Output()
if err != nil {
onErr("cat auth file %s %s", output, err)
}
oldKeys = string(output)
}
if err := os.Chmod(authFile, 0644); err != nil {
onErr("Chmod %s to 0644: %v", authFile, err)
newKeys := fsdriver.MergeAuthorizedKeys(oldKeys, pubKeys)
if output, err := procutils.NewRemoteCommandAsFarAsPossible(
"sh", "-c", fmt.Sprintf("echo '%s' > %s", newKeys, authFile)).Output(); err != nil {
onErr("write public keys: %s %s", output, err)
}
if output, err := procutils.NewRemoteCommandAsFarAsPossible(
"chmod", "0644", authFile).Output(); err != nil {
onErr("chmod failed %s %s", output, err)
}
h.onSucc()
}