fix: correct error messages and enhance cookie handling in OpenClash …

…status script
bin64 · Dec 25, 2024 · 21c1431 · 21c1431
1 parent d32d999
commit 21c1431
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Clash Dash/ViewModels/ServerViewModel.swift b/Clash Dash/ViewModels/ServerViewModel.swift
@@ -609,7 +609,7 @@ class ServerViewModel: NSObject, ObservableObject, URLSessionDelegate, URLSessio
             case 200:
                 return try JSONDecoder().decode(ClashConfig.self, from: data)
             case 401:
-                throw NetworkError.unauthorized(message: "��证失败: 服务器返回 401 未授权")
+                throw NetworkError.unauthorized(message: "认证失败: 服务器返回 401 未授权")
             default:
                 throw NetworkError.serverError(httpResponse.statusCode)
             }
@@ -887,7 +887,7 @@ class ServerViewModel: NSObject, ObservableObject, URLSessionDelegate, URLSessio
             if let error = authResponse.error {
                 throw NetworkError.unauthorized(message: "认证失败: \(error)")
             }
-            throw NetworkError.unauthorized(message: "认证失败: 服务器没有返回有效的认��令牌")
+            throw NetworkError.unauthorized(message: "认证失败: 服务器没有返回有效的认证令牌")
         }
 
         return token

diff --git a/Debug/get_openclash_status.sh b/Debug/get_openclash_status.sh
@@ -115,7 +115,7 @@ case $status_code in
         log "send" "发送状态请求: $status_url"
 
         # 构建状态请求头
-        status_headers="Cookie: sysauth_http=$token
+        status_headers="Cookie: sysauth_http=$token; sysauth=$token
 Accept: */*
 Connection: keep-alive
 User-Agent: curl
@@ -126,7 +126,7 @@ Pragma: no-cache"
         print_request "GET" "$status_url" "$status_headers"
 
         status_response=$(curl -s --max-redirs 0 -w "\n%{http_code}" \
-            -H "Cookie: sysauth_http=$token" \
+            -H "Cookie: sysauth_http=$token; sysauth=$token" \
             -H "Accept: */*" \
             -H "Connection: keep-alive" \
             -H "User-Agent: curl" \
@@ -160,7 +160,7 @@ Upgrade-Insecure-Requests: 1"
             -H "Accept-Language: en-US,en;q=0.9" \
             -H "Cache-Control: no-cache" \
             -H "Connection: keep-alive" \
-            -H "Cookie: sysauth_http=$token" \
+            -H "Cookie: sysauth_http=$token; sysauth=$token" \
             -H "DNT: 1" \
             -H "Pragma: no-cache" \
             -H "Upgrade-Insecure-Requests: 1" \
@@ -195,7 +195,7 @@ Content-Type: application/x-www-form-urlencoded; charset=utf-8"
             -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh-TW;q=0.7,zh;q=0.6" \
             -H "Cache-Control: no-cache" \
             -H "Connection: keep-alive" \
-            -H "Cookie: sysauth_http=$token" \
+            -H "Cookie: sysauth_http=$token; sysauth=$token" \
             -H "DNT: 1" \
             -H "Pragma: no-cache" \
             -H "Content-Type: application/x-www-form-urlencoded; charset=utf-8" \