diff --git a/README.md b/README.md index baca76a..c2defc1 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
LOGO designed by 熊大 .

-    +   

:trollface: 哪吒监控 一站式轻监控轻运维系统。支持系统状态、HTTP(SSL 证书变更、即将到期、到期)、TCP、Ping 监控报警,计划任务和在线终端。

diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 59d8721..0476b0b 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -433,6 +433,12 @@ func handleTerminalTask(task *pb.Task) { } header := http.Header{} header.Add("Secret", agentCliParam.ClientSecret) + // 目前只兼容Cloudflare验证 + // 后续可能需要兼容更多的Cookie验证情况 + if terminal.Cookie != "" { + cfCookie := fmt.Sprintf("CF_Authorization=%s", terminal.Cookie) + header.Add("Cookie", cfCookie) + } conn, _, err := websocket.DefaultDialer.Dial(fmt.Sprintf("%s://%s/terminal/%s", protocol, terminal.Host, terminal.Session), header) if err != nil { println("Terminal 连接失败:", err) diff --git a/cmd/dashboard/controller/common_page.go b/cmd/dashboard/controller/common_page.go index 8eb9692..42010a5 100644 --- a/cmd/dashboard/controller/common_page.go +++ b/cmd/dashboard/controller/common_page.go @@ -5,6 +5,8 @@ import ( "fmt" "log" "net/http" + "regexp" + "strings" "sync" "time" @@ -275,13 +277,28 @@ func (cp *commonPage) terminal(c *gin.Context) { }, true) return } - + cloudflareCookies, _ := c.Cookie("CF_Authorization") + // CloudflareCookies合法性验证 + // 其应该包含.分隔的三组BASE64-URL编码 + if cloudflareCookies != "" { + encodedCookies := strings.Split(cloudflareCookies, ".") + if len(encodedCookies) == 3 { + for i := 0; i < 3; i++ { + if valid, _ := regexp.MatchString("^[A-Za-z0-9-_]+$", encodedCookies[i]); !valid { + cloudflareCookies = "" + break + } + } + } else { + cloudflareCookies = "" + } + } terminalData, _ := utils.Json.Marshal(&model.TerminalTask{ Host: terminal.host, UseSSL: terminal.useSSL, Session: terminalID, + Cookie: cloudflareCookies, }) - if err := server.TaskStream.Send(&proto.Task{ Type: model.TaskTypeTerminal, Data: string(terminalData), diff --git a/model/monitor.go b/model/monitor.go index cdabccd..309de37 100644 --- a/model/monitor.go +++ b/model/monitor.go @@ -27,6 +27,8 @@ type TerminalTask struct { UseSSL bool `json:"use_ssl,omitempty"` // 会话标识 Session string `json:"session,omitempty"` + // Agent在连接Server时需要的额外Cookie信息 + Cookie string `json:"cookie,omitempty"` } const ( diff --git a/service/singleton/singleton.go b/service/singleton/singleton.go index 2de0947..e784739 100644 --- a/service/singleton/singleton.go +++ b/service/singleton/singleton.go @@ -10,7 +10,7 @@ import ( "github.com/naiba/nezha/model" ) -var Version = "v0.12.18" // !!记得修改 README 中的 badge 版本!! +var Version = "v0.12.19" // !!记得修改 README 中的 badge 版本!! var ( Conf *model.Config