public_git
/
oauth2-proxy
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adjust provider sorting, fixes

This commit is contained in:
Teko012 2024-08-21 17:55:30 +02:00 committed by Jan Larwig
parent 7dfbf3b940
commit 00a83f01be
No known key found for this signature in database
GPG Key ID: C2172BFA220A037A
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -11,7 +11,7 @@
- [#3072](https://github.com/oauth2-proxy/oauth2-proxy/pull/3072) feat: support for multiple github orgs #3072 (@daniel-mersch) - [#3072](https://github.com/oauth2-proxy/oauth2-proxy/pull/3072) feat: support for multiple github orgs #3072 (@daniel-mersch)
- [#3116](https://github.com/oauth2-proxy/oauth2-proxy/pull/3116) feat: bump to go1.24.5 and full dependency update (@wardviaene / @dolmen) - [#3116](https://github.com/oauth2-proxy/oauth2-proxy/pull/3116) feat: bump to go1.24.5 and full dependency update (@wardviaene / @dolmen)
- [#3097](https://github.com/oauth2-proxy/oauth2-proxy/pull/3097) chore(deps): update alpine base image to v3.22.0 - [#3097](https://github.com/oauth2-proxy/oauth2-proxy/pull/3097) chore(deps): update alpine base image to v3.22.0
- [#2273](https://github.com/oauth2-proxy/oauth2-proxy/pull/2273) feat: add Cidaas provider (@Bibob7) - [#2273](https://github.com/oauth2-proxy/oauth2-proxy/pull/2273) feat: add Cidaas provider (@Bibob7, @Teko012)
# V7.9.0 # V7.9.0

6
pkg/apis/options/providers.go
View File

@ -115,6 +115,9 @@ const (
// BitbucketProvider is the provider type for Bitbucket // BitbucketProvider is the provider type for Bitbucket
BitbucketProvider ProviderType = "bitbucket" BitbucketProvider ProviderType = "bitbucket"
// CidaasProvider is the provider type for Cidaas IDP
CidaasProvider ProviderType = "cidaas"
// DigitalOceanProvider is the provider type for DigitalOcean // DigitalOceanProvider is the provider type for DigitalOcean
DigitalOceanProvider ProviderType = "digitalocean" DigitalOceanProvider ProviderType = "digitalocean"
@ -147,9 +150,6 @@ const (
// OIDCProvider is the provider type for OIDC // OIDCProvider is the provider type for OIDC
OIDCProvider ProviderType = "oidc" OIDCProvider ProviderType = "oidc"
// CidaasProvider is the provider type for Cidaas IDP
CidaasProvider ProviderType = "cidaas"
) )
type KeycloakOptions struct { type KeycloakOptions struct {

8
providers/providers.go
View File

@ -45,6 +45,8 @@ func NewProvider(providerConfig options.Provider) (Provider, error) {
return NewMicrosoftEntraIDProvider(providerData, providerConfig), nil return NewMicrosoftEntraIDProvider(providerData, providerConfig), nil
case options.BitbucketProvider: case options.BitbucketProvider:
return NewBitbucketProvider(providerData, providerConfig.BitbucketConfig), nil return NewBitbucketProvider(providerData, providerConfig.BitbucketConfig), nil
case options.CidaasProvider:
return NewCIDAASProvider(providerData), nil
case options.DigitalOceanProvider: case options.DigitalOceanProvider:
return NewDigitalOceanProvider(providerData), nil return NewDigitalOceanProvider(providerData), nil
case options.FacebookProvider: case options.FacebookProvider:
@ -67,8 +69,6 @@ func NewProvider(providerConfig options.Provider) (Provider, error) {
return NewNextcloudProvider(providerData), nil return NewNextcloudProvider(providerData), nil
case options.OIDCProvider: case options.OIDCProvider:
return NewOIDCProvider(providerData, providerConfig.OIDCConfig), nil return NewOIDCProvider(providerData, providerConfig.OIDCConfig), nil
case options.CidaasProvider:
return NewCIDAASProvider(providerData), nil
default: default:
return nil, fmt.Errorf("unknown provider type %q", providerConfig.Type) return nil, fmt.Errorf("unknown provider type %q", providerConfig.Type)
} }
@ -187,8 +187,8 @@ func providerRequiresOIDCProviderVerifier(providerType options.ProviderType) (bo
case options.BitbucketProvider, options.DigitalOceanProvider, options.FacebookProvider, options.GitHubProvider, case options.BitbucketProvider, options.DigitalOceanProvider, options.FacebookProvider, options.GitHubProvider,
options.GoogleProvider, options.KeycloakProvider, options.LinkedInProvider, options.LoginGovProvider, options.NextCloudProvider: options.GoogleProvider, options.KeycloakProvider, options.LinkedInProvider, options.LoginGovProvider, options.NextCloudProvider:
return false, nil return false, nil
case options.OIDCProvider, options.ADFSProvider, options.AzureProvider, options.GitLabProvider, case options.OIDCProvider, options.ADFSProvider, options.AzureProvider, options.CidaasProvider,
options.KeycloakOIDCProvider, options.MicrosoftEntraIDProvider, options.CidaasProvider: options.GitLabProvider, options.KeycloakOIDCProvider, options.MicrosoftEntraIDProvider:
return true, nil return true, nil
default: default:
return false, fmt.Errorf("unknown provider type: %s", providerType) return false, fmt.Errorf("unknown provider type: %s", providerType)