IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

set userToken on request when logging in

Browse Source
This commit is contained in:
bergquist 2019-01-21 11:42:10 +01:00
parent 55b3013eb3
commit 697ddccd8e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/services/auth/auth_token.go
View File

@ -22,7 +22,7 @@ func init() {
var ( var (
now = time.Now now = time.Now
RotateTime = 1 * time.Minute RotateTime = 1 * time.Minute // this should be read from [session] configuration.
UrgentRotateTime = 30 * time.Second UrgentRotateTime = 30 * time.Second
oneYearInSeconds = 31557600 //used as default maxage for session cookies. We validate/rotate them more often. oneYearInSeconds = 31557600 //used as default maxage for session cookies. We validate/rotate them more often.
) )
@ -77,7 +77,8 @@ func (s *UserAuthTokenService) InitContextWithToken(ctx *models.ReqContext, orgI
} }
func (s *UserAuthTokenService) writeSessionCookie(ctx *models.ReqContext, value string, maxAge int) { func (s *UserAuthTokenService) writeSessionCookie(ctx *models.ReqContext, value string, maxAge int) {
ctx.Logger.Info("new token", "unhashed token", ctx.UserToken.UnhashedToken) ctx.Logger.Info("new token", "unhashed token", value)
ctx.Resp.Header().Del("Set-Cookie") ctx.Resp.Header().Del("Set-Cookie")
cookie := http.Cookie{ cookie := http.Cookie{
Name: setting.SessionOptions.CookieName, Name: setting.SessionOptions.CookieName,
@ -97,6 +98,8 @@ func (s *UserAuthTokenService) UserAuthenticatedHook(user *models.User, c *model
return err return err
} }
c.UserToken = userToken
s.writeSessionCookie(c, userToken.UnhashedToken, oneYearInSeconds) s.writeSessionCookie(c, userToken.UnhashedToken, oneYearInSeconds)
return nil return nil
} }