🚀 dashboard v0.14.4 hide the server from guests

README.md

@@ -4,7 +4,7 @@
   <br>
   <small><i>LOGO designed by <a href="https://xio.ng" target="_blank">熊大</a> .</i></small>
   <br><br>
-<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.14.3&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.10.7-brightgreen?style=for-the-badge&logo=linux">
+<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.14.4&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.10.7-brightgreen?style=for-the-badge&logo=linux">
   <br>
   <br>
   <p>:trollface: <b>Nezha Monitoring: Self-hosted, lightweight server and website monitoring and O&M tool.</b></p>

cmd/dashboard/controller/common_page.go

@@ -101,6 +101,7 @@ func (p *commonPage) checkViewPassword(c *gin.Context) {
 		return
 	}
 
+	c.Set(model.CtxKeyViewPasswordVerified, true)
 	c.Next()
 }
 
@@ -125,20 +126,32 @@ func (p *commonPage) service(c *gin.Context) {
 	}))
 }
 
-func (cp *commonPage) getServerStat() ([]byte, error) {
+func (cp *commonPage) getServerStat(c *gin.Context) ([]byte, error) {
 	v, err, _ := cp.requestGroup.Do("serverStats", func() (any, error) {
 		singleton.SortedServerLock.RLock()
 		defer singleton.SortedServerLock.RUnlock()
+
+		_, isMember := c.Get(model.CtxKeyAuthorizedUser)
+		_, isViewPasswordVerfied := c.Get(model.CtxKeyViewPasswordVerified)
+
+		var servers []*model.Server
+
+		if isMember || isViewPasswordVerfied {
+			servers = singleton.SortedServerList
+		} else {
+			servers = singleton.SortedServerListForGuest
+		}
+
 		return utils.Json.Marshal(Data{
 			Now:     time.Now().Unix() * 1000,
-			Servers: singleton.SortedServerList,
+			Servers: servers,
 		})
 	})
 	return v.([]byte), err
 }
 
 func (cp *commonPage) home(c *gin.Context) {
-	stat, err := cp.getServerStat()
+	stat, err := cp.getServerStat(c)
 	if err != nil {
 		mygin.ShowErrorPage(c, mygin.ErrInfo{
 			Code: http.StatusInternalServerError,
@@ -186,7 +199,7 @@ func (cp *commonPage) ws(c *gin.Context) {
 	defer conn.Close()
 	count := 0
 	for {
-		stat, err := cp.getServerStat()
+		stat, err := cp.getServerStat(c)
 		if err != nil {
 			continue
 		}

cmd/dashboard/controller/member_api.go

@@ -306,6 +306,7 @@ type serverForm struct {
 	Secret       string
 	Tag          string
 	Note         string
+	HideForGuest string
 }
 
 func (ma *memberAPI) addOrEditServer(c *gin.Context) {
@@ -321,6 +322,7 @@ func (ma *memberAPI) addOrEditServer(c *gin.Context) {
 		s.ID = sf.ID
 		s.Tag = sf.Tag
 		s.Note = sf.Note
+		s.HideForGuest = sf.HideForGuest == "on"
 		if s.ID == 0 {
 			s.Secret = utils.MD5(fmt.Sprintf("%s%s%d", time.Now(), sf.Name, admin.ID))
 			s.Secret = s.Secret[:18]

model/common.go

@@ -5,7 +5,7 @@ import (
 )
 
 const CtxKeyAuthorizedUser = "ckau"
-
+const CtxKeyViewPasswordVerified = "ckvpv"
 const CacheKeyOauth2State = "p:a:state"
 
 type Common struct {

model/server.go

@@ -16,6 +16,7 @@ type Server struct {
 	Secret       string `gorm:"uniqueIndex" json:"-"`
 	Note         string `json:"-"` // 管理员可见备注
 	DisplayIndex int    // 展示排序，越大越靠前
+	HideForGuest bool   // 对游客隐藏
 
 	Host       *Host      `gorm:"-"`
 	State      *HostState `gorm:"-"`
@@ -38,10 +39,17 @@ func (s *Server) CopyFromRunningServer(old *Server) {
 	s.PrevHourlyTransferOut = old.PrevHourlyTransferOut
 }
 
+func boolToString(b bool) string {
+	if b {
+		return "true"
+	}
+	return "false"
+}
+
 func (s Server) Marshal() template.JS {
 	name, _ := utils.Json.Marshal(s.Name)
 	tag, _ := utils.Json.Marshal(s.Tag)
 	note, _ := utils.Json.Marshal(s.Note)
 	secret, _ := utils.Json.Marshal(s.Secret)
-	return template.JS(fmt.Sprintf(`{"ID":%d,"Name":%s,"Secret":%s,"DisplayIndex":%d,"Tag":%s,"Note":%s}`, s.ID, name, secret, s.DisplayIndex, tag, note)) // #nosec
+	return template.JS(fmt.Sprintf(`{"ID":%d,"Name":%s,"Secret":%s,"DisplayIndex":%d,"Tag":%s,"Note":%s,"HideForGuest": %s}`, s.ID, name, secret, s.DisplayIndex, tag, note, boolToString(s.HideForGuest))) // #nosec
 }

resource/static/main.js

@@ -292,6 +292,11 @@ function addOrEditServer(server, conf) {
     modal.find(".command.field").attr("style", "display:none");
     modal.find("input[name=secret]").val("");
   }
+  if (server && server.HideForGuest) {
+    modal.find(".ui.hideforguest.checkbox").checkbox("set checked");
+  } else {
+    modal.find(".ui.hideforguest.checkbox").checkbox("set unchecked");
+  }
   showFormModal(".server.modal", "#serverForm", "/api/server");
 }
 

resource/template/common/footer.html

@@ -10,7 +10,7 @@
 <script src="https://cdn.staticfile.org/semantic-ui/2.4.1/semantic.min.js"></script>
 <script src="/static/semantic-ui-alerts.min.js"></script>
 <script src="https://cdn.staticfile.org/vue/2.6.14/vue.min.js"></script>
-<script src="/static/main.js?v20220917"></script>
+<script src="/static/main.js?v20220930"></script>
 <script>
     (function () {
         updateLang({{.LANG }});

resource/template/component/server.html

@@ -20,11 +20,16 @@
                 <label>{{tr "Secret"}}</label>
                 <input type="text" name="secret">
             </div>
+            <div class="field">
+                <div class="ui hideforguest checkbox">
+                    <input name="HideForGuest" type="checkbox" tabindex="0" class="hidden" />
+                    <label>{{tr "HideForGuest"}}</label>
+                </div>
+            </div>
             <div class="field">
                 <label>{{tr "Note"}}</label>
                 <textarea name="Note"></textarea>
             </div>
-
             <div class="command field">
                 <label>{{tr "LinuxOneKeyInstall"}}</label>
                 <div class="ui message">

resource/template/dashboard-default/server.html

@@ -25,6 +25,7 @@
                     <th>{{tr "ServerGroup"}}</th>
                     <th>IP</th>
                     <th>{{tr "VersionNumber"}}</th>
+                    <th>{{tr "HideForGuest"}}</th>
                     <th>{{tr "Secret"}}</th>
                     <th>{{tr "OneKeyInstall"}}</th>
                     <th>{{tr "Note"}}</th>
@@ -40,7 +41,12 @@
                     <td>{{$server.Tag}}</td>
                     <td>{{$server.Host.IP}}</td>
                     <td>{{$server.Host.Version}}</td>
-                    <td>{{$server.Secret}}</td>
+                    <td>{{$server.HideForGuest}}</td>
+                    <td>
+                        <button class="ui icon green mini button" data-clipboard-text="{{$server.Secret}}">
+                            <i class="copy icon"></i>
+                        </button>
+                    </td>
                     <td>
                         <button class="ui icon green mini button"
                             data-clipboard-text="{{if $.Conf.GRPCHost}}{{if eq $.Conf.Language "zh-CN"}}curl -L https://raw.githubusercontent.com/naiba/nezha/master/script/install.sh{{else}}curl -L https://raw.githubusercontent.com/naiba/nezha/master/script/install_en.sh{{end}} -o nezha.sh && chmod +x nezha.sh && sudo ./nezha.sh install_agent {{$.Conf.GRPCHost}} {{if $.Conf.ProxyGRPCPort}}{{$.Conf.ProxyGRPCPort}}{{else}}{{$.Conf.GRPCPort}}{{end}} {{$server.Secret}}{{if $.Conf.TLS}} --tls{{end}}{{else}}{{tr "NoDomainAlert"}}{{end}}"

service/singleton/server.go

@@ -13,8 +13,9 @@ var (
 	ServerTagToIDList map[string][]uint64      // [ServerTag] -> ServerID
 	ServerLock        sync.RWMutex
 
-	SortedServerList []*model.Server // 用于存储服务器列表的 slice，按照服务器 ID 排序
+	SortedServerList         []*model.Server // 用于存储服务器列表的 slice，按照服务器 ID 排序
-	SortedServerLock sync.RWMutex
+	SortedServerListForGuest []*model.Server
+	SortedServerLock         sync.RWMutex
 )
 
 // InitServer 初始化 ServerID <-> Secret 的映射
@@ -24,7 +25,7 @@ func InitServer() {
 	ServerTagToIDList = make(map[string][]uint64)
 }
 
-//LoadServers 加载服务器列表并根据ID排序
+// LoadServers 加载服务器列表并根据ID排序
 func LoadServers() {
 	InitServer()
 	var servers []model.Server
@@ -48,8 +49,12 @@ func ReSortServer() {
 	defer SortedServerLock.Unlock()
 
 	SortedServerList = []*model.Server{}
+	SortedServerListForGuest = []*model.Server{}
 	for _, s := range ServerList {
 		SortedServerList = append(SortedServerList, s)
+		if !s.HideForGuest {
+			SortedServerListForGuest = append(SortedServerListForGuest, s)
+		}
 	}
 
 	// 按照服务器 ID 排序的具体实现（ID越大越靠前）
@@ -59,4 +64,11 @@ func ReSortServer() {
 		}
 		return SortedServerList[i].DisplayIndex > SortedServerList[j].DisplayIndex
 	})
+
+	sort.SliceStable(SortedServerListForGuest, func(i, j int) bool {
+		if SortedServerListForGuest[i].DisplayIndex == SortedServerListForGuest[j].DisplayIndex {
+			return SortedServerListForGuest[i].ID < SortedServerListForGuest[j].ID
+		}
+		return SortedServerListForGuest[i].DisplayIndex > SortedServerListForGuest[j].DisplayIndex
+	})
 }

service/singleton/singleton.go

@@ -12,7 +12,7 @@ import (
 	"github.com/naiba/nezha/pkg/utils"
 )
 
-var Version = "v0.14.3" // ！！记得修改 README 中的 badge 版本！！
+var Version = "v0.14.4" // ！！记得修改 README 中的 badge 版本！！
 
 var (
 	Conf  *model.Config