From 2a557f67d28f3936196fe8af993690de7899d4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 7 Mar 2016 17:26:31 +0100 Subject: [PATCH] Do not set remember me cookie when days are set to zero --- pkg/api/login.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/api/login.go b/pkg/api/login.go index d0aace4235c..463fa8282a5 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -126,8 +126,10 @@ func loginUserWithUser(user *m.User, c *middleware.Context) { } days := 86400 * setting.LogInRememberDays - c.SetCookie(setting.CookieUserName, user.Login, days, setting.AppSubUrl+"/") - c.SetSuperSecureCookie(util.EncodeMd5(user.Rands+user.Password), setting.CookieRememberName, user.Login, days, setting.AppSubUrl+"/") + if days > 0 { + c.SetCookie(setting.CookieUserName, user.Login, days, setting.AppSubUrl+"/") + c.SetSuperSecureCookie(util.EncodeMd5(user.Rands+user.Password), setting.CookieRememberName, user.Login, days, setting.AppSubUrl+"/") + } c.Session.Set(middleware.SESS_KEY_USERID, user.Id) }