diff --git a/oauthproxy_test.go b/oauthproxy_test.go index 50df0872..957b4334 100644 --- a/oauthproxy_test.go +++ b/oauthproxy_test.go @@ -1403,7 +1403,7 @@ func TestClearSplitCookie(t *testing.T) { opts := NewOptions() opts.Cookie.Name = "oauth2" opts.Cookie.Domains = []string{"abc"} - store, err := cookie.NewCookieSessionStore(&opts.SessionOptions, &opts.Cookie) + store, err := cookie.NewCookieSessionStore(&opts.Session, &opts.Cookie) assert.Equal(t, err, nil) p := OAuthProxy{CookieName: opts.Cookie.Name, CookieDomains: opts.Cookie.Domains, sessionStore: store} var rw = httptest.NewRecorder() @@ -1432,7 +1432,7 @@ func TestClearSingleCookie(t *testing.T) { opts := NewOptions() opts.Cookie.Name = "oauth2" opts.Cookie.Domains = []string{"abc"} - store, err := cookie.NewCookieSessionStore(&opts.SessionOptions, &opts.Cookie) + store, err := cookie.NewCookieSessionStore(&opts.Session, &opts.Cookie) assert.Equal(t, err, nil) p := OAuthProxy{CookieName: opts.Cookie.Name, CookieDomains: opts.Cookie.Domains, sessionStore: store} var rw = httptest.NewRecorder() diff --git a/options.go b/options.go index 8b3e461b..ca8c14d1 100644 --- a/options.go +++ b/options.go @@ -66,8 +66,7 @@ type Options struct { Cookie options.CookieOptions - // Embed SessionOptions - options.SessionOptions + Session options.SessionOptions Upstreams []string `flag:"upstream" cfg:"upstreams" env:"OAUTH2_PROXY_UPSTREAMS"` SkipAuthRegex []string `flag:"skip-auth-regex" cfg:"skip_auth_regex" env:"OAUTH2_PROXY_SKIP_AUTH_REGEX"` @@ -164,7 +163,7 @@ func NewOptions() *Options { Expire: time.Duration(168) * time.Hour, Refresh: time.Duration(0), }, - SessionOptions: options.SessionOptions{ + Session: options.SessionOptions{ Type: "cookie", }, SetXAuthRequest: false, @@ -412,8 +411,8 @@ func (o *Options) Validate() error { } } - o.SessionOptions.Cipher = cipher - sessionStore, err := sessions.NewSessionStore(&o.SessionOptions, &o.Cookie) + o.Session.Cipher = cipher + sessionStore, err := sessions.NewSessionStore(&o.Session, &o.Cookie) if err != nil { msgs = append(msgs, fmt.Sprintf("error initialising session storage: %v", err)) } else { diff --git a/pkg/apis/options/sessions.go b/pkg/apis/options/sessions.go index 3e222780..a12be7f4 100644 --- a/pkg/apis/options/sessions.go +++ b/pkg/apis/options/sessions.go @@ -6,29 +6,25 @@ import "github.com/oauth2-proxy/oauth2-proxy/pkg/encryption" type SessionOptions struct { Type string `flag:"session-store-type" cfg:"session_store_type" env:"OAUTH2_PROXY_SESSION_STORE_TYPE"` Cipher *encryption.Cipher - CookieStoreOptions - RedisStoreOptions + Redis RedisStoreOptions } // CookieSessionStoreType is used to indicate the CookieSessionStore should be // used for storing sessions. var CookieSessionStoreType = "cookie" -// CookieStoreOptions contains configuration options for the CookieSessionStore. -type CookieStoreOptions struct{} - // RedisSessionStoreType is used to indicate the RedisSessionStore should be // used for storing sessions. var RedisSessionStoreType = "redis" // RedisStoreOptions contains configuration options for the RedisSessionStore. type RedisStoreOptions struct { - RedisConnectionURL string `flag:"redis-connection-url" cfg:"redis_connection_url" env:"OAUTH2_PROXY_REDIS_CONNECTION_URL"` + ConnectionURL string `flag:"redis-connection-url" cfg:"redis_connection_url" env:"OAUTH2_PROXY_REDIS_CONNECTION_URL"` UseSentinel bool `flag:"redis-use-sentinel" cfg:"redis_use_sentinel" env:"OAUTH2_PROXY_REDIS_USE_SENTINEL"` SentinelMasterName string `flag:"redis-sentinel-master-name" cfg:"redis_sentinel_master_name" env:"OAUTH2_PROXY_REDIS_SENTINEL_MASTER_NAME"` SentinelConnectionURLs []string `flag:"redis-sentinel-connection-urls" cfg:"redis_sentinel_connection_urls" env:"OAUTH2_PROXY_REDIS_SENTINEL_CONNECTION_URLS"` UseCluster bool `flag:"redis-use-cluster" cfg:"redis_use_cluster" env:"OAUTH2_PROXY_REDIS_USE_CLUSTER"` ClusterConnectionURLs []string `flag:"redis-cluster-connection-urls" cfg:"redis_cluster_connection_urls" env:"OAUTH2_PROXY_REDIS_CLUSTER_CONNECTION_URLS"` - RedisCAPath string `flag:"redis-ca-path" cfg:"redis_ca_path" env:"OAUTH2_PROXY_REDIS_CA_PATH"` - RedisInsecureTLS bool `flag:"redis-insecure-skip-tls-verify" cfg:"redis_insecure_skip_tls_verify" env:"OAUTH2_PROXY_REDIS_INSECURE_SKIP_TLS_VERIFY"` + CAPath string `flag:"redis-ca-path" cfg:"redis_ca_path" env:"OAUTH2_PROXY_REDIS_CA_PATH"` + InsecureSkipTLSVerify bool `flag:"redis-insecure-skip-tls-verify" cfg:"redis_insecure_skip_tls_verify" env:"OAUTH2_PROXY_REDIS_INSECURE_SKIP_TLS_VERIFY"` } diff --git a/pkg/sessions/redis/redis_store.go b/pkg/sessions/redis/redis_store.go index 28eff8c4..7737b960 100644 --- a/pkg/sessions/redis/redis_store.go +++ b/pkg/sessions/redis/redis_store.go @@ -40,7 +40,7 @@ type SessionStore struct { // NewRedisSessionStore initialises a new instance of the SessionStore from // the configuration given func NewRedisSessionStore(opts *options.SessionOptions, cookieOpts *options.CookieOptions) (sessions.SessionStore, error) { - client, err := newRedisCmdable(opts.RedisStoreOptions) + client, err := newRedisCmdable(opts.Redis) if err != nil { return nil, fmt.Errorf("error constructing redis client: %v", err) } @@ -74,16 +74,16 @@ func newRedisCmdable(opts options.RedisStoreOptions) (Client, error) { return newClusterClient(client), nil } - opt, err := redis.ParseURL(opts.RedisConnectionURL) + opt, err := redis.ParseURL(opts.ConnectionURL) if err != nil { return nil, fmt.Errorf("unable to parse redis url: %s", err) } - if opts.RedisInsecureTLS { + if opts.InsecureSkipTLSVerify { opt.TLSConfig.InsecureSkipVerify = true } - if opts.RedisCAPath != "" { + if opts.CAPath != "" { rootCAs, err := x509.SystemCertPool() if err != nil { logger.Printf("failed to load system cert pool for redis connection, falling back to empty cert pool") @@ -91,9 +91,9 @@ func newRedisCmdable(opts options.RedisStoreOptions) (Client, error) { if rootCAs == nil { rootCAs = x509.NewCertPool() } - certs, err := ioutil.ReadFile(opts.RedisCAPath) + certs, err := ioutil.ReadFile(opts.CAPath) if err != nil { - return nil, fmt.Errorf("failed to load %q, %v", opts.RedisCAPath, err) + return nil, fmt.Errorf("failed to load %q, %v", opts.CAPath, err) } // Append our cert to the system pool diff --git a/pkg/sessions/session_store_test.go b/pkg/sessions/session_store_test.go index 69ccf7db..ded609ec 100644 --- a/pkg/sessions/session_store_test.go +++ b/pkg/sessions/session_store_test.go @@ -428,7 +428,7 @@ var _ = Describe("NewSessionStore", func() { mr, err = miniredis.Run() Expect(err).ToNot(HaveOccurred()) opts.Type = options.RedisSessionStoreType - opts.RedisConnectionURL = "redis://" + mr.Addr() + opts.Redis.ConnectionURL = "redis://" + mr.Addr() }) AfterEach(func() {