feat(cloudflare): Token 配置新增测试连接与获取入口并发布 v1.6.5

This commit is contained in:
2026-09-28 17:32:06 +08:00
parent be35fbf546
commit 3caff9fd8e
12 changed files with 137 additions and 17 deletions
+16
View File
@@ -189,6 +189,22 @@ func (h *CloudflareHandler) SaveAppSettings(w http.ResponseWriter, r *http.Reque
writeJSON(w, http.StatusOK, settings)
}
func (h *CloudflareHandler) TestToken(w http.ResponseWriter, r *http.Request) {
var request struct {
Token string `json:"token"`
}
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&request); err != nil {
writeError(r, w, http.StatusBadRequest, "请求格式无效")
return
}
message, err := h.svc.TestToken(r.Context(), request.Token)
if err != nil {
writeError(r, w, http.StatusBadGateway, err.Error())
return
}
writeJSON(w, http.StatusOK, map[string]any{"ok": true, "message": message})
}
func (h *CloudflareHandler) DownloadBinary(w http.ResponseWriter, r *http.Request) {
var request struct {
Mirror string `json:"mirror"`
+1
View File
@@ -208,6 +208,7 @@ func newRouterWithSpecs(deps Deps) (http.Handler, []routeSpec) {
protect("POST /api/cloudflare/binary/download", cf.DownloadBinary)
protect("GET /api/cloudflare/settings", cf.AppSettings)
protect("PUT /api/cloudflare/settings", cf.SaveAppSettings)
protect("POST /api/cloudflare/settings/test", cf.TestToken)
protect("GET /api/cloudflare/ingress-candidates", cf.IngressCandidates)
}
+55
View File
@@ -7,6 +7,7 @@ import (
"os"
"path/filepath"
"strings"
"time"
"github.com/fonu/fonu/internal/config"
"github.com/fonu/fonu/internal/fsutil"
@@ -276,6 +277,60 @@ func (s *Service) resolveToken(ctx context.Context, input string) (string, error
return plain, nil
}
// TestToken 用 cloudflared 临时启动一次连接,验证 token 能否注册到 Cloudflare 边缘。
func (s *Service) TestToken(ctx context.Context, input string) (string, error) {
token, err := s.resolveToken(ctx, input)
if err != nil {
return "", err
}
accountTag, tunnelID, tunnelSecret, err := DecodeToken(token)
if err != nil {
return "", err
}
binaryPath := s.binaryPath()
if _, err := os.Stat(binaryPath); err != nil {
return "", fmt.Errorf("cloudflared 未安装,请先在应用配置中下载")
}
baseDir := filepath.Join(s.cfg.DataDir, "cloudflared")
if err := os.MkdirAll(baseDir, 0o755); err != nil {
return "", err
}
dir, err := os.MkdirTemp(baseDir, "token-test-")
if err != nil {
return "", err
}
defer os.RemoveAll(dir)
credsPath := filepath.Join(dir, "creds.json")
configPath := filepath.Join(dir, "config.yml")
if err := fsutil.WriteFileAtomic(credsPath, []byte(CredentialsJSON(accountTag, tunnelID, tunnelSecret)), 0o600); err != nil {
return "", err
}
ingress := BuildIngress(nil, defaultOriginService)
if err := fsutil.WriteFileAtomic(configPath, []byte(BuildConfig(tunnelID, credsPath, DefaultNetworkSettings(), ingress)), 0o640); err != nil {
return "", err
}
temp := Tunnel{
ID: -1, Name: "token-test", Mode: ModeTokenLocal,
Network: DefaultNetworkSettings(), LogPath: filepath.Join(dir, "cloudflared.log"),
}
if err := s.manager.Start(temp, binaryPath, configPath, ""); err != nil {
return "", err
}
defer func() { _ = s.manager.Stop(-1) }()
deadline := time.Now().Add(25 * time.Second)
for time.Now().Before(deadline) {
status := s.manager.Status(-1)
if status.Status == "connected" {
return fmt.Sprintf("连接成功,隧道 %s 已注册到 Cloudflare 边缘", tunnelID), nil
}
if status.Status == "failed" {
return "", fmt.Errorf("连接失败: %s", status.LastError)
}
time.Sleep(500 * time.Millisecond)
}
return "", fmt.Errorf("连接超时:25 秒内未注册到 Cloudflare 边缘,请检查网络或 token")
}
// attachConfig 从 config.yml 回填域名与回源 service,供编辑弹窗使用。
func (s *Service) attachConfig(item *Tunnel) {
data, err := os.ReadFile(item.ConfigPath)