medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: oauth gocyclo

This commit is contained in:
jamesread 2025-12-25 08:35:09 +00:00
parent d5607c363a
commit e9d90060fd
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
service/internal/auth/otoauth2/restapi_auth_oauth2.go
View File

@ -219,11 +219,43 @@ func getOAuthCertBundle(providerConfig *config.OAuth2Provider) *x509.CertPool {
return caCertPool return caCertPool
} }
func (h *OAuth2Handler) exchangeOAuthCode(ctx context.Context, providerConfig *oauth2.Config, code string, clientSettings *HttpClientSettings) (*oauth2.Token, error) {
exchangeClient := &http.Client{
Transport: clientSettings.Transport,
Timeout: clientSettings.Timeout,
}
ctx = context.WithValue(ctx, oauth2.HTTPClient, exchangeClient)
return providerConfig.Exchange(ctx, code)
}
func (h *OAuth2Handler) createUserInfoClient(ctx context.Context, providerConfig *oauth2.Config, tok *oauth2.Token, clientSettings *HttpClientSettings) *http.Client {
return &http.Client{
Transport: &oauth2.Transport{
Source: providerConfig.TokenSource(ctx, tok),
Base: clientSettings.Transport,
},
Timeout: clientSettings.Timeout,
}
}
func (h *OAuth2Handler) computeUsergroup(userinfo *UserInfo, providerConfig *config.OAuth2Provider) string {
usergroup := userinfo.Usergroup
if providerConfig != nil && providerConfig.AddToUsergroup != "" {
if usergroup != "" {
usergroup = usergroup + " " + providerConfig.AddToUsergroup
} else {
usergroup = providerConfig.AddToUsergroup
}
}
return usergroup
}
func (h *OAuth2Handler) HandleOAuthCallback(w http.ResponseWriter, r *http.Request) { func (h *OAuth2Handler) HandleOAuthCallback(w http.ResponseWriter, r *http.Request) {
log.Infof("OAuth2 Callback received") log.Infof("OAuth2 Callback received")
registeredState, state, ok := h.checkOAuthCallbackCookie(w, r) registeredState, state, ok := h.checkOAuthCallbackCookie(w, r)
if !ok { if !ok {
return return
} }
@ -236,48 +268,21 @@ func (h *OAuth2Handler) HandleOAuthCallback(w http.ResponseWriter, r *http.Reque
}).Debug("OAuth2 Token Code") }).Debug("OAuth2 Token Code")
providerConfig := h.cfg.AuthOAuth2Providers[registeredState.providerName] providerConfig := h.cfg.AuthOAuth2Providers[registeredState.providerName]
clientSettings := getOAuth2HttpClient(providerConfig) clientSettings := getOAuth2HttpClient(providerConfig)
exchangeClient := &http.Client{
Transport: clientSettings.Transport,
Timeout: clientSettings.Timeout,
}
ctx := context.Background() ctx := context.Background()
ctx = context.WithValue(ctx, oauth2.HTTPClient, exchangeClient) tok, err := h.exchangeOAuthCode(ctx, registeredState.providerConfig, code, clientSettings)
tok, err := registeredState.providerConfig.Exchange(ctx, code)
if err != nil { if err != nil {
log.Errorf("Failed to exchange code: %v", err) log.Errorf("Failed to exchange code: %v", err)
http.Error(w, "Failed to exchange code", http.StatusBadRequest) http.Error(w, "Failed to exchange code", http.StatusBadRequest)
return return
} }
userInfoClient := &http.Client{ userInfoClient := h.createUserInfoClient(ctx, registeredState.providerConfig, tok, clientSettings)
Transport: &oauth2.Transport{
Source: registeredState.providerConfig.TokenSource(ctx, tok),
Base: clientSettings.Transport,
},
Timeout: clientSettings.Timeout,
}
userinfo := getUserInfo(h.cfg, userInfoClient, providerConfig) userinfo := getUserInfo(h.cfg, userInfoClient, providerConfig)
h.registeredStates[state].Username = userinfo.Username h.registeredStates[state].Username = userinfo.Username
h.registeredStates[state].Usergroup = h.computeUsergroup(userinfo, providerConfig)
usergroup := userinfo.Usergroup
if providerConfig != nil && providerConfig.AddToUsergroup != "" {
// Append configured usergroup name if addToUsergroup is set
if usergroup != "" {
usergroup = usergroup + " " + providerConfig.AddToUsergroup
} else {
usergroup = providerConfig.AddToUsergroup
}
}
h.registeredStates[state].Usergroup = usergroup
http.Redirect(w, r, "/", http.StatusFound) http.Redirect(w, r, "/", http.StatusFound)
} }