From 3fa2cae86260d39fa2ffd43d59b2754327f6169a Mon Sep 17 00:00:00 2001 From: Li4n0 <34324462+Li4n0@users.noreply.github.com> Date: Wed, 14 Sep 2022 01:06:26 +0800 Subject: [PATCH] fix: fix the bug that authentication always fails after token change (#59) --- pkg/server/controller.go | 2 +- pkg/server/router.go | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkg/server/controller.go b/pkg/server/controller.go index 908ec58..db74fce 100644 --- a/pkg/server/controller.go +++ b/pkg/server/controller.go @@ -18,7 +18,7 @@ import ( func (revsuit *Revsuit) auth(c *gin.Context) { c.SetSameSite(http.SameSiteLaxMode) - c.SetCookie("token", c.Request.Header["Token"][0], 0, revsuit.config.AdminPathPrefix, "", false, true) + c.SetCookie("token", c.Request.Header.Get("Token"), 0, revsuit.config.AdminPathPrefix, "", false, true) c.String(200, "pong") } diff --git a/pkg/server/router.go b/pkg/server/router.go index eea0ef7..26766b3 100644 --- a/pkg/server/router.go +++ b/pkg/server/router.go @@ -32,13 +32,12 @@ func (revsuit *Revsuit) registerPlatformRouter() { // /api need Authorization api := revsuit.http.Router.Group(revsuit.config.AdminPathPrefix + "/api") api.Use(func(c *gin.Context) { - token, err := c.Cookie("token") - if err == http.ErrNoCookie { - token = c.Request.Header.Get("Token") - } + token, _ := c.Cookie("token") if token != revsuit.http.Token { - c.Abort() - c.Status(403) + if c.Request.Header.Get("Token") != revsuit.http.Token { + c.Abort() + c.Status(403) + } } }) revsuit.http.ApiGroup = api