mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-19 11:31:05 +00:00
Using the standard OpenID Connect OAuth2 provider type doesn't work well for AWS Cognito. Most of the functionality works absolutely fine, however the query parameter `post_logout_redirect_uri` is not understood by Cognito and results in a bad experience when logging out. To combat this i've added a new `AWS Cognito` provider which is almost identical to the `Open ID Connect` type except it overrides the query parameter to `logout_uri` which is what Cognito expects. <img width="647" height="272" alt="image" src="https://github.com/user-attachments/assets/d4bb30e2-f25e-41a1-91cb-4efa67137c57" /> This then results in a nice experience logging out with no errors seen - even though the logout does succeed. Why AWS thought they would deviate from the OAuth spec in this particular area is beyond me... --------- Co-authored-by: Tom Thornton <tom.thornton@sony.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: Nicolas <bircni@icloud.com>
145 lines
5.4 KiB
Go
145 lines
5.4 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package oauth2
|
|
|
|
import (
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
"github.com/markbates/goth"
|
|
"github.com/markbates/goth/providers/azureadv2"
|
|
"github.com/markbates/goth/providers/gitea"
|
|
"github.com/markbates/goth/providers/github"
|
|
"github.com/markbates/goth/providers/gitlab"
|
|
"github.com/markbates/goth/providers/mastodon"
|
|
"github.com/markbates/goth/providers/nextcloud"
|
|
)
|
|
|
|
// CustomProviderNewFn creates a goth.Provider using a custom url mapping
|
|
type CustomProviderNewFn func(clientID, secret, callbackURL string, custom *CustomURLMapping, scopes []string) (goth.Provider, error)
|
|
|
|
// CustomProvider is a GothProvider that has CustomURL features
|
|
type CustomProvider struct {
|
|
BaseProvider
|
|
customURLSettings *CustomURLSettings
|
|
newFn CustomProviderNewFn
|
|
}
|
|
|
|
// CustomURLSettings returns the CustomURLSettings for this provider
|
|
func (c *CustomProvider) CustomURLSettings() *CustomURLSettings {
|
|
return c.customURLSettings
|
|
}
|
|
|
|
// CreateGothProvider creates a GothProvider from this Provider
|
|
func (c *CustomProvider) CreateGothProvider(providerName, callbackURL string, source *Source) (goth.Provider, error) {
|
|
custom := c.customURLSettings.OverrideWith(source.CustomURLMapping)
|
|
|
|
return c.newFn(source.ClientID, source.ClientSecret, callbackURL, custom, source.Scopes)
|
|
}
|
|
|
|
// NewCustomProvider is a constructor function for custom providers
|
|
func NewCustomProvider(name, displayName string, customURLSetting *CustomURLSettings, newFn CustomProviderNewFn) *CustomProvider {
|
|
return &CustomProvider{
|
|
BaseProvider: BaseProvider{
|
|
name: name,
|
|
displayName: displayName,
|
|
},
|
|
customURLSettings: customURLSetting,
|
|
newFn: newFn,
|
|
}
|
|
}
|
|
|
|
var _ GothProvider = &CustomProvider{}
|
|
|
|
func init() {
|
|
RegisterGothProvider(NewCustomProvider(
|
|
"github", "GitHub", &CustomURLSettings{
|
|
TokenURL: availableAttribute(github.TokenURL),
|
|
AuthURL: availableAttribute(github.AuthURL),
|
|
ProfileURL: availableAttribute(github.ProfileURL),
|
|
EmailURL: availableAttribute(github.EmailURL),
|
|
},
|
|
func(clientID, secret, callbackURL string, custom *CustomURLMapping, scopes []string) (goth.Provider, error) {
|
|
if setting.OAuth2Client.EnableAutoRegistration {
|
|
scopes = append(scopes, "user:email")
|
|
}
|
|
return github.NewCustomisedURL(clientID, secret, callbackURL, custom.AuthURL, custom.TokenURL, custom.ProfileURL, custom.EmailURL, scopes...), nil
|
|
}))
|
|
|
|
RegisterGothProvider(NewCustomProvider(
|
|
"gitlab", "GitLab", &CustomURLSettings{
|
|
AuthURL: availableAttribute(gitlab.AuthURL),
|
|
TokenURL: availableAttribute(gitlab.TokenURL),
|
|
ProfileURL: availableAttribute(gitlab.ProfileURL),
|
|
}, func(clientID, secret, callbackURL string, custom *CustomURLMapping, scopes []string) (goth.Provider, error) {
|
|
scopes = append(scopes, "read_user")
|
|
return gitlab.NewCustomisedURL(clientID, secret, callbackURL, custom.AuthURL, custom.TokenURL, custom.ProfileURL, scopes...), nil
|
|
}))
|
|
|
|
RegisterGothProvider(NewCustomProvider(
|
|
"gitea", "Gitea", &CustomURLSettings{
|
|
TokenURL: requiredAttribute(gitea.TokenURL),
|
|
AuthURL: requiredAttribute(gitea.AuthURL),
|
|
ProfileURL: requiredAttribute(gitea.ProfileURL),
|
|
},
|
|
func(clientID, secret, callbackURL string, custom *CustomURLMapping, scopes []string) (goth.Provider, error) {
|
|
return gitea.NewCustomisedURL(clientID, secret, callbackURL, custom.AuthURL, custom.TokenURL, custom.ProfileURL, scopes...), nil
|
|
}))
|
|
|
|
RegisterGothProvider(NewCustomProvider(
|
|
"nextcloud", "Nextcloud", &CustomURLSettings{
|
|
TokenURL: requiredAttribute(nextcloud.TokenURL),
|
|
AuthURL: requiredAttribute(nextcloud.AuthURL),
|
|
ProfileURL: requiredAttribute(nextcloud.ProfileURL),
|
|
},
|
|
func(clientID, secret, callbackURL string, custom *CustomURLMapping, scopes []string) (goth.Provider, error) {
|
|
return nextcloud.NewCustomisedURL(clientID, secret, callbackURL, custom.AuthURL, custom.TokenURL, custom.ProfileURL, scopes...), nil
|
|
}))
|
|
|
|
RegisterGothProvider(NewCustomProvider(
|
|
"mastodon", "Mastodon", &CustomURLSettings{
|
|
AuthURL: requiredAttribute(mastodon.InstanceURL),
|
|
},
|
|
func(clientID, secret, callbackURL string, custom *CustomURLMapping, scopes []string) (goth.Provider, error) {
|
|
return mastodon.NewCustomisedURL(clientID, secret, callbackURL, custom.AuthURL, scopes...), nil
|
|
}))
|
|
|
|
RegisterGothProvider(NewCustomProvider(
|
|
"azureadv2", "Azure AD v2", &CustomURLSettings{
|
|
Tenant: requiredAttribute("organizations"),
|
|
},
|
|
func(clientID, secret, callbackURL string, custom *CustomURLMapping, scopes []string) (goth.Provider, error) {
|
|
azureScopes := make([]azureadv2.ScopeType, len(scopes))
|
|
for i, scope := range scopes {
|
|
azureScopes[i] = azureadv2.ScopeType(scope)
|
|
}
|
|
|
|
return azureadv2.New(clientID, secret, callbackURL, azureadv2.ProviderOptions{
|
|
Tenant: azureadv2.TenantType(custom.Tenant),
|
|
Scopes: azureScopes,
|
|
}), nil
|
|
},
|
|
))
|
|
|
|
RegisterGothProvider(&AwsCognitoProvider{})
|
|
}
|
|
|
|
const ProviderNameAwsCognito = "aws-cognito"
|
|
|
|
// AwsCognitoProvider is a GothProvider for AWS Cognito (based on OpenID Connect)
|
|
type AwsCognitoProvider struct {
|
|
OpenIDProvider
|
|
}
|
|
|
|
// Name provides the technical name for this provider
|
|
func (c *AwsCognitoProvider) Name() string {
|
|
return ProviderNameAwsCognito
|
|
}
|
|
|
|
// DisplayName returns the friendly name for this provider
|
|
func (c *AwsCognitoProvider) DisplayName() string {
|
|
return "AWS Cognito"
|
|
}
|
|
|
|
var _ GothProvider = &AwsCognitoProvider{}
|