git.iko.soy/typeable/oauth2-proxy
on master help sign in
Fix uninitialized user claim (#1873)
fd2807cDamien Degois
CHANGELOG.md+1
compare with master
unifiedsplit
@@ -8,6 +8,7 @@
8
8
9## Changes since v7.4.0
9## Changes since v7.4.0
10
10
11+- [#1873](https://github.com/oauth2-proxy/oauth2-proxy/pull/1873) Fix empty users with some OIDC providers (@babs)
11- [#1882](https://github.com/oauth2-proxy/oauth2-proxy/pull/1882) Make `htpasswd.GetUsers` racecondition safe
12- [#1882](https://github.com/oauth2-proxy/oauth2-proxy/pull/1882) Make `htpasswd.GetUsers` racecondition safe
12- [#1883](https://github.com/oauth2-proxy/oauth2-proxy/pull/1883) Ensure v8 manifest variant is set on docker images
13- [#1883](https://github.com/oauth2-proxy/oauth2-proxy/pull/1883) Ensure v8 manifest variant is set on docker images
13
14
providers/gitlab.go+4−1
@@ -32,7 +32,10 @@ var _ Provider = (*GitLabProvider)(nil)
32
32
33// NewGitLabProvider initiates a new GitLabProvider
33// NewGitLabProvider initiates a new GitLabProvider
34func NewGitLabProvider(p *ProviderData, opts options.GitLabOptions) (*GitLabProvider, error) {
34func NewGitLabProvider(p *ProviderData, opts options.GitLabOptions) (*GitLabProvider, error) {
35+ p.setProviderDefaults(providerDefaults{
35− p.ProviderName = gitlabProviderName
36+ name: gitlabProviderName,
37+ })
38+
36 if p.Scope == "" {
39 if p.Scope == "" {
37 p.Scope = gitlabDefaultScope
40 p.Scope = gitlabDefaultScope
38 }
41 }
providers/keycloak_oidc.go+3−1
@@ -17,7 +17,9 @@ type KeycloakOIDCProvider struct {
17
17
18// NewKeycloakOIDCProvider makes a KeycloakOIDCProvider using the ProviderData
18// NewKeycloakOIDCProvider makes a KeycloakOIDCProvider using the ProviderData
19func NewKeycloakOIDCProvider(p *ProviderData, opts options.KeycloakOptions) *KeycloakOIDCProvider {
19func NewKeycloakOIDCProvider(p *ProviderData, opts options.KeycloakOptions) *KeycloakOIDCProvider {
20+ p.setProviderDefaults(providerDefaults{
20− p.ProviderName = keycloakOIDCProviderName
21+ name: keycloakOIDCProviderName,
22+ })
21
23
22 provider := &KeycloakOIDCProvider{
24 provider := &KeycloakOIDCProvider{
23 OIDCProvider: &OIDCProvider{
25 OIDCProvider: &OIDCProvider{
providers/nextcloud.go+4−1
@@ -21,7 +21,10 @@ const nextCloudProviderName = "Nextcloud"
21
21
22// NewNextcloudProvider initiates a new NextcloudProvider
22// NewNextcloudProvider initiates a new NextcloudProvider
23func NewNextcloudProvider(p *ProviderData) *NextcloudProvider {
23func NewNextcloudProvider(p *ProviderData) *NextcloudProvider {
24+ p.setProviderDefaults(providerDefaults{
24− p.ProviderName = nextCloudProviderName
25+ name: nextCloudProviderName,
26+ })
27+
25 p.getAuthorizationHeaderFunc = makeOIDCHeader
28 p.getAuthorizationHeaderFunc = makeOIDCHeader
26 if p.EmailClaim == options.OIDCEmailClaim {
29 if p.EmailClaim == options.OIDCEmailClaim {
27 // This implies the email claim has not been overridden, we should set a default
30 // This implies the email claim has not been overridden, we should set a default