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

config: Remove CookieRefresh (#428) (#436)

Browse source
This commit is contained in:
Y.Horie 2019-12-25 04:22:55 +09:00 • committed by Bobby DeSimone
parent fd7873d5d3
commit 9a330613aa
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/options.go
View file

@ -96,7 +96,6 @@ type Options struct {
CookieSecure bool `mapstructure:"cookie_secure" yaml:"cookie_secure,omitempty"` CookieSecure bool `mapstructure:"cookie_secure" yaml:"cookie_secure,omitempty"`
CookieHTTPOnly bool `mapstructure:"cookie_http_only" yaml:"cookie_http_only,omitempty"` CookieHTTPOnly bool `mapstructure:"cookie_http_only" yaml:"cookie_http_only,omitempty"`
CookieExpire time.Duration `mapstructure:"cookie_expire" yaml:"cookie_expire,omitempty"` CookieExpire time.Duration `mapstructure:"cookie_expire" yaml:"cookie_expire,omitempty"`
CookieRefresh time.Duration `mapstructure:"cookie_refresh" yaml:"cookie_refresh,omitempty"`
// Identity provider configuration variables as specified by RFC6749 // Identity provider configuration variables as specified by RFC6749
// https://openid.net/specs/openid-connect-basic-1_0.html#RFC6749 // https://openid.net/specs/openid-connect-basic-1_0.html#RFC6749
@ -185,7 +184,6 @@ var defaultOptions = Options{
CookieHTTPOnly: true, CookieHTTPOnly: true,
CookieSecure: true, CookieSecure: true,
CookieExpire: 14 * time.Hour, CookieExpire: 14 * time.Hour,
CookieRefresh: 30 * time.Minute,
CookieName: "_pomerium", CookieName: "_pomerium",
DefaultUpstreamTimeout: 30 * time.Second, DefaultUpstreamTimeout: 30 * time.Second,
Headers: map[string]string{ Headers: map[string]string{

2
config/options_test.go
View file

@ -205,7 +205,7 @@ func Test_Checksum(t *testing.T) {
func TestOptionsFromViper(t *testing.T) { func TestOptionsFromViper(t *testing.T) {
t.Parallel() t.Parallel()
opts := []cmp.Option{ opts := []cmp.Option{
cmpopts.IgnoreFields(Options{}, "CookieSecret", "GRPCInsecure", "GRPCAddr", "AuthorizeURL", "AuthorizeURLString", "DefaultUpstreamTimeout", "CookieRefresh", "CookieExpire", "Services", "Addr", "RefreshCooldown", "LogLevel", "KeyFile", "CertFile", "SharedKey", "ReadTimeout", "ReadHeaderTimeout", "IdleTimeout", "GRPCClientTimeout", "GRPCClientDNSRoundRobin"), cmpopts.IgnoreFields(Options{}, "CookieSecret", "GRPCInsecure", "GRPCAddr", "AuthorizeURL", "AuthorizeURLString", "DefaultUpstreamTimeout", "CookieExpire", "Services", "Addr", "RefreshCooldown", "LogLevel", "KeyFile", "CertFile", "SharedKey", "ReadTimeout", "ReadHeaderTimeout", "IdleTimeout", "GRPCClientTimeout", "GRPCClientDNSRoundRobin"),
cmpopts.IgnoreFields(Policy{}, "Source", "Destination"), cmpopts.IgnoreFields(Policy{}, "Source", "Destination"),
cmpOptIgnoreUnexported, cmpOptIgnoreUnexported,
} }