github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(oauth): if username is empty, fail to login (#4232) 

* fix(oauth): if username is empty, fail to login

* fix(oauth): return err when failing to find username

* fix(oauth): disable autofill
pull/4234/head
Chaim Lev-Ari 2020-08-18 15:38:58 +03:00 committed by GitHub
parent b3b706d88d
commit 35fa9d6981
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/http/handler/auth/authenticate_oauth.go
View File

@ -35,8 +35,7 @@ func (handler *Handler) authenticateOAuth(code string, settings *portainer.OAuth
username, err := handler.OAuthService.Authenticate(code, settings) username, err := handler.OAuthService.Authenticate(code, settings)
if err != nil { if err != nil {
log.Printf("[DEBUG] - Unable to authenticate user via OAuth: %v", err) return "", err
return "", nil
} }
return username, nil return username, nil

7
api/oauth/oauth.go
View File

@ -88,6 +88,13 @@ func getUsername(token string, configuration *portainer.OAuthSettings) (string,
} }
username := values.Get(configuration.UserIdentifier) username := values.Get(configuration.UserIdentifier)
if username == "" {
return username, &oauth2.RetrieveError{
Response: resp,
Body: body,
}
}
return username, nil return username, nil
} }

2
app/portainer/oauth/components/oauth-settings/oauth-settings.html
View File

@ -56,7 +56,7 @@
Client secret Client secret
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="password" class="form-control" id="oauth_client_secret" ng-model="$ctrl.settings.ClientSecret" placeholder="xxxxxxxxxxxxxxxxxxxx" /> <input type="password" class="form-control" id="oauth_client_secret" ng-model="$ctrl.settings.ClientSecret" placeholder="xxxxxxxxxxxxxxxxxxxx" autocomplete="new-password" />
</div> </div>
</div> </div>