go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-12-21 23:57:36 +02:00
Code Issues Releases Activity

feat: add ensure defaults to all migrated structs

Browse Source 
Signed-off-by: Jan Larwig <jan@larwig.com>
This commit is contained in:
Jan Larwig
2025-10-30 09:26:14 +01:00
parent 51b1fd0510
commit 527c72f23f
14 changed files with 189 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,6 +289,7 @@ type LoginGovOptions struct {
PubJWKURL string `yaml:"pubjwkURL,omitempty"`
}
// Legacy default providers configuration
func providerDefaults() Providers {
providers := Providers{
{
@@ -310,3 +311,72 @@ func providerDefaults() Providers {
}
return providers
}
// EnsureDefaults sets any default values for Providers fields.
func (p Providers) EnsureDefaults() {
for i := range p {
p[i].EnsureDefaults()
}
}
// EnsureDefaults sets any default values for Provider fields.
func (p *Provider) EnsureDefaults() {
if p.SkipClaimsFromProfileURL == nil {
p.SkipClaimsFromProfileURL = ptr.Ptr(false)
}
if p.UseSystemTrustStore == nil {
p.UseSystemTrustStore = ptr.Ptr(true)
}
p.OIDCConfig.EnsureDefaults()
p.MicrosoftEntraIDConfig.EnsureDefaults()
p.ADFSConfig.EnsureDefaults()
p.GoogleConfig.EnsureDefaults()
}
// EnsureDefaults sets any default values for OIDCOptions fields.
func (o *OIDCOptions) EnsureDefaults() {
// Ensure OIDC defaults
if o.InsecureAllowUnverifiedEmail == nil {
o.InsecureAllowUnverifiedEmail = ptr.Ptr(false)
}
if o.InsecureSkipNonce == nil {
o.InsecureSkipNonce = ptr.Ptr(true)
}
if o.SkipDiscovery == nil {
o.SkipDiscovery = ptr.Ptr(false)
}
if o.UserIDClaim == "" {
o.UserIDClaim = OIDCEmailClaim
}
if o.EmailClaim == "" {
o.EmailClaim = OIDCEmailClaim
}
if o.GroupsClaim == "" {
o.GroupsClaim = OIDCGroupsClaim
}
if len(o.AudienceClaims) == 0 {
o.AudienceClaims = OIDCAudienceClaims
}
}
// EnsureDefaults sets any default values for MicrosoftEntraIDOptions fields.
func (me *MicrosoftEntraIDOptions) EnsureDefaults() {
if me.FederatedTokenAuth == nil {
me.FederatedTokenAuth = ptr.Ptr(false)
}
}
// EnsureDefaults sets any default values for ADFSOptions fields.
func (a *ADFSOptions) EnsureDefaults() {
if a.SkipScope == nil {
a.SkipScope = ptr.Ptr(false)
}
}
// EnsureDefaults sets any default values for GoogleOptions fields.
func (g *GoogleOptions) EnsureDefaults() {
if g.UseApplicationDefaultCredentials == nil {
g.UseApplicationDefaultCredentials = ptr.Ptr(false)
}
}