git.iko.soy/typeable/oauth2-proxy
on master help sign in
Extract MakeCookie()
beed9fbMike Bland
oauthproxy.go+14−26
compare with master
unifiedsplit
@@ -223,7 +223,7 @@ func (p *OauthProxy) redeemCode(host, code string) (string, string, error) {
223 return access_token, email, nil
223 return access_token, email, nil
224}
224}
225
225
226−func (p *OauthProxy) ClearCookie(rw http.ResponseWriter, req *http.Request) {
226+func (p *OauthProxy) MakeCookie(req *http.Request, value string, expiration time.Duration) *http.Cookie {
227 domain := req.Host
227 domain := req.Host
228 if h, _, err := net.SplitHostPort(domain); err == nil {
228 if h, _, err := net.SplitHostPort(domain); err == nil {
229 domain = h
229 domain = h
@@ -234,40 +234,28 @@ func (p *OauthProxy) ClearCookie(rw http.ResponseWriter, req *http.Request) {
234 }
234 }
235 domain = p.CookieDomain
235 domain = p.CookieDomain
236 }
236 }
237+
238+ if value != "" {
239+ value = signedCookieValue(p.CookieSeed, p.CookieKey, value)
240+ }
241+
237− cookie := &http.Cookie{
242+ return &http.Cookie{
238 Name: p.CookieKey,
243 Name: p.CookieKey,
239− Value: "",
244+ Value: value,
240 Path: "/",
245 Path: "/",
241 Domain: domain,
246 Domain: domain,
242 HttpOnly: p.CookieHttpOnly,
247 HttpOnly: p.CookieHttpOnly,
243 Secure: p.CookieSecure,
248 Secure: p.CookieSecure,
244− Expires: time.Now().Add(time.Duration(1) * time.Hour * -1),
249+ Expires: time.Now().Add(expiration),
245 }
250 }
246− http.SetCookie(rw, cookie)
247}
251}
248
252
249−func (p *OauthProxy) SetCookie(rw http.ResponseWriter, req *http.Request, val string) {
253+func (p *OauthProxy) ClearCookie(rw http.ResponseWriter, req *http.Request) {
254+ http.SetCookie(rw, p.MakeCookie(req, "", time.Duration(1)*time.Hour*-1))
255+}
250
256
251− domain := req.Host
257+func (p *OauthProxy) SetCookie(rw http.ResponseWriter, req *http.Request, val string) {
252− if h, _, err := net.SplitHostPort(domain); err == nil {
258+ http.SetCookie(rw, p.MakeCookie(req, val, p.CookieExpire))
253− domain = h
254− }
255− if p.CookieDomain != "" {
256− if !strings.HasSuffix(domain, p.CookieDomain) {
257− log.Printf("Warning: request host is %q but using configured cookie domain of %q", domain, p.CookieDomain)
258− }
259− domain = p.CookieDomain
260− }
261− cookie := &http.Cookie{
262− Name: p.CookieKey,
263− Value: signedCookieValue(p.CookieSeed, p.CookieKey, val),
264− Path: "/",
265− Domain: domain,
266− HttpOnly: p.CookieHttpOnly,
267− Secure: p.CookieSecure,
268− Expires: time.Now().Add(p.CookieExpire),
269− }
270− http.SetCookie(rw, cookie)
271}
259}
272
260
273func (p *OauthProxy) ProcessCookie(rw http.ResponseWriter, req *http.Request) (email, user, access_token string, ok bool) {
261func (p *OauthProxy) ProcessCookie(rw http.ResponseWriter, req *http.Request) (email, user, access_token string, ok bool) {