k-space/dex
Archived
11
0
Fork 0
Code Issues Pull Requests Packages Projects Activity

cleanup and optimization

Browse Source 
Signed-off-by: Rui Yang <ruiya@vmware.com>
This commit is contained in:
Rui Yang
2021-05-10 15:41:50 -04:00
parent 8ea121b45a
commit f980d3e0a7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
connector/oauth/oauth.go
View File

@@ -191,16 +191,14 @@ func (c *oauthConnector) HandleCallback(s connector.Scopes, r *http.Request) (id
if err != nil { if err != nil {
return identity, fmt.Errorf("OAuth Connector: failed to execute request to userinfo: %v", err) return identity, fmt.Errorf("OAuth Connector: failed to execute request to userinfo: %v", err)
} }
defer userInfoResp.Body.Close()
if userInfoResp.StatusCode != http.StatusOK { if userInfoResp.StatusCode != http.StatusOK {
return identity, fmt.Errorf("OAuth Connector: failed to execute request to userinfo: status %d", userInfoResp.StatusCode) return identity, fmt.Errorf("OAuth Connector: failed to execute request to userinfo: status %d", userInfoResp.StatusCode)
} }
defer userInfoResp.Body.Close()
var userInfoResult map[string]interface{} var userInfoResult map[string]interface{}
err = json.NewDecoder(userInfoResp.Body).Decode(&userInfoResult) err = json.NewDecoder(userInfoResp.Body).Decode(&userInfoResult)
if err != nil { if err != nil {
return identity, fmt.Errorf("OAuth Connector: failed to parse userinfo: %v", err) return identity, fmt.Errorf("OAuth Connector: failed to parse userinfo: %v", err)
} }
@@ -217,7 +215,7 @@ func (c *oauthConnector) HandleCallback(s connector.Scopes, r *http.Request) (id
identity.EmailVerified, _ = userInfoResult[c.emailVerifiedKey].(bool) identity.EmailVerified, _ = userInfoResult[c.emailVerifiedKey].(bool)
if s.Groups { if s.Groups {
groups := map[string]bool{} groups := map[string]struct{}{}
c.addGroupsFromMap(groups, userInfoResult) c.addGroupsFromMap(groups, userInfoResult)
c.addGroupsFromToken(groups, token.AccessToken) c.addGroupsFromToken(groups, token.AccessToken)
@@ -239,7 +237,7 @@ func (c *oauthConnector) HandleCallback(s connector.Scopes, r *http.Request) (id
return identity, nil return identity, nil
} }
func (c *oauthConnector) addGroupsFromMap(groups map[string]bool, result map[string]interface{}) error { func (c *oauthConnector) addGroupsFromMap(groups map[string]struct{}, result map[string]interface{}) error {
groupsClaim, ok := result[c.groupsKey].([]interface{}) groupsClaim, ok := result[c.groupsKey].([]interface{})
if !ok { if !ok {
return errors.New("cannot convert to slice") return errors.New("cannot convert to slice")
@@ -247,14 +245,14 @@ func (c *oauthConnector) addGroupsFromMap(groups map[string]bool, result map[str
for _, group := range groupsClaim { for _, group := range groupsClaim {
if groupString, ok := group.(string); ok { if groupString, ok := group.(string); ok {
groups[groupString] = true groups[groupString] = struct{}{}
} }
} }
return nil return nil
} }
func (c *oauthConnector) addGroupsFromToken(groups map[string]bool, token string) error { func (c *oauthConnector) addGroupsFromToken(groups map[string]struct{}, token string) error {
parts := strings.Split(token, ".") parts := strings.Split(token, ".")
if len(parts) < 2 { if len(parts) < 2 {
return errors.New("invalid token") return errors.New("invalid token")