jianf/webui4frpc
1
0
Fork 0
mirror of https://gitcode.com/JianFeeeee/webui4frpc.git synced 2026-09-20 08:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 集群操作日志同步修复 — 全量回填 + 重启节点 seq 水位抬升

Browse Source 
两个根因:
1. 离线错过条目永久缺失: token delta 被下游 trim (keep=seq>wm)，
   离线节点错过的 seq 再也收不到 → 'log delta gap: want N got N+1' 死循环。
   修复: OnToken 改为附带自己的全量日志 (Snapshot)，接收方 ApplyDelta 按 seq 幂等去重，
   缺口节点下一轮自动补齐。日志量小(几十条)，开销可忽略。

2. 重启节点重新从 seq=1 编号: NewClusterLog 从 Seq=0 起，重启后产生的新事件
   与环上历史 seq 冲突 → ApplyDelta 视为 already-have 静默丢弃 + 全量附带出现歧义 id。
   修复: OnToken 收到日志时把本地 Seq 抬到环高水位之上，新编号接在历史之后。

测试: TestFullLogBackfillAfterGap / TestApplyDeltaIdempotentOnFullResend

实测: 三台集群撤销 minecraft 转发 → 三台均记录 seq=10 forward.remove;
恢复后三台均记录 seq=11 forward.add
This commit is contained in:
JianFeeeee
2026-08-25 11:55:34 +08:00
parent 94b6396738
commit 1abf1bb447
5 changed files with 350 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/httpapi/server.go
View File

@ -144,10 +144,14 @@ func NewServeMux(h *Handler) (http.Handler, error) {
// resolve to admin via the flag fast path.
mux.HandleFunc("/frpc/", h.auth("read")(h.handleFrpcBinary))
// Static assets behind the same auth as the API: the browser caches the
// Basic header once and sends it on every asset + /api/* request, so the
// SPA loads for any valid identity (viewer included).
mux.HandleFunc("/", h.auth("read")(h.handleStatic))
// Static assets WITHOUT auth: the SPA must load before it can show its
// login form (auth.ts resolves GET /me on mount; a 401 there drops the UI
// into the login page). Gating index.html behind auth() would make an
// unauthenticated browser see {"error":"unauthorized"} instead of the
// app shell — exactly the bug where the domain showed raw JSON. The
// embedded assets are static/public (no user data); every privileged
// action still requires an authenticated API call.
mux.HandleFunc("/", h.handleStatic)
return mux, nil
}

30
internal/httpapi/server_test.go
View File

@ -4,6 +4,7 @@ import (
"bytes"
"context"
"encoding/json"
"io"
"net/http"
"net/http/httptest"
"path/filepath"
@ -249,3 +250,32 @@ func TestSaveCanvasPublishesRevokeTask(t *testing.T) {
t.Fatalf("expected revoke task for web, pending=%+v", ring.State().PendingList())
}
}
// TestStaticServesWithoutAuth: the SPA shell (index.html) must load WITHOUT
// credentials so an unauthenticated browser sees the login page instead of a
// raw {"error":"unauthorized"} JSON body. API routes stay gated.
func TestStaticServesWithoutAuth(t *testing.T) {
_, ts := newTestHandler(t)
resp, err := http.Get(ts.URL + "/")
if err != nil {
t.Fatal(err)
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
t.Fatalf("status = %d, want 200 for SPA shell", resp.StatusCode)
}
body, _ := io.ReadAll(resp.Body)
if !strings.Contains(string(body), "<div id=\"app\">") && !strings.Contains(string(body), "<!DOCTYPE html>") {
t.Fatalf("body does not look like index.html: %.80s", body)
}
// API remains gated.
req, _ := http.NewRequest(http.MethodGet, ts.URL+"/api/manager/status", nil)
resp2, err := http.DefaultClient.Do(req)
if err != nil {
t.Fatal(err)
}
defer resp2.Body.Close()
if resp2.StatusCode != http.StatusUnauthorized {
t.Fatalf("API status = %d, want 401", resp2.StatusCode)
}
}