git.iko.soy/typeable/oauth2-proxy
on master help sign in
Remove Env tags from Cookie and Session Options
commitc3f9cbeb3dffcd25c52ef5b798b34477a3fd513b authorJoel Speed <joel.speed@hotmail.co.uk> dateFri 8 May 2020, 18:16 (6 years ago) parent189ed4d
2 files changed+18−18
compare with master
unifiedsplit
pkg/apis/options/cookie.go+9−9 pkg/apis/options/sessions.go+9−9
pkg/apis/options/cookie.go+9−9
@@ -4,13 +4,13 @@ import "time"
44
55// CookieOptions contains configuration options relating to Cookie configuration
66type CookieOptions struct {
7− Name string `flag:"cookie-name" cfg:"cookie_name" env:"OAUTH2_PROXY_COOKIE_NAME"`
8− Secret string `flag:"cookie-secret" cfg:"cookie_secret" env:"OAUTH2_PROXY_COOKIE_SECRET"`
9− Domains []string `flag:"cookie-domain" cfg:"cookie_domain" env:"OAUTH2_PROXY_COOKIE_DOMAIN"`
10− Path string `flag:"cookie-path" cfg:"cookie_path" env:"OAUTH2_PROXY_COOKIE_PATH"`
11− Expire time.Duration `flag:"cookie-expire" cfg:"cookie_expire" env:"OAUTH2_PROXY_COOKIE_EXPIRE"`
12− Refresh time.Duration `flag:"cookie-refresh" cfg:"cookie_refresh" env:"OAUTH2_PROXY_COOKIE_REFRESH"`
13− Secure bool `flag:"cookie-secure" cfg:"cookie_secure" env:"OAUTH2_PROXY_COOKIE_SECURE"`
14− HTTPOnly bool `flag:"cookie-httponly" cfg:"cookie_httponly" env:"OAUTH2_PROXY_COOKIE_HTTPONLY"`
15− SameSite string `flag:"cookie-samesite" cfg:"cookie_samesite" env:"OAUTH2_PROXY_COOKIE_SAMESITE"`
7+ Name string `flag:"cookie-name" cfg:"cookie_name"`
8+ Secret string `flag:"cookie-secret" cfg:"cookie_secret"`
9+ Domains []string `flag:"cookie-domain" cfg:"cookie_domain"`
10+ Path string `flag:"cookie-path" cfg:"cookie_path"`
11+ Expire time.Duration `flag:"cookie-expire" cfg:"cookie_expire"`
12+ Refresh time.Duration `flag:"cookie-refresh" cfg:"cookie_refresh"`
13+ Secure bool `flag:"cookie-secure" cfg:"cookie_secure"`
14+ HTTPOnly bool `flag:"cookie-httponly" cfg:"cookie_httponly"`
15+ SameSite string `flag:"cookie-samesite" cfg:"cookie_samesite"`
1616}
pkg/apis/options/sessions.go+9−9
@@ -4,7 +4,7 @@ import "github.com/oauth2-proxy/oauth2-proxy/pkg/encryption"
44
55// SessionOptions contains configuration options for the SessionStore providers.
66type SessionOptions struct {
7− Type string `flag:"session-store-type" cfg:"session_store_type" env:"OAUTH2_PROXY_SESSION_STORE_TYPE"`
7+ Type string `flag:"session-store-type" cfg:"session_store_type"`
88 Cipher *encryption.Cipher `cfg:",internal"`
99 Redis RedisStoreOptions `cfg:",squash"`
1010}
@@ -19,12 +19,12 @@ var RedisSessionStoreType = "redis"
1919
2020// RedisStoreOptions contains configuration options for the RedisSessionStore.
2121type RedisStoreOptions struct {
22− ConnectionURL string `flag:"redis-connection-url" cfg:"redis_connection_url" env:"OAUTH2_PROXY_REDIS_CONNECTION_URL"`
23− UseSentinel bool `flag:"redis-use-sentinel" cfg:"redis_use_sentinel" env:"OAUTH2_PROXY_REDIS_USE_SENTINEL"`
24− SentinelMasterName string `flag:"redis-sentinel-master-name" cfg:"redis_sentinel_master_name" env:"OAUTH2_PROXY_REDIS_SENTINEL_MASTER_NAME"`
25− SentinelConnectionURLs []string `flag:"redis-sentinel-connection-urls" cfg:"redis_sentinel_connection_urls" env:"OAUTH2_PROXY_REDIS_SENTINEL_CONNECTION_URLS"`
26− UseCluster bool `flag:"redis-use-cluster" cfg:"redis_use_cluster" env:"OAUTH2_PROXY_REDIS_USE_CLUSTER"`
27− ClusterConnectionURLs []string `flag:"redis-cluster-connection-urls" cfg:"redis_cluster_connection_urls" env:"OAUTH2_PROXY_REDIS_CLUSTER_CONNECTION_URLS"`
28− CAPath string `flag:"redis-ca-path" cfg:"redis_ca_path" env:"OAUTH2_PROXY_REDIS_CA_PATH"`
29− InsecureSkipTLSVerify bool `flag:"redis-insecure-skip-tls-verify" cfg:"redis_insecure_skip_tls_verify" env:"OAUTH2_PROXY_REDIS_INSECURE_SKIP_TLS_VERIFY"`
22+ ConnectionURL string `flag:"redis-connection-url" cfg:"redis_connection_url"`
23+ UseSentinel bool `flag:"redis-use-sentinel" cfg:"redis_use_sentinel"`
24+ SentinelMasterName string `flag:"redis-sentinel-master-name" cfg:"redis_sentinel_master_name"`
25+ SentinelConnectionURLs []string `flag:"redis-sentinel-connection-urls" cfg:"redis_sentinel_connection_urls"`
26+ UseCluster bool `flag:"redis-use-cluster" cfg:"redis_use_cluster"`
27+ ClusterConnectionURLs []string `flag:"redis-cluster-connection-urls" cfg:"redis_cluster_connection_urls"`
28+ CAPath string `flag:"redis-ca-path" cfg:"redis_ca_path"`
29+ InsecureSkipTLSVerify bool `flag:"redis-insecure-skip-tls-verify" cfg:"redis_insecure_skip_tls_verify"`
3030}