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

Merge pull request #1880 from swordqiu/hotfix/qj-server-logininfo-inclide-login-key

Browse Source 
fix: server-logininfo rpc include login_key
This commit is contained in:
yunion-ci-robot
2019-07-24 13:23:06 +08:00
committed by GitHub
parent b5a17ad44d 2c673a1169
commit e28da4e5ff
2 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/modules/mod_servers.go
+41 -24
View File
@@ -16,6 +16,7 @@ package modules
import (
"fmt"
"strings"
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/gotypes"
@@ -30,38 +31,54 @@ type ServerManager struct {
}
func (this *ServerManager) GetLoginInfo(s *mcclient.ClientSession, id string, params jsonutils.JSONObject) (jsonutils.JSONObject, error) {
data, e := this.GetMetadata(s, id, nil)
data, e := this.Get(s, id, nil)
if e != nil {
return nil, e
}
ret := jsonutils.NewDict()
loginKey, e := data.GetString("login_key")
v, e := data.Get("metadata", "login_account")
if e == nil {
ret.Add(v, "username")
}
v, e = data.Get("metadata", "login_key_timestamp")
if e == nil {
ret.Add(v, "updated")
}
loginKey, _ := data.GetString("metadata", "login_key")
if e != nil {
return nil, fmt.Errorf("No login key: %s", e)
}
var privateKey string
if params != nil && !gotypes.IsNil(params) {
privateKey, _ = params.GetString("private_key")
}
var passwd string
if len(privateKey) > 0 {
passwd, e = seclib2.DecryptBase64(privateKey, loginKey)
} else {
passwd, e = utils.DescryptAESBase64(id, loginKey)
}
if e != nil {
return nil, e
}
ret.Add(jsonutils.NewString(passwd), "password")
v, e := data.Get("login_account")
if e == nil {
ret.Add(v, "username")
}
v, e = data.Get("login_key_timestamp")
if e == nil {
ret.Add(v, "updated")
if len(loginKey) > 0 {
ret.Add(jsonutils.NewString(loginKey), "login_key")
var passwd string
keypairId, _ := data.GetString("keypair_id")
if len(keypairId) > 0 && !strings.EqualFold(keypairId, "none") {
keypair, e := data.Get("keypair")
if e == nil {
ret.Add(keypair, "keypair")
}
if params != nil && !gotypes.IsNil(params) {
privateKey, _ := params.GetString("private_key")
if len(privateKey) > 0 {
passwd, e = seclib2.DecryptBase64(privateKey, loginKey)
if e != nil {
return nil, e
}
}
}
} else {
passwd, e = utils.DescryptAESBase64(id, loginKey)
if e != nil {
return nil, e
}
}
if len(passwd) > 0 {
ret.Add(jsonutils.NewString(passwd), "password")
}
}
return ret, nil
pkg/util/huawei/vpc.go
+1 -1
View File
@@ -17,8 +17,8 @@ package huawei
import (
"strings"
"yunion.io/x/pkg/errors"
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/errors"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudprovider"