fankes/komari-agent
2
0
Fork 0
mirror of https://github.com/fankes/komari-agent.git synced 2025-10-18 18:49:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 添加自定义 DNS 解析器

Browse Source
This commit is contained in:
fankesyooni
2025-09-13 02:05:00 +08:00
parent 7af8e540db
commit 9834a55e5d
7 changed files with 175 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/basicInfo.go
View File

@@ -10,6 +10,7 @@ import (
"time"
"github.com/komari-monitor/komari-agent/cmd/flags"
"github.com/komari-monitor/komari-agent/dnsresolver"
monitoring "github.com/komari-monitor/komari-agent/monitoring/unit"
"github.com/komari-monitor/komari-agent/update"
)
@@ -79,14 +80,16 @@ func tryUploadData(data map[string]interface{}) error {
return err
}
req.Header.Set("Content-Type", "application/json")
// 添加Cloudflare Access头部
if flags.CFAccessClientID != "" && flags.CFAccessClientSecret != "" {
req.Header.Set("CF-Access-Client-Id", flags.CFAccessClientID)
req.Header.Set("CF-Access-Client-Secret", flags.CFAccessClientSecret)
}
client := &http.Client{}
// 使用dnsresolver获取自定义HTTP客户端
client := dnsresolver.GetHTTPClient(30 * time.Second)
resp, err := client.Do(req)
if err != nil {
return err

18
server/websocket.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/gorilla/websocket"
"github.com/komari-monitor/komari-agent/cmd/flags"
"github.com/komari-monitor/komari-agent/dnsresolver"
"github.com/komari-monitor/komari-agent/monitoring"
"github.com/komari-monitor/komari-agent/terminal"
"github.com/komari-monitor/komari-agent/ws"
@@ -90,17 +91,21 @@ func EstablishWebSocketConnection() {
}
func connectWebSocket(websocketEndpoint string) (*ws.SafeConn, error) {
// 使用dnsresolver获取自定义网络拨号器
netDialer := dnsresolver.GetNetDialer(5 * time.Second)
dialer := &websocket.Dialer{
HandshakeTimeout: 5 * time.Second,
NetDialContext: netDialer.DialContext,
}
// 创建请求头并添加Cloudflare Access头部
headers := http.Header{}
if flags.CFAccessClientID != "" && flags.CFAccessClientSecret != "" {
headers.Set("CF-Access-Client-Id", flags.CFAccessClientID)
headers.Set("CF-Access-Client-Secret", flags.CFAccessClientSecret)
}
conn, resp, err := dialer.Dial(websocketEndpoint, headers)
if err != nil {
if resp != nil && resp.StatusCode != 101 {
@@ -159,17 +164,22 @@ func handleWebSocketMessages(conn *ws.SafeConn, done chan<- struct{}) {
func establishTerminalConnection(token, id, endpoint string) {
endpoint = strings.TrimSuffix(endpoint, "/") + "/api/clients/terminal?token=" + token + "&id=" + id
endpoint = "ws" + strings.TrimPrefix(endpoint, "http")
// 使用dnsresolver获取自定义网络拨号器
netDialer := dnsresolver.GetNetDialer(5 * time.Second)
dialer := &websocket.Dialer{
HandshakeTimeout: 5 * time.Second,
NetDialContext: netDialer.DialContext,
}
// 创建请求头并添加Cloudflare Access头部
headers := http.Header{}
if flags.CFAccessClientID != "" && flags.CFAccessClientSecret != "" {
headers.Set("CF-Access-Client-Id", flags.CFAccessClientID)
headers.Set("CF-Access-Client-Secret", flags.CFAccessClientSecret)
}
conn, _, err := dialer.Dial(endpoint, headers)
if err != nil {
log.Println("Failed to establish terminal connection:", err)