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

Merge pull request #2808 from swordqiu/hotfix/qj-yunionapi-nil-pointer-panic-after-failed-login

Browse Source 
fix: yunionapi nil pointer panic after failed login
This commit is contained in:
yunion-ci-robot
2019-09-09 16:31:20 +08:00
committed by GitHub
parent 9ce20cd694 783dfbc245
commit c1d9124389
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apigateway/handler/auth.go
+4 -3
View File
@@ -24,7 +24,6 @@ import (
"github.com/pkg/errors"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/onecloud/pkg/mcclient/modulebase"
"yunion.io/x/onecloud/pkg/apigateway/clientman"
"yunion.io/x/onecloud/pkg/apigateway/constants"
@@ -36,6 +35,7 @@ import (
"yunion.io/x/onecloud/pkg/httperrors"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/mcclient/auth"
"yunion.io/x/onecloud/pkg/mcclient/modulebase"
"yunion.io/x/onecloud/pkg/mcclient/modules"
"yunion.io/x/onecloud/pkg/util/httputils"
"yunion.io/x/onecloud/pkg/util/netutils2"
@@ -257,12 +257,13 @@ func (h *AuthHandlers) doCredentialLogin(ctx context.Context, req *http.Request,
uname, _ := body.GetString("username")
if h.preLoginHook != nil {
if err := h.preLoginHook(ctx, req, uname, body); err != nil {
if err = h.preLoginHook(ctx, req, uname, body); err != nil {
return nil, err
}
}
passwd, err := body.GetString("password")
var passwd string
passwd, err = body.GetString("password")
if err != nil {
return nil, httperrors.NewInputParameterError("get password in body")
}
pkg/appsrv/dispatcher/handlers.go
+1 -1
View File
@@ -20,8 +20,8 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/onecloud/pkg/mcclient/modulebase"
"yunion.io/x/onecloud/pkg/appsrv"
"yunion.io/x/onecloud/pkg/mcclient/modulebase"
)
type IMiddlewareFilter interface {