🐛 查看密码逻辑修复

* fix bugs

1. 修复default主题mixin.js文件丢失
2. 修复主题默认值为后台设置值
3. default主题样式优化

* 修复前台切换 theme-custom 不生效

README.md

@@ -89,6 +89,9 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <a href="https://github.com/Mmx233" title="Mmx">
   <img src="https://avatars.githubusercontent.com/u/36563672?v=4" width="50;" alt="Mmx"/>
 </a>
+<a href="https://github.com/nap0o" title="nap0o">
+  <img src="https://avatars.githubusercontent.com/u/144927971?v=4" width="50;" alt="nap0o"/>
+</a>
 <a href="https://github.com/rootmelo92118" title="rootmelo92118">
   <img src="https://avatars.githubusercontent.com/u/32770959?v=4" width="50;" alt="rootmelo92118"/>
 </a>
@@ -122,9 +125,6 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <a href="https://github.com/unclezs" title="unclezs">
   <img src="https://avatars.githubusercontent.com/u/42318775?v=4" width="50;" alt="unclezs"/>
 </a>
-<a href="https://github.com/nap0o" title="nap0o">
-  <img src="https://avatars.githubusercontent.com/u/144927971?v=4" width="50;" alt="nap0o"/>
-</a>
 <a href="https://github.com/yuanweize" title="I">
   <img src="https://avatars.githubusercontent.com/u/30067203?v=4" width="50;" alt="I"/>
 </a>

cmd/dashboard/controller/api_v1.go

@@ -31,13 +31,16 @@ func (v *apiV1) serve() {
 	// 不强制认证的 API
 	mr := v.r.Group("monitor")
 	mr.Use(mygin.Authorize(mygin.AuthorizeOption{
-		MemberOnly:           false,
+		MemberOnly: false,
-		IsPage:               false,
+		IsPage:     false,
-		ValidateViewPassword: true,
+		AllowAPI:   true,
-		AllowAPI:             true,
+		Msg:        "访问此接口需要认证",
-		Msg:                  "访问此接口需要认证",
+		Btn:        "点此登录",
-		Btn:                  "点此登录",
+		Redirect:   "/login",
-		Redirect:             "/login",
+	}))
+	mr.Use(mygin.ValidateViewPassword(mygin.ValidateViewPasswordOption{
+		IsPage:        false,
+		AbortWhenFail: true,
 	}))
 	mr.GET("/:id", v.monitorHistoriesById)
 }

cmd/dashboard/controller/common_page.go

@@ -43,12 +43,14 @@ type commonPage struct {
 
 func (cp *commonPage) serve() {
 	cr := cp.r.Group("")
-	cr.Use(mygin.Authorize(mygin.AuthorizeOption{
+	cr.Use(mygin.Authorize(mygin.AuthorizeOption{}))
-		ValidateViewPassword: true,
-	}))
 	cr.Use(mygin.PreferredTheme)
-	cr.GET("/terminal/:id", cp.terminal)
 	cr.POST("/view-password", cp.issueViewPassword)
+	cr.GET("/terminal/:id", cp.terminal)
+	cr.Use(mygin.ValidateViewPassword(mygin.ValidateViewPasswordOption{
+		IsPage:        true,
+		AbortWhenFail: true,
+	}))
 	cr.GET("/", cp.home)
 	cr.GET("/service", cp.service)
 	// TODO: 界面直接跳转使用该接口
@@ -65,6 +67,7 @@ type viewPasswordForm struct {
 func (p *commonPage) issueViewPassword(c *gin.Context) {
 	var vpf viewPasswordForm
 	err := c.ShouldBind(&vpf)
+	log.Println("bingo", vpf)
 	var hash []byte
 	if err == nil && vpf.Password != singleton.Conf.Site.ViewPassword {
 		err = errors.New(singleton.Localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "WrongAccessPassword"}))

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
+	GuestOnly  bool
-	MemberOnly           bool
+	MemberOnly bool
-	ValidateViewPassword bool
+	IsPage     bool
-	IsPage               bool
+	AllowAPI   bool
-	AllowAPI             bool
+	Msg        string
-	Msg                  string
+	Redirect   string
-	Redirect             string
+	Btn        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/preferred_theme.go

@@ -14,7 +14,7 @@ func PreferredTheme(c *gin.Context) {
 	if theme, err := c.Cookie("preferred_theme"); err == nil {
 		if _, has := model.Themes[theme]; has {
 			// 检验自定义主题
-			if theme == "custom" && singleton.Conf.Site.Theme != "custom" && !utils.IsFileExists("resource/template/custom/home.html") {
+			if theme == "custom" && singleton.Conf.Site.Theme != "custom" && !utils.IsFileExists("resource/template/theme-custom/home.html") {
 				return
 			}
 			c.Set(model.CtxKeyPreferredTheme, theme)

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()
+	}
+}

resource/l10n/en-US.toml

@@ -398,7 +398,7 @@ other = "Virtualization"
 other = "Swap"
 
 [NetTransfer]
-other = "Network Transfer"
+other = "Transfer"
 
 [Load]
 other = "Load"
@@ -419,7 +419,7 @@ other = "Last Active"
 other = "Version"
 
 [NetSpeed]
-other = "Network Speed"
+other = "Speed"
 
 [Uptime]
 other = "Uptime"
@@ -627,3 +627,6 @@ other = "Feature"
 
 [Template]
 other = "Template"
+
+[Stat]
+other = "Stat"

resource/l10n/es-ES.toml

@@ -627,3 +627,6 @@ other = "Característica"
 
 [Template]
 other = "Plantilla"
+
+[Stat]
+other = "Stat"

resource/l10n/zh-CN.toml

@@ -627,3 +627,6 @@ other = "功能"
 
 [Template]
 other = "主题"
+
+[Stat]
+other = "信息"

resource/l10n/zh-TW.toml

@@ -627,3 +627,6 @@ other = "功能"
 
 [Template]
 other = "主題"
+
+[Stat]
+other = "信息"

resource/static/theme-default/css/main.css

@@ -86,21 +86,35 @@ td {
   margin-right: 0;
 }
 
+.ui.grid {
+  margin-bottom:-0.5em
+}
+
+.ui.card>.content>.header:not(.ui), .ui.cards>.card>.content>.header:not(.ui){
+  line-height: 1em;
+}
+
 .status.cards .wide.column {
   padding-top: 0 !important;
   padding-bottom: 0 !important;
-  height:3.3rem !important;
+  height:2.3rem !important;
 }
 
 .status.cards .wide.column:nth-child(1) {
-  margin-top:2rem !important;
+  margin-top:1.2rem !important;
 }
 
 .status.cards .wide.column:nth-child(2) {
-  margin-top:2rem !important;
+  margin-top:1.2rem !important;
+}
+
+.status.cards .three.wide.column {
+  text-align: center;
+  width: 22%!important;
 }
 
 .status.cards .thirteen.wide.column{
+  width: 78%!important;
   padding-left:0;
 }
 
@@ -124,7 +138,7 @@ td {
 .closePopup{
   color:rgb(10, 148, 242) !important;
   position: absolute;
-  top: 10px;
+  top: 7px;
   right: 10px;
   cursor: pointer;
   z-index: 9999;
@@ -194,6 +208,7 @@ td {
 }
 
 .nezha-secondary-font {
+  height: 1em;
   color: rgb(10, 148, 242) !important;
 }
 

resource/static/theme-default/js/mixin.js

@@ -0,0 +1,56 @@
+const mixinsVue = {
+    delimiters: ['@#', '#@'],
+    data: {
+        preferredTemplate: null,
+        isMobile: false
+    },
+    created() {
+        this.isMobile = this.checkIsMobile();
+        this.preferredTemplate = this.getCookie('preferred_theme') ? this.getCookie('preferred_theme') : this.$root.defaultTemplate;
+    },
+    methods: {
+        toggleTemplate(template) {
+            if( template != this.preferredTemplate){
+                this.preferredTemplate = template;
+                this.updateCookie("preferred_theme", template);
+                window.location.reload();
+            }
+        },
+        updateCookie(name, value) {
+            document.cookie = name + "=" + value +"; path=/";
+        },
+        getCookie(name) {
+            const cookies = document.cookie.split(';');
+            let cookieValue = null;
+            for (let i = 0; i < cookies.length; i++) {
+                const cookie = cookies[i].trim();
+                if (cookie.startsWith(name + '=')) {
+                    cookieValue = cookie.substring(name.length + 1, cookie.length);
+                    break;
+                }
+            }
+            return cookieValue;
+        },
+        checkIsMobile() { // 检测设备类型,页面宽度小于768px认为是移动设备
+            return window.innerWidth <= 768;
+        },
+        logOut(id) {
+            $.ajax({
+                type: 'POST',
+                url: '/api/logout',
+                data: JSON.stringify({ id: id }),
+                contentType: 'application/json',
+                success: function (resp) {
+                    if (resp.code == 200) {
+                        window.location.reload();
+                    } else {
+                        alert('注销失败(Error ' + resp.code + '): ' + resp.message);
+                    }
+                },
+                error: function (err) {
+                    alert('网络错误: ' + err.responseText);
+                }
+            });
+        }
+    }
+}

resource/static/theme-server-status/js/mixin.js

@@ -5,14 +5,14 @@ const mixinsVue = {
         isSystemTheme: false,
         showGroup: false,
         showGoTop: false,
-        preferredTemplate: 'default',
+        preferredTemplate: null,
         isMobile: false
     },
     created() {
         this.isMobile = this.checkIsMobile();
         this.initTheme();
         this.storedShowGroup();
-        this.preferredTemplate = this.getCookie('preferred_theme') ? this.getCookie('preferred_theme') : 'default';
+        this.preferredTemplate = this.getCookie('preferred_theme') ? this.getCookie('preferred_theme') : this.$root.defaultTemplate;
         window.addEventListener('scroll', this.handleScroll);
     },
     destroyed() {

resource/template/theme-default/header.html

@@ -12,14 +12,14 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.min.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/lipis/[email protected]/css/flag-icons.min.css">
     <link rel="stylesheet" type="text/css" href="/static/semantic-ui-alerts.min.css">
-    <link rel="stylesheet" type="text/css" href="/static/theme-default/css/main.css?v20240222">
+    <link rel="stylesheet" type="text/css" href="/static/theme-default/css/main.css?v20240226">
     <link rel="shortcut icon" type="image/png" href="/static/logo.svg" />
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.js"></script>
     <script src="/static/semantic-ui-alerts.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts.min.js"></script>
-    <script src="/static/theme-server-status/js/mixin.js?v20240225"></script>
+    <script src="/static/theme-default/js/mixin.js?v20240226"></script>
 </head>
 <body>
 {{end}}

resource/template/theme-default/home.html

@@ -19,7 +19,7 @@
                     class="apple icon"></i><i v-else-if='isWindowsPlatform(server.Host.Platform)'
                     class="windows icon"></i><i v-else :class="'fl-' + getFontLogoClass(server.Host.Platform)"></i>
                   @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@
-                  <i @click="togglePopup($event, server.ID)" aria-expanded="false" class="nezha-secondary-font info circle icon" style="height: 28px"></i>                 
+                  <i @click="togglePopup($event, server.ID)" aria-expanded="false" class="nezha-secondary-font info circle icon"></i>                 
                   <div class="ui content popup" :class="{ 'visible': isActive(server.ID) }" style="margin-bottom: 0;">
                     <i class="closePopup window close icon" @click="closePopup(server.ID)"></i>
                     {{tr "Platform"}}: @#server.Host.Platform#@-@#server.Host.PlatformVersion#@
@@ -90,7 +90,7 @@
                       <i class="arrow alternate circle up outline icon"></i>
                       @#formatByteSize(server.State.NetOutSpeed)#@/s
                     </div>
-                    <div class="three wide column">流量</div>
+                    <div class="three wide column">{{tr "NetTransfer"}}</div>
                     <div class="thirteen wide column">
                       <i class="arrow circle down icon"></i>
                       @#formatByteSize(server.State.NetInTransfer)#@
@@ -98,7 +98,7 @@
                       <i class="arrow circle up icon"></i>
                       @#formatByteSize(server.State.NetOutTransfer)#@
                     </div>
-                    <div class="three wide column">信息</div>
+                    <div class="three wide column">{{tr "Stat"}}</div>
                     <div class="thirteen wide column">
                       <i class="bi bi-cpu-fill" style="font-size: 1.1rem; color: #4a86e8;"></i> @#getCoreAndGHz(server.Host.CPU)#@
                       &nbsp;
@@ -138,6 +138,7 @@
     delimiters: ['@#', '#@'],
     data: {
       page: 'index',
+      defaultTemplate: {{.Conf.Site.Theme}},
       templates: {{.Themes}},
       data: [],
       groups: [],

resource/template/theme-default/network.html

@@ -36,6 +36,7 @@
         delimiters: ['@#', '#@'],
         data: {
             page: 'network',
+            defaultTemplate: {{.Conf.Site.Theme}},
             templates: {{.Themes}},
             servers: initData,
             option: {

resource/template/theme-default/service.html

@@ -87,6 +87,7 @@
         delimiters: ['@#', '#@'],
         data: {
             page: 'service',
+            defaultTemplate: {{.Conf.Site.Theme}},
             templates: {{.Themes}}
         },
         mixins: [mixinsVue]

resource/template/theme-server-status/header.html

@@ -28,7 +28,7 @@
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts.min.js"></script>
-    <script src="/static/theme-server-status/js/mixin.js?v20240225"></script>
+    <script src="/static/theme-server-status/js/mixin.js?v20240226"></script>
 </head>
 <body>
 {{end}}

resource/template/theme-server-status/home.html

@@ -22,6 +22,7 @@
         delimiters: ['@#', '#@'],
         data: {
             page: 'index',
+            defaultTemplate: {{.Conf.Site.Theme}},
             templates: {{.Themes}},
             nodesTag: [],
             nodesNoTag: [],

resource/template/theme-server-status/network.html

@@ -30,6 +30,7 @@
         delimiters: ['@#', '#@'],
         data: {
             page: 'network',
+            defaultTemplate: {{.Conf.Site.Theme}},
             templates: {{.Themes}},
             servers: initData,
             option: {

resource/template/theme-server-status/service.html

@@ -78,6 +78,7 @@
         delimiters: ['@#', '#@'],
         data: {
             page: 'service',
+            defaultTemplate: {{.Conf.Site.Theme}},
             templates: {{.Themes}},
             servicesTag: [],
             servicesNoTag: [],