mrlee/-Fonu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(cloudflare): 新增全局托管开关并发布 v1.8.0
CI / verify (push) Canceled after 0s
Details

Browse Source
This commit is contained in:
mrlee
2026-09-30 11:56:56 +08:00
parent 1434cfd72b
commit 2d0f63517b
17 changed files with 198 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/cloudflare_handler.go
+16
View File
@@ -207,6 +207,22 @@ func (h *CloudflareHandler) TestToken(w http.ResponseWriter, r *http.Request) {
writeJSON(w, http.StatusOK, map[string]any{"ok": true, "message": message})
}
func (h *CloudflareHandler) SetEnabled(w http.ResponseWriter, r *http.Request) {
var request struct {
Enabled bool `json:"enabled"`
}
if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 4<<10)).Decode(&request); err != nil {
writeError(r, w, http.StatusBadRequest, "请求格式无效")
return
}
settings, err := h.svc.SetEnabled(r.Context(), request.Enabled)
if err != nil {
writeError(r, w, http.StatusBadGateway, err.Error())
return
}
writeJSON(w, http.StatusOK, settings)
}
func (h *CloudflareHandler) DownloadBinary(w http.ResponseWriter, r *http.Request) {
var request struct {
Mirror string `json:"mirror"`
internal/api/router.go
+1
View File
@@ -209,6 +209,7 @@ func newRouterWithSpecs(deps Deps) (http.Handler, []routeSpec) {
protect("GET /api/cloudflare/settings", cf.AppSettings)
protect("PUT /api/cloudflare/settings", cf.SaveAppSettings)
protect("POST /api/cloudflare/settings/test", cf.TestToken)
protect("POST /api/cloudflare/enabled", cf.SetEnabled)
protect("GET /api/cloudflare/ingress-candidates", cf.IngressCandidates)
}
internal/cloudflared/model.go
+2
View File
@@ -74,6 +74,7 @@ type CreateInput struct {
// AppSettings 是模块级配置；默认 token 只回显掩码，不返回明文。
type AppSettings struct {
AccountID string `json:"account_id"`
Enabled bool `json:"enabled"`
DefaultTokenConfigured bool `json:"default_token_configured"`
DefaultTokenMasked string `json:"default_token_masked"`
APITokenConfigured bool `json:"api_token_configured"`
@@ -85,6 +86,7 @@ type AppSettings struct {
// AppSettingsInput 是保存应用配置的入参；Token 留空表示保留原值。
type AppSettingsInput struct {
AccountID string `json:"account_id"`
Enabled *bool `json:"enabled,omitempty"`
Token string `json:"token"`
APIToken string `json:"api_token"`
Mirror string `json:"mirror"`
internal/cloudflared/service.go
+53 -2
View File
@@ -181,6 +181,13 @@ func (s *Service) Delete(ctx context.Context, id int64) error {
}
func (s *Service) Start(ctx context.Context, id int64) (Tunnel, error) {
settings, err := s.store.GetSettingsRaw(ctx)
if err != nil {
return Tunnel{}, err
}
if !settings.Enabled {
return Tunnel{}, fmt.Errorf("Cloudflare 隧道全局已停用，请先在页面顶部重新启用")
}
tunnel, err := s.store.Get(ctx, id)
if err != nil {
return Tunnel{}, err
@@ -229,7 +236,7 @@ func (s *Service) AppSettings(ctx context.Context) (AppSettings, error) {
if err != nil {
return AppSettings{}, err
}
out := AppSettings{AccountID: row.AccountID, Mirror: row.Mirror, Network: row.Network}
out := AppSettings{AccountID: row.AccountID, Enabled: row.Enabled, Mirror: row.Mirror, Network: row.Network}
if row.TokenEnc != "" {
out.DefaultTokenConfigured = true
if plain, err := s.secretBox.Decrypt(row.TokenEnc); err == nil {
@@ -255,6 +262,10 @@ func (s *Service) SaveAppSettings(ctx context.Context, in AppSettingsInput) (App
if accountID == "" {
accountID = row.AccountID
}
enabled := row.Enabled
if in.Enabled != nil {
enabled = *in.Enabled
}
tokenEnc := row.TokenEnc
apiTokenEnc := row.APITokenEnc
if apiToken := strings.TrimSpace(in.APIToken); apiToken != "" {
@@ -274,12 +285,44 @@ func (s *Service) SaveAppSettings(ctx context.Context, in AppSettingsInput) (App
if strings.TrimSpace(network.TransportProtocol) == "" {
network = row.Network
}
if err := s.store.SaveSettings(ctx, accountID, tokenEnc, apiTokenEnc, mirror, network); err != nil {
if err := s.store.SaveSettings(ctx, accountID, enabled, tokenEnc, apiTokenEnc, mirror, network); err != nil {
return AppSettings{}, err
}
return s.AppSettings(ctx)
}
// SetEnabled 切换全局托管开关；关闭时停止所有隧道，开启时恢复 auto_start 的隧道。
func (s *Service) SetEnabled(ctx context.Context, enabled bool) (AppSettings, error) {
row, err := s.store.GetSettingsRaw(ctx)
if err != nil {
return AppSettings{}, err
}
if err := s.store.SaveSettings(ctx, row.AccountID, enabled, row.TokenEnc, row.APITokenEnc, row.Mirror, row.Network); err != nil {
return AppSettings{}, err
}
if enabled {
s.StartAuto(ctx)
} else {
s.StopAll(ctx)
}
return s.AppSettings(ctx)
}
// StopAll 停止所有隧道进程，但保留配置、凭据与云端隧道。
func (s *Service) StopAll(ctx context.Context) {
tunnels, err := s.store.List(ctx)
if err != nil {
s.logger.Warn("读取 Cloudflare 隧道失败", "error", err.Error())
return
}
for _, tunnel := range tunnels {
if err := s.manager.Stop(tunnel.ID); err != nil {
s.logger.Warn("停止 Cloudflare 隧道失败", "tunnel_id", tunnel.ID, "error", err.Error())
}
_ = s.store.SetRuntime(ctx, tunnel.ID, "stopped", "", 0)
}
}
func (s *Service) applyDefaultNetwork(ctx context.Context, network NetworkSettings) NetworkSettings {
if strings.TrimSpace(network.TransportProtocol) != "" {
return network
@@ -438,6 +481,14 @@ func (s *Service) IngressCandidates(ctx context.Context) ([]string, error) {
// StartAuto 在应用启动时拉起标记了 auto_start 的隧道。
func (s *Service) StartAuto(ctx context.Context) {
settings, err := s.store.GetSettingsRaw(ctx)
if err != nil {
s.logger.Warn("读取 Cloudflare 配置失败", "error", err.Error())
return
}
if !settings.Enabled {
return
}
tunnels, err := s.store.List(ctx)
if err != nil {
s.logger.Warn("读取 Cloudflare 隧道失败", "error", err.Error())
internal/cloudflared/settings_test.go
+33
View File
@@ -5,6 +5,7 @@ import (
"io"
"log/slog"
"path/filepath"
"strings"
"testing"
"github.com/fonu/fonu/internal/config"
@@ -41,3 +42,35 @@ func TestAppSettingsAccountAndAPIToken(t *testing.T) {
t.Fatalf("cloudflareAPI 构造失败：%v %#v", err, api)
}
}
func TestSetEnabledBlocksStart(t *testing.T) {
dir := t.TempDir()
conn, err := db.Open(filepath.Join(dir, "test.db"))
if err != nil {
t.Fatal(err)
}
defer conn.Close()
if err := db.Migrate(context.Background(), conn, filepath.Join("..", "..", "migrations")); err != nil {
t.Fatal(err)
}
box, err := secret.NewBox("cloudflared-enabled-test")
if err != nil {
t.Fatal(err)
}
svc := NewService(config.Config{DataDir: dir}, NewStore(conn), box, slog.New(slog.NewTextHandler(io.Discard, nil)), nil)
settings, err := svc.SetEnabled(context.Background(), false)
if err != nil {
t.Fatal(err)
}
if settings.Enabled {
t.Fatal("全局托管应为停用")
}
if _, err := svc.Start(context.Background(), 1); err == nil || !strings.Contains(err.Error(), "全局已停用") {
t.Fatalf("全局停用时启动应被拒绝：%v", err)
}
settings, err = svc.SetEnabled(context.Background(), true)
if err != nil || !settings.Enabled {
t.Fatalf("重新启用失败：%v %#v", err, settings)
}
}
internal/cloudflared/store.go
+9 -7
View File
@@ -98,6 +98,7 @@ func (s *Store) SetRuntime(ctx context.Context, id int64, status, lastError stri
// settingsRow 是应用配置的原始行；TokenEnc 只在 Service 内部解密，不直接回给前端。
type settingsRow struct {
AccountID string
Enabled bool
TokenEnc string
APITokenEnc string
Mirror string
@@ -106,29 +107,30 @@ type settingsRow struct {
func (s *Store) GetSettingsRaw(ctx context.Context) (settingsRow, error) {
var accountID, tokenEnc, apiTokenEnc, mirror, networkJSON string
var enabled int
err := s.db.QueryRowContext(ctx, `
SELECT COALESCE(account_id, ''), COALESCE(default_token_enc, ''), COALESCE(api_token_enc, ''),
SELECT COALESCE(account_id, ''), COALESCE(enabled, 1), COALESCE(default_token_enc, ''), COALESCE(api_token_enc, ''),
COALESCE(mirror, 'official'), COALESCE(network_json, '{}')
FROM cf_settings WHERE id = 1
`).Scan(&accountID, &tokenEnc, &apiTokenEnc, &mirror, &networkJSON)
`).Scan(&accountID, &enabled, &tokenEnc, &apiTokenEnc, &mirror, &networkJSON)
if errors.Is(err, sql.ErrNoRows) {
return settingsRow{Mirror: "official", Network: DefaultNetworkSettings()}, nil
return settingsRow{Enabled: true, Mirror: "official", Network: DefaultNetworkSettings()}, nil
}
if err != nil {
return settingsRow{}, err
}
row := settingsRow{AccountID: accountID, TokenEnc: tokenEnc, APITokenEnc: apiTokenEnc, Mirror: mirror, Network: DefaultNetworkSettings()}
row := settingsRow{AccountID: accountID, Enabled: enabled == 1, TokenEnc: tokenEnc, APITokenEnc: apiTokenEnc, Mirror: mirror, Network: DefaultNetworkSettings()}
_ = json.Unmarshal([]byte(networkJSON), &row.Network)
return row, nil
}
func (s *Store) SaveSettings(ctx context.Context, accountID, tokenEnc, apiTokenEnc, mirror string, network NetworkSettings) error {
func (s *Store) SaveSettings(ctx context.Context, accountID string, enabled bool, tokenEnc, apiTokenEnc, mirror string, network NetworkSettings) error {
networkJSON, _ := json.Marshal(network)
_, err := s.db.ExecContext(ctx, `
UPDATE cf_settings
SET account_id = ?, default_token_enc = ?, api_token_enc = ?, mirror = ?, network_json = ?, updated_at = datetime('now')
SET account_id = ?, enabled = ?, default_token_enc = ?, api_token_enc = ?, mirror = ?, network_json = ?, updated_at = datetime('now')
WHERE id = 1
`, accountID, tokenEnc, apiTokenEnc, mirror, string(networkJSON))
`, accountID, boolInt(enabled), tokenEnc, apiTokenEnc, mirror, string(networkJSON))
return err
}