3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-07-29 06:29:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into kralicky/tracing

Browse source
This commit is contained in:
Joe Kralicky 2025-01-17 22:08:22 +00:00
commit d45d37be9f
No known key found for this signature in database
GPG key ID: 75C4875F34A9FB79
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/options.go
View file

@ -1495,7 +1495,9 @@ func (o *Options) ApplySettings(ctx context.Context, certsIndex *cryptutil.Certi
set(&o.SigningKey, settings.SigningKey)
setMap(&o.SetResponseHeaders, settings.SetResponseHeaders)
setMap(&o.JWTClaimsHeaders, settings.JwtClaimsHeaders)
o.JWTGroupsFilter = NewJWTGroupsFilter(settings.JwtGroupsFilter)
if len(settings.JwtGroupsFilter) > 0 {
o.JWTGroupsFilter = NewJWTGroupsFilter(settings.JwtGroupsFilter)
}
setDuration(&o.DefaultUpstreamTimeout, settings.DefaultUpstreamTimeout)
set(&o.MetricsAddr, settings.MetricsAddress)
set(&o.MetricsBasicAuth, settings.MetricsBasicAuth)

13
config/options_test.go
View file

@ -976,6 +976,19 @@ func TestOptions_ApplySettings(t *testing.T) {
})
assert.Equal(t, "#333333", options.BrandingOptions.GetPrimaryColor())
})
t.Run("jwt_groups_filter", func(t *testing.T) {
options := NewDefaultOptions()
options.ApplySettings(ctx, nil, &configpb.Settings{
JwtGroupsFilter: []string{"foo", "bar", "baz"},
})
options.ApplySettings(ctx, nil, &configpb.Settings{})
assert.Equal(t, NewJWTGroupsFilter([]string{"foo", "bar", "baz"}), options.JWTGroupsFilter)
options.ApplySettings(ctx, nil, &configpb.Settings{
JwtGroupsFilter: []string{"quux", "zulu"},
})
assert.Equal(t, NewJWTGroupsFilter([]string{"quux", "zulu"}), options.JWTGroupsFilter)
})
}
func TestOptions_GetSetResponseHeaders(t *testing.T) {