071d17b · typeable/oauth2-proxy

git.iko.soy/typeable/oauth2-proxy

Expose -cookie-path as configuration parameter

commit071d17b521d3652380f02ecf80849712bec02526 authorCostel Moraru <costel.moraru@ro.ibm.com> dateWed 10 Apr 2019, 00:36 (8 years ago) parente9d4f6e

3 files changed+6−2

compare with master

unifiedsplit

main.go+1 oauthproxy.go+4−2 options.go+1

main.go+1

@@ -69,6 +69,7 @@ func main() {

6969 flagSet.String("cookie-name", "_oauth2_proxy", "the name of the cookie that the oauth_proxy creates")

7070 flagSet.String("cookie-secret", "", "the seed string for secure cookies (optionally base64 encoded)")

7171 flagSet.String("cookie-domain", "", "an optional cookie domain to force cookies to (ie: .yourcompany.com)*")

72+ flagSet.String("cookie-path", "/", "an optional cookie path to force cookies to (ie: /poc/)*")

7273 flagSet.Duration("cookie-expire", time.Duration(168)*time.Hour, "expire timeframe for cookie")

7374 flagSet.Duration("cookie-refresh", time.Duration(0), "refresh the cookie after this duration; 0 to disable")

7475 flagSet.Bool("cookie-secure", true, "set secure (HTTPS) cookie flag")

oauthproxy.go+4−2

@@ -56,6 +56,7 @@ type OAuthProxy struct {

5656 CookieName string

5757 CSRFCookieName string

5858 CookieDomain string

59+ CookiePath string

5960 CookieSecure bool

6061 CookieHTTPOnly bool

6162 CookieExpire time.Duration

@@ -214,7 +215,7 @@ func NewOAuthProxy(opts *Options, validator func(string) bool) *OAuthProxy {

214215 refresh = fmt.Sprintf("after %s", opts.CookieRefresh)

215216 }

216217

217− log.Printf("Cookie settings: name:%s secure(https):%v httponly:%v expiry:%s domain:%s refresh:%s", opts.CookieName, opts.CookieSecure, opts.CookieHTTPOnly, opts.CookieExpire, opts.CookieDomain, refresh)

218+ log.Printf("Cookie settings: name:%s secure(https):%v httponly:%v expiry:%s domain:%s path:%s refresh:%s", opts.CookieName, opts.CookieSecure, opts.CookieHTTPOnly, opts.CookieExpire, opts.CookieDomain, opts.CookiePath, refresh)

218219

219220 var cipher *cookie.Cipher

220221 if opts.PassAccessToken || opts.SetAuthorization || opts.PassAuthorization || (opts.CookieRefresh != time.Duration(0)) {

@@ -230,6 +231,7 @@ func NewOAuthProxy(opts *Options, validator func(string) bool) *OAuthProxy {

230231 CSRFCookieName: fmt.Sprintf("%v_%v", opts.CookieName, "csrf"),

231232 CookieSeed: opts.CookieSecret,

232233 CookieDomain: opts.CookieDomain,

234+ CookiePath: opts.CookiePath,

233235 CookieSecure: opts.CookieSecure,

234236 CookieHTTPOnly: opts.CookieHTTPOnly,

235237 CookieExpire: opts.CookieExpire,

@@ -430,7 +432,7 @@ func (p *OAuthProxy) makeCookie(req *http.Request, name string, value string, ex

430432 return &http.Cookie{

431433 Name: name,

432434 Value: value,

433− Path: "/",

435+ Path: p.CookiePath,

434436 Domain: p.CookieDomain,

435437 HttpOnly: p.CookieHTTPOnly,

436438 Secure: p.CookieSecure,

options.go+1

@@ -49,6 +49,7 @@ type Options struct {

4949 CookieName string `flag:"cookie-name" cfg:"cookie_name" env:"OAUTH2_PROXY_COOKIE_NAME"`

5050 CookieSecret string `flag:"cookie-secret" cfg:"cookie_secret" env:"OAUTH2_PROXY_COOKIE_SECRET"`

5151 CookieDomain string `flag:"cookie-domain" cfg:"cookie_domain" env:"OAUTH2_PROXY_COOKIE_DOMAIN"`

52+ CookiePath string `flag:"cookie-path" cfg:"cookie_path" env:"OAUTH2_PROXY_COOKIE_PATH"`

5253 CookieExpire time.Duration `flag:"cookie-expire" cfg:"cookie_expire" env:"OAUTH2_PROXY_COOKIE_EXPIRE"`

5354 CookieRefresh time.Duration `flag:"cookie-refresh" cfg:"cookie_refresh" env:"OAUTH2_PROXY_COOKIE_REFRESH"`

5455 CookieSecure bool `flag:"cookie-secure" cfg:"cookie_secure" env:"OAUTH2_PROXY_COOKIE_SECURE"`