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 #11635 from tb365/bugfix/tb-pre-login-hook-fix

Browse Source 
feat(yunionapi): pre login hook fix
This commit is contained in:
Zexi Li
2021-07-13 10:45:55 +08:00
committed by GitHub
parent 820492aa9c 6f91fa7a45
commit 585f9e802f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apigateway/handler/auth.go
+3 -4
View File
@@ -314,14 +314,13 @@ func (h *AuthHandlers) doCredentialLogin(ctx context.Context, req *http.Request,
// log.Debugf("doCredentialLogin body: %s", body)
cliIp := netutils2.GetHttpRequestIp(req)
if body.Contains("username") {
uname, _ := body.GetString("username")
if h.preLoginHook != nil {
if err = h.preLoginHook(ctx, req, uname, body); err != nil {
if err = h.preLoginHook(ctx, req, body); err != nil {
return nil, err
}
}
uname, _ := body.GetString("username")
var passwd string
passwd, err = body.GetString("password")
if err != nil {
@@ -528,7 +527,7 @@ func clearAuthCookie(w http.ResponseWriter) {
clearCookie(w, constants.YUNION_AUTH_COOKIE, options.Options.CookieDomain)
}
type PreLoginFunc func(ctx context.Context, req *http.Request, uname string, body jsonutils.JSONObject) error
type PreLoginFunc func(ctx context.Context, req *http.Request, body jsonutils.JSONObject) error
func (h *AuthHandlers) postLoginHandler(ctx context.Context, w http.ResponseWriter, req *http.Request) {
body, err := appsrv.FetchJSON(req)