diff options
Diffstat (limited to 'internal/route')
| -rw-r--r-- | internal/route/admin/admin.go | 3 | ||||
| -rw-r--r-- | internal/route/user/auth.go | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/internal/route/admin/admin.go b/internal/route/admin/admin.go index a5217875..e6a3a61a 100644 --- a/internal/route/admin/admin.go +++ b/internal/route/admin/admin.go @@ -205,6 +205,7 @@ func Config(c *context.Context) { c.Data["Email"] = conf.Email c.Data["Auth"] = conf.Auth c.Data["User"] = conf.User + c.Data["Session"] = conf.Session c.Data["LogRootPath"] = conf.LogRootPath @@ -216,8 +217,6 @@ func Config(c *context.Context) { c.Data["CacheInterval"] = conf.CacheInterval c.Data["CacheConn"] = conf.CacheConn - c.Data["SessionConfig"] = conf.SessionConfig - c.Data["DisableGravatar"] = conf.DisableGravatar c.Data["EnableFederatedAvatar"] = conf.EnableFederatedAvatar diff --git a/internal/route/user/auth.go b/internal/route/user/auth.go index 7c29634b..7d72eb16 100644 --- a/internal/route/user/auth.go +++ b/internal/route/user/auth.go @@ -66,7 +66,7 @@ func AutoLogin(c *context.Context) (bool, error) { isSucceed = true c.Session.Set("uid", u.ID) c.Session.Set("uname", u.Name) - c.SetCookie(conf.CSRFCookieName, "", -1, conf.Server.Subpath) + c.SetCookie(conf.Session.CSRFCookieName, "", -1, conf.Server.Subpath) if conf.Security.EnableLoginStatusCookie { c.SetCookie(conf.Security.LoginStatusCookieName, "true", 0, conf.Server.Subpath) } @@ -130,7 +130,7 @@ func afterLogin(c *context.Context, u *db.User, remember bool) { c.Session.Delete("twoFactorUserID") // Clear whatever CSRF has right now, force to generate a new one - c.SetCookie(conf.CSRFCookieName, "", -1, conf.Server.Subpath) + c.SetCookie(conf.Session.CSRFCookieName, "", -1, conf.Server.Subpath) if conf.Security.EnableLoginStatusCookie { c.SetCookie(conf.Security.LoginStatusCookieName, "true", 0, conf.Server.Subpath) } @@ -285,7 +285,7 @@ func SignOut(c *context.Context) { c.Session.Destory(c.Context) c.SetCookie(conf.Security.CookieUsername, "", -1, conf.Server.Subpath) c.SetCookie(conf.Security.CookieRememberName, "", -1, conf.Server.Subpath) - c.SetCookie(conf.CSRFCookieName, "", -1, conf.Server.Subpath) + c.SetCookie(conf.Session.CSRFCookieName, "", -1, conf.Server.Subpath) c.SubURLRedirect("/") } |