From 734a7d38b28c15849389328cbf7ca0d3286f198c Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Mon, 21 Jan 2019 11:21:43 +0100 Subject: [PATCH] set cookie name from configuration --- pkg/middleware/middleware.go | 2 +- pkg/services/auth/auth_token.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go index a6800971f4f..6cec2b9ad05 100644 --- a/pkg/middleware/middleware.go +++ b/pkg/middleware/middleware.go @@ -125,7 +125,7 @@ func initContextWithToken(ctx *m.ReqContext, orgID int64, ts *auth.UserAuthToken ctx.Logger.Info("new token", "unhashed token", ctx.UserToken.UnhashedToken) ctx.Resp.Header().Del("Set-Cookie") cookie := http.Cookie{ - Name: "grafana_session", + Name: setting.SessionOptions.CookieName, Value: url.QueryEscape(ctx.UserToken.UnhashedToken), HttpOnly: true, Domain: setting.Domain, diff --git a/pkg/services/auth/auth_token.go b/pkg/services/auth/auth_token.go index 1c687841f7e..5929043573e 100644 --- a/pkg/services/auth/auth_token.go +++ b/pkg/services/auth/auth_token.go @@ -37,8 +37,6 @@ func (s *UserAuthTokenService) Init() error { return nil } -const sessionCookieKey = "grafana_session" - func (s *UserAuthTokenService) UserAuthenticatedHook(user *models.User, c *models.ReqContext) error { userToken, err := s.CreateToken(user.Id, c.RemoteAddr(), c.Req.UserAgent()) if err != nil { @@ -47,11 +45,12 @@ func (s *UserAuthTokenService) UserAuthenticatedHook(user *models.User, c *model c.Resp.Header().Del("Set-Cookie") cookie := http.Cookie{ - Name: sessionCookieKey, + Name: setting.SessionOptions.CookieName, Value: url.QueryEscape(userToken.UnhashedToken), HttpOnly: true, Domain: setting.Domain, Path: setting.AppSubUrl + "/", + Secure: setting.SessionOptions.Secure, } http.SetCookie(c.Resp, &cookie) @@ -62,11 +61,12 @@ func (s *UserAuthTokenService) UserAuthenticatedHook(user *models.User, c *model func (s *UserAuthTokenService) UserSignedOutHook(c *models.ReqContext) { c.Resp.Header().Del("Set-Cookie") cookie := http.Cookie{ - Name: sessionCookieKey, + Name: setting.SessionOptions.CookieName, Value: "", HttpOnly: true, Domain: setting.Domain, Path: setting.AppSubUrl + "/", + Secure: setting.SessionOptions.Secure, } http.SetCookie(c.Resp, &cookie) }