Skip to content

BillionMail gives you open-source MailServer, NewsLetter, Email Marketing — fully self-hosted, dev-friendly, and free from monthly fees. Join the discord: https://discord.gg/asfXzBUhZr

Fixed "access denied" prompt when logging out. Optimized login status verification with session.

Jack2dec228d5bb6
diff --git a/core/internal/cmd/cmd.go b/core/internal/cmd/cmd.go
index 878dd680..721f67fe 100644
--- a/core/internal/cmd/cmd.go
+++ b/core/internal/cmd/cmd.go
@@ -291,7 +291,7 @@ var (
var rspamdProxy *httputil.ReverseProxy
rspamdProxyMutex := sync.Mutex{}
s.BindHandler("/rspamd/*any", func(r *ghttp.Request) {
- if !r.Session.MustGet("UserLogin", false).Bool() {
+ if _, err := rbac2.JWT().ParseToken(r.Session.MustGet("SignedToken", "").String()); err != nil {
r.Response.WriteHeader(403)
r.Response.Write([]byte("Access denied"))
return
diff --git a/core/internal/controller/rbac/rbac_v1_auth.go b/core/internal/controller/rbac/rbac_v1_auth.go
index 5db12819..6f2878ff 100644
--- a/core/internal/controller/rbac/rbac_v1_auth.go
+++ b/core/internal/controller/rbac/rbac_v1_auth.go
@@ -158,6 +158,9 @@ func (c *ControllerV1) Logout(ctx context.Context, req *v1.LogoutReq) (res *v1.L
// Destroy the session
_ = g.RequestFromCtx(ctx).Session.RemoveAll()
+ // reset the safe path pass
+ _ = g.RequestFromCtx(ctx).Session.Set("safe_path_pass", true)
+
res.Success = true
res.Code = 0
res.Msg = "Logout successful"
diff --git a/core/internal/service/rbac/jwt.go b/core/internal/service/rbac/jwt.go
index 57d0539b..67b371bd 100644
--- a/core/internal/service/rbac/jwt.go
+++ b/core/internal/service/rbac/jwt.go
@@ -213,10 +213,10 @@ func (s *JWTService) JWTAuthMiddleware(r *ghttp.Request) {
}
// Update Session
- err = r.Session.Set("UserLogin", true)
+ err = r.Session.Set("SignedToken", tokenString)
if err != nil {
- g.Log().Warning(r.GetCtx(), "set UserLogin failed ", err)
+ g.Log().Warning(r.GetCtx(), "Save SignedToken failed ", err)
}
r.Middleware.Next()