🐛 查看密码逻辑修复

pkg/mygin/auth.go

@@ -6,22 +6,19 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/nicksnyder/go-i18n/v2/i18n"
-	"golang.org/x/crypto/bcrypt"
 
 	"github.com/naiba/nezha/model"
 	"github.com/naiba/nezha/service/singleton"
 )
 
 type AuthorizeOption struct {
-	GuestOnly            bool
-	MemberOnly           bool
-	ValidateViewPassword bool
-	IsPage               bool
-	AllowAPI             bool
-	Msg                  string
-	Redirect             string
-	Btn                  string
+	GuestOnly  bool
+	MemberOnly bool
+	IsPage     bool
+	AllowAPI   bool
+	Msg        string
+	Redirect   string
+	Btn        string
 }
 
 func Authorize(opt AuthorizeOption) func(*gin.Context) {
@@ -82,20 +79,5 @@ func Authorize(opt AuthorizeOption) func(*gin.Context) {
 			ShowErrorPage(c, commonErr, opt.IsPage)
 			return
 		}
-
-		// 验证查看密码
-		if opt.ValidateViewPassword && singleton.Conf.Site.ViewPassword != "" {
-			viewPassword, _ := c.Cookie(singleton.Conf.Site.CookieName + "-vp")
-			if err := bcrypt.CompareHashAndPassword([]byte(viewPassword), []byte(singleton.Conf.Site.ViewPassword)); err != nil {
-				c.HTML(http.StatusOK, GetPreferredTheme(c, "/viewpassword"), CommonEnvironment(c, gin.H{
-					"Title":      singleton.Localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "VerifyPassword"}),
-					"CustomCode": singleton.Conf.Site.CustomCode,
-				}))
-				c.Abort()
-				return
-			}
-
-			c.Set(model.CtxKeyViewPasswordVerified, true)
-		}
 	}
 }

pkg/mygin/view_password.go

@@ -0,0 +1,52 @@
+package mygin
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/naiba/nezha/model"
+	"github.com/naiba/nezha/service/singleton"
+	"github.com/nicksnyder/go-i18n/v2/i18n"
+	"golang.org/x/crypto/bcrypt"
+)
+
+type ValidateViewPasswordOption struct {
+	IsPage        bool
+	AbortWhenFail bool
+}
+
+func ValidateViewPassword(opt ValidateViewPasswordOption) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		if singleton.Conf.Site.ViewPassword == "" {
+			return
+		}
+		_, authorized := c.Get(model.CtxKeyAuthorizedUser)
+		if authorized {
+			return
+		}
+		viewPassword, err := c.Cookie(singleton.Conf.Site.CookieName + "-vp")
+		if err == nil {
+			err = bcrypt.CompareHashAndPassword([]byte(viewPassword), []byte(singleton.Conf.Site.ViewPassword))
+		}
+		if err == nil {
+			c.Set(model.CtxKeyViewPasswordVerified, true)
+			return
+		}
+		if !opt.AbortWhenFail {
+			return
+		}
+		if opt.IsPage {
+			c.HTML(http.StatusOK, GetPreferredTheme(c, "/viewpassword"), CommonEnvironment(c, gin.H{
+				"Title":      singleton.Localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "VerifyPassword"}),
+				"CustomCode": singleton.Conf.Site.CustomCode,
+			}))
+
+		} else {
+			c.JSON(http.StatusOK, model.Response{
+				Code:    http.StatusForbidden,
+				Message: "访问受限",
+			})
+		}
+		c.Abort()
+	}
+}