mirror of
https://github.com/Sagit-chu/flvx.git
synced 2026-11-16 09:34:22 +08:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2e845030de | |||
| 2269f2e2d5 | |||
| da7bef88f1 | |||
| f26014579b | |||
| 5041c722c9 | |||
| c56798e991 | |||
| 40e96f3592 | |||
| 0e24b53a5b | |||
| a820c49c94 | |||
| 538e64ffc0 | |||
| 0b23d6f7d7 | |||
| 9e6f80019d |
@@ -22,7 +22,7 @@ jobs:
|
|||||||
node-version: '20.19.0'
|
node-version: '20.19.0'
|
||||||
|
|
||||||
- name: Install pnpm
|
- name: Install pnpm
|
||||||
run: npm install -g pnpm
|
run: npm install -g pnpm@10.28.1
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: pnpm install --frozen-lockfile
|
run: pnpm install --frozen-lockfile
|
||||||
|
|||||||
@@ -229,6 +229,7 @@ jobs:
|
|||||||
|
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--platform linux/amd64,linux/arm64 \
|
--platform linux/amd64,linux/arm64 \
|
||||||
|
--build-arg KEYGEN_ACCOUNT_ID=${{ secrets.KEYGEN_ACCOUNT_ID }} \
|
||||||
--push \
|
--push \
|
||||||
-t ${{ env.REGISTRY }}/${OWNER}/flux-panel-backend:latest \
|
-t ${{ env.REGISTRY }}/${OWNER}/flux-panel-backend:latest \
|
||||||
-t ${{ env.REGISTRY }}/${OWNER}/flux-panel-backend:${VERSION} \
|
-t ${{ env.REGISTRY }}/${OWNER}/flux-panel-backend:${VERSION} \
|
||||||
@@ -431,4 +432,3 @@ jobs:
|
|||||||
gh release upload "${VERSION}" ./artifacts/gost-arm64.sha256 --clobber
|
gh release upload "${VERSION}" ./artifacts/gost-arm64.sha256 --clobber
|
||||||
|
|
||||||
echo "✅ GOST 二进制文件更新完成"
|
echo "✅ GOST 二进制文件更新完成"
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -70,7 +70,7 @@ Alpine Linux 最小化安装若未包含 `curl`,可使用系统自带的 `wget
|
|||||||
wget -O install.sh https://raw.githubusercontent.com/Sagit-chu/flux-panel/main/install.sh && chmod +x install.sh && ./install.sh
|
wget -O install.sh https://raw.githubusercontent.com/Sagit-chu/flux-panel/main/install.sh && chmod +x install.sh && ./install.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
脚本会在 Alpine 上自动安装 Bash,并使用 OpenRC 注册、启动和管理 `flux_agent` 服务;其他受支持的 Linux 发行版继续使用 systemd。
|
脚本会在 Alpine 上自动安装 Bash、`curl` 和 CA 证书,并使用 OpenRC 注册、启动和管理 `flux_agent` 服务;其他受支持的 Linux 发行版继续使用 systemd。
|
||||||
|
|
||||||
**安装过程中会提示输入:**
|
**安装过程中会提示输入:**
|
||||||
- **服务器地址**: 面板端的通信地址(通常是 `http://<面板IP>:<后端端口>`,例如 `http://1.2.3.4:6365`)。
|
- **服务器地址**: 面板端的通信地址(通常是 `http://<面板IP>:<后端端口>`,例如 `http://1.2.3.4:6365`)。
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ RUN go mod download
|
|||||||
COPY . .
|
COPY . .
|
||||||
ARG TARGETOS
|
ARG TARGETOS
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} env ${TARGETARCH:+GOARCH=${TARGETARCH}} go build -o /out/paneld ./cmd/paneld
|
ARG KEYGEN_ACCOUNT_ID
|
||||||
|
RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} env ${TARGETARCH:+GOARCH=${TARGETARCH}} go build -ldflags="-X 'go-backend/internal/license.AccountID=${KEYGEN_ACCOUNT_ID}'" -o /out/paneld ./cmd/paneld
|
||||||
|
|
||||||
FROM docker:27-cli AS dockercli
|
FROM docker:27-cli AS dockercli
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,10 @@ func (h *Handler) getPublicConfigByName(w http.ResponseWriter, r *http.Request)
|
|||||||
response.WriteJSON(w, response.Err(403, "禁止访问敏感配置"))
|
response.WriteJSON(w, response.Err(403, "禁止访问敏感配置"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if value, gated := h.unlicensedPublicBrandValue(configName); gated {
|
||||||
|
response.WriteJSON(w, response.OK(map[string]string{"name": configName, "value": value}))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
cfg, err := h.repo.GetConfigByName(configName)
|
cfg, err := h.repo.GetConfigByName(configName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -42,3 +46,22 @@ func (h *Handler) getPublicConfigByName(w http.ResponseWriter, r *http.Request)
|
|||||||
|
|
||||||
response.WriteJSON(w, response.OK(cfg))
|
response.WriteJSON(w, response.OK(cfg))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Handler) unlicensedPublicBrandValue(configName string) (string, bool) {
|
||||||
|
switch configName {
|
||||||
|
case "app_name", "app_logo", "app_favicon", "hide_footer_brand":
|
||||||
|
default:
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
isCommercial, _ := h.repo.GetViteConfigValue("is_commercial")
|
||||||
|
if isCommercial == "true" {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
if configName == "app_name" {
|
||||||
|
return "FLVX", true
|
||||||
|
}
|
||||||
|
if configName == "hide_footer_brand" {
|
||||||
|
return "false", true
|
||||||
|
}
|
||||||
|
return "", true
|
||||||
|
}
|
||||||
|
|||||||
@@ -30,6 +30,40 @@ func TestPublicConfigGetAllowsBrandKeys(t *testing.T) {
|
|||||||
assertHandlerCode(t, resp, 0)
|
assertHandlerCode(t, resp, 0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestPublicBrandConfigFallsBackWithoutCommercialLicense(t *testing.T) {
|
||||||
|
router, r := setupConfigAccessTestRouter(t)
|
||||||
|
seedConfigValue(t, r, "app_name", "Paid Brand")
|
||||||
|
seedConfigValue(t, r, "app_logo", "logo-data")
|
||||||
|
seedConfigValue(t, r, "app_favicon", "favicon-data")
|
||||||
|
seedConfigValue(t, r, "hide_footer_brand", "true")
|
||||||
|
seedConfigValue(t, r, "is_commercial", "false")
|
||||||
|
|
||||||
|
for name, want := range map[string]string{
|
||||||
|
"app_name": "FLVX",
|
||||||
|
"app_logo": "",
|
||||||
|
"app_favicon": "",
|
||||||
|
"hide_footer_brand": "false",
|
||||||
|
} {
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/public/config/get", bytes.NewBufferString(`{"name":"`+name+`"}`))
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
resp := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(resp, req)
|
||||||
|
assertHandlerConfigValue(t, resp, name, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPublicBrandConfigUsesSavedValuesWithCommercialLicense(t *testing.T) {
|
||||||
|
router, r := setupConfigAccessTestRouter(t)
|
||||||
|
seedConfigValue(t, r, "app_name", "Paid Brand")
|
||||||
|
seedConfigValue(t, r, "is_commercial", "true")
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/public/config/get", bytes.NewBufferString(`{"name":"app_name"}`))
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
resp := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(resp, req)
|
||||||
|
assertHandlerConfigValue(t, resp, "app_name", "Paid Brand")
|
||||||
|
}
|
||||||
|
|
||||||
func TestPublicConfigGetRejectsSensitiveKeys(t *testing.T) {
|
func TestPublicConfigGetRejectsSensitiveKeys(t *testing.T) {
|
||||||
router, _ := setupConfigAccessTestRouter(t)
|
router, _ := setupConfigAccessTestRouter(t)
|
||||||
|
|
||||||
@@ -82,6 +116,56 @@ func TestConfigGetAllowsSensitiveKeysForAdmin(t *testing.T) {
|
|||||||
assertHandlerConfigValue(t, resp, "jwt_secret", "jwt-secret")
|
assertHandlerConfigValue(t, resp, "jwt_secret", "jwt-secret")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestConfigGetNeverReturnsLicenseCredentials(t *testing.T) {
|
||||||
|
router, r := setupConfigAccessTestRouter(t)
|
||||||
|
adminToken := mustGenerateConfigAccessToken(t, 1, "admin_user", 0)
|
||||||
|
seedConfigValue(t, r, "license_key", "license-secret")
|
||||||
|
seedConfigValue(t, r, "machine_fingerprint", "fingerprint-secret")
|
||||||
|
|
||||||
|
for _, name := range []string{"license_key", "license_machine_id", "machine_fingerprint"} {
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/config/get", bytes.NewBufferString(`{"name":"`+name+`"}`))
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
req.Header.Set("Authorization", adminToken)
|
||||||
|
resp := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(resp, req)
|
||||||
|
assertHandlerCodeMsg(t, resp, 403, "禁止访问系统授权凭据")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConfigListNeverReturnsLicenseCredentials(t *testing.T) {
|
||||||
|
router, r := setupConfigAccessTestRouter(t)
|
||||||
|
adminToken := mustGenerateConfigAccessToken(t, 1, "admin_user", 0)
|
||||||
|
seedConfigValue(t, r, "license_key", "license-secret")
|
||||||
|
seedConfigValue(t, r, "license_machine_id", "machine-id")
|
||||||
|
seedConfigValue(t, r, "machine_fingerprint", "fingerprint-secret")
|
||||||
|
seedConfigValue(t, r, "is_commercial", "true")
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/config/list", nil)
|
||||||
|
req.Header.Set("Authorization", adminToken)
|
||||||
|
resp := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(resp, req)
|
||||||
|
|
||||||
|
var out struct {
|
||||||
|
Code int `json:"code"`
|
||||||
|
Data map[string]string `json:"data"`
|
||||||
|
}
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&out); err != nil {
|
||||||
|
t.Fatalf("decode response: %v", err)
|
||||||
|
}
|
||||||
|
if out.Code != 0 || out.Data["is_commercial"] != "true" {
|
||||||
|
t.Fatalf("unexpected config response: %+v", out)
|
||||||
|
}
|
||||||
|
if _, ok := out.Data["license_key"]; ok {
|
||||||
|
t.Fatal("license_key must not be returned")
|
||||||
|
}
|
||||||
|
if _, ok := out.Data["license_machine_id"]; ok {
|
||||||
|
t.Fatal("license_machine_id must not be returned")
|
||||||
|
}
|
||||||
|
if _, ok := out.Data["machine_fingerprint"]; ok {
|
||||||
|
t.Fatal("machine_fingerprint must not be returned")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestConfigUpdateAllowsSensitiveKeysForAdmin(t *testing.T) {
|
func TestConfigUpdateAllowsSensitiveKeysForAdmin(t *testing.T) {
|
||||||
router, _ := setupConfigAccessTestRouter(t)
|
router, _ := setupConfigAccessTestRouter(t)
|
||||||
adminToken := mustGenerateConfigAccessToken(t, 1, "admin_user", 0)
|
adminToken := mustGenerateConfigAccessToken(t, 1, "admin_user", 0)
|
||||||
@@ -154,7 +238,7 @@ func TestConfigUpdateSingleAllowsCloudflareSecretKeyWrite(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestConfigUpdateAllowsLicenseKeyWrite(t *testing.T) {
|
func TestConfigUpdateRejectsLicenseKeyWrite(t *testing.T) {
|
||||||
router, r := setupConfigAccessTestRouter(t)
|
router, r := setupConfigAccessTestRouter(t)
|
||||||
adminToken := mustGenerateConfigAccessToken(t, 1, "admin_user", 0)
|
adminToken := mustGenerateConfigAccessToken(t, 1, "admin_user", 0)
|
||||||
|
|
||||||
@@ -165,18 +249,13 @@ func TestConfigUpdateAllowsLicenseKeyWrite(t *testing.T) {
|
|||||||
|
|
||||||
router.ServeHTTP(resp, req)
|
router.ServeHTTP(resp, req)
|
||||||
|
|
||||||
assertHandlerCode(t, resp, 0)
|
assertHandlerCodeMsg(t, resp, -1, "该配置由系统管理")
|
||||||
|
if cfg, err := r.GetConfigByName("license_key"); err != nil || cfg != nil {
|
||||||
cfg, err := r.GetConfigByName("license_key")
|
t.Fatalf("license_key should not be written, got %#v err=%v", cfg, err)
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get config: %v", err)
|
|
||||||
}
|
|
||||||
if cfg == nil || cfg.Value != "license-secret" {
|
|
||||||
t.Fatalf("expected license_key to be updated, got %#v", cfg)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestConfigUpdateSingleAllowsLicenseKeyWrite(t *testing.T) {
|
func TestConfigUpdateSingleRejectsLicenseKeyWrite(t *testing.T) {
|
||||||
router, r := setupConfigAccessTestRouter(t)
|
router, r := setupConfigAccessTestRouter(t)
|
||||||
adminToken := mustGenerateConfigAccessToken(t, 1, "admin_user", 0)
|
adminToken := mustGenerateConfigAccessToken(t, 1, "admin_user", 0)
|
||||||
|
|
||||||
@@ -187,14 +266,9 @@ func TestConfigUpdateSingleAllowsLicenseKeyWrite(t *testing.T) {
|
|||||||
|
|
||||||
router.ServeHTTP(resp, req)
|
router.ServeHTTP(resp, req)
|
||||||
|
|
||||||
assertHandlerCode(t, resp, 0)
|
assertHandlerCodeMsg(t, resp, -1, "该配置由系统管理")
|
||||||
|
if cfg, err := r.GetConfigByName("license_key"); err != nil || cfg != nil {
|
||||||
cfg, err := r.GetConfigByName("license_key")
|
t.Fatalf("license_key should not be written, got %#v err=%v", cfg, err)
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get config: %v", err)
|
|
||||||
}
|
|
||||||
if cfg == nil || cfg.Value != "license-secret" {
|
|
||||||
t.Fatalf("expected license_key to be updated, got %#v", cfg)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -659,9 +659,21 @@ func (h *Handler) sendDeleteOrphanedForwardService(nodeID int64, serviceName str
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handler) speedLimiterExists(name string) bool {
|
func (h *Handler) speedLimiterExists(name string) bool {
|
||||||
|
name = strings.TrimSpace(name)
|
||||||
if name == "" {
|
if name == "" {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const forwardRulePrefix = "rule_traffic_limit_"
|
||||||
|
if strings.HasPrefix(name, forwardRulePrefix) {
|
||||||
|
forwardID, err := strconv.ParseInt(strings.TrimPrefix(name, forwardRulePrefix), 10, 64)
|
||||||
|
if err != nil || forwardID <= 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
forward, err := h.getForwardRecord(forwardID)
|
||||||
|
return err == nil && forward != nil && forward.IPSpeedID.Valid && forward.IPSpeedID.Int64 > 0
|
||||||
|
}
|
||||||
|
|
||||||
id, err := strconv.ParseInt(name, 10, 64)
|
id, err := strconv.ParseInt(name, 10, 64)
|
||||||
if err != nil || id <= 0 {
|
if err != nil || id <= 0 {
|
||||||
return false
|
return false
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"go-backend/internal/store/repo"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestSpeedLimiterExistsPreservesForwardRuleLimiter(t *testing.T) {
|
||||||
|
r, err := repo.Open(filepath.Join(t.TempDir(), "panel.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open repo: %v", err)
|
||||||
|
}
|
||||||
|
defer r.Close()
|
||||||
|
|
||||||
|
if err := r.DB().Exec(`
|
||||||
|
INSERT INTO forward(id, user_id, user_name, name, tunnel_id, remote_addr, strategy, in_flow, out_flow, created_time, updated_time, status, inx, ip_speed_id)
|
||||||
|
VALUES(8, 1, 'user', 'forward', 1, '127.0.0.1:80', 'fifo', 0, 0, 1, 1, 1, 0, 3),
|
||||||
|
(9, 1, 'user', 'forward-without-ip-limit', 1, '127.0.0.1:81', 'fifo', 0, 0, 1, 1, 1, 0, NULL)
|
||||||
|
`).Error; err != nil {
|
||||||
|
t.Fatalf("insert forward: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
h := &Handler{repo: r}
|
||||||
|
if !h.speedLimiterExists("rule_traffic_limit_8") {
|
||||||
|
t.Fatal("expected runtime limiter for existing forward to be preserved")
|
||||||
|
}
|
||||||
|
if h.speedLimiterExists("rule_traffic_limit_9") {
|
||||||
|
t.Fatal("expected runtime limiter for forward without per-IP speed limit to be treated as orphaned")
|
||||||
|
}
|
||||||
|
if h.speedLimiterExists("rule_traffic_limit_10") {
|
||||||
|
t.Fatal("expected runtime limiter for missing forward to be treated as orphaned")
|
||||||
|
}
|
||||||
|
if h.speedLimiterExists("rule_traffic_limit_invalid") {
|
||||||
|
t.Fatal("expected malformed runtime limiter name to be treated as orphaned")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"database/sql"
|
"database/sql"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"log"
|
"log"
|
||||||
@@ -20,7 +21,6 @@ import (
|
|||||||
"go-backend/internal/health"
|
"go-backend/internal/health"
|
||||||
"go-backend/internal/http/middleware"
|
"go-backend/internal/http/middleware"
|
||||||
"go-backend/internal/http/response"
|
"go-backend/internal/http/response"
|
||||||
"go-backend/internal/license"
|
|
||||||
"go-backend/internal/metrics"
|
"go-backend/internal/metrics"
|
||||||
"go-backend/internal/monitoring"
|
"go-backend/internal/monitoring"
|
||||||
runtimenft "go-backend/internal/runtime/nftables"
|
runtimenft "go-backend/internal/runtime/nftables"
|
||||||
@@ -42,10 +42,12 @@ type Handler struct {
|
|||||||
captchaMu sync.Mutex
|
captchaMu sync.Mutex
|
||||||
captchaTokens map[string]int64
|
captchaTokens map[string]int64
|
||||||
|
|
||||||
jobsMu sync.Mutex
|
jobsMu sync.Mutex
|
||||||
jobsCancel context.CancelFunc
|
jobsCancel context.CancelFunc
|
||||||
jobsStarted bool
|
jobsStarted bool
|
||||||
jobsWG sync.WaitGroup
|
jobsWG sync.WaitGroup
|
||||||
|
fingerprintMu sync.Mutex
|
||||||
|
licenseValidationMu sync.Mutex
|
||||||
|
|
||||||
upgradeMu sync.Mutex
|
upgradeMu sync.Mutex
|
||||||
systemUpgradeMu sync.Mutex
|
systemUpgradeMu sync.Mutex
|
||||||
@@ -400,6 +402,10 @@ func (h *Handler) getConfigByName(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
configName := strings.ToLower(strings.TrimSpace(req.Name))
|
configName := strings.ToLower(strings.TrimSpace(req.Name))
|
||||||
|
if configName == "license_key" || configName == "license_machine_id" || configName == "machine_fingerprint" {
|
||||||
|
response.WriteJSON(w, response.Err(403, "禁止访问系统授权凭据"))
|
||||||
|
return
|
||||||
|
}
|
||||||
if repo.IsSensitiveConfigKey(configName) && !isAdminRequest(r) {
|
if repo.IsSensitiveConfigKey(configName) && !isAdminRequest(r) {
|
||||||
response.WriteJSON(w, response.Err(403, "禁止访问敏感配置"))
|
response.WriteJSON(w, response.Err(403, "禁止访问敏感配置"))
|
||||||
return
|
return
|
||||||
@@ -435,11 +441,13 @@ func (h *Handler) getConfigs(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
ctxClaims := r.Context().Value(middleware.ClaimsContextKey)
|
ctxClaims := r.Context().Value(middleware.ClaimsContextKey)
|
||||||
if claims, ok := ctxClaims.(auth.Claims); !ok || claims.RoleID != 0 {
|
claims, isAdmin := ctxClaims.(auth.Claims)
|
||||||
delete(cfgMap, "license_key")
|
if !isAdmin || claims.RoleID != 0 {
|
||||||
delete(cfgMap, "cloudflare_secret_key")
|
cfgMap = repo.FilterSensitiveConfigs(cfgMap)
|
||||||
delete(cfgMap, "jwt_secret")
|
|
||||||
}
|
}
|
||||||
|
delete(cfgMap, "license_key")
|
||||||
|
delete(cfgMap, "license_machine_id")
|
||||||
|
delete(cfgMap, "machine_fingerprint")
|
||||||
response.WriteJSON(w, response.OK(cfgMap))
|
response.WriteJSON(w, response.OK(cfgMap))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -878,10 +886,16 @@ func (h *Handler) flowUpload(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handler) getOrCreateMachineFingerprint() (string, error) {
|
func (h *Handler) getOrCreateMachineFingerprint() (string, error) {
|
||||||
fp, _ := h.repo.GetViteConfigValue("machine_fingerprint")
|
h.fingerprintMu.Lock()
|
||||||
|
defer h.fingerprintMu.Unlock()
|
||||||
|
|
||||||
|
fp, err := h.repo.GetViteConfigValue("machine_fingerprint")
|
||||||
if fp != "" {
|
if fp != "" {
|
||||||
return fp, nil
|
return fp, nil
|
||||||
}
|
}
|
||||||
|
if err != nil && !errors.Is(err, sql.ErrNoRows) {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
newFp := uuid.New().String()
|
newFp := uuid.New().String()
|
||||||
now := time.Now().UnixMilli()
|
now := time.Now().UnixMilli()
|
||||||
@@ -908,56 +922,35 @@ func (h *Handler) licenseActivate(w http.ResponseWriter, r *http.Request) {
|
|||||||
response.WriteJSON(w, response.ErrDefault("授权码不能为空"))
|
response.WriteJSON(w, response.ErrDefault("授权码不能为空"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
h.licenseValidationMu.Lock()
|
||||||
|
defer h.licenseValidationMu.Unlock()
|
||||||
|
|
||||||
accountID := "1bc96cac-09de-4cf4-af34-26afdad63a90"
|
valResp, err := h.validateLicenseForMachine(key)
|
||||||
|
|
||||||
fingerprint, err := h.getOrCreateMachineFingerprint()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
response.WriteJSON(w, response.ErrDefault("生成设备指纹失败"))
|
log.Printf("license activation failed: %v", err)
|
||||||
return
|
response.WriteJSON(w, response.ErrDefault(licenseValidationErrorMessage(err)))
|
||||||
}
|
|
||||||
|
|
||||||
client := license.NewKeygenClient(accountID, "")
|
|
||||||
valResp, err := client.ValidateKeyWithFingerprint(key, fingerprint)
|
|
||||||
if err != nil {
|
|
||||||
response.WriteJSON(w, response.ErrDefault("连接授权服务器失败: "+err.Error()))
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if !valResp.Meta.Valid {
|
if !valResp.Meta.Valid {
|
||||||
if valResp.Meta.Code == "NO_MACHINES" || valResp.Meta.Code == "NO_MACHINE" || valResp.Meta.Code == "MACHINE_SCOPE_REQUIRED" || valResp.Meta.Code == "FINGERPRINT_SCOPE_MISMATCH" {
|
response.WriteJSON(w, response.ErrDefault("授权码无效或已过期 (Code: "+valResp.Meta.Code+")"))
|
||||||
// Needs machine activation
|
return
|
||||||
client.Token = key
|
|
||||||
err = client.ActivateMachine(valResp.Data.ID, fingerprint)
|
|
||||||
if err != nil {
|
|
||||||
// Translate specific error messages or log them
|
|
||||||
response.WriteJSON(w, response.ErrDefault("设备绑定失败: "+err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Validation might still fail with scope if we don't query via machine id, but since activate machine succeeded
|
|
||||||
// we can consider the license valid for our simple usecase
|
|
||||||
} else {
|
|
||||||
response.WriteJSON(w, response.ErrDefault("授权码无效或已过期 (Code: "+valResp.Meta.Code+")"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
now := time.Now().UnixMilli()
|
now := time.Now().UnixMilli()
|
||||||
if err := h.repo.UpsertConfig("license_key", key, now); err != nil {
|
|
||||||
response.WriteJSON(w, response.Err(-2, err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := h.repo.UpsertConfig("is_commercial", "true", now); err != nil {
|
|
||||||
response.WriteJSON(w, response.Err(-2, err.Error()))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
expiry := valResp.Data.Attributes.Expiry
|
expiry := valResp.Data.Attributes.Expiry
|
||||||
if expiry == "" {
|
if expiry == "" {
|
||||||
expiry = "never"
|
expiry = "never"
|
||||||
}
|
}
|
||||||
if err := h.repo.UpsertConfig("license_expiry", expiry, now); err != nil {
|
licenseState := map[string]string{
|
||||||
|
"license_key": key,
|
||||||
|
"is_commercial": "true",
|
||||||
|
"license_expiry": expiry,
|
||||||
|
}
|
||||||
|
if valResp.MachineID != "" {
|
||||||
|
licenseState["license_machine_id"] = valResp.MachineID
|
||||||
|
}
|
||||||
|
if err := h.repo.UpsertConfigs(licenseState, now); err != nil {
|
||||||
response.WriteJSON(w, response.Err(-2, err.Error()))
|
response.WriteJSON(w, response.Err(-2, err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -999,6 +992,10 @@ func (h *Handler) updateConfigs(w http.ResponseWriter, r *http.Request) {
|
|||||||
response.WriteJSON(w, response.Err(403, "禁止访问敏感配置"))
|
response.WriteJSON(w, response.Err(403, "禁止访问敏感配置"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if repo.IsSystemManagedConfigKey(key) {
|
||||||
|
response.WriteJSON(w, response.ErrDefault("该配置由系统管理"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if protectedKeys[key] && isCommercial != "true" {
|
if protectedKeys[key] && isCommercial != "true" {
|
||||||
response.WriteJSON(w, response.ErrDefault("需要商业版授权"))
|
response.WriteJSON(w, response.ErrDefault("需要商业版授权"))
|
||||||
@@ -1041,6 +1038,10 @@ func (h *Handler) updateSingleConfig(w http.ResponseWriter, r *http.Request) {
|
|||||||
response.WriteJSON(w, response.Err(403, "禁止访问敏感配置"))
|
response.WriteJSON(w, response.Err(403, "禁止访问敏感配置"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if repo.IsSystemManagedConfigKey(name) {
|
||||||
|
response.WriteJSON(w, response.ErrDefault("该配置由系统管理"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
isCommercial, _ := h.repo.GetViteConfigValue("is_commercial")
|
isCommercial, _ := h.repo.GetViteConfigValue("is_commercial")
|
||||||
if (name == "app_name" || name == "app_logo" || name == "app_favicon" || name == "hide_footer_brand") && isCommercial != "true" {
|
if (name == "app_name" || name == "app_logo" || name == "app_favicon" || name == "hide_footer_brand") && isCommercial != "true" {
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"log"
|
"log"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go-backend/internal/license"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var nftablesTrafficCollectInterval = 30 * time.Second
|
var nftablesTrafficCollectInterval = 30 * time.Second
|
||||||
@@ -38,6 +36,7 @@ func (h *Handler) StartBackgroundJobs() {
|
|||||||
|
|
||||||
func (h *Handler) runValidateLicenseJob(ctx context.Context) {
|
func (h *Handler) runValidateLicenseJob(ctx context.Context) {
|
||||||
defer h.jobsWG.Done()
|
defer h.jobsWG.Done()
|
||||||
|
h.validateLicenseJob()
|
||||||
ticker := time.NewTicker(12 * time.Hour)
|
ticker := time.NewTicker(12 * time.Hour)
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
|
||||||
@@ -55,22 +54,25 @@ func (h *Handler) validateLicenseJob() {
|
|||||||
if h == nil || h.repo == nil {
|
if h == nil || h.repo == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
h.licenseValidationMu.Lock()
|
||||||
accountID := "1bc96cac-09de-4cf4-af34-26afdad63a90"
|
defer h.licenseValidationMu.Unlock()
|
||||||
|
|
||||||
key, _ := h.repo.GetViteConfigValue("license_key")
|
key, _ := h.repo.GetViteConfigValue("license_key")
|
||||||
isCommercial, _ := h.repo.GetViteConfigValue("is_commercial")
|
|
||||||
|
|
||||||
if key == "" || isCommercial != "true" {
|
if key == "" {
|
||||||
return // Nothing to validate
|
return // Nothing to validate
|
||||||
}
|
}
|
||||||
|
|
||||||
fingerprint, _ := h.repo.GetViteConfigValue("machine_fingerprint")
|
valResp, err := h.validateLicenseForMachine(key)
|
||||||
client := license.NewKeygenClient(accountID, "")
|
|
||||||
valResp, err := client.ValidateKeyWithFingerprint(key, fingerprint)
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Network error or timeout. Grace period by not revoking immediately here.
|
// Network and decode failures have no validation response, so retain the
|
||||||
|
// current state as a grace period. A rejected machine binding still has
|
||||||
|
// the original invalid response and must not stay commercially enabled.
|
||||||
|
if licenseValidationErrorIsDefinitive(valResp, err) {
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
_ = h.repo.UpsertConfig("is_commercial", "false", now)
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -84,7 +86,14 @@ func (h *Handler) validateLicenseJob() {
|
|||||||
if expiry == "" {
|
if expiry == "" {
|
||||||
expiry = "never"
|
expiry = "never"
|
||||||
}
|
}
|
||||||
_ = h.repo.UpsertConfig("license_expiry", expiry, now)
|
licenseState := map[string]string{
|
||||||
|
"is_commercial": "true",
|
||||||
|
"license_expiry": expiry,
|
||||||
|
}
|
||||||
|
if valResp.MachineID != "" {
|
||||||
|
licenseState["license_machine_id"] = valResp.MachineID
|
||||||
|
}
|
||||||
|
_ = h.repo.UpsertConfigs(licenseState, now)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,109 @@
|
|||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"go-backend/internal/license"
|
||||||
|
)
|
||||||
|
|
||||||
|
var newLicenseClient = license.NewKeygenClient
|
||||||
|
|
||||||
|
func keygenAccountID() string {
|
||||||
|
if value := strings.TrimSpace(license.AccountID); value != "" {
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(os.Getenv("KEYGEN_ACCOUNT_ID"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func licenseNeedsMachineActivation(code string) bool {
|
||||||
|
switch strings.ToUpper(strings.TrimSpace(code)) {
|
||||||
|
case "NO_MACHINES", "NO_MACHINE", "MACHINE_SCOPE_REQUIRED", "FINGERPRINT_SCOPE_MISMATCH":
|
||||||
|
return true
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func licenseValidationErrorIsDefinitive(validation *license.ValidateResponse, err error) bool {
|
||||||
|
if err == nil {
|
||||||
|
return validation != nil && !validation.Meta.Valid
|
||||||
|
}
|
||||||
|
var apiErr *license.APIError
|
||||||
|
if !errors.As(err, &apiErr) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if apiErr.StatusCode == http.StatusTooManyRequests || apiErr.StatusCode >= http.StatusInternalServerError {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return apiErr.Operation == "activate machine" && validation != nil && !validation.Meta.Valid
|
||||||
|
}
|
||||||
|
|
||||||
|
func licenseValidationErrorMessage(err error) string {
|
||||||
|
if strings.Contains(err.Error(), "keygen account id is not configured") {
|
||||||
|
return "授权服务配置错误"
|
||||||
|
}
|
||||||
|
var apiErr *license.APIError
|
||||||
|
if errors.As(err, &apiErr) {
|
||||||
|
if apiErr.HasCode("MACHINE_LIMIT_EXCEEDED") {
|
||||||
|
return "授权设备数量已达上限"
|
||||||
|
}
|
||||||
|
if apiErr.StatusCode == http.StatusUnauthorized || apiErr.StatusCode == http.StatusForbidden {
|
||||||
|
return "授权码无效或无权绑定设备"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "连接授权服务器失败,请稍后重试"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) validateLicenseForMachine(key string) (*license.ValidateResponse, error) {
|
||||||
|
fingerprint, err := h.getOrCreateMachineFingerprint()
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("prepare machine fingerprint: %w", err)
|
||||||
|
}
|
||||||
|
storedMachineID, _ := h.repo.GetViteConfigValue("license_machine_id")
|
||||||
|
|
||||||
|
accountID := keygenAccountID()
|
||||||
|
if accountID == "" {
|
||||||
|
return nil, fmt.Errorf("keygen account id is not configured")
|
||||||
|
}
|
||||||
|
client := newLicenseClient(accountID, "")
|
||||||
|
var validation *license.ValidateResponse
|
||||||
|
if storedMachineID != "" {
|
||||||
|
validation, err = client.ValidateKeyWithMachine(key, fingerprint, storedMachineID)
|
||||||
|
} else {
|
||||||
|
validation, err = client.ValidateKeyWithFingerprint(key, fingerprint)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if validation.Meta.Valid || !licenseNeedsMachineActivation(validation.Meta.Code) {
|
||||||
|
if validation.Meta.Valid {
|
||||||
|
validation.MachineID = storedMachineID
|
||||||
|
}
|
||||||
|
return validation, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
client.Token = key
|
||||||
|
machineID, err := client.ActivateMachine(validation.Data.ID, fingerprint)
|
||||||
|
if err != nil {
|
||||||
|
return validation, err
|
||||||
|
}
|
||||||
|
if machineID == "" {
|
||||||
|
machineID, err = client.GetMachineID(fingerprint)
|
||||||
|
if err != nil {
|
||||||
|
return validation, fmt.Errorf("retrieve activated machine: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
validation, err = client.ValidateKeyWithMachine(key, fingerprint, machineID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if validation.Meta.Valid {
|
||||||
|
validation.MachineID = machineID
|
||||||
|
}
|
||||||
|
return validation, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,358 @@
|
|||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"sync/atomic"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"go-backend/internal/license"
|
||||||
|
"go-backend/internal/store/repo"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestValidateLicenseJobRepairsMissingMachineBinding(t *testing.T) {
|
||||||
|
r := openLicenseTestRepository(t)
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
seedLicenseConfig(t, r, "license_key", "license-secret", now)
|
||||||
|
seedLicenseConfig(t, r, "is_commercial", "true", now)
|
||||||
|
|
||||||
|
var validations atomic.Int32
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
switch {
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/licenses/actions/validate-key"):
|
||||||
|
if validations.Add(1) == 1 {
|
||||||
|
_, _ = fmt.Fprint(w, `{"meta":{"valid":false,"code":"NO_MACHINE"},"data":{"id":"license-id","attributes":{}}}`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, _ = fmt.Fprint(w, `{"meta":{"valid":true,"code":"VALID"},"data":{"id":"license-id","attributes":{"expiry":"2030-01-02T00:00:00.000Z"}}}`)
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/machines"):
|
||||||
|
w.WriteHeader(http.StatusCreated)
|
||||||
|
_, _ = fmt.Fprint(w, `{"data":{"type":"machines","id":"machine-id"}}`)
|
||||||
|
case strings.Contains(req.URL.Path, "/machines/"):
|
||||||
|
_, _ = fmt.Fprint(w, `{"data":{"type":"machines","id":"machine-id"}}`)
|
||||||
|
default:
|
||||||
|
http.NotFound(w, req)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
restoreLicenseClientFactory(t, server.URL)
|
||||||
|
|
||||||
|
h := &Handler{repo: r}
|
||||||
|
h.validateLicenseJob()
|
||||||
|
|
||||||
|
assertLicenseConfig(t, r, "is_commercial", "true")
|
||||||
|
assertLicenseConfig(t, r, "license_expiry", "2030-01-02T00:00:00.000Z")
|
||||||
|
fingerprint, err := r.GetViteConfigValue("machine_fingerprint")
|
||||||
|
if err != nil || strings.TrimSpace(fingerprint) == "" {
|
||||||
|
t.Fatalf("expected persisted machine fingerprint, got value=%q err=%v", fingerprint, err)
|
||||||
|
}
|
||||||
|
if got := validations.Load(); got != 2 {
|
||||||
|
t.Fatalf("validation calls = %d, want 2", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateLicenseJobAcceptsExistingMachineActivation(t *testing.T) {
|
||||||
|
r := openLicenseTestRepository(t)
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
seedLicenseConfig(t, r, "license_key", "license-secret", now)
|
||||||
|
seedLicenseConfig(t, r, "is_commercial", "true", now)
|
||||||
|
|
||||||
|
var validations atomic.Int32
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
switch {
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/licenses/actions/validate-key"):
|
||||||
|
if validations.Add(1) == 1 {
|
||||||
|
_, _ = fmt.Fprint(w, `{"meta":{"valid":false,"code":"NO_MACHINE"},"data":{"id":"license-id","attributes":{}}}`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, _ = fmt.Fprint(w, `{"meta":{"valid":true,"code":"VALID"},"data":{"id":"license-id","attributes":{"expiry":"never"}}}`)
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/machines"):
|
||||||
|
w.WriteHeader(http.StatusUnprocessableEntity)
|
||||||
|
_, _ = fmt.Fprint(w, `{"errors":[{"code":"FINGERPRINT_TAKEN"},{"code":"MACHINE_LIMIT_EXCEEDED"}]}`)
|
||||||
|
case strings.Contains(req.URL.Path, "/machines/"):
|
||||||
|
_, _ = fmt.Fprint(w, `{"data":{"type":"machines","id":"machine-id"}}`)
|
||||||
|
default:
|
||||||
|
http.NotFound(w, req)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
restoreLicenseClientFactory(t, server.URL)
|
||||||
|
|
||||||
|
h := &Handler{repo: r}
|
||||||
|
h.validateLicenseJob()
|
||||||
|
|
||||||
|
assertLicenseConfig(t, r, "is_commercial", "true")
|
||||||
|
assertLicenseConfig(t, r, "license_expiry", "never")
|
||||||
|
if got := validations.Load(); got != 2 {
|
||||||
|
t.Fatalf("validation calls = %d, want 2", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLicenseActivateRequiresSuccessfulPostActivationValidation(t *testing.T) {
|
||||||
|
r := openLicenseTestRepository(t)
|
||||||
|
|
||||||
|
var validations atomic.Int32
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
switch {
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/licenses/actions/validate-key"):
|
||||||
|
code := "NO_MACHINE"
|
||||||
|
if validations.Add(1) > 1 {
|
||||||
|
code = "FINGERPRINT_SCOPE_MISMATCH"
|
||||||
|
}
|
||||||
|
_, _ = fmt.Fprintf(w, `{"meta":{"valid":false,"code":%q},"data":{"id":"license-id","attributes":{}}}`, code)
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/machines"):
|
||||||
|
w.WriteHeader(http.StatusCreated)
|
||||||
|
_, _ = fmt.Fprint(w, `{"data":{"type":"machines","id":"machine-id"}}`)
|
||||||
|
case strings.Contains(req.URL.Path, "/machines/"):
|
||||||
|
_, _ = fmt.Fprint(w, `{"data":{"type":"machines","id":"machine-id"}}`)
|
||||||
|
default:
|
||||||
|
http.NotFound(w, req)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
restoreLicenseClientFactory(t, server.URL)
|
||||||
|
|
||||||
|
h := &Handler{repo: r}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/license/activate", bytes.NewBufferString(`{"license_key":"license-secret"}`))
|
||||||
|
res := httptest.NewRecorder()
|
||||||
|
h.licenseActivate(res, req)
|
||||||
|
|
||||||
|
if !strings.Contains(res.Body.String(), "FINGERPRINT_SCOPE_MISMATCH") {
|
||||||
|
t.Fatalf("expected post-activation validation failure, got %s", res.Body.String())
|
||||||
|
}
|
||||||
|
assertLicenseConfig(t, r, "is_commercial", "false")
|
||||||
|
for _, name := range []string{"license_key", "license_expiry"} {
|
||||||
|
if value, err := r.GetViteConfigValue(name); err == nil || value != "" {
|
||||||
|
t.Fatalf("%s should not be persisted, got value=%q err=%v", name, value, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLicenseActivatePersistsValidatedState(t *testing.T) {
|
||||||
|
r := openLicenseTestRepository(t)
|
||||||
|
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
switch {
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/licenses/actions/validate-key"):
|
||||||
|
_, _ = fmt.Fprint(w, `{"meta":{"valid":true,"code":"VALID"},"data":{"id":"license-id","attributes":{"expiry":"2030-01-02T00:00:00.000Z"}}}`)
|
||||||
|
default:
|
||||||
|
http.NotFound(w, req)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
restoreLicenseClientFactory(t, server.URL)
|
||||||
|
|
||||||
|
h := &Handler{repo: r}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/license/activate", bytes.NewBufferString(`{"license_key":"license-secret"}`))
|
||||||
|
res := httptest.NewRecorder()
|
||||||
|
h.licenseActivate(res, req)
|
||||||
|
|
||||||
|
if !strings.Contains(res.Body.String(), `"code":0`) {
|
||||||
|
t.Fatalf("expected activation success, got %s", res.Body.String())
|
||||||
|
}
|
||||||
|
assertLicenseConfig(t, r, "license_key", "license-secret")
|
||||||
|
assertLicenseConfig(t, r, "is_commercial", "true")
|
||||||
|
assertLicenseConfig(t, r, "license_expiry", "2030-01-02T00:00:00.000Z")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateLicenseJobDowngradesWhenMachineBindingIsRejected(t *testing.T) {
|
||||||
|
r := openLicenseTestRepository(t)
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
seedLicenseConfig(t, r, "license_key", "license-secret", now)
|
||||||
|
seedLicenseConfig(t, r, "is_commercial", "true", now)
|
||||||
|
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
switch {
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/licenses/actions/validate-key"):
|
||||||
|
_, _ = fmt.Fprint(w, `{"meta":{"valid":false,"code":"NO_MACHINE"},"data":{"id":"license-id","attributes":{}}}`)
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/machines"):
|
||||||
|
w.WriteHeader(http.StatusUnprocessableEntity)
|
||||||
|
_, _ = fmt.Fprint(w, `{"errors":[{"code":"MACHINE_LIMIT_EXCEEDED"}]}`)
|
||||||
|
default:
|
||||||
|
http.NotFound(w, req)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
restoreLicenseClientFactory(t, server.URL)
|
||||||
|
|
||||||
|
h := &Handler{repo: r}
|
||||||
|
h.validateLicenseJob()
|
||||||
|
|
||||||
|
assertLicenseConfig(t, r, "is_commercial", "false")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateLicenseJobRestoresCommercialStateWhenLicenseRecovers(t *testing.T) {
|
||||||
|
r := openLicenseTestRepository(t)
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
seedLicenseConfig(t, r, "license_key", "license-secret", now)
|
||||||
|
seedLicenseConfig(t, r, "is_commercial", "false", now)
|
||||||
|
seedLicenseConfig(t, r, "machine_fingerprint", "fingerprint", now)
|
||||||
|
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
if strings.HasSuffix(req.URL.Path, "/licenses/actions/validate-key") {
|
||||||
|
_, _ = fmt.Fprint(w, `{"meta":{"valid":true,"code":"VALID"},"data":{"id":"license-id","attributes":{"expiry":"never"}}}`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
http.NotFound(w, req)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
restoreLicenseClientFactory(t, server.URL)
|
||||||
|
|
||||||
|
h := &Handler{repo: r}
|
||||||
|
h.validateLicenseJob()
|
||||||
|
|
||||||
|
assertLicenseConfig(t, r, "is_commercial", "true")
|
||||||
|
assertLicenseConfig(t, r, "license_expiry", "never")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateLicenseJobUsesStoredMachineScope(t *testing.T) {
|
||||||
|
r := openLicenseTestRepository(t)
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
seedLicenseConfig(t, r, "license_key", "license-secret", now)
|
||||||
|
seedLicenseConfig(t, r, "is_commercial", "true", now)
|
||||||
|
seedLicenseConfig(t, r, "machine_fingerprint", "fingerprint", now)
|
||||||
|
seedLicenseConfig(t, r, "license_machine_id", "machine-id", now)
|
||||||
|
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
if !strings.HasSuffix(req.URL.Path, "/licenses/actions/validate-key") {
|
||||||
|
t.Fatalf("unexpected request %s %s", req.Method, req.URL.Path)
|
||||||
|
}
|
||||||
|
var body struct {
|
||||||
|
Meta struct {
|
||||||
|
Scope map[string]string `json:"scope"`
|
||||||
|
} `json:"meta"`
|
||||||
|
}
|
||||||
|
if err := json.NewDecoder(req.Body).Decode(&body); err != nil {
|
||||||
|
t.Fatalf("decode request: %v", err)
|
||||||
|
}
|
||||||
|
if body.Meta.Scope["machine"] != "machine-id" || body.Meta.Scope["fingerprint"] != "fingerprint" {
|
||||||
|
t.Fatalf("unexpected validation scope: %+v", body.Meta.Scope)
|
||||||
|
}
|
||||||
|
_, _ = fmt.Fprint(w, `{"meta":{"valid":true,"code":"VALID"},"data":{"id":"license-id","attributes":{"expiry":"never"}}}`)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
restoreLicenseClientFactory(t, server.URL)
|
||||||
|
|
||||||
|
h := &Handler{repo: r}
|
||||||
|
h.validateLicenseJob()
|
||||||
|
|
||||||
|
assertLicenseConfig(t, r, "is_commercial", "true")
|
||||||
|
assertLicenseConfig(t, r, "license_machine_id", "machine-id")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateLicenseJobKeepsStateOnMachineLookupServerFailure(t *testing.T) {
|
||||||
|
r := openLicenseTestRepository(t)
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
seedLicenseConfig(t, r, "license_key", "license-secret", now)
|
||||||
|
seedLicenseConfig(t, r, "is_commercial", "true", now)
|
||||||
|
seedLicenseConfig(t, r, "machine_fingerprint", "fingerprint", now)
|
||||||
|
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
switch {
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/licenses/actions/validate-key"):
|
||||||
|
_, _ = fmt.Fprint(w, `{"meta":{"valid":false,"code":"MACHINE_SCOPE_REQUIRED"},"data":{"id":"license-id","attributes":{}}}`)
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/machines"):
|
||||||
|
w.WriteHeader(http.StatusUnprocessableEntity)
|
||||||
|
_, _ = fmt.Fprint(w, `{"errors":[{"code":"FINGERPRINT_TAKEN"}]}`)
|
||||||
|
case strings.Contains(req.URL.Path, "/machines/"):
|
||||||
|
w.WriteHeader(http.StatusServiceUnavailable)
|
||||||
|
_, _ = fmt.Fprint(w, `{"errors":[{"code":"SERVICE_UNAVAILABLE"}]}`)
|
||||||
|
default:
|
||||||
|
http.NotFound(w, req)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
restoreLicenseClientFactory(t, server.URL)
|
||||||
|
|
||||||
|
h := &Handler{repo: r}
|
||||||
|
h.validateLicenseJob()
|
||||||
|
|
||||||
|
assertLicenseConfig(t, r, "is_commercial", "true")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateLicenseJobKeepsStateOnMachineLookupNotFound(t *testing.T) {
|
||||||
|
r := openLicenseTestRepository(t)
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
seedLicenseConfig(t, r, "license_key", "license-secret", now)
|
||||||
|
seedLicenseConfig(t, r, "is_commercial", "true", now)
|
||||||
|
seedLicenseConfig(t, r, "machine_fingerprint", "fingerprint", now)
|
||||||
|
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
switch {
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/licenses/actions/validate-key"):
|
||||||
|
_, _ = fmt.Fprint(w, `{"meta":{"valid":false,"code":"MACHINE_SCOPE_REQUIRED"},"data":{"id":"license-id","attributes":{}}}`)
|
||||||
|
case strings.HasSuffix(req.URL.Path, "/machines"):
|
||||||
|
w.WriteHeader(http.StatusUnprocessableEntity)
|
||||||
|
_, _ = fmt.Fprint(w, `{"errors":[{"code":"FINGERPRINT_TAKEN"}]}`)
|
||||||
|
case strings.Contains(req.URL.Path, "/machines/"):
|
||||||
|
http.NotFound(w, req)
|
||||||
|
default:
|
||||||
|
http.NotFound(w, req)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
restoreLicenseClientFactory(t, server.URL)
|
||||||
|
|
||||||
|
h := &Handler{repo: r}
|
||||||
|
h.validateLicenseJob()
|
||||||
|
|
||||||
|
assertLicenseConfig(t, r, "is_commercial", "true")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLicenseValidationErrorMessageDoesNotExposeKeygenResponse(t *testing.T) {
|
||||||
|
err := &license.APIError{
|
||||||
|
Operation: "activate machine",
|
||||||
|
StatusCode: http.StatusUnprocessableEntity,
|
||||||
|
Body: `{"errors":[{"code":"MACHINE_LIMIT_EXCEEDED","detail":"private detail"}]}`,
|
||||||
|
}
|
||||||
|
message := licenseValidationErrorMessage(err)
|
||||||
|
if message != "授权设备数量已达上限" || strings.Contains(message, "private detail") {
|
||||||
|
t.Fatalf("unexpected public error message %q", message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func openLicenseTestRepository(t *testing.T) *repo.Repository {
|
||||||
|
t.Helper()
|
||||||
|
r, err := repo.Open(filepath.Join(t.TempDir(), "license.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("repo.Open() error = %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = r.Close() })
|
||||||
|
return r
|
||||||
|
}
|
||||||
|
|
||||||
|
func seedLicenseConfig(t *testing.T, r *repo.Repository, name, value string, now int64) {
|
||||||
|
t.Helper()
|
||||||
|
if err := r.UpsertConfig(name, value, now); err != nil {
|
||||||
|
t.Fatalf("UpsertConfig(%q) error = %v", name, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func assertLicenseConfig(t *testing.T, r *repo.Repository, name, want string) {
|
||||||
|
t.Helper()
|
||||||
|
got, err := r.GetViteConfigValue(name)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GetViteConfigValue(%q) error = %v", name, err)
|
||||||
|
}
|
||||||
|
if got != want {
|
||||||
|
t.Fatalf("config %q = %q, want %q", name, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func restoreLicenseClientFactory(t *testing.T, baseURL string) {
|
||||||
|
t.Helper()
|
||||||
|
t.Setenv("KEYGEN_ACCOUNT_ID", "account-id")
|
||||||
|
previous := newLicenseClient
|
||||||
|
newLicenseClient = func(accountID, token string) *license.KeygenClient {
|
||||||
|
client := license.NewKeygenClient(accountID, token)
|
||||||
|
client.BaseURL = baseURL
|
||||||
|
return client
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { newLicenseClient = previous })
|
||||||
|
}
|
||||||
@@ -182,6 +182,8 @@ func requiresAdmin(path string) bool {
|
|||||||
return true
|
return true
|
||||||
case "/api/v1/config/update", "/api/v1/config/update-single":
|
case "/api/v1/config/update", "/api/v1/config/update-single":
|
||||||
return true
|
return true
|
||||||
|
case "/api/v1/license/activate":
|
||||||
|
return true
|
||||||
case "/api/v1/announcement/update":
|
case "/api/v1/announcement/update":
|
||||||
return true
|
return true
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -197,6 +197,39 @@ func TestShouldSkipBypassesPublicConfigGet(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestLicenseActivateRequiresAdmin(t *testing.T) {
|
||||||
|
if !requiresAdmin("/api/v1/license/activate") {
|
||||||
|
t.Fatal("expected license activation to require admin")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestJWTRejectsNonAdminLicenseActivation(t *testing.T) {
|
||||||
|
secret := "unit-test-secret"
|
||||||
|
token, err := auth.GenerateToken(2, "regular_user", 1, secret)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("generate token: %v", err)
|
||||||
|
}
|
||||||
|
claims, err := auth.ParseClaims(token, secret)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse claims: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
wrapped := JWT(AuthOptions{
|
||||||
|
JWTSecret: secret,
|
||||||
|
GetUserAuthState: func(userID int64) (*auth.UserAuthState, error) {
|
||||||
|
return &auth.UserAuthState{ID: userID, RoleID: 1, Status: 1, PasswordChangedAt: claims.IatMs - 1}, nil
|
||||||
|
},
|
||||||
|
})(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
response.WriteJSON(w, response.OK("pass"))
|
||||||
|
}))
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/v1/license/activate", nil)
|
||||||
|
req.Header.Set("Authorization", token)
|
||||||
|
res := httptest.NewRecorder()
|
||||||
|
wrapped.ServeHTTP(res, req)
|
||||||
|
assertCodeMsg(t, res, 403, "权限不足,仅管理员可操作")
|
||||||
|
}
|
||||||
|
|
||||||
func TestJWTExpiresAfterSevenDays(t *testing.T) {
|
func TestJWTExpiresAfterSevenDays(t *testing.T) {
|
||||||
secret := "unit-test-secret"
|
secret := "unit-test-secret"
|
||||||
token, err := auth.GenerateToken(1, "admin_user", 0, secret)
|
token, err := auth.GenerateToken(1, "admin_user", 0, secret)
|
||||||
|
|||||||
@@ -6,24 +6,53 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"net/url"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var AccountID string
|
||||||
|
|
||||||
type KeygenClient struct {
|
type KeygenClient struct {
|
||||||
AccountID string
|
AccountID string
|
||||||
Token string
|
Token string
|
||||||
|
BaseURL string
|
||||||
HTTPClient *http.Client
|
HTTPClient *http.Client
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type APIError struct {
|
||||||
|
Operation string
|
||||||
|
StatusCode int
|
||||||
|
Body string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *APIError) Error() string {
|
||||||
|
return fmt.Sprintf("keygen %s failed: status %d, response: %s", e.Operation, e.StatusCode, e.Body)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *APIError) HasCode(code string) bool {
|
||||||
|
return e != nil && hasKeygenErrorCode([]byte(e.Body), code)
|
||||||
|
}
|
||||||
|
|
||||||
|
const defaultAPIBaseURL = "https://api.keygen.sh/v1"
|
||||||
|
|
||||||
func NewKeygenClient(accountID, token string) *KeygenClient {
|
func NewKeygenClient(accountID, token string) *KeygenClient {
|
||||||
return &KeygenClient{
|
return &KeygenClient{
|
||||||
AccountID: accountID,
|
AccountID: accountID,
|
||||||
Token: token,
|
Token: token,
|
||||||
|
BaseURL: defaultAPIBaseURL,
|
||||||
HTTPClient: &http.Client{Timeout: 10 * time.Second},
|
HTTPClient: &http.Client{Timeout: 10 * time.Second},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *KeygenClient) apiURL(path string) string {
|
||||||
|
baseURL := strings.TrimRight(c.BaseURL, "/")
|
||||||
|
if baseURL == "" {
|
||||||
|
baseURL = defaultAPIBaseURL
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("%s/accounts/%s/%s", baseURL, c.AccountID, strings.TrimLeft(path, "/"))
|
||||||
|
}
|
||||||
|
|
||||||
type ValidateResponse struct {
|
type ValidateResponse struct {
|
||||||
Meta struct {
|
Meta struct {
|
||||||
Valid bool `json:"valid"`
|
Valid bool `json:"valid"`
|
||||||
@@ -35,6 +64,7 @@ type ValidateResponse struct {
|
|||||||
Expiry string `json:"expiry"`
|
Expiry string `json:"expiry"`
|
||||||
} `json:"attributes"`
|
} `json:"attributes"`
|
||||||
} `json:"data"`
|
} `json:"data"`
|
||||||
|
MachineID string `json:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ActivateMachineRequest struct {
|
type ActivateMachineRequest struct {
|
||||||
@@ -54,8 +84,37 @@ type ActivateMachineRequest struct {
|
|||||||
} `json:"data"`
|
} `json:"data"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type keygenErrorResponse struct {
|
||||||
|
Errors []struct {
|
||||||
|
Code string `json:"code"`
|
||||||
|
} `json:"errors"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type MachineResponse struct {
|
||||||
|
Data struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
} `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func hasKeygenErrorCode(body []byte, code string) bool {
|
||||||
|
var resp keygenErrorResponse
|
||||||
|
if err := json.Unmarshal(body, &resp); err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, item := range resp.Errors {
|
||||||
|
if strings.EqualFold(strings.TrimSpace(item.Code), code) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
func (c *KeygenClient) ValidateKeyWithFingerprint(key string, fingerprint string) (*ValidateResponse, error) {
|
func (c *KeygenClient) ValidateKeyWithFingerprint(key string, fingerprint string) (*ValidateResponse, error) {
|
||||||
url := fmt.Sprintf("https://api.keygen.sh/v1/accounts/%s/licenses/actions/validate-key", c.AccountID)
|
return c.ValidateKeyWithMachine(key, fingerprint, "")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *KeygenClient) ValidateKeyWithMachine(key, fingerprint, machineID string) (*ValidateResponse, error) {
|
||||||
|
url := c.apiURL("licenses/actions/validate-key")
|
||||||
|
|
||||||
meta := map[string]interface{}{
|
meta := map[string]interface{}{
|
||||||
"key": key,
|
"key": key,
|
||||||
@@ -66,6 +125,14 @@ func (c *KeygenClient) ValidateKeyWithFingerprint(key string, fingerprint string
|
|||||||
"fingerprint": fingerprint,
|
"fingerprint": fingerprint,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if machineID != "" {
|
||||||
|
scope, _ := meta["scope"].(map[string]interface{})
|
||||||
|
if scope == nil {
|
||||||
|
scope = make(map[string]interface{})
|
||||||
|
meta["scope"] = scope
|
||||||
|
}
|
||||||
|
scope["machine"] = machineID
|
||||||
|
}
|
||||||
|
|
||||||
reqBody := map[string]interface{}{
|
reqBody := map[string]interface{}{
|
||||||
"meta": meta,
|
"meta": meta,
|
||||||
@@ -91,7 +158,8 @@ func (c *KeygenClient) ValidateKeyWithFingerprint(key string, fingerprint string
|
|||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, fmt.Errorf("keygen api error: status %d", resp.StatusCode)
|
body, _ := io.ReadAll(resp.Body)
|
||||||
|
return nil, &APIError{Operation: "validate license", StatusCode: resp.StatusCode, Body: string(body)}
|
||||||
}
|
}
|
||||||
|
|
||||||
var valResp ValidateResponse
|
var valResp ValidateResponse
|
||||||
@@ -102,8 +170,44 @@ func (c *KeygenClient) ValidateKeyWithFingerprint(key string, fingerprint string
|
|||||||
return &valResp, nil
|
return &valResp, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *KeygenClient) GetMachineID(fingerprint string) (string, error) {
|
||||||
|
machineURL := c.apiURL("machines/" + url.PathEscape(fingerprint))
|
||||||
|
req, err := http.NewRequest(http.MethodGet, machineURL, nil)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
req.Header.Set("Accept", "application/vnd.api+json")
|
||||||
|
if c.Token != "" {
|
||||||
|
if !strings.HasPrefix(c.Token, "Bearer ") && !strings.HasPrefix(c.Token, "License ") {
|
||||||
|
req.Header.Set("Authorization", "License "+c.Token)
|
||||||
|
} else {
|
||||||
|
req.Header.Set("Authorization", c.Token)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := c.HTTPClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
body, _ := io.ReadAll(resp.Body)
|
||||||
|
return "", &APIError{Operation: "retrieve machine", StatusCode: resp.StatusCode, Body: string(body)}
|
||||||
|
}
|
||||||
|
|
||||||
|
var machineResp MachineResponse
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&machineResp); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
machineID := strings.TrimSpace(machineResp.Data.ID)
|
||||||
|
if machineID == "" {
|
||||||
|
return "", fmt.Errorf("failed to retrieve machine: empty machine id")
|
||||||
|
}
|
||||||
|
return machineID, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (c *KeygenClient) ValidateKey(key string) (*ValidateResponse, error) {
|
func (c *KeygenClient) ValidateKey(key string) (*ValidateResponse, error) {
|
||||||
url := fmt.Sprintf("https://api.keygen.sh/v1/accounts/%s/licenses/actions/validate-key", c.AccountID)
|
url := c.apiURL("licenses/actions/validate-key")
|
||||||
|
|
||||||
reqBody := map[string]interface{}{
|
reqBody := map[string]interface{}{
|
||||||
"meta": map[string]string{
|
"meta": map[string]string{
|
||||||
@@ -130,7 +234,8 @@ func (c *KeygenClient) ValidateKey(key string) (*ValidateResponse, error) {
|
|||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, fmt.Errorf("keygen api error: status %d", resp.StatusCode)
|
body, _ := io.ReadAll(resp.Body)
|
||||||
|
return nil, &APIError{Operation: "validate license", StatusCode: resp.StatusCode, Body: string(body)}
|
||||||
}
|
}
|
||||||
|
|
||||||
var valResp ValidateResponse
|
var valResp ValidateResponse
|
||||||
@@ -141,8 +246,8 @@ func (c *KeygenClient) ValidateKey(key string) (*ValidateResponse, error) {
|
|||||||
return &valResp, nil
|
return &valResp, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *KeygenClient) ActivateMachine(licenseID, fingerprint string) error {
|
func (c *KeygenClient) ActivateMachine(licenseID, fingerprint string) (string, error) {
|
||||||
url := fmt.Sprintf("https://api.keygen.sh/v1/accounts/%s/machines", c.AccountID)
|
url := c.apiURL("machines")
|
||||||
|
|
||||||
var reqBody ActivateMachineRequest
|
var reqBody ActivateMachineRequest
|
||||||
reqBody.Data.Type = "machines"
|
reqBody.Data.Type = "machines"
|
||||||
@@ -165,23 +270,24 @@ func (c *KeygenClient) ActivateMachine(licenseID, fingerprint string) error {
|
|||||||
|
|
||||||
resp, err := c.HTTPClient.Do(req)
|
resp, err := c.HTTPClient.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return "", err
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
body, _ := io.ReadAll(resp.Body)
|
||||||
|
|
||||||
if resp.StatusCode == http.StatusCreated || resp.StatusCode == http.StatusOK {
|
if resp.StatusCode == http.StatusCreated || resp.StatusCode == http.StatusOK {
|
||||||
return nil
|
var machineResp MachineResponse
|
||||||
}
|
if json.Unmarshal(body, &machineResp) == nil {
|
||||||
|
return strings.TrimSpace(machineResp.Data.ID), nil
|
||||||
body, _ := io.ReadAll(resp.Body)
|
|
||||||
|
|
||||||
if resp.StatusCode == http.StatusConflict || resp.StatusCode == http.StatusUnprocessableEntity {
|
|
||||||
if strings.Contains(string(body), "FINGERPRINT_TAKEN") || strings.Contains(string(body), "MACHINE_LIMIT_EXCEEDED") {
|
|
||||||
// Machine already registered to this license or limit reached because it's already us.
|
|
||||||
// The subsequent ValidateKey check will determine if the existing machine is actually us.
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
return "", nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return fmt.Errorf("failed to activate machine: status %d, response: %s", resp.StatusCode, string(body))
|
if resp.StatusCode == http.StatusUnprocessableEntity && hasKeygenErrorCode(body, "FINGERPRINT_TAKEN") {
|
||||||
}
|
// Machine activation is idempotent. Keygen scopes fingerprint uniqueness
|
||||||
|
// to the target license, so this means the same machine is already bound.
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return "", &APIError{Operation: "activate machine", StatusCode: resp.StatusCode, Body: string(body)}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,104 @@
|
|||||||
|
package license
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestValidateKeyWithMachineSendsFingerprintAndMachineScopes(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var body struct {
|
||||||
|
Meta struct {
|
||||||
|
Scope map[string]string `json:"scope"`
|
||||||
|
} `json:"meta"`
|
||||||
|
}
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
||||||
|
t.Fatalf("decode request: %v", err)
|
||||||
|
}
|
||||||
|
if body.Meta.Scope["fingerprint"] != "fingerprint" {
|
||||||
|
t.Fatalf("fingerprint scope = %q", body.Meta.Scope["fingerprint"])
|
||||||
|
}
|
||||||
|
if body.Meta.Scope["machine"] != "machine-id" {
|
||||||
|
t.Fatalf("machine scope = %q", body.Meta.Scope["machine"])
|
||||||
|
}
|
||||||
|
_, _ = fmt.Fprint(w, `{"meta":{"valid":true,"code":"VALID"},"data":{"id":"license-id","attributes":{}}}`)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
client := NewKeygenClient("account-id", "")
|
||||||
|
client.BaseURL = server.URL
|
||||||
|
validation, err := client.ValidateKeyWithMachine("license-key", "fingerprint", "machine-id")
|
||||||
|
if err != nil || !validation.Meta.Valid {
|
||||||
|
t.Fatalf("ValidateKeyWithMachine() validation=%+v err=%v", validation, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetMachineIDRetrievesMachineByFingerprint(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.Method != http.MethodGet || !strings.HasSuffix(r.URL.Path, "/machines/fingerprint") {
|
||||||
|
t.Fatalf("unexpected request %s %s", r.Method, r.URL.Path)
|
||||||
|
}
|
||||||
|
if r.Header.Get("Authorization") != "License license-key" {
|
||||||
|
t.Fatalf("authorization = %q", r.Header.Get("Authorization"))
|
||||||
|
}
|
||||||
|
_, _ = fmt.Fprint(w, `{"data":{"type":"machines","id":"machine-id"}}`)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
client := NewKeygenClient("account-id", "license-key")
|
||||||
|
client.BaseURL = server.URL
|
||||||
|
machineID, err := client.GetMachineID("fingerprint")
|
||||||
|
if err != nil || machineID != "machine-id" {
|
||||||
|
t.Fatalf("GetMachineID() = %q, %v", machineID, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestActivateMachineTreatsFingerprintTakenAsIdempotent(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusUnprocessableEntity)
|
||||||
|
_, _ = fmt.Fprint(w, `{"errors":[{"code":"FINGERPRINT_TAKEN"},{"code":"MACHINE_LIMIT_EXCEEDED"}]}`)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
client := NewKeygenClient("account-id", "license-key")
|
||||||
|
client.BaseURL = server.URL
|
||||||
|
|
||||||
|
if machineID, err := client.ActivateMachine("license-id", "fingerprint"); err != nil || machineID != "" {
|
||||||
|
t.Fatalf("ActivateMachine() error = %v, want idempotent success", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestActivateMachineReturnsCreatedMachineID(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusCreated)
|
||||||
|
_, _ = fmt.Fprint(w, `{"data":{"type":"machines","id":"machine-id"}}`)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
client := NewKeygenClient("account-id", "license-key")
|
||||||
|
client.BaseURL = server.URL
|
||||||
|
machineID, err := client.ActivateMachine("license-id", "fingerprint")
|
||||||
|
if err != nil || machineID != "machine-id" {
|
||||||
|
t.Fatalf("ActivateMachine() = %q, %v", machineID, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestActivateMachineRejectsMachineLimitWithoutFingerprintTaken(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusUnprocessableEntity)
|
||||||
|
_, _ = fmt.Fprint(w, `{"errors":[{"code":"MACHINE_LIMIT_EXCEEDED"}]}`)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
client := NewKeygenClient("account-id", "license-key")
|
||||||
|
client.BaseURL = server.URL
|
||||||
|
|
||||||
|
_, err := client.ActivateMachine("license-id", "fingerprint")
|
||||||
|
if err == nil || !strings.Contains(err.Error(), "MACHINE_LIMIT_EXCEEDED") {
|
||||||
|
t.Fatalf("ActivateMachine() error = %v, want machine limit failure", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -46,7 +46,8 @@ func RenderTable(plan NodePlan) string {
|
|||||||
}
|
}
|
||||||
targetHost := strings.Trim(strings.TrimSpace(rule.TargetHost), "[]")
|
targetHost := strings.Trim(strings.TrimSpace(rule.TargetHost), "[]")
|
||||||
for _, protocol := range normalizedProtocols(rule.Protocols) {
|
for _, protocol := range normalizedProtocols(rule.Protocols) {
|
||||||
b.WriteString(fmt.Sprintf(" ct original proto-dst %d %s daddr %s %s dport %d counter comment %q\n",
|
b.WriteString(fmt.Sprintf(" meta l4proto %s ct original proto-dst %d %s daddr %s %s dport %d counter comment %q\n",
|
||||||
|
protocol,
|
||||||
rule.InPort,
|
rule.InPort,
|
||||||
family,
|
family,
|
||||||
targetHost,
|
targetHost,
|
||||||
@@ -54,7 +55,8 @@ func RenderTable(plan NodePlan) string {
|
|||||||
rule.TargetPort,
|
rule.TargetPort,
|
||||||
counterComment(rule.ForwardID, CounterDirectionToTarget, protocol),
|
counterComment(rule.ForwardID, CounterDirectionToTarget, protocol),
|
||||||
))
|
))
|
||||||
b.WriteString(fmt.Sprintf(" ct original proto-dst %d %s saddr %s %s sport %d counter comment %q\n",
|
b.WriteString(fmt.Sprintf(" meta l4proto %s ct original proto-dst %d %s saddr %s %s sport %d counter comment %q\n",
|
||||||
|
protocol,
|
||||||
rule.InPort,
|
rule.InPort,
|
||||||
family,
|
family,
|
||||||
targetHost,
|
targetHost,
|
||||||
|
|||||||
@@ -62,10 +62,10 @@ func TestRenderTableIncludesForwardAccountingCounters(t *testing.T) {
|
|||||||
wantLines := []string{
|
wantLines := []string{
|
||||||
`tcp dport 12345 counter dnat ip to 198.51.100.20:443 comment "flvx forward:42 dnat tcp"`,
|
`tcp dport 12345 counter dnat ip to 198.51.100.20:443 comment "flvx forward:42 dnat tcp"`,
|
||||||
`udp dport 12345 counter dnat ip to 198.51.100.20:443 comment "flvx forward:42 dnat udp"`,
|
`udp dport 12345 counter dnat ip to 198.51.100.20:443 comment "flvx forward:42 dnat udp"`,
|
||||||
`ct original proto-dst 12345 ip daddr 198.51.100.20 tcp dport 443 counter comment "flvx forward:42 to-target tcp"`,
|
`meta l4proto tcp ct original proto-dst 12345 ip daddr 198.51.100.20 tcp dport 443 counter comment "flvx forward:42 to-target tcp"`,
|
||||||
`ct original proto-dst 12345 ip saddr 198.51.100.20 tcp sport 443 counter comment "flvx forward:42 from-target tcp"`,
|
`meta l4proto tcp ct original proto-dst 12345 ip saddr 198.51.100.20 tcp sport 443 counter comment "flvx forward:42 from-target tcp"`,
|
||||||
`ct original proto-dst 12345 ip daddr 198.51.100.20 udp dport 443 counter comment "flvx forward:42 to-target udp"`,
|
`meta l4proto udp ct original proto-dst 12345 ip daddr 198.51.100.20 udp dport 443 counter comment "flvx forward:42 to-target udp"`,
|
||||||
`ct original proto-dst 12345 ip saddr 198.51.100.20 udp sport 443 counter comment "flvx forward:42 from-target udp"`,
|
`meta l4proto udp ct original proto-dst 12345 ip saddr 198.51.100.20 udp sport 443 counter comment "flvx forward:42 from-target udp"`,
|
||||||
}
|
}
|
||||||
for _, want := range wantLines {
|
for _, want := range wantLines {
|
||||||
if !strings.Contains(got, want) {
|
if !strings.Contains(got, want) {
|
||||||
@@ -89,8 +89,8 @@ func TestRenderTableIncludesIPv6ForwardAccountingCounters(t *testing.T) {
|
|||||||
got := RenderTable(plan)
|
got := RenderTable(plan)
|
||||||
wantLines := []string{
|
wantLines := []string{
|
||||||
`tcp dport 12346 counter dnat ip6 to [2001:db8::20]:8443 comment "flvx forward:43 dnat tcp"`,
|
`tcp dport 12346 counter dnat ip6 to [2001:db8::20]:8443 comment "flvx forward:43 dnat tcp"`,
|
||||||
`ct original proto-dst 12346 ip6 daddr 2001:db8::20 tcp dport 8443 counter comment "flvx forward:43 to-target tcp"`,
|
`meta l4proto tcp ct original proto-dst 12346 ip6 daddr 2001:db8::20 tcp dport 8443 counter comment "flvx forward:43 to-target tcp"`,
|
||||||
`ct original proto-dst 12346 ip6 saddr 2001:db8::20 tcp sport 8443 counter comment "flvx forward:43 from-target tcp"`,
|
`meta l4proto tcp ct original proto-dst 12346 ip6 saddr 2001:db8::20 tcp sport 8443 counter comment "flvx forward:43 from-target tcp"`,
|
||||||
}
|
}
|
||||||
for _, want := range wantLines {
|
for _, want := range wantLines {
|
||||||
if !strings.Contains(got, want) {
|
if !strings.Contains(got, want) {
|
||||||
@@ -110,8 +110,8 @@ func TestRenderTableAccountingCountersIncludeOriginalPort(t *testing.T) {
|
|||||||
|
|
||||||
got := RenderTable(plan)
|
got := RenderTable(plan)
|
||||||
wantLines := []string{
|
wantLines := []string{
|
||||||
`ct original proto-dst 12345 ip daddr 198.51.100.20 tcp dport 443 counter comment "flvx forward:42 to-target tcp"`,
|
`meta l4proto tcp ct original proto-dst 12345 ip daddr 198.51.100.20 tcp dport 443 counter comment "flvx forward:42 to-target tcp"`,
|
||||||
`ct original proto-dst 12346 ip daddr 198.51.100.20 tcp dport 443 counter comment "flvx forward:43 to-target tcp"`,
|
`meta l4proto tcp ct original proto-dst 12346 ip daddr 198.51.100.20 tcp dport 443 counter comment "flvx forward:43 to-target tcp"`,
|
||||||
}
|
}
|
||||||
for _, want := range wantLines {
|
for _, want := range wantLines {
|
||||||
if !strings.Contains(got, want) {
|
if !strings.Contains(got, want) {
|
||||||
|
|||||||
@@ -26,23 +26,58 @@ func NewSSHRunner() *SSHRunner {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *SSHRunner) Test(ctx context.Context, cfg SSHConfig) error {
|
func (r *SSHRunner) Test(ctx context.Context, cfg SSHConfig) error {
|
||||||
return r.run(ctx, cfg, "command -v nft >/dev/null 2>&1 && nft --version >/dev/null 2>&1")
|
nft := nftBinary(cfg)
|
||||||
|
tableName := fmt.Sprintf("flvx_capability_%d", time.Now().UnixNano())
|
||||||
|
return r.run(ctx, cfg, buildCapabilityCheckCommand(nft, tableName))
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildCapabilityCheckCommand(nft, tableName string) string {
|
||||||
|
script := RenderTable(NodePlan{
|
||||||
|
Rules: []Rule{{
|
||||||
|
ForwardID: 1,
|
||||||
|
InPort: 12345,
|
||||||
|
TargetHost: "192.0.2.1",
|
||||||
|
TargetPort: 443,
|
||||||
|
Protocols: []string{"tcp", "udp"},
|
||||||
|
}},
|
||||||
|
})
|
||||||
|
script = strings.Replace(script, "table inet flvx {", "table inet "+tableName+" {", 1)
|
||||||
|
return "set -eu\n" +
|
||||||
|
"command -v nft >/dev/null 2>&1\n" +
|
||||||
|
nft + " --version >/dev/null 2>&1\n" +
|
||||||
|
"tmp=$(mktemp /tmp/flvx-nft-capability-XXXXXX.nft)\n" +
|
||||||
|
"trap 'rm -f \"$tmp\"' EXIT\n" +
|
||||||
|
"cat > \"$tmp\" <<'EOF'\n" + script + "\nEOF\n" +
|
||||||
|
"if ! " + nft + " -c -f \"$tmp\"; then\n" +
|
||||||
|
" echo 'nftables cannot validate the generated FLVX rules' >&2\n" +
|
||||||
|
" exit 1\n" +
|
||||||
|
"fi"
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *SSHRunner) ApplyScript(ctx context.Context, cfg SSHConfig, script string) error {
|
func (r *SSHRunner) ApplyScript(ctx context.Context, cfg SSHConfig, script string) error {
|
||||||
nft := nftBinary(cfg)
|
command := buildApplyCommand(nftBinary(cfg), script)
|
||||||
command := "tmp=$(mktemp /tmp/flvx-nft-XXXXXX.nft) || exit 1\n" +
|
return r.run(ctx, cfg, command)
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildApplyCommand(nft, script string) string {
|
||||||
|
return "set -eu\n" +
|
||||||
|
"tmp=$(mktemp /tmp/flvx-nft-XXXXXX.nft)\n" +
|
||||||
|
"batch=$(mktemp /tmp/flvx-nft-batch-XXXXXX.nft) || { rm -f \"$tmp\"; exit 1; }\n" +
|
||||||
"cleanup() {\n" +
|
"cleanup() {\n" +
|
||||||
" rm -f \"$tmp\"\n" +
|
" rm -f \"$tmp\" \"$batch\"\n" +
|
||||||
"}\n" +
|
"}\n" +
|
||||||
"trap cleanup EXIT\n" +
|
"trap cleanup EXIT\n" +
|
||||||
"cat > \"$tmp\" <<'EOF'\n" + script + "\nEOF\n" +
|
"cat > \"$tmp\" <<'EOF'\n" + script + "\nEOF\n" +
|
||||||
nft + " -c -f \"$tmp\"\n" +
|
|
||||||
"if " + nft + " list table inet flvx >/dev/null 2>&1; then\n" +
|
"if " + nft + " list table inet flvx >/dev/null 2>&1; then\n" +
|
||||||
" " + nft + " delete table inet flvx\n" +
|
" { printf '%s\\n' 'delete table inet flvx'; cat \"$tmp\"; } > \"$batch\"\n" +
|
||||||
|
"else\n" +
|
||||||
|
" cp \"$tmp\" \"$batch\"\n" +
|
||||||
"fi\n" +
|
"fi\n" +
|
||||||
nft + " -f \"$tmp\""
|
"if ! " + nft + " -c -f \"$batch\"; then\n" +
|
||||||
return r.run(ctx, cfg, command)
|
" echo 'nftables rule validation failed; active rules were preserved' >&2\n" +
|
||||||
|
" exit 1\n" +
|
||||||
|
"fi\n" +
|
||||||
|
nft + " -f \"$batch\""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *SSHRunner) ListTableJSON(ctx context.Context, cfg SSHConfig) ([]byte, error) {
|
func (r *SSHRunner) ListTableJSON(ctx context.Context, cfg SSHConfig) ([]byte, error) {
|
||||||
|
|||||||
@@ -5,10 +5,113 @@ import (
|
|||||||
"crypto/rsa"
|
"crypto/rsa"
|
||||||
"crypto/x509"
|
"crypto/x509"
|
||||||
"encoding/pem"
|
"encoding/pem"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func TestBuildApplyCommandStopsAfterValidationFailure(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
logPath := filepath.Join(dir, "calls.log")
|
||||||
|
applyMarker := filepath.Join(dir, "applied")
|
||||||
|
nftPath := filepath.Join(dir, "nft")
|
||||||
|
fake := `#!/bin/sh
|
||||||
|
echo "$*" >> "` + logPath + `"
|
||||||
|
if [ "$1" = "list" ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
if [ "$1" = "-c" ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
touch "` + applyMarker + `"
|
||||||
|
`
|
||||||
|
if err := os.WriteFile(nftPath, []byte(fake), 0o755); err != nil {
|
||||||
|
t.Fatalf("write fake nft: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
command := buildApplyCommand(nftPath, "table inet flvx { }")
|
||||||
|
result := exec.Command("sh", "-c", command)
|
||||||
|
if err := result.Run(); err == nil {
|
||||||
|
t.Fatal("expected validation failure")
|
||||||
|
}
|
||||||
|
if _, err := os.Stat(applyMarker); !os.IsNotExist(err) {
|
||||||
|
t.Fatalf("apply ran after validation failure, stat err=%v", err)
|
||||||
|
}
|
||||||
|
calls, err := os.ReadFile(logPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read fake nft calls: %v", err)
|
||||||
|
}
|
||||||
|
if strings.Count(string(calls), "-f ") != 1 {
|
||||||
|
t.Fatalf("expected validation only, got calls:\n%s", calls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBuildCapabilityCheckCommandValidatesRenderedRulesWithoutApplying(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
logPath := filepath.Join(dir, "calls.log")
|
||||||
|
nftPath := filepath.Join(dir, "nft")
|
||||||
|
fake := `#!/bin/sh
|
||||||
|
echo "$*" >> "` + logPath + `"
|
||||||
|
if [ "$1" = "--version" ] || [ "$1" = "-c" ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
exit 1
|
||||||
|
`
|
||||||
|
if err := os.WriteFile(nftPath, []byte(fake), 0o755); err != nil {
|
||||||
|
t.Fatalf("write fake nft: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
command := strings.Replace(buildCapabilityCheckCommand(nftPath, "flvx_capability_test"), "command -v nft", "command -v "+nftPath, 1)
|
||||||
|
result := exec.Command("sh", "-c", command)
|
||||||
|
if output, err := result.CombinedOutput(); err != nil {
|
||||||
|
t.Fatalf("capability command failed: %v: %s", err, output)
|
||||||
|
}
|
||||||
|
calls, err := os.ReadFile(logPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read fake nft calls: %v", err)
|
||||||
|
}
|
||||||
|
if strings.Count(string(calls), "-c -f ") != 1 || strings.Contains(string(calls), "\n-f ") {
|
||||||
|
t.Fatalf("expected one check-only invocation, got calls:\n%s", calls)
|
||||||
|
}
|
||||||
|
if !strings.Contains(command, "table inet flvx_capability_test") || !strings.Contains(command, "meta l4proto tcp ct original proto-dst") {
|
||||||
|
t.Fatalf("capability check does not contain representative rendered rules:\n%s", command)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBuildApplyCommandUsesAtomicReplacementBatch(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
batchPath := filepath.Join(dir, "batch.nft")
|
||||||
|
nftPath := filepath.Join(dir, "nft")
|
||||||
|
fake := `#!/bin/sh
|
||||||
|
if [ "$1" = "list" ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
if [ "$1" = "-f" ]; then
|
||||||
|
cp "$2" "` + batchPath + `"
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
`
|
||||||
|
if err := os.WriteFile(nftPath, []byte(fake), 0o755); err != nil {
|
||||||
|
t.Fatalf("write fake nft: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
script := "table inet flvx {\n chain forward { }\n}"
|
||||||
|
result := exec.Command("sh", "-c", buildApplyCommand(nftPath, script))
|
||||||
|
if output, err := result.CombinedOutput(); err != nil {
|
||||||
|
t.Fatalf("apply command failed: %v: %s", err, output)
|
||||||
|
}
|
||||||
|
batch, err := os.ReadFile(batchPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read applied batch: %v", err)
|
||||||
|
}
|
||||||
|
want := "delete table inet flvx\n" + script + "\n"
|
||||||
|
if string(batch) != want {
|
||||||
|
t.Fatalf("atomic batch = %q, want %q", batch, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestAuthMethodsDefaultToPrivateKey(t *testing.T) {
|
func TestAuthMethodsDefaultToPrivateKey(t *testing.T) {
|
||||||
privateKey := mustGeneratePrivateKey(t)
|
privateKey := mustGeneratePrivateKey(t)
|
||||||
methods, err := authMethods(SSHConfig{PrivateKey: privateKey})
|
methods, err := authMethods(SSHConfig{PrivateKey: privateKey})
|
||||||
|
|||||||
@@ -15,14 +15,27 @@ var publicConfigKeys = map[string]struct{}{
|
|||||||
"app_favicon": {},
|
"app_favicon": {},
|
||||||
"app_bg_image": {},
|
"app_bg_image": {},
|
||||||
"cloudflare_site_key": {},
|
"cloudflare_site_key": {},
|
||||||
|
"is_commercial": {},
|
||||||
|
"hide_footer_brand": {},
|
||||||
}
|
}
|
||||||
|
|
||||||
var sensitiveConfigKeys = map[string]struct{}{
|
var sensitiveConfigKeys = map[string]struct{}{
|
||||||
"jwt_secret": {},
|
"jwt_secret": {},
|
||||||
"license_key": {},
|
"license_key": {},
|
||||||
|
"license_expiry": {},
|
||||||
|
"license_machine_id": {},
|
||||||
|
"machine_fingerprint": {},
|
||||||
"cloudflare_secret_key": {},
|
"cloudflare_secret_key": {},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var systemManagedConfigKeys = map[string]struct{}{
|
||||||
|
"license_key": {},
|
||||||
|
"license_expiry": {},
|
||||||
|
"license_machine_id": {},
|
||||||
|
"is_commercial": {},
|
||||||
|
"machine_fingerprint": {},
|
||||||
|
}
|
||||||
|
|
||||||
func PolicyForConfig(name string) ConfigAccessPolicy {
|
func PolicyForConfig(name string) ConfigAccessPolicy {
|
||||||
if IsPublicConfigKey(name) {
|
if IsPublicConfigKey(name) {
|
||||||
return ConfigAccessPublic
|
return ConfigAccessPublic
|
||||||
@@ -43,6 +56,11 @@ func IsSensitiveConfigKey(name string) bool {
|
|||||||
return ok
|
return ok
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func IsSystemManagedConfigKey(name string) bool {
|
||||||
|
_, ok := systemManagedConfigKeys[normalizeConfigKey(name)]
|
||||||
|
return ok
|
||||||
|
}
|
||||||
|
|
||||||
func FilterSensitiveConfigs(in map[string]string) map[string]string {
|
func FilterSensitiveConfigs(in map[string]string) map[string]string {
|
||||||
if len(in) == 0 {
|
if len(in) == 0 {
|
||||||
return map[string]string{}
|
return map[string]string{}
|
||||||
@@ -57,6 +75,20 @@ func FilterSensitiveConfigs(in map[string]string) map[string]string {
|
|||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func FilterBackupConfigs(in map[string]string) map[string]string {
|
||||||
|
if len(in) == 0 {
|
||||||
|
return map[string]string{}
|
||||||
|
}
|
||||||
|
out := make(map[string]string, len(in))
|
||||||
|
for name, value := range in {
|
||||||
|
if IsSensitiveConfigKey(name) || IsSystemManagedConfigKey(name) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out[name] = value
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
func normalizeConfigKey(name string) string {
|
func normalizeConfigKey(name string) string {
|
||||||
return strings.ToLower(strings.TrimSpace(name))
|
return strings.ToLower(strings.TrimSpace(name))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ func TestConfigPolicy(t *testing.T) {
|
|||||||
{name: "app_favicon is public", key: "app_favicon", want: ConfigAccessPublic},
|
{name: "app_favicon is public", key: "app_favicon", want: ConfigAccessPublic},
|
||||||
{name: "app_bg_image is public", key: "app_bg_image", want: ConfigAccessPublic},
|
{name: "app_bg_image is public", key: "app_bg_image", want: ConfigAccessPublic},
|
||||||
{name: "cloudflare_site_key is public", key: "cloudflare_site_key", want: ConfigAccessPublic},
|
{name: "cloudflare_site_key is public", key: "cloudflare_site_key", want: ConfigAccessPublic},
|
||||||
|
{name: "is_commercial is public", key: "is_commercial", want: ConfigAccessPublic},
|
||||||
|
{name: "hide_footer_brand is public", key: "hide_footer_brand", want: ConfigAccessPublic},
|
||||||
{name: "jwt_secret is sensitive", key: "jwt_secret", want: ConfigAccessSensitive},
|
{name: "jwt_secret is sensitive", key: "jwt_secret", want: ConfigAccessSensitive},
|
||||||
{name: "license_key is sensitive", key: "license_key", want: ConfigAccessSensitive},
|
{name: "license_key is sensitive", key: "license_key", want: ConfigAccessSensitive},
|
||||||
{name: "cloudflare_secret_key is sensitive", key: "cloudflare_secret_key", want: ConfigAccessSensitive},
|
{name: "cloudflare_secret_key is sensitive", key: "cloudflare_secret_key", want: ConfigAccessSensitive},
|
||||||
@@ -29,14 +31,14 @@ func TestConfigPolicy(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestConfigPolicyHelpers(t *testing.T) {
|
func TestConfigPolicyHelpers(t *testing.T) {
|
||||||
publicKeys := []string{"app_name", "app_logo", "app_favicon", "app_bg_image", "cloudflare_site_key"}
|
publicKeys := []string{"app_name", "app_logo", "app_favicon", "app_bg_image", "cloudflare_site_key", "is_commercial", "hide_footer_brand"}
|
||||||
for _, key := range publicKeys {
|
for _, key := range publicKeys {
|
||||||
if !IsPublicConfigKey(key) {
|
if !IsPublicConfigKey(key) {
|
||||||
t.Fatalf("expected %q to be public", key)
|
t.Fatalf("expected %q to be public", key)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sensitiveKeys := []string{"jwt_secret", "license_key", "cloudflare_secret_key"}
|
sensitiveKeys := []string{"jwt_secret", "license_key", "license_expiry", "license_machine_id", "machine_fingerprint", "cloudflare_secret_key"}
|
||||||
for _, key := range sensitiveKeys {
|
for _, key := range sensitiveKeys {
|
||||||
if !IsSensitiveConfigKey(key) {
|
if !IsSensitiveConfigKey(key) {
|
||||||
t.Fatalf("expected %q to be sensitive", key)
|
t.Fatalf("expected %q to be sensitive", key)
|
||||||
@@ -67,3 +69,30 @@ func TestConfigPolicyHelpers(t *testing.T) {
|
|||||||
t.Fatal("expected cloudflare_secret_key to be filtered out")
|
t.Fatal("expected cloudflare_secret_key to be filtered out")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestFilterBackupConfigsOmitsLicenseState(t *testing.T) {
|
||||||
|
filtered := FilterBackupConfigs(map[string]string{
|
||||||
|
"app_name": "Brand",
|
||||||
|
"license_key": "secret-license",
|
||||||
|
"license_expiry": "never",
|
||||||
|
"license_machine_id": "machine-id",
|
||||||
|
"is_commercial": "true",
|
||||||
|
"machine_fingerprint": "fingerprint",
|
||||||
|
})
|
||||||
|
if len(filtered) != 1 || filtered["app_name"] != "Brand" {
|
||||||
|
t.Fatalf("unexpected backup configs: %+v", filtered)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSystemManagedConfigKeys(t *testing.T) {
|
||||||
|
for _, key := range []string{"license_key", "license_expiry", "license_machine_id", "is_commercial", "machine_fingerprint"} {
|
||||||
|
if !IsSystemManagedConfigKey(key) {
|
||||||
|
t.Fatalf("expected %s to be system managed", key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, key := range []string{"jwt_secret", "cloudflare_secret_key", "app_name"} {
|
||||||
|
if IsSystemManagedConfigKey(key) {
|
||||||
|
t.Fatalf("did not expect %s to be system managed", key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -473,6 +473,14 @@ func seedData(db *gorm.DB) {
|
|||||||
|
|
||||||
appNameConfig := model.ViteConfig{ID: 1, Name: "app_name", Value: "flux", Time: 1755147963000}
|
appNameConfig := model.ViteConfig{ID: 1, Name: "app_name", Value: "flux", Time: 1755147963000}
|
||||||
db.Where("id = ?", 1).FirstOrCreate(&appNameConfig)
|
db.Where("id = ?", 1).FirstOrCreate(&appNameConfig)
|
||||||
|
now := time.Now().UnixMilli()
|
||||||
|
for name, value := range map[string]string{
|
||||||
|
"is_commercial": "false",
|
||||||
|
"hide_footer_brand": "false",
|
||||||
|
} {
|
||||||
|
cfg := model.ViteConfig{Name: name, Value: value, Time: now}
|
||||||
|
db.Where("name = ?", name).FirstOrCreate(&cfg)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ─── User Queries ────────────────────────────────────────────────────
|
// ─── User Queries ────────────────────────────────────────────────────
|
||||||
@@ -600,6 +608,23 @@ func (r *Repository) UpsertConfig(name, value string, now int64) error {
|
|||||||
}).Create(&model.ViteConfig{Name: name, Value: value, Time: now}).Error
|
}).Create(&model.ViteConfig{Name: name, Value: value, Time: now}).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *Repository) UpsertConfigs(values map[string]string, now int64) error {
|
||||||
|
if r == nil || r.db == nil {
|
||||||
|
return errors.New("repository not initialized")
|
||||||
|
}
|
||||||
|
return r.db.Transaction(func(tx *gorm.DB) error {
|
||||||
|
for name, value := range values {
|
||||||
|
if err := tx.Clauses(clause.OnConflict{
|
||||||
|
Columns: []clause.Column{{Name: "name"}},
|
||||||
|
DoUpdates: clause.AssignmentColumns([]string{"value", "time"}),
|
||||||
|
}).Create(&model.ViteConfig{Name: name, Value: value, Time: now}).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// ─── Announcement Queries ────────────────────────────────────────────
|
// ─── Announcement Queries ────────────────────────────────────────────
|
||||||
|
|
||||||
func (r *Repository) GetAnnouncement() (*model.Announcement, error) {
|
func (r *Repository) GetAnnouncement() (*model.Announcement, error) {
|
||||||
@@ -1967,7 +1992,7 @@ func (r *Repository) ExportAll() (*model.BackupData, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("export configs failed: %w", err)
|
return nil, fmt.Errorf("export configs failed: %w", err)
|
||||||
}
|
}
|
||||||
backup.Configs = FilterSensitiveConfigs(configs)
|
backup.Configs = FilterBackupConfigs(configs)
|
||||||
|
|
||||||
return backup, nil
|
return backup, nil
|
||||||
}
|
}
|
||||||
@@ -2047,7 +2072,7 @@ func (r *Repository) ExportPartial(types []string) (*model.BackupData, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("export configs failed: %w", err)
|
return nil, fmt.Errorf("export configs failed: %w", err)
|
||||||
}
|
}
|
||||||
backup.Configs = FilterSensitiveConfigs(v)
|
backup.Configs = FilterBackupConfigs(v)
|
||||||
}
|
}
|
||||||
return backup, nil
|
return backup, nil
|
||||||
}
|
}
|
||||||
@@ -2839,7 +2864,7 @@ func importPermissions(tx *gorm.DB, permissions []model.PermissionBackup, _ int6
|
|||||||
}
|
}
|
||||||
|
|
||||||
func importConfigs(tx *gorm.DB, configs map[string]string, now int64) (int, error) {
|
func importConfigs(tx *gorm.DB, configs map[string]string, now int64) (int, error) {
|
||||||
configs = FilterSensitiveConfigs(configs)
|
configs = FilterBackupConfigs(configs)
|
||||||
count := 0
|
count := 0
|
||||||
for name, value := range configs {
|
for name, value := range configs {
|
||||||
err := tx.Clauses(clause.OnConflict{
|
err := tx.Clauses(clause.OnConflict{
|
||||||
|
|||||||
@@ -97,6 +97,10 @@ func TestExportAllOmitsSensitiveConfigs(t *testing.T) {
|
|||||||
seedConfig(t, r, "cloudflare_site_key", "site-key")
|
seedConfig(t, r, "cloudflare_site_key", "site-key")
|
||||||
seedConfig(t, r, "jwt_secret", "jwt-secret")
|
seedConfig(t, r, "jwt_secret", "jwt-secret")
|
||||||
seedConfig(t, r, "license_key", "license-secret")
|
seedConfig(t, r, "license_key", "license-secret")
|
||||||
|
seedConfig(t, r, "license_expiry", "2030-01-02T00:00:00.000Z")
|
||||||
|
seedConfig(t, r, "license_machine_id", "machine-id")
|
||||||
|
seedConfig(t, r, "is_commercial", "true")
|
||||||
|
seedConfig(t, r, "machine_fingerprint", "machine-fingerprint")
|
||||||
seedConfig(t, r, "cloudflare_secret_key", "cloudflare-secret")
|
seedConfig(t, r, "cloudflare_secret_key", "cloudflare-secret")
|
||||||
|
|
||||||
for _, tc := range []struct {
|
for _, tc := range []struct {
|
||||||
@@ -117,7 +121,7 @@ func TestExportAllOmitsSensitiveConfigs(t *testing.T) {
|
|||||||
if backup.Configs["cloudflare_site_key"] != "site-key" {
|
if backup.Configs["cloudflare_site_key"] != "site-key" {
|
||||||
t.Fatalf("expected public config in export, got %+v", backup.Configs)
|
t.Fatalf("expected public config in export, got %+v", backup.Configs)
|
||||||
}
|
}
|
||||||
for _, key := range []string{"jwt_secret", "license_key", "cloudflare_secret_key"} {
|
for _, key := range []string{"jwt_secret", "license_key", "license_expiry", "license_machine_id", "is_commercial", "machine_fingerprint", "cloudflare_secret_key"} {
|
||||||
if _, ok := backup.Configs[key]; ok {
|
if _, ok := backup.Configs[key]; ok {
|
||||||
t.Fatalf("expected %s to be omitted from export, got %+v", key, backup.Configs)
|
t.Fatalf("expected %s to be omitted from export, got %+v", key, backup.Configs)
|
||||||
}
|
}
|
||||||
@@ -136,12 +140,20 @@ func TestImportIgnoresSensitiveConfigs(t *testing.T) {
|
|||||||
seedConfig(t, r, "app_name", "before")
|
seedConfig(t, r, "app_name", "before")
|
||||||
seedConfig(t, r, "jwt_secret", "jwt-before")
|
seedConfig(t, r, "jwt_secret", "jwt-before")
|
||||||
seedConfig(t, r, "license_key", "license-before")
|
seedConfig(t, r, "license_key", "license-before")
|
||||||
|
seedConfig(t, r, "license_expiry", "expiry-before")
|
||||||
|
seedConfig(t, r, "license_machine_id", "machine-before")
|
||||||
|
seedConfig(t, r, "is_commercial", "true")
|
||||||
|
seedConfig(t, r, "machine_fingerprint", "fingerprint-before")
|
||||||
seedConfig(t, r, "cloudflare_secret_key", "cloudflare-before")
|
seedConfig(t, r, "cloudflare_secret_key", "cloudflare-before")
|
||||||
|
|
||||||
backup := &model.BackupData{Configs: map[string]string{
|
backup := &model.BackupData{Configs: map[string]string{
|
||||||
"app_name": "after",
|
"app_name": "after",
|
||||||
"jwt_secret": "jwt-after",
|
"jwt_secret": "jwt-after",
|
||||||
"license_key": "license-after",
|
"license_key": "license-after",
|
||||||
|
"license_expiry": "expiry-after",
|
||||||
|
"license_machine_id": "machine-after",
|
||||||
|
"is_commercial": "false",
|
||||||
|
"machine_fingerprint": "fingerprint-after",
|
||||||
"cloudflare_secret_key": "cloudflare-after",
|
"cloudflare_secret_key": "cloudflare-after",
|
||||||
}}
|
}}
|
||||||
|
|
||||||
@@ -156,6 +168,10 @@ func TestImportIgnoresSensitiveConfigs(t *testing.T) {
|
|||||||
assertConfigValue(t, r, "app_name", "after")
|
assertConfigValue(t, r, "app_name", "after")
|
||||||
assertConfigValue(t, r, "jwt_secret", "jwt-before")
|
assertConfigValue(t, r, "jwt_secret", "jwt-before")
|
||||||
assertConfigValue(t, r, "license_key", "license-before")
|
assertConfigValue(t, r, "license_key", "license-before")
|
||||||
|
assertConfigValue(t, r, "license_expiry", "expiry-before")
|
||||||
|
assertConfigValue(t, r, "license_machine_id", "machine-before")
|
||||||
|
assertConfigValue(t, r, "is_commercial", "true")
|
||||||
|
assertConfigValue(t, r, "machine_fingerprint", "fingerprint-before")
|
||||||
assertConfigValue(t, r, "cloudflare_secret_key", "cloudflare-before")
|
assertConfigValue(t, r, "cloudflare_secret_key", "cloudflare-before")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ package chain
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
|
||||||
"github.com/go-gost/core/chain"
|
"github.com/go-gost/core/chain"
|
||||||
"github.com/go-gost/core/hop"
|
"github.com/go-gost/core/hop"
|
||||||
@@ -38,11 +40,12 @@ type chainNamer interface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Chain struct {
|
type Chain struct {
|
||||||
name string
|
name string
|
||||||
hops []hop.Hop
|
hops []hop.Hop
|
||||||
marker selector.Marker
|
ownedHops []hop.Hop
|
||||||
metadata metadata.Metadata
|
marker selector.Marker
|
||||||
logger logger.Logger
|
metadata metadata.Metadata
|
||||||
|
logger logger.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewChain(name string, opts ...ChainOption) *Chain {
|
func NewChain(name string, opts ...ChainOption) *Chain {
|
||||||
@@ -61,8 +64,15 @@ func NewChain(name string, opts ...ChainOption) *Chain {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Chain) AddHop(hop hop.Hop) {
|
func (c *Chain) AddHop(hop hop.Hop, owned ...bool) {
|
||||||
c.hops = append(c.hops, hop)
|
c.hops = append(c.hops, hop)
|
||||||
|
isOwned := true
|
||||||
|
if len(owned) > 0 {
|
||||||
|
isOwned = owned[0]
|
||||||
|
}
|
||||||
|
if isOwned {
|
||||||
|
c.ownedHops = append(c.ownedHops, hop)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Metadata implements metadata.Metadatable interface.
|
// Metadata implements metadata.Metadatable interface.
|
||||||
@@ -112,6 +122,36 @@ func (c *Chain) Route(ctx context.Context, network, address string, opts ...chai
|
|||||||
return rt
|
return rt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Retire gracefully drains resources owned by a chain that has been replaced.
|
||||||
|
func (c *Chain) Retire() {
|
||||||
|
if c == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, h := range c.ownedHops {
|
||||||
|
if retirer, ok := h.(interface{ Retire() }); ok {
|
||||||
|
retirer.Retire()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if closer, ok := h.(io.Closer); ok {
|
||||||
|
_ = closer.Close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close immediately releases all resources owned by the chain.
|
||||||
|
func (c *Chain) Close() error {
|
||||||
|
if c == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
var errs []error
|
||||||
|
for _, h := range c.ownedHops {
|
||||||
|
if closer, ok := h.(io.Closer); ok {
|
||||||
|
errs = append(errs, closer.Close())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return errors.Join(errs...)
|
||||||
|
}
|
||||||
|
|
||||||
type chainGroup struct {
|
type chainGroup struct {
|
||||||
chains []chain.Chainer
|
chains []chain.Chainer
|
||||||
selector selector.Selector[chain.Chainer]
|
selector selector.Selector[chain.Chainer]
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
package chain
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
corechain "github.com/go-gost/core/chain"
|
||||||
|
corehop "github.com/go-gost/core/hop"
|
||||||
|
)
|
||||||
|
|
||||||
|
type lifecycleTestHop struct {
|
||||||
|
selected int
|
||||||
|
retired int
|
||||||
|
closed int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *lifecycleTestHop) Select(context.Context, ...corehop.SelectOption) *corechain.Node {
|
||||||
|
h.selected++
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *lifecycleTestHop) Retire() {
|
||||||
|
h.retired++
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *lifecycleTestHop) Close() error {
|
||||||
|
h.closed++
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestChainRoutesThroughSharedHopWithoutOwningLifecycle(t *testing.T) {
|
||||||
|
hop := &lifecycleTestHop{}
|
||||||
|
chain := NewChain("shared-hop")
|
||||||
|
chain.AddHop(hop, false)
|
||||||
|
|
||||||
|
if route := chain.Route(context.Background(), "tcp", "example.com:443"); route == nil {
|
||||||
|
t.Fatal("route is nil")
|
||||||
|
}
|
||||||
|
if hop.selected != 1 {
|
||||||
|
t.Fatalf("shared hop selected %d times, want 1", hop.selected)
|
||||||
|
}
|
||||||
|
|
||||||
|
chain.Retire()
|
||||||
|
if err := chain.Close(); err != nil {
|
||||||
|
t.Fatalf("close chain: %v", err)
|
||||||
|
}
|
||||||
|
if hop.retired != 0 || hop.closed != 0 {
|
||||||
|
t.Fatalf("shared hop lifecycle changed: retired=%d closed=%d", hop.retired, hop.closed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestChainRetiresAndClosesOwnedHop(t *testing.T) {
|
||||||
|
hop := &lifecycleTestHop{}
|
||||||
|
chain := NewChain("owned-hop")
|
||||||
|
chain.AddHop(hop)
|
||||||
|
|
||||||
|
chain.Retire()
|
||||||
|
if err := chain.Close(); err != nil {
|
||||||
|
t.Fatalf("close chain: %v", err)
|
||||||
|
}
|
||||||
|
if hop.retired != 1 || hop.closed != 1 {
|
||||||
|
t.Fatalf("owned hop lifecycle: retired=%d closed=%d, want 1/1", hop.retired, hop.closed)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,8 @@ package chain
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
"net"
|
"net"
|
||||||
|
|
||||||
"github.com/go-gost/core/chain"
|
"github.com/go-gost/core/chain"
|
||||||
@@ -102,5 +104,34 @@ func (tr *Transport) Options() *chain.TransportOptions {
|
|||||||
func (tr *Transport) Copy() chain.Transporter {
|
func (tr *Transport) Copy() chain.Transporter {
|
||||||
tr2 := &Transport{}
|
tr2 := &Transport{}
|
||||||
*tr2 = *tr
|
*tr2 = *tr
|
||||||
return tr
|
return tr2
|
||||||
|
}
|
||||||
|
|
||||||
|
// Retire prevents long-lived dialer sessions owned by an obsolete chain from
|
||||||
|
// accepting new streams while allowing existing streams to drain.
|
||||||
|
func (tr *Transport) Retire() {
|
||||||
|
if tr == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if retirer, ok := tr.dialer.(interface{ Retire() }); ok {
|
||||||
|
retirer.Retire()
|
||||||
|
}
|
||||||
|
if retirer, ok := tr.connector.(interface{ Retire() }); ok {
|
||||||
|
retirer.Retire()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close immediately releases transport-owned dialer and connector resources.
|
||||||
|
func (tr *Transport) Close() error {
|
||||||
|
if tr == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
var errs []error
|
||||||
|
if closer, ok := tr.dialer.(io.Closer); ok {
|
||||||
|
errs = append(errs, closer.Close())
|
||||||
|
}
|
||||||
|
if closer, ok := tr.connector.(io.Closer); ok {
|
||||||
|
errs = append(errs, closer.Close())
|
||||||
|
}
|
||||||
|
return errors.Join(errs...)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
package chain
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
corechain "github.com/go-gost/core/chain"
|
||||||
|
)
|
||||||
|
|
||||||
|
type copyTestRoute struct{}
|
||||||
|
|
||||||
|
func (copyTestRoute) Dial(context.Context, string, string, ...corechain.DialOption) (net.Conn, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (copyTestRoute) Bind(context.Context, string, string, ...corechain.BindOption) (net.Listener, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (copyTestRoute) Nodes() []*corechain.Node {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTransportCopyReturnsIndependentTransport(t *testing.T) {
|
||||||
|
originalRoute := copyTestRoute{}
|
||||||
|
replacementRoute := ©TestRoute{}
|
||||||
|
original := NewTransport(nil, nil, corechain.RouteTransportOption(originalRoute))
|
||||||
|
|
||||||
|
copied, ok := original.Copy().(*Transport)
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("copy type = %T, want *Transport", original.Copy())
|
||||||
|
}
|
||||||
|
if copied == original {
|
||||||
|
t.Fatal("Copy returned the original transport")
|
||||||
|
}
|
||||||
|
|
||||||
|
copied.Options().Route = replacementRoute
|
||||||
|
if original.Options().Route != originalRoute {
|
||||||
|
t.Fatal("mutating copied transport changed original route")
|
||||||
|
}
|
||||||
|
if copied.Options().Route != replacementRoute {
|
||||||
|
t.Fatal("copied transport did not retain its independent route")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ package config
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"io"
|
"io"
|
||||||
|
"reflect"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -30,9 +31,87 @@ func Global() *Config {
|
|||||||
globalMux.RLock()
|
globalMux.RLock()
|
||||||
defer globalMux.RUnlock()
|
defer globalMux.RUnlock()
|
||||||
|
|
||||||
cfg := &Config{}
|
return cloneConfig(global)
|
||||||
*cfg = *global
|
}
|
||||||
return cfg
|
|
||||||
|
// cloneConfig returns a detached snapshot of the runtime config. Runtime
|
||||||
|
// commands mutate slices, pointers and metadata maps, so a shallow struct copy
|
||||||
|
// is not sufficient once readers and persistence run concurrently.
|
||||||
|
func cloneConfig(c *Config) *Config {
|
||||||
|
if c == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
v := cloneConfigValue(reflect.ValueOf(c))
|
||||||
|
if !v.IsValid() || v.IsNil() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return v.Interface().(*Config)
|
||||||
|
}
|
||||||
|
|
||||||
|
func cloneConfigValue(v reflect.Value) reflect.Value {
|
||||||
|
if !v.IsValid() {
|
||||||
|
return reflect.Value{}
|
||||||
|
}
|
||||||
|
|
||||||
|
switch v.Kind() {
|
||||||
|
case reflect.Interface:
|
||||||
|
if v.IsNil() {
|
||||||
|
return reflect.Zero(v.Type())
|
||||||
|
}
|
||||||
|
cloned := cloneConfigValue(v.Elem())
|
||||||
|
out := reflect.New(v.Type()).Elem()
|
||||||
|
if cloned.IsValid() && cloned.Type().AssignableTo(v.Type()) {
|
||||||
|
out.Set(cloned)
|
||||||
|
} else if cloned.IsValid() && cloned.Type().Implements(v.Type()) {
|
||||||
|
out.Set(cloned)
|
||||||
|
} else if cloned.IsValid() {
|
||||||
|
out.Set(cloned)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
case reflect.Pointer:
|
||||||
|
if v.IsNil() {
|
||||||
|
return reflect.Zero(v.Type())
|
||||||
|
}
|
||||||
|
out := reflect.New(v.Type().Elem())
|
||||||
|
out.Elem().Set(cloneConfigValue(v.Elem()))
|
||||||
|
return out
|
||||||
|
case reflect.Map:
|
||||||
|
if v.IsNil() {
|
||||||
|
return reflect.Zero(v.Type())
|
||||||
|
}
|
||||||
|
out := reflect.MakeMapWithSize(v.Type(), v.Len())
|
||||||
|
iter := v.MapRange()
|
||||||
|
for iter.Next() {
|
||||||
|
out.SetMapIndex(cloneConfigValue(iter.Key()), cloneConfigValue(iter.Value()))
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
case reflect.Slice:
|
||||||
|
if v.IsNil() {
|
||||||
|
return reflect.Zero(v.Type())
|
||||||
|
}
|
||||||
|
out := reflect.MakeSlice(v.Type(), v.Len(), v.Len())
|
||||||
|
for i := 0; i < v.Len(); i++ {
|
||||||
|
out.Index(i).Set(cloneConfigValue(v.Index(i)))
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
case reflect.Array:
|
||||||
|
out := reflect.New(v.Type()).Elem()
|
||||||
|
for i := 0; i < v.Len(); i++ {
|
||||||
|
out.Index(i).Set(cloneConfigValue(v.Index(i)))
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
case reflect.Struct:
|
||||||
|
out := reflect.New(v.Type()).Elem()
|
||||||
|
out.Set(v)
|
||||||
|
for i := 0; i < v.NumField(); i++ {
|
||||||
|
if out.Field(i).CanSet() && v.Field(i).CanInterface() {
|
||||||
|
out.Field(i).Set(cloneConfigValue(v.Field(i)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
default:
|
||||||
|
return v
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func Set(c *Config) {
|
func Set(c *Config) {
|
||||||
|
|||||||
@@ -0,0 +1,121 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"path/filepath"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestGlobalReturnsDetachedSnapshot(t *testing.T) {
|
||||||
|
original := Global()
|
||||||
|
t.Cleanup(func() { Set(original) })
|
||||||
|
|
||||||
|
Set(&Config{Services: []*ServiceConfig{{
|
||||||
|
Name: "snapshot-service",
|
||||||
|
Metadata: map[string]any{"paused": false},
|
||||||
|
Handler: &HandlerConfig{
|
||||||
|
Type: "relay",
|
||||||
|
Metadata: map[string]any{"retries": 2},
|
||||||
|
},
|
||||||
|
}}})
|
||||||
|
|
||||||
|
snapshot := Global()
|
||||||
|
snapshot.Services[0].Name = "changed"
|
||||||
|
snapshot.Services[0].Metadata["paused"] = true
|
||||||
|
snapshot.Services[0].Handler.Metadata["retries"] = 9
|
||||||
|
|
||||||
|
current := Global()
|
||||||
|
if current.Services[0].Name != "snapshot-service" {
|
||||||
|
t.Fatalf("snapshot mutated global service name: %q", current.Services[0].Name)
|
||||||
|
}
|
||||||
|
if paused, _ := current.Services[0].Metadata["paused"].(bool); paused {
|
||||||
|
t.Fatalf("snapshot mutated global service metadata")
|
||||||
|
}
|
||||||
|
if retries, _ := current.Services[0].Handler.Metadata["retries"].(int); retries != 2 {
|
||||||
|
t.Fatalf("snapshot mutated nested handler metadata: %v", current.Services[0].Handler.Metadata["retries"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConcurrentGlobalSnapshotAndUpdate(t *testing.T) {
|
||||||
|
original := Global()
|
||||||
|
t.Cleanup(func() { Set(original) })
|
||||||
|
|
||||||
|
Set(&Config{Services: []*ServiceConfig{{
|
||||||
|
Name: "concurrent-service",
|
||||||
|
Metadata: map[string]any{"generation": 0},
|
||||||
|
}}})
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for worker := 0; worker < 4; worker++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(worker int) {
|
||||||
|
defer wg.Done()
|
||||||
|
for i := 0; i < 500; i++ {
|
||||||
|
if err := OnUpdate(func(c *Config) error {
|
||||||
|
c.Services[0] = &ServiceConfig{
|
||||||
|
Name: "concurrent-service",
|
||||||
|
Metadata: map[string]any{"generation": worker*500 + i},
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}); err != nil {
|
||||||
|
t.Errorf("OnUpdate: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}(worker)
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := 0; i < 2000; i++ {
|
||||||
|
if _, err := json.Marshal(Global()); err != nil {
|
||||||
|
t.Fatalf("marshal snapshot: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConcurrentPersistProducesValidConfig(t *testing.T) {
|
||||||
|
original := Global()
|
||||||
|
originalPath := PersistPath()
|
||||||
|
persistMu.Lock()
|
||||||
|
originalEnabled := persistEnable
|
||||||
|
persistMu.Unlock()
|
||||||
|
t.Cleanup(func() {
|
||||||
|
Set(original)
|
||||||
|
SetPersistPath(originalPath)
|
||||||
|
persistMu.Lock()
|
||||||
|
persistEnable = originalEnabled
|
||||||
|
persistMu.Unlock()
|
||||||
|
})
|
||||||
|
|
||||||
|
path := filepath.Join(t.TempDir(), "gost.json")
|
||||||
|
SetPersistPath(path)
|
||||||
|
EnablePersist()
|
||||||
|
Set(&Config{Services: []*ServiceConfig{{Name: "persist-service"}}})
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for worker := 0; worker < 4; worker++ {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(worker int) {
|
||||||
|
defer wg.Done()
|
||||||
|
for i := 0; i < 50; i++ {
|
||||||
|
if err := OnUpdate(func(c *Config) error {
|
||||||
|
c.Services[0].Metadata = map[string]any{"generation": worker*50 + i}
|
||||||
|
return nil
|
||||||
|
}); err != nil {
|
||||||
|
t.Errorf("persist update: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}(worker)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
var persisted Config
|
||||||
|
if err := persisted.ReadFile(path); err != nil {
|
||||||
|
t.Fatalf("read persisted config: %v", err)
|
||||||
|
}
|
||||||
|
if len(persisted.Services) != 1 || persisted.Services[0] == nil || persisted.Services[0].Name != "persist-service" {
|
||||||
|
t.Fatalf("unexpected persisted services: %#v", persisted.Services)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -35,16 +35,18 @@ func ParseChain(cfg *config.ChainConfig, log logger.Logger) (chain.Chainer, erro
|
|||||||
for _, ch := range cfg.Hops {
|
for _, ch := range cfg.Hops {
|
||||||
var hop hop.Hop
|
var hop hop.Hop
|
||||||
var err error
|
var err error
|
||||||
|
owned := false
|
||||||
|
|
||||||
if ch.Nodes != nil || ch.Plugin != nil {
|
if ch.Nodes != nil || ch.Plugin != nil {
|
||||||
if hop, err = hop_parser.ParseHop(ch, log); err != nil {
|
if hop, err = hop_parser.ParseHop(ch, log); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
owned = true
|
||||||
} else {
|
} else {
|
||||||
hop = registry.HopRegistry().Get(ch.Name)
|
hop = registry.HopRegistry().Get(ch.Name)
|
||||||
}
|
}
|
||||||
if hop != nil {
|
if hop != nil {
|
||||||
c.AddHop(hop)
|
c.AddHop(hop, owned)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,9 +42,9 @@ func EnablePersist() {
|
|||||||
// persist writes the current global config to the configured file atomically.
|
// persist writes the current global config to the configured file atomically.
|
||||||
func persist() error {
|
func persist() error {
|
||||||
persistMu.Lock()
|
persistMu.Lock()
|
||||||
|
defer persistMu.Unlock()
|
||||||
path := persistPath
|
path := persistPath
|
||||||
enabled := persistEnable
|
enabled := persistEnable
|
||||||
persistMu.Unlock()
|
|
||||||
|
|
||||||
if !enabled || path == "" {
|
if !enabled || path == "" {
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -19,20 +19,23 @@ func (session *muxSession) Accept() (net.Conn, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (session *muxSession) Close() error {
|
func (session *muxSession) Close() error {
|
||||||
if session.session == nil {
|
if session == nil || session.session == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return session.session.Close()
|
return session.session.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (session *muxSession) IsClosed() bool {
|
func (session *muxSession) IsClosed() bool {
|
||||||
if session.session == nil {
|
if session == nil || session.session == nil {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
return session.session.IsClosed()
|
return session.session.IsClosed()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (session *muxSession) NumStreams() int {
|
func (session *muxSession) NumStreams() int {
|
||||||
|
if session == nil || session.session == nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
return session.session.NumStreams()
|
return session.session.NumStreams()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
"github.com/go-gost/core/logger"
|
"github.com/go-gost/core/logger"
|
||||||
md "github.com/go-gost/core/metadata"
|
md "github.com/go-gost/core/metadata"
|
||||||
kcp_util "github.com/go-gost/x/internal/util/kcp"
|
kcp_util "github.com/go-gost/x/internal/util/kcp"
|
||||||
|
"github.com/go-gost/x/internal/util/sessionretire"
|
||||||
mdutil "github.com/go-gost/x/metadata/util"
|
mdutil "github.com/go-gost/x/metadata/util"
|
||||||
"github.com/go-gost/x/registry"
|
"github.com/go-gost/x/registry"
|
||||||
"github.com/xtaci/kcp-go/v5"
|
"github.com/xtaci/kcp-go/v5"
|
||||||
@@ -25,6 +26,7 @@ func init() {
|
|||||||
type kcpDialer struct {
|
type kcpDialer struct {
|
||||||
sessions map[string]*muxSession
|
sessions map[string]*muxSession
|
||||||
sessionMutex sync.Mutex
|
sessionMutex sync.Mutex
|
||||||
|
retired bool
|
||||||
logger logger.Logger
|
logger logger.Logger
|
||||||
md metadata
|
md metadata
|
||||||
options dialer.Options
|
options dialer.Options
|
||||||
@@ -64,6 +66,9 @@ func (d *kcpDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialOp
|
|||||||
|
|
||||||
d.sessionMutex.Lock()
|
d.sessionMutex.Lock()
|
||||||
defer d.sessionMutex.Unlock()
|
defer d.sessionMutex.Unlock()
|
||||||
|
if d.retired {
|
||||||
|
return nil, net.ErrClosed
|
||||||
|
}
|
||||||
|
|
||||||
session, ok := d.sessions[addr]
|
session, ok := d.sessions[addr]
|
||||||
if session != nil && session.IsClosed() {
|
if session != nil && session.IsClosed() {
|
||||||
@@ -171,3 +176,36 @@ func (d *kcpDialer) initSession(ctx context.Context, addr net.Addr, conn net.Pac
|
|||||||
func (d *kcpDialer) Multiplex() bool {
|
func (d *kcpDialer) Multiplex() bool {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Retire drains existing streams and closes their backing sessions once idle.
|
||||||
|
func (d *kcpDialer) Retire() {
|
||||||
|
for _, session := range d.detachSessions() {
|
||||||
|
sessionretire.Gracefully(session)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close immediately releases all cached multiplex sessions.
|
||||||
|
func (d *kcpDialer) Close() error {
|
||||||
|
var errs []error
|
||||||
|
for _, session := range d.detachSessions() {
|
||||||
|
errs = append(errs, session.Close())
|
||||||
|
}
|
||||||
|
return errors.Join(errs...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *kcpDialer) detachSessions() []*muxSession {
|
||||||
|
if d == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
d.sessionMutex.Lock()
|
||||||
|
d.retired = true
|
||||||
|
sessions := make([]*muxSession, 0, len(d.sessions))
|
||||||
|
for _, session := range d.sessions {
|
||||||
|
if session != nil {
|
||||||
|
sessions = append(sessions, session)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
d.sessions = make(map[string]*muxSession)
|
||||||
|
d.sessionMutex.Unlock()
|
||||||
|
return sessions
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package kcp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"net"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRetiredDialerRejectsNewConnections(t *testing.T) {
|
||||||
|
dialer := NewDialer().(*kcpDialer)
|
||||||
|
dialer.Retire()
|
||||||
|
|
||||||
|
if _, err := dialer.Dial(context.Background(), "127.0.0.1:1"); !errors.Is(err, net.ErrClosed) {
|
||||||
|
t.Fatalf("Dial error = %v, want net.ErrClosed", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,13 +20,24 @@ func (session *muxSession) Accept() (net.Conn, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (session *muxSession) Close() error {
|
func (session *muxSession) Close() error {
|
||||||
|
if session == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
if session.session == nil {
|
if session.session == nil {
|
||||||
|
if session.conn != nil {
|
||||||
|
conn := session.conn
|
||||||
|
session.conn = nil
|
||||||
|
return conn.Close()
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return session.session.Close()
|
return session.session.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (session *muxSession) IsClosed() bool {
|
func (session *muxSession) IsClosed() bool {
|
||||||
|
if session == nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
if session.session == nil {
|
if session.session == nil {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -34,5 +45,8 @@ func (session *muxSession) IsClosed() bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (session *muxSession) NumStreams() int {
|
func (session *muxSession) NumStreams() int {
|
||||||
|
if session == nil || session.session == nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
return session.session.NumStreams()
|
return session.session.NumStreams()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
"github.com/go-gost/core/logger"
|
"github.com/go-gost/core/logger"
|
||||||
md "github.com/go-gost/core/metadata"
|
md "github.com/go-gost/core/metadata"
|
||||||
"github.com/go-gost/x/internal/util/mux"
|
"github.com/go-gost/x/internal/util/mux"
|
||||||
|
"github.com/go-gost/x/internal/util/sessionretire"
|
||||||
"github.com/go-gost/x/registry"
|
"github.com/go-gost/x/registry"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -21,6 +22,7 @@ func init() {
|
|||||||
type mtcpDialer struct {
|
type mtcpDialer struct {
|
||||||
sessions map[string]*muxSession
|
sessions map[string]*muxSession
|
||||||
sessionMutex sync.Mutex
|
sessionMutex sync.Mutex
|
||||||
|
retired bool
|
||||||
logger logger.Logger
|
logger logger.Logger
|
||||||
md metadata
|
md metadata
|
||||||
options dialer.Options
|
options dialer.Options
|
||||||
@@ -55,6 +57,9 @@ func (d *mtcpDialer) Multiplex() bool {
|
|||||||
func (d *mtcpDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialOption) (conn net.Conn, err error) {
|
func (d *mtcpDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialOption) (conn net.Conn, err error) {
|
||||||
d.sessionMutex.Lock()
|
d.sessionMutex.Lock()
|
||||||
defer d.sessionMutex.Unlock()
|
defer d.sessionMutex.Unlock()
|
||||||
|
if d.retired {
|
||||||
|
return nil, net.ErrClosed
|
||||||
|
}
|
||||||
|
|
||||||
session, ok := d.sessions[addr]
|
session, ok := d.sessions[addr]
|
||||||
if session != nil && session.IsClosed() {
|
if session != nil && session.IsClosed() {
|
||||||
@@ -88,6 +93,10 @@ func (d *mtcpDialer) Handshake(ctx context.Context, conn net.Conn, options ...di
|
|||||||
|
|
||||||
d.sessionMutex.Lock()
|
d.sessionMutex.Lock()
|
||||||
defer d.sessionMutex.Unlock()
|
defer d.sessionMutex.Unlock()
|
||||||
|
if d.retired {
|
||||||
|
conn.Close()
|
||||||
|
return nil, net.ErrClosed
|
||||||
|
}
|
||||||
|
|
||||||
if d.md.handshakeTimeout > 0 {
|
if d.md.handshakeTimeout > 0 {
|
||||||
conn.SetDeadline(time.Now().Add(d.md.handshakeTimeout))
|
conn.SetDeadline(time.Now().Add(d.md.handshakeTimeout))
|
||||||
@@ -129,3 +138,34 @@ func (d *mtcpDialer) initSession(ctx context.Context, conn net.Conn) (*muxSessio
|
|||||||
}
|
}
|
||||||
return &muxSession{conn: conn, session: session}, nil
|
return &muxSession{conn: conn, session: session}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (d *mtcpDialer) Retire() {
|
||||||
|
for _, session := range d.detachSessions() {
|
||||||
|
sessionretire.Gracefully(session)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *mtcpDialer) Close() error {
|
||||||
|
var errs []error
|
||||||
|
for _, session := range d.detachSessions() {
|
||||||
|
errs = append(errs, session.Close())
|
||||||
|
}
|
||||||
|
return errors.Join(errs...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *mtcpDialer) detachSessions() []*muxSession {
|
||||||
|
if d == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
d.sessionMutex.Lock()
|
||||||
|
d.retired = true
|
||||||
|
sessions := make([]*muxSession, 0, len(d.sessions))
|
||||||
|
for _, session := range d.sessions {
|
||||||
|
if session != nil {
|
||||||
|
sessions = append(sessions, session)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
d.sessions = make(map[string]*muxSession)
|
||||||
|
d.sessionMutex.Unlock()
|
||||||
|
return sessions
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package mtcp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"net"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRetiredDialerRejectsNewConnections(t *testing.T) {
|
||||||
|
dialer := NewDialer().(*mtcpDialer)
|
||||||
|
dialer.Retire()
|
||||||
|
|
||||||
|
if _, err := dialer.Dial(context.Background(), "127.0.0.1:1"); !errors.Is(err, net.ErrClosed) {
|
||||||
|
t.Fatalf("Dial error = %v, want net.ErrClosed", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSessionCloseReleasesPreHandshakeConnection(t *testing.T) {
|
||||||
|
conn, peer := net.Pipe()
|
||||||
|
defer peer.Close()
|
||||||
|
session := &muxSession{conn: conn}
|
||||||
|
|
||||||
|
if err := session.Close(); err != nil {
|
||||||
|
t.Fatalf("Close: %v", err)
|
||||||
|
}
|
||||||
|
if !session.IsClosed() {
|
||||||
|
t.Fatal("pre-handshake session still reports open after Close")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,13 +20,24 @@ func (session *muxSession) Accept() (net.Conn, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (session *muxSession) Close() error {
|
func (session *muxSession) Close() error {
|
||||||
|
if session == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
if session.session == nil {
|
if session.session == nil {
|
||||||
|
if session.conn != nil {
|
||||||
|
conn := session.conn
|
||||||
|
session.conn = nil
|
||||||
|
return conn.Close()
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return session.session.Close()
|
return session.session.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (session *muxSession) IsClosed() bool {
|
func (session *muxSession) IsClosed() bool {
|
||||||
|
if session == nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
if session.session == nil {
|
if session.session == nil {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -34,5 +45,8 @@ func (session *muxSession) IsClosed() bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (session *muxSession) NumStreams() int {
|
func (session *muxSession) NumStreams() int {
|
||||||
|
if session == nil || session.session == nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
return session.session.NumStreams()
|
return session.session.NumStreams()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import (
|
|||||||
"github.com/go-gost/core/logger"
|
"github.com/go-gost/core/logger"
|
||||||
md "github.com/go-gost/core/metadata"
|
md "github.com/go-gost/core/metadata"
|
||||||
"github.com/go-gost/x/internal/util/mux"
|
"github.com/go-gost/x/internal/util/mux"
|
||||||
|
"github.com/go-gost/x/internal/util/sessionretire"
|
||||||
"github.com/go-gost/x/registry"
|
"github.com/go-gost/x/registry"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -22,6 +23,7 @@ func init() {
|
|||||||
type mtlsDialer struct {
|
type mtlsDialer struct {
|
||||||
sessions map[string]*muxSession
|
sessions map[string]*muxSession
|
||||||
sessionMutex sync.Mutex
|
sessionMutex sync.Mutex
|
||||||
|
retired bool
|
||||||
logger logger.Logger
|
logger logger.Logger
|
||||||
md metadata
|
md metadata
|
||||||
options dialer.Options
|
options dialer.Options
|
||||||
@@ -56,6 +58,9 @@ func (d *mtlsDialer) Multiplex() bool {
|
|||||||
func (d *mtlsDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialOption) (conn net.Conn, err error) {
|
func (d *mtlsDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialOption) (conn net.Conn, err error) {
|
||||||
d.sessionMutex.Lock()
|
d.sessionMutex.Lock()
|
||||||
defer d.sessionMutex.Unlock()
|
defer d.sessionMutex.Unlock()
|
||||||
|
if d.retired {
|
||||||
|
return nil, net.ErrClosed
|
||||||
|
}
|
||||||
|
|
||||||
session, ok := d.sessions[addr]
|
session, ok := d.sessions[addr]
|
||||||
if session != nil && session.IsClosed() {
|
if session != nil && session.IsClosed() {
|
||||||
@@ -89,6 +94,10 @@ func (d *mtlsDialer) Handshake(ctx context.Context, conn net.Conn, options ...di
|
|||||||
|
|
||||||
d.sessionMutex.Lock()
|
d.sessionMutex.Lock()
|
||||||
defer d.sessionMutex.Unlock()
|
defer d.sessionMutex.Unlock()
|
||||||
|
if d.retired {
|
||||||
|
conn.Close()
|
||||||
|
return nil, net.ErrClosed
|
||||||
|
}
|
||||||
|
|
||||||
if d.md.handshakeTimeout > 0 {
|
if d.md.handshakeTimeout > 0 {
|
||||||
conn.SetDeadline(time.Now().Add(d.md.handshakeTimeout))
|
conn.SetDeadline(time.Now().Add(d.md.handshakeTimeout))
|
||||||
@@ -136,3 +145,34 @@ func (d *mtlsDialer) initSession(ctx context.Context, conn net.Conn) (*muxSessio
|
|||||||
}
|
}
|
||||||
return &muxSession{conn: conn, session: session}, nil
|
return &muxSession{conn: conn, session: session}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (d *mtlsDialer) Retire() {
|
||||||
|
for _, session := range d.detachSessions() {
|
||||||
|
sessionretire.Gracefully(session)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *mtlsDialer) Close() error {
|
||||||
|
var errs []error
|
||||||
|
for _, session := range d.detachSessions() {
|
||||||
|
errs = append(errs, session.Close())
|
||||||
|
}
|
||||||
|
return errors.Join(errs...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *mtlsDialer) detachSessions() []*muxSession {
|
||||||
|
if d == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
d.sessionMutex.Lock()
|
||||||
|
d.retired = true
|
||||||
|
sessions := make([]*muxSession, 0, len(d.sessions))
|
||||||
|
for _, session := range d.sessions {
|
||||||
|
if session != nil {
|
||||||
|
sessions = append(sessions, session)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
d.sessions = make(map[string]*muxSession)
|
||||||
|
d.sessionMutex.Unlock()
|
||||||
|
return sessions
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package mtls
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"net"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRetiredDialerRejectsNewConnections(t *testing.T) {
|
||||||
|
dialer := NewDialer().(*mtlsDialer)
|
||||||
|
dialer.Retire()
|
||||||
|
|
||||||
|
if _, err := dialer.Dial(context.Background(), "127.0.0.1:1"); !errors.Is(err, net.ErrClosed) {
|
||||||
|
t.Fatalf("Dial error = %v, want net.ErrClosed", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSessionCloseReleasesPreHandshakeConnection(t *testing.T) {
|
||||||
|
conn, peer := net.Pipe()
|
||||||
|
defer peer.Close()
|
||||||
|
session := &muxSession{conn: conn}
|
||||||
|
|
||||||
|
if err := session.Close(); err != nil {
|
||||||
|
t.Fatalf("Close: %v", err)
|
||||||
|
}
|
||||||
|
if !session.IsClosed() {
|
||||||
|
t.Fatal("pre-handshake session still reports open after Close")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,13 +20,24 @@ func (session *muxSession) Accept() (net.Conn, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (session *muxSession) Close() error {
|
func (session *muxSession) Close() error {
|
||||||
|
if session == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
if session.session == nil {
|
if session.session == nil {
|
||||||
|
if session.conn != nil {
|
||||||
|
conn := session.conn
|
||||||
|
session.conn = nil
|
||||||
|
return conn.Close()
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return session.session.Close()
|
return session.session.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (session *muxSession) IsClosed() bool {
|
func (session *muxSession) IsClosed() bool {
|
||||||
|
if session == nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
if session.session == nil {
|
if session.session == nil {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -34,5 +45,8 @@ func (session *muxSession) IsClosed() bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (session *muxSession) NumStreams() int {
|
func (session *muxSession) NumStreams() int {
|
||||||
|
if session == nil || session.session == nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
return session.session.NumStreams()
|
return session.session.NumStreams()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import (
|
|||||||
"github.com/go-gost/core/logger"
|
"github.com/go-gost/core/logger"
|
||||||
md "github.com/go-gost/core/metadata"
|
md "github.com/go-gost/core/metadata"
|
||||||
"github.com/go-gost/x/internal/util/mux"
|
"github.com/go-gost/x/internal/util/mux"
|
||||||
|
"github.com/go-gost/x/internal/util/sessionretire"
|
||||||
ws_util "github.com/go-gost/x/internal/util/ws"
|
ws_util "github.com/go-gost/x/internal/util/ws"
|
||||||
"github.com/go-gost/x/registry"
|
"github.com/go-gost/x/registry"
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
@@ -25,6 +26,7 @@ func init() {
|
|||||||
type mwsDialer struct {
|
type mwsDialer struct {
|
||||||
sessions map[string]*muxSession
|
sessions map[string]*muxSession
|
||||||
sessionMutex sync.Mutex
|
sessionMutex sync.Mutex
|
||||||
|
retired bool
|
||||||
tlsEnabled bool
|
tlsEnabled bool
|
||||||
md metadata
|
md metadata
|
||||||
options dialer.Options
|
options dialer.Options
|
||||||
@@ -70,6 +72,9 @@ func (d *mwsDialer) Multiplex() bool {
|
|||||||
func (d *mwsDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialOption) (conn net.Conn, err error) {
|
func (d *mwsDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialOption) (conn net.Conn, err error) {
|
||||||
d.sessionMutex.Lock()
|
d.sessionMutex.Lock()
|
||||||
defer d.sessionMutex.Unlock()
|
defer d.sessionMutex.Unlock()
|
||||||
|
if d.retired {
|
||||||
|
return nil, net.ErrClosed
|
||||||
|
}
|
||||||
|
|
||||||
session, ok := d.sessions[addr]
|
session, ok := d.sessions[addr]
|
||||||
if session != nil && session.IsClosed() {
|
if session != nil && session.IsClosed() {
|
||||||
@@ -108,6 +113,10 @@ func (d *mwsDialer) Handshake(ctx context.Context, conn net.Conn, options ...dia
|
|||||||
|
|
||||||
d.sessionMutex.Lock()
|
d.sessionMutex.Lock()
|
||||||
defer d.sessionMutex.Unlock()
|
defer d.sessionMutex.Unlock()
|
||||||
|
if d.retired {
|
||||||
|
conn.Close()
|
||||||
|
return nil, net.ErrClosed
|
||||||
|
}
|
||||||
|
|
||||||
session, ok := d.sessions[opts.Addr]
|
session, ok := d.sessions[opts.Addr]
|
||||||
if session != nil && session.conn != conn {
|
if session != nil && session.conn != conn {
|
||||||
@@ -208,3 +217,34 @@ func (d *mwsDialer) keepAlive(conn ws_util.WebsocketConn) {
|
|||||||
conn.SetWriteDeadline(time.Time{})
|
conn.SetWriteDeadline(time.Time{})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (d *mwsDialer) Retire() {
|
||||||
|
for _, session := range d.detachSessions() {
|
||||||
|
sessionretire.Gracefully(session)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *mwsDialer) Close() error {
|
||||||
|
var errs []error
|
||||||
|
for _, session := range d.detachSessions() {
|
||||||
|
errs = append(errs, session.Close())
|
||||||
|
}
|
||||||
|
return errors.Join(errs...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *mwsDialer) detachSessions() []*muxSession {
|
||||||
|
if d == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
d.sessionMutex.Lock()
|
||||||
|
d.retired = true
|
||||||
|
sessions := make([]*muxSession, 0, len(d.sessions))
|
||||||
|
for _, session := range d.sessions {
|
||||||
|
if session != nil {
|
||||||
|
sessions = append(sessions, session)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
d.sessions = make(map[string]*muxSession)
|
||||||
|
d.sessionMutex.Unlock()
|
||||||
|
return sessions
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package mws
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"net"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRetiredDialerRejectsNewConnections(t *testing.T) {
|
||||||
|
dialer := NewDialer().(*mwsDialer)
|
||||||
|
dialer.Retire()
|
||||||
|
|
||||||
|
if _, err := dialer.Dial(context.Background(), "127.0.0.1:1"); !errors.Is(err, net.ErrClosed) {
|
||||||
|
t.Fatalf("Dial error = %v, want net.ErrClosed", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSessionCloseReleasesPreHandshakeConnection(t *testing.T) {
|
||||||
|
conn, peer := net.Pipe()
|
||||||
|
defer peer.Close()
|
||||||
|
session := &muxSession{conn: conn}
|
||||||
|
|
||||||
|
if err := session.Close(); err != nil {
|
||||||
|
t.Fatalf("Close: %v", err)
|
||||||
|
}
|
||||||
|
if !session.IsClosed() {
|
||||||
|
t.Fatal("pre-handshake session still reports open after Close")
|
||||||
|
}
|
||||||
|
}
|
||||||
+49
-8
@@ -3,6 +3,7 @@ package hop
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"io"
|
"io"
|
||||||
"net"
|
"net"
|
||||||
"sort"
|
"sort"
|
||||||
@@ -92,6 +93,7 @@ type chainHop struct {
|
|||||||
nodes []*chain.Node
|
nodes []*chain.Node
|
||||||
mu sync.RWMutex
|
mu sync.RWMutex
|
||||||
cancelFunc context.CancelFunc
|
cancelFunc context.CancelFunc
|
||||||
|
stopOnce sync.Once
|
||||||
options options
|
options options
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -383,13 +385,52 @@ func (p *chainHop) parseNode(r io.Reader) ([]*chain.Node, error) {
|
|||||||
return nodes, nil
|
return nodes, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *chainHop) Close() error {
|
func (p *chainHop) stopReload() {
|
||||||
p.cancelFunc()
|
if p == nil {
|
||||||
if p.options.fileLoader != nil {
|
return
|
||||||
p.options.fileLoader.Close()
|
|
||||||
}
|
}
|
||||||
if p.options.redisLoader != nil {
|
p.stopOnce.Do(func() {
|
||||||
p.options.redisLoader.Close()
|
p.cancelFunc()
|
||||||
}
|
if p.options.fileLoader != nil {
|
||||||
return nil
|
p.options.fileLoader.Close()
|
||||||
|
}
|
||||||
|
if p.options.redisLoader != nil {
|
||||||
|
p.options.redisLoader.Close()
|
||||||
|
}
|
||||||
|
if p.options.httpLoader != nil {
|
||||||
|
p.options.httpLoader.Close()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *chainHop) Retire() {
|
||||||
|
if p == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
p.stopReload()
|
||||||
|
for _, node := range p.Nodes() {
|
||||||
|
if node == nil || node.Options().Transport == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if retirer, ok := node.Options().Transport.(interface{ Retire() }); ok {
|
||||||
|
retirer.Retire()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *chainHop) Close() error {
|
||||||
|
if p == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
p.stopReload()
|
||||||
|
var errs []error
|
||||||
|
for _, node := range p.Nodes() {
|
||||||
|
if node == nil || node.Options().Transport == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if closer, ok := node.Options().Transport.(io.Closer); ok {
|
||||||
|
errs = append(errs, closer.Close())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return errors.Join(errs...)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
package sessionretire
|
||||||
|
|
||||||
|
import "time"
|
||||||
|
|
||||||
|
const (
|
||||||
|
defaultIdleGrace = time.Second
|
||||||
|
defaultPollPeriod = 100 * time.Millisecond
|
||||||
|
)
|
||||||
|
|
||||||
|
// Session is the lifecycle surface shared by the multiplexed dialers.
|
||||||
|
type Session interface {
|
||||||
|
Close() error
|
||||||
|
IsClosed() bool
|
||||||
|
NumStreams() int
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gracefully closes a retired session after all existing streams have drained.
|
||||||
|
// A short idle grace covers the Dial/Handshake hand-off used by several dialers.
|
||||||
|
func Gracefully(session Session) {
|
||||||
|
if session == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
go waitUntilIdle(session, defaultIdleGrace, defaultPollPeriod)
|
||||||
|
}
|
||||||
|
|
||||||
|
func waitUntilIdle(session Session, idleGrace, pollPeriod time.Duration) {
|
||||||
|
if session == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if idleGrace <= 0 {
|
||||||
|
idleGrace = defaultIdleGrace
|
||||||
|
}
|
||||||
|
if pollPeriod <= 0 {
|
||||||
|
pollPeriod = defaultPollPeriod
|
||||||
|
}
|
||||||
|
|
||||||
|
ticker := time.NewTicker(pollPeriod)
|
||||||
|
defer ticker.Stop()
|
||||||
|
|
||||||
|
var idleSince time.Time
|
||||||
|
for {
|
||||||
|
if session.IsClosed() {
|
||||||
|
_ = session.Close()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if session.NumStreams() == 0 {
|
||||||
|
if idleSince.IsZero() {
|
||||||
|
idleSince = time.Now()
|
||||||
|
} else if time.Since(idleSince) >= idleGrace {
|
||||||
|
_ = session.Close()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
idleSince = time.Time{}
|
||||||
|
}
|
||||||
|
<-ticker.C
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package sessionretire
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type testSession struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
streams int
|
||||||
|
closed bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *testSession) Close() error {
|
||||||
|
s.mu.Lock()
|
||||||
|
s.closed = true
|
||||||
|
s.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *testSession) IsClosed() bool {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
return s.closed
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *testSession) NumStreams() int {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
return s.streams
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWaitUntilIdlePreservesActiveStreams(t *testing.T) {
|
||||||
|
session := &testSession{streams: 1}
|
||||||
|
done := make(chan struct{})
|
||||||
|
go func() {
|
||||||
|
waitUntilIdle(session, 20*time.Millisecond, time.Millisecond)
|
||||||
|
close(done)
|
||||||
|
}()
|
||||||
|
|
||||||
|
time.Sleep(30 * time.Millisecond)
|
||||||
|
if session.IsClosed() {
|
||||||
|
t.Fatal("active session was closed")
|
||||||
|
}
|
||||||
|
|
||||||
|
session.mu.Lock()
|
||||||
|
session.streams = 0
|
||||||
|
session.mu.Unlock()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
case <-time.After(250 * time.Millisecond):
|
||||||
|
t.Fatal("idle session was not closed")
|
||||||
|
}
|
||||||
|
if !session.IsClosed() {
|
||||||
|
t.Fatal("retired session did not close after becoming idle")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -28,7 +28,13 @@ func (r *chainRegistry) Register(name string, v chain.Chainer) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *chainRegistry) replace(name string, v chain.Chainer) {
|
func (r *chainRegistry) replace(name string, v chain.Chainer) {
|
||||||
r.m.Store(name, v)
|
old, loaded := r.m.Swap(name, v)
|
||||||
|
if !loaded {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if retirer, ok := old.(interface{ Retire() }); ok {
|
||||||
|
retirer.Retire()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *chainRegistry) Get(name string) chain.Chainer {
|
func (r *chainRegistry) Get(name string) chain.Chainer {
|
||||||
|
|||||||
@@ -16,6 +16,15 @@ func (c testChainer) Route(context.Context, string, string, ...chain.RouteOption
|
|||||||
return c.route
|
return c.route
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type retiringTestChainer struct {
|
||||||
|
testChainer
|
||||||
|
retired bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *retiringTestChainer) Retire() {
|
||||||
|
c.retired = true
|
||||||
|
}
|
||||||
|
|
||||||
type testRoute struct {
|
type testRoute struct {
|
||||||
nodes []*chain.Node
|
nodes []*chain.Node
|
||||||
}
|
}
|
||||||
@@ -49,3 +58,20 @@ func TestReplaceChainOverwritesExistingRegistration(t *testing.T) {
|
|||||||
t.Fatalf("expected replacement chain route, got %#v", route)
|
t.Fatalf("expected replacement chain route, got %#v", route)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestReplaceChainRetiresPreviousRegistration(t *testing.T) {
|
||||||
|
name := "replace_chain_retire_tdd"
|
||||||
|
ChainRegistry().Unregister(name)
|
||||||
|
defer ChainRegistry().Unregister(name)
|
||||||
|
|
||||||
|
old := &retiringTestChainer{}
|
||||||
|
if err := ChainRegistry().Register(name, old); err != nil {
|
||||||
|
t.Fatalf("register old chain: %v", err)
|
||||||
|
}
|
||||||
|
if err := ReplaceChain(name, testChainer{}); err != nil {
|
||||||
|
t.Fatalf("replace chain: %v", err)
|
||||||
|
}
|
||||||
|
if !old.retired {
|
||||||
|
t.Fatal("previous chain was not retired")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,117 @@
|
|||||||
|
package socket
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
coreservice "github.com/go-gost/core/service"
|
||||||
|
"github.com/go-gost/x/config"
|
||||||
|
"github.com/go-gost/x/registry"
|
||||||
|
)
|
||||||
|
|
||||||
|
type blockingCommandService struct {
|
||||||
|
started chan struct{}
|
||||||
|
release chan struct{}
|
||||||
|
startedOnce sync.Once
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *blockingCommandService) Serve() error { return nil }
|
||||||
|
func (s *blockingCommandService) Addr() net.Addr { return nil }
|
||||||
|
func (s *blockingCommandService) Close() error {
|
||||||
|
s.startedOnce.Do(func() { close(s.started) })
|
||||||
|
<-s.release
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMutationCommandsAreSerialized(t *testing.T) {
|
||||||
|
mutations := []string{
|
||||||
|
"AddService", "UpdateService", "DeleteService", "PauseService", "ResumeService",
|
||||||
|
"AddChains", "UpdateChains", "DeleteChains",
|
||||||
|
"AddLimiters", "UpdateLimiters", "DeleteLimiters",
|
||||||
|
"AddCLimiters", "UpdateCLimiters", "DeleteCLimiters",
|
||||||
|
"SetProtocol", "UpgradeAgent", "RollbackAgent", "reload",
|
||||||
|
}
|
||||||
|
for _, command := range mutations {
|
||||||
|
if !isMutationCommand(command) {
|
||||||
|
t.Fatalf("expected %s to use the serialized mutation queue", command)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestReadOnlyCommandsRemainBoundedAsync(t *testing.T) {
|
||||||
|
for _, command := range []string{"TcpPing", "UdpPing", "ServiceMonitorCheck"} {
|
||||||
|
if isMutationCommand(command) {
|
||||||
|
t.Fatalf("expected %s to remain a read-only command", command)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCommandResponseTypePreservesRequestContract(t *testing.T) {
|
||||||
|
if got := commandResponseType("UpdateService"); got != "UpdateServiceResponse" {
|
||||||
|
t.Fatalf("unexpected response type: %s", got)
|
||||||
|
}
|
||||||
|
if got := commandResponseType(""); got != "UnknownCommandResponse" {
|
||||||
|
t.Fatalf("unexpected empty command response type: %s", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMutationQueueExecutesCommandsInArrivalOrder(t *testing.T) {
|
||||||
|
originalConfig := config.Global()
|
||||||
|
t.Cleanup(func() { config.Set(originalConfig) })
|
||||||
|
|
||||||
|
firstName := "mutation_queue_first_tdd"
|
||||||
|
secondName := "mutation_queue_second_tdd"
|
||||||
|
first := &blockingCommandService{started: make(chan struct{}), release: make(chan struct{})}
|
||||||
|
second := &blockingCommandService{started: make(chan struct{}), release: make(chan struct{})}
|
||||||
|
for _, name := range []string{firstName, secondName} {
|
||||||
|
registry.ServiceRegistry().Unregister(name)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() {
|
||||||
|
select {
|
||||||
|
case <-first.release:
|
||||||
|
default:
|
||||||
|
close(first.release)
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case <-second.release:
|
||||||
|
default:
|
||||||
|
close(second.release)
|
||||||
|
}
|
||||||
|
registry.ServiceRegistry().Unregister(firstName)
|
||||||
|
registry.ServiceRegistry().Unregister(secondName)
|
||||||
|
})
|
||||||
|
if err := registry.ServiceRegistry().Register(firstName, coreservice.Service(first)); err != nil {
|
||||||
|
t.Fatalf("register first service: %v", err)
|
||||||
|
}
|
||||||
|
if err := registry.ServiceRegistry().Register(secondName, coreservice.Service(second)); err != nil {
|
||||||
|
t.Fatalf("register second service: %v", err)
|
||||||
|
}
|
||||||
|
config.Set(&config.Config{Services: []*config.ServiceConfig{{Name: firstName}, {Name: secondName}}})
|
||||||
|
|
||||||
|
reporter := NewWebSocketReporter("", "mutation-queue-test-secret")
|
||||||
|
go reporter.runMutationCommands()
|
||||||
|
t.Cleanup(reporter.Stop)
|
||||||
|
reporter.dispatchCommand(CommandMessage{Type: "DeleteService", Data: map[string]any{"services": []string{firstName}}})
|
||||||
|
reporter.dispatchCommand(CommandMessage{Type: "DeleteService", Data: map[string]any{"services": []string{secondName}}})
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-first.started:
|
||||||
|
case <-time.After(time.Second):
|
||||||
|
t.Fatal("first mutation did not start")
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case <-second.started:
|
||||||
|
t.Fatal("second mutation started before first mutation completed")
|
||||||
|
case <-time.After(100 * time.Millisecond):
|
||||||
|
}
|
||||||
|
|
||||||
|
close(first.release)
|
||||||
|
select {
|
||||||
|
case <-second.started:
|
||||||
|
case <-time.After(time.Second):
|
||||||
|
t.Fatal("second mutation did not start after first mutation completed")
|
||||||
|
}
|
||||||
|
close(second.release)
|
||||||
|
}
|
||||||
+82
-18
@@ -15,6 +15,11 @@ import (
|
|||||||
xservice "github.com/go-gost/x/service"
|
xservice "github.com/go-gost/x/service"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type serviceReplacement struct {
|
||||||
|
config config.ServiceConfig
|
||||||
|
oldConfig *config.ServiceConfig
|
||||||
|
}
|
||||||
|
|
||||||
func createServices(req createServicesRequest) error {
|
func createServices(req createServicesRequest) error {
|
||||||
|
|
||||||
if len(req.Data) == 0 {
|
if len(req.Data) == 0 {
|
||||||
@@ -95,11 +100,11 @@ func updateServices(req updateServicesRequest) error {
|
|||||||
req.Data[i].Name = name
|
req.Data[i].Name = name
|
||||||
}
|
}
|
||||||
|
|
||||||
// 第二阶段:逐个更新服务(Upsert模式:存在则更新,不存在则创建)
|
// 第二阶段:逐个更新服务(Upsert模式:存在则更新,不存在则创建)。
|
||||||
changedServices := make([]struct {
|
// 配置变更命令由 WebSocket reporter 串行调度,但这里仍保留完整回滚,
|
||||||
config config.ServiceConfig
|
// 避免新配置解析或监听失败后旧服务永久消失。
|
||||||
service service.Service
|
originalConfig := config.Global()
|
||||||
}, 0, len(req.Data))
|
changedServices := make([]serviceReplacement, 0, len(req.Data))
|
||||||
for i := range req.Data {
|
for i := range req.Data {
|
||||||
serviceConfig := &req.Data[i]
|
serviceConfig := &req.Data[i]
|
||||||
name := serviceConfig.Name
|
name := serviceConfig.Name
|
||||||
@@ -107,33 +112,48 @@ func updateServices(req updateServicesRequest) error {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1. 获取旧服务
|
var oldConfig *config.ServiceConfig
|
||||||
old := registry.ServiceRegistry().Get(name)
|
if originalConfig != nil {
|
||||||
|
for _, current := range originalConfig.Services {
|
||||||
|
if current != nil && strings.TrimSpace(current.Name) == name {
|
||||||
|
oldConfig = current
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 2. 关闭旧服务 (如果存在)
|
// 1. 关闭并移除旧服务(如果存在)。同名监听必须先释放端口,
|
||||||
if old != nil {
|
// 才能创建新 listener。
|
||||||
// 3. 从注册表移除旧服务;registry 会负责关闭旧服务。
|
if registry.ServiceRegistry().Get(name) != nil {
|
||||||
registry.ServiceRegistry().Unregister(name)
|
registry.ServiceRegistry().Unregister(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 4. 解析新服务配置
|
// 2. 解析新服务配置。
|
||||||
svc, err := parser.ParseService(serviceConfig)
|
svc, err := parser.ParseService(serviceConfig)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
rollbackErr := restoreServiceRuntime(name, oldConfig)
|
||||||
|
rollbackErr = errors.Join(rollbackErr, rollbackServiceReplacements(changedServices))
|
||||||
|
if rollbackErr != nil {
|
||||||
|
return fmt.Errorf("create service %s failed: %v; restore previous service failed: %w", name, err, rollbackErr)
|
||||||
|
}
|
||||||
return errors.New("create service " + name + " failed: " + err.Error())
|
return errors.New("create service " + name + " failed: " + err.Error())
|
||||||
}
|
}
|
||||||
changedServices = append(changedServices, struct {
|
|
||||||
config config.ServiceConfig
|
|
||||||
service service.Service
|
|
||||||
}{*serviceConfig, svc})
|
|
||||||
|
|
||||||
// 5. 注册新服务
|
// 3. 注册并启动新服务。
|
||||||
if err := registry.ServiceRegistry().Register(name, svc); err != nil {
|
if err := registry.ServiceRegistry().Register(name, svc); err != nil {
|
||||||
svc.Close()
|
svc.Close()
|
||||||
|
rollbackErr := restoreServiceRuntime(name, oldConfig)
|
||||||
|
rollbackErr = errors.Join(rollbackErr, rollbackServiceReplacements(changedServices))
|
||||||
|
if rollbackErr != nil {
|
||||||
|
return fmt.Errorf("service %s already exists; restore previous service failed: %w", name, rollbackErr)
|
||||||
|
}
|
||||||
return errors.New("service " + name + " already exists")
|
return errors.New("service " + name + " already exists")
|
||||||
}
|
}
|
||||||
|
|
||||||
// 6. 启动新服务
|
|
||||||
go svc.Serve()
|
go svc.Serve()
|
||||||
|
changedServices = append(changedServices, serviceReplacement{
|
||||||
|
config: *serviceConfig,
|
||||||
|
oldConfig: oldConfig,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
if len(changedServices) == 0 {
|
if len(changedServices) == 0 {
|
||||||
return nil
|
return nil
|
||||||
@@ -158,12 +178,56 @@ func updateServices(req updateServicesRequest) error {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
|
config.Set(originalConfig)
|
||||||
|
if rollbackErr := rollbackServiceReplacements(changedServices); rollbackErr != nil {
|
||||||
|
return fmt.Errorf("%w; restore previous services failed: %v", err, rollbackErr)
|
||||||
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func restoreServiceRuntime(name string, serviceConfig *config.ServiceConfig) error {
|
||||||
|
name = strings.TrimSpace(name)
|
||||||
|
if name == "" || serviceConfig == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if registry.ServiceRegistry().Get(name) != nil {
|
||||||
|
registry.ServiceRegistry().Unregister(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfgCopy := *serviceConfig
|
||||||
|
cfgCopy.Name = name
|
||||||
|
svc, err := parser.ParseService(&cfgCopy)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := registry.ServiceRegistry().Register(name, svc); err != nil {
|
||||||
|
svc.Close()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
go svc.Serve()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func rollbackServiceReplacements(replacements []serviceReplacement) error {
|
||||||
|
var rollbackErr error
|
||||||
|
for i := len(replacements) - 1; i >= 0; i-- {
|
||||||
|
name := strings.TrimSpace(replacements[i].config.Name)
|
||||||
|
if name == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if registry.ServiceRegistry().Get(name) != nil {
|
||||||
|
registry.ServiceRegistry().Unregister(name)
|
||||||
|
}
|
||||||
|
if err := restoreServiceRuntime(name, replacements[i].oldConfig); err != nil {
|
||||||
|
rollbackErr = errors.Join(rollbackErr, fmt.Errorf("restore service %s: %w", name, err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return rollbackErr
|
||||||
|
}
|
||||||
|
|
||||||
func serviceConfigUnchanged(name string, next config.ServiceConfig) bool {
|
func serviceConfigUnchanged(name string, next config.ServiceConfig) bool {
|
||||||
cfg := config.Global()
|
cfg := config.Global()
|
||||||
if cfg == nil {
|
if cfg == nil {
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ import (
|
|||||||
corelogger "github.com/go-gost/core/logger"
|
corelogger "github.com/go-gost/core/logger"
|
||||||
"github.com/go-gost/core/service"
|
"github.com/go-gost/core/service"
|
||||||
"github.com/go-gost/x/config"
|
"github.com/go-gost/x/config"
|
||||||
|
_ "github.com/go-gost/x/handler/auto"
|
||||||
|
_ "github.com/go-gost/x/listener/tcp"
|
||||||
xlogger "github.com/go-gost/x/logger"
|
xlogger "github.com/go-gost/x/logger"
|
||||||
"github.com/go-gost/x/registry"
|
"github.com/go-gost/x/registry"
|
||||||
)
|
)
|
||||||
@@ -15,6 +17,43 @@ type recordingService struct {
|
|||||||
closed int
|
closed int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestUpdateServicesParseFailureRestoresPreviousRuntime(t *testing.T) {
|
||||||
|
corelogger.SetDefault(xlogger.Nop())
|
||||||
|
|
||||||
|
name := "restore_after_failed_update_tdd"
|
||||||
|
existing := &recordingService{}
|
||||||
|
registry.ServiceRegistry().Unregister(name)
|
||||||
|
t.Cleanup(func() { registry.ServiceRegistry().Unregister(name) })
|
||||||
|
if err := registry.ServiceRegistry().Register(name, service.Service(existing)); err != nil {
|
||||||
|
t.Fatalf("register existing service: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
originalConfig := config.Global()
|
||||||
|
t.Cleanup(func() { config.Set(originalConfig) })
|
||||||
|
serviceConfig := config.ServiceConfig{Name: name, Addr: "127.0.0.1:0"}
|
||||||
|
config.Set(&config.Config{Services: []*config.ServiceConfig{&serviceConfig}})
|
||||||
|
|
||||||
|
invalid := serviceConfig
|
||||||
|
invalid.Listener = &config.ListenerConfig{Type: "listener-does-not-exist"}
|
||||||
|
if err := updateServices(updateServicesRequest{Data: []config.ServiceConfig{invalid}}); err == nil {
|
||||||
|
t.Fatalf("expected invalid service update to fail")
|
||||||
|
}
|
||||||
|
if existing.closed != 1 {
|
||||||
|
t.Fatalf("expected old runtime to be closed once, got %d", existing.closed)
|
||||||
|
}
|
||||||
|
if registry.ServiceRegistry().Get(name) == nil {
|
||||||
|
t.Fatalf("expected previous runtime to be restored")
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg := config.Global()
|
||||||
|
if len(cfg.Services) != 1 || cfg.Services[0] == nil || cfg.Services[0].Name != name {
|
||||||
|
t.Fatalf("expected previous config to remain, got %#v", cfg.Services)
|
||||||
|
}
|
||||||
|
if cfg.Services[0].Listener != nil {
|
||||||
|
t.Fatalf("expected previous listener config to remain unchanged")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (s *recordingService) Serve() error { return nil }
|
func (s *recordingService) Serve() error { return nil }
|
||||||
func (s *recordingService) Addr() net.Addr { return nil }
|
func (s *recordingService) Addr() net.Addr { return nil }
|
||||||
func (s *recordingService) Close() error {
|
func (s *recordingService) Close() error {
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
"runtime/debug"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -152,6 +153,8 @@ const (
|
|||||||
maxBackoff = 2 * time.Minute // 重连最大退避
|
maxBackoff = 2 * time.Minute // 重连最大退避
|
||||||
defaultMetricReportInterval = 5 * time.Second
|
defaultMetricReportInterval = 5 * time.Second
|
||||||
maxConcurrentTCPPings = 8
|
maxConcurrentTCPPings = 8
|
||||||
|
maxConcurrentReadCommands = 16
|
||||||
|
maxQueuedMutationCommands = 256
|
||||||
)
|
)
|
||||||
|
|
||||||
type WebSocketReporter struct {
|
type WebSocketReporter struct {
|
||||||
@@ -174,6 +177,8 @@ type WebSocketReporter struct {
|
|||||||
connMutex sync.Mutex // 连接状态锁
|
connMutex sync.Mutex // 连接状态锁
|
||||||
aesCrypto *crypto.AESCrypto // AES加密器
|
aesCrypto *crypto.AESCrypto // AES加密器
|
||||||
tcpPingSem chan struct{} // 限制诊断探测并发,避免离线目标耗尽连接
|
tcpPingSem chan struct{} // 限制诊断探测并发,避免离线目标耗尽连接
|
||||||
|
readCommandSem chan struct{} // 限制只读命令并发,避免诊断请求耗尽资源
|
||||||
|
mutationQueue chan CommandMessage
|
||||||
}
|
}
|
||||||
|
|
||||||
var wsDial = func(dialer *websocket.Dialer, rawURL string) (*websocket.Conn, *http.Response, error) {
|
var wsDial = func(dialer *websocket.Dialer, rawURL string) (*websocket.Conn, *http.Response, error) {
|
||||||
@@ -204,6 +209,8 @@ func NewWebSocketReporter(serverURL string, secret string) *WebSocketReporter {
|
|||||||
connecting: false,
|
connecting: false,
|
||||||
aesCrypto: aesCrypto,
|
aesCrypto: aesCrypto,
|
||||||
tcpPingSem: make(chan struct{}, maxConcurrentTCPPings),
|
tcpPingSem: make(chan struct{}, maxConcurrentTCPPings),
|
||||||
|
readCommandSem: make(chan struct{}, maxConcurrentReadCommands),
|
||||||
|
mutationQueue: make(chan CommandMessage, maxQueuedMutationCommands),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,6 +238,7 @@ func (w *WebSocketReporter) releaseTCPPingSlot() {
|
|||||||
|
|
||||||
// Start 启动WebSocket报告器
|
// Start 启动WebSocket报告器
|
||||||
func (w *WebSocketReporter) Start() {
|
func (w *WebSocketReporter) Start() {
|
||||||
|
go w.runMutationCommands()
|
||||||
go w.run()
|
go w.run()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -777,8 +785,7 @@ func (w *WebSocketReporter) handleReceivedMessage(messageType int, message []byt
|
|||||||
}
|
}
|
||||||
|
|
||||||
if cmdMsg.Type != "call" {
|
if cmdMsg.Type != "call" {
|
||||||
// 所有命令统一异步执行,避免阻塞消息接收循环
|
w.dispatchCommand(cmdMsg)
|
||||||
go w.routeCommand(cmdMsg)
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// 处理普通消息
|
// 处理普通消息
|
||||||
@@ -789,8 +796,7 @@ func (w *WebSocketReporter) handleReceivedMessage(messageType int, message []byt
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if cmdMsg.Type != "call" {
|
if cmdMsg.Type != "call" {
|
||||||
// 所有命令统一异步执行,避免阻塞消息接收循环
|
w.dispatchCommand(cmdMsg)
|
||||||
go w.routeCommand(cmdMsg)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -799,6 +805,86 @@ func (w *WebSocketReporter) handleReceivedMessage(messageType int, message []byt
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// dispatchCommand keeps all runtime mutations ordered while allowing bounded
|
||||||
|
// concurrency for read-only diagnostics. Mutations share process-wide
|
||||||
|
// registries and configuration, so running them concurrently can corrupt the
|
||||||
|
// persisted config or interleave service lifecycle operations.
|
||||||
|
func (w *WebSocketReporter) dispatchCommand(cmd CommandMessage) {
|
||||||
|
if isMutationCommand(cmd.Type) {
|
||||||
|
select {
|
||||||
|
case w.mutationQueue <- cmd:
|
||||||
|
case <-w.ctx.Done():
|
||||||
|
w.sendCommandFailure(cmd, "Agent is shutting down")
|
||||||
|
default:
|
||||||
|
w.sendCommandFailure(cmd, "运行时配置命令队列已满,请稍后重试")
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
select {
|
||||||
|
case w.readCommandSem <- struct{}{}:
|
||||||
|
go func() {
|
||||||
|
defer func() { <-w.readCommandSem }()
|
||||||
|
w.routeCommandSafely(cmd)
|
||||||
|
}()
|
||||||
|
case <-w.ctx.Done():
|
||||||
|
w.sendCommandFailure(cmd, "Agent is shutting down")
|
||||||
|
default:
|
||||||
|
w.sendCommandFailure(cmd, "只读命令并发过多,请稍后重试")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WebSocketReporter) runMutationCommands() {
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-w.ctx.Done():
|
||||||
|
return
|
||||||
|
case cmd := <-w.mutationQueue:
|
||||||
|
w.routeCommandSafely(cmd)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WebSocketReporter) routeCommandSafely(cmd CommandMessage) {
|
||||||
|
defer func() {
|
||||||
|
if recovered := recover(); recovered != nil {
|
||||||
|
fmt.Printf("❌ 命令处理 panic: type=%s panic=%v\n%s", cmd.Type, recovered, debug.Stack())
|
||||||
|
w.sendCommandFailure(cmd, fmt.Sprintf("命令处理异常: %v", recovered))
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
w.routeCommand(cmd)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WebSocketReporter) sendCommandFailure(cmd CommandMessage, message string) {
|
||||||
|
w.sendResponse(CommandResponse{
|
||||||
|
Type: commandResponseType(cmd.Type),
|
||||||
|
Success: false,
|
||||||
|
Message: message,
|
||||||
|
RequestId: cmd.RequestId,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func commandResponseType(commandType string) string {
|
||||||
|
commandType = strings.TrimSpace(commandType)
|
||||||
|
if commandType == "" {
|
||||||
|
return "UnknownCommandResponse"
|
||||||
|
}
|
||||||
|
return commandType + "Response"
|
||||||
|
}
|
||||||
|
|
||||||
|
func isMutationCommand(commandType string) bool {
|
||||||
|
switch strings.ToLower(strings.TrimSpace(commandType)) {
|
||||||
|
case "addservice", "updateservice", "deleteservice", "pauseservice", "resumeservice",
|
||||||
|
"addchains", "updatechains", "deletechains",
|
||||||
|
"addlimiters", "updatelimiters", "deletelimiters",
|
||||||
|
"addclimiters", "updateclimiters", "deleteclimiters",
|
||||||
|
"setprotocol", "upgradeagent", "rollbackagent", "reload":
|
||||||
|
return true
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// routeCommand 路由命令到对应的处理函数
|
// routeCommand 路由命令到对应的处理函数
|
||||||
func (w *WebSocketReporter) routeCommand(cmd CommandMessage) {
|
func (w *WebSocketReporter) routeCommand(cmd CommandMessage) {
|
||||||
jsonBytes, errs := json.Marshal(cmd)
|
jsonBytes, errs := json.Marshal(cmd)
|
||||||
|
|||||||
+46
-5
@@ -64,6 +64,38 @@ SERVICE_MANAGER="${SERVICE_MANAGER:-}"
|
|||||||
PROXY_ENABLED="${PROXY_ENABLED:-}"
|
PROXY_ENABLED="${PROXY_ENABLED:-}"
|
||||||
PROXY_URL="${PROXY_URL:-}"
|
PROXY_URL="${PROXY_URL:-}"
|
||||||
|
|
||||||
|
ensure_alpine_runtime_dependencies() {
|
||||||
|
[[ -f /etc/alpine-release ]] || return 0
|
||||||
|
|
||||||
|
local missing_packages=()
|
||||||
|
local privileged_command=""
|
||||||
|
|
||||||
|
command -v curl >/dev/null 2>&1 || missing_packages+=(curl)
|
||||||
|
[[ -f /etc/ssl/certs/ca-certificates.crt ]] || missing_packages+=(ca-certificates)
|
||||||
|
|
||||||
|
if [[ ${#missing_packages[@]} -eq 0 ]]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $EUID -ne 0 ]]; then
|
||||||
|
if command -v sudo >/dev/null 2>&1; then
|
||||||
|
privileged_command="sudo"
|
||||||
|
elif command -v doas >/dev/null 2>&1; then
|
||||||
|
privileged_command="doas"
|
||||||
|
else
|
||||||
|
echo "❌ Alpine 安装需要 root 权限,或已配置 sudo/doas 来安装依赖: ${missing_packages[*]}。" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "📦 Alpine 缺少运行依赖,正在安装: ${missing_packages[*]}"
|
||||||
|
if [[ -n "$privileged_command" ]]; then
|
||||||
|
"$privileged_command" apk add --no-cache "${missing_packages[@]}"
|
||||||
|
else
|
||||||
|
apk add --no-cache "${missing_packages[@]}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# 镜像加速
|
# 镜像加速
|
||||||
maybe_proxy_url() {
|
maybe_proxy_url() {
|
||||||
local url="$1"
|
local url="$1"
|
||||||
@@ -169,6 +201,8 @@ build_download_url() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ensure_download_url_initialized() {
|
ensure_download_url_initialized() {
|
||||||
|
ensure_alpine_runtime_dependencies || return 1
|
||||||
|
|
||||||
if [[ -n "${DOWNLOAD_URL:-}" ]]; then
|
if [[ -n "${DOWNLOAD_URL:-}" ]]; then
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
@@ -299,11 +333,16 @@ ensure_service_manager() {
|
|||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if command -v systemctl >/dev/null 2>&1 && [[ -d /run/systemd/system ]]; then
|
# Alpine uses OpenRC even if a systemctl compatibility command happens to be installed.
|
||||||
|
if [[ -f /etc/alpine-release ]]; then
|
||||||
|
if command -v rc-service >/dev/null 2>&1 && command -v rc-update >/dev/null 2>&1; then
|
||||||
|
SERVICE_MANAGER="openrc"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
elif command -v systemctl >/dev/null 2>&1 && [[ -d /run/systemd/system ]]; then
|
||||||
SERVICE_MANAGER="systemd"
|
SERVICE_MANAGER="systemd"
|
||||||
return 0
|
return 0
|
||||||
fi
|
elif command -v rc-service >/dev/null 2>&1 && command -v rc-update >/dev/null 2>&1; then
|
||||||
if command -v rc-service >/dev/null 2>&1 && command -v rc-update >/dev/null 2>&1; then
|
|
||||||
SERVICE_MANAGER="openrc"
|
SERVICE_MANAGER="openrc"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
@@ -366,6 +405,7 @@ After=network.target
|
|||||||
[Service]
|
[Service]
|
||||||
WorkingDirectory=$INSTALL_DIR
|
WorkingDirectory=$INSTALL_DIR
|
||||||
ExecStart=$INSTALL_DIR/flux_agent
|
ExecStart=$INSTALL_DIR/flux_agent
|
||||||
|
Environment=GODEBUG=disablethp=1
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
StandardOutput=null
|
StandardOutput=null
|
||||||
StandardError=null
|
StandardError=null
|
||||||
@@ -501,7 +541,8 @@ cleanup_legacy_gost_installation() {
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if systemctl list-units --full -all 2>/dev/null | grep -Fq "gost.service"; then
|
if [[ "$SERVICE_MANAGER" == "systemd" ]] && \
|
||||||
|
systemctl list-units --full -all 2>/dev/null | grep -Fq "gost.service"; then
|
||||||
systemctl stop gost 2>/dev/null || true
|
systemctl stop gost 2>/dev/null || true
|
||||||
systemctl disable gost 2>/dev/null || true
|
systemctl disable gost 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
@@ -520,7 +561,7 @@ cleanup_legacy_gost_installation() {
|
|||||||
rm -f "$LEGACY_GOST_CONFIG_DIR/gost"
|
rm -f "$LEGACY_GOST_CONFIG_DIR/gost"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$removed_service_file" == "1" ]]; then
|
if [[ "$removed_service_file" == "1" && "$SERVICE_MANAGER" == "systemd" ]]; then
|
||||||
systemctl daemon-reload 2>/dev/null || true
|
systemctl daemon-reload 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|||||||
+319
-48
@@ -16,6 +16,9 @@ PINNED_VERSION=""
|
|||||||
# 镜像加速配置(可由面板传入或交互式询问)
|
# 镜像加速配置(可由面板传入或交互式询问)
|
||||||
PROXY_ENABLED="${PROXY_ENABLED:-}"
|
PROXY_ENABLED="${PROXY_ENABLED:-}"
|
||||||
PROXY_URL="${PROXY_URL:-}"
|
PROXY_URL="${PROXY_URL:-}"
|
||||||
|
DEFAULT_PANEL_BACKEND_CONTAINER="flux-panel-backend"
|
||||||
|
DEFAULT_PANEL_POSTGRES_CONTAINER="flux-panel-postgres"
|
||||||
|
PANEL_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")"
|
||||||
|
|
||||||
# 镜像加速
|
# 镜像加速
|
||||||
maybe_proxy_url() {
|
maybe_proxy_url() {
|
||||||
@@ -304,8 +307,8 @@ get_env_var() {
|
|||||||
get_current_db_type() {
|
get_current_db_type() {
|
||||||
local db_type database_url
|
local db_type database_url
|
||||||
|
|
||||||
db_type=$(get_env_var "DB_TYPE")
|
db_type=$(get_env_var "DB_TYPE" || true)
|
||||||
database_url=$(get_env_var "DATABASE_URL")
|
database_url=$(get_env_var "DATABASE_URL" || true)
|
||||||
|
|
||||||
if [[ "$db_type" == "sqlite" ]]; then
|
if [[ "$db_type" == "sqlite" ]]; then
|
||||||
echo "sqlite"
|
echo "sqlite"
|
||||||
@@ -316,13 +319,289 @@ get_current_db_type() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get_container_compose_label() {
|
||||||
|
local container="$1"
|
||||||
|
local label="$2"
|
||||||
|
local value
|
||||||
|
|
||||||
|
value=$(docker inspect -f "{{ index .Config.Labels \"$label\" }}" "$container" 2>/dev/null || true)
|
||||||
|
if [[ "$value" == "<no value>" ]]; then
|
||||||
|
value=""
|
||||||
|
fi
|
||||||
|
printf '%s' "$value"
|
||||||
|
}
|
||||||
|
|
||||||
|
resolve_panel_deployment() {
|
||||||
|
local backend_container="${PANEL_BACKEND_CONTAINER:-$DEFAULT_PANEL_BACKEND_CONTAINER}"
|
||||||
|
local requested_dir="${PANEL_DEPLOY_DIR:-}"
|
||||||
|
local label_dir label_project deploy_dir project_name
|
||||||
|
|
||||||
|
label_dir=$(get_container_compose_label "$backend_container" "com.docker.compose.project.working_dir")
|
||||||
|
label_project=$(get_container_compose_label "$backend_container" "com.docker.compose.project")
|
||||||
|
|
||||||
|
if [[ -n "$requested_dir" ]]; then
|
||||||
|
deploy_dir="$requested_dir"
|
||||||
|
elif [[ -n "$label_dir" ]]; then
|
||||||
|
deploy_dir="$label_dir"
|
||||||
|
elif [[ -f ".env" && -f "docker-compose.yml" ]]; then
|
||||||
|
deploy_dir=$(pwd -P)
|
||||||
|
else
|
||||||
|
echo "❌ 无法识别面板部署目录:未找到容器 Compose 标签,当前目录也没有完整部署配置"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -d "$deploy_dir" ]]; then
|
||||||
|
echo "❌ 面板部署目录不存在:$deploy_dir"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
deploy_dir=$(cd "$deploy_dir" && pwd -P)
|
||||||
|
if [[ -n "$label_dir" && -d "$label_dir" ]]; then
|
||||||
|
label_dir=$(cd "$label_dir" && pwd -P)
|
||||||
|
fi
|
||||||
|
if [[ -n "$requested_dir" && -n "$label_dir" && "$deploy_dir" != "$label_dir" ]]; then
|
||||||
|
echo "❌ 指定部署目录与运行中容器标签不一致:$deploy_dir != $label_dir"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
project_name="${COMPOSE_PROJECT_NAME:-}"
|
||||||
|
if [[ -z "$project_name" && -n "$label_project" ]]; then
|
||||||
|
project_name="$label_project"
|
||||||
|
fi
|
||||||
|
if [[ -n "$project_name" && ! "$project_name" =~ ^[a-z0-9][a-z0-9_-]*$ ]]; then
|
||||||
|
echo "❌ Compose 项目名不合法:$project_name"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
PANEL_DEPLOY_DIR="$deploy_dir"
|
||||||
|
PANEL_BACKEND_CONTAINER="$backend_container"
|
||||||
|
PANEL_POSTGRES_CONTAINER="${PANEL_POSTGRES_CONTAINER:-$DEFAULT_PANEL_POSTGRES_CONTAINER}"
|
||||||
|
PANEL_COMPOSE_PROJECT="$project_name"
|
||||||
|
export PANEL_DEPLOY_DIR PANEL_BACKEND_CONTAINER PANEL_POSTGRES_CONTAINER PANEL_COMPOSE_PROJECT
|
||||||
|
if [[ -n "$project_name" ]]; then
|
||||||
|
COMPOSE_PROJECT_NAME="$project_name"
|
||||||
|
export COMPOSE_PROJECT_NAME
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd "$PANEL_DEPLOY_DIR"
|
||||||
|
echo "📁 部署目录:$PANEL_DEPLOY_DIR"
|
||||||
|
if [[ -n "$PANEL_COMPOSE_PROJECT" ]]; then
|
||||||
|
echo "📦 Compose 项目:$PANEL_COMPOSE_PROJECT"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
run_panel_compose() {
|
||||||
|
$DOCKER_CMD "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
validate_panel_update_environment() {
|
||||||
|
local key value backend_port frontend_port configured_db_type db_type database_url postgres_password
|
||||||
|
|
||||||
|
if [[ ! -f ".env" ]]; then
|
||||||
|
echo "❌ 部署目录缺少 .env,更新终止"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
if [[ ! -f "docker-compose.yml" ]]; then
|
||||||
|
echo "❌ 部署目录缺少 docker-compose.yml,更新终止"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
for key in JWT_SECRET BACKEND_PORT FRONTEND_PORT; do
|
||||||
|
value=$(get_env_var "$key" || true)
|
||||||
|
if [[ -z "${value//[[:space:]]/}" ]]; then
|
||||||
|
echo "❌ .env 中 $key 缺失或为空,更新终止"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
backend_port=$(get_env_var "BACKEND_PORT" || true)
|
||||||
|
frontend_port=$(get_env_var "FRONTEND_PORT" || true)
|
||||||
|
if [[ ! "$backend_port" =~ ^[0-9]+$ || "$backend_port" -lt 1 || "$backend_port" -gt 65535 ]]; then
|
||||||
|
echo "❌ BACKEND_PORT 不是有效端口:$backend_port"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
if [[ ! "$frontend_port" =~ ^[0-9]+$ || "$frontend_port" -lt 1 || "$frontend_port" -gt 65535 ]]; then
|
||||||
|
echo "❌ FRONTEND_PORT 不是有效端口:$frontend_port"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
configured_db_type=$(get_env_var "DB_TYPE" || true)
|
||||||
|
if [[ -n "$configured_db_type" && "$configured_db_type" != "sqlite" && "$configured_db_type" != "postgres" ]]; then
|
||||||
|
echo "❌ DB_TYPE 仅支持 sqlite 或 postgres:$configured_db_type"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
db_type=$(get_current_db_type)
|
||||||
|
if [[ "$db_type" == "postgres" ]]; then
|
||||||
|
database_url=$(get_env_var "DATABASE_URL" || true)
|
||||||
|
postgres_password=$(get_env_var "POSTGRES_PASSWORD" || true)
|
||||||
|
if [[ -z "${database_url//[[:space:]]/}" || -z "${postgres_password//[[:space:]]/}" ]]; then
|
||||||
|
echo "❌ PostgreSQL 模式要求 DATABASE_URL 和 POSTGRES_PASSWORD 均非空"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! run_panel_compose -f docker-compose.yml config -q; then
|
||||||
|
echo "❌ 当前 Compose 配置校验失败,更新终止"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
download_panel_update_compose() {
|
||||||
|
local compose_url="$1"
|
||||||
|
|
||||||
|
UPDATE_COMPOSE_CANDIDATE=$(mktemp "$PANEL_DEPLOY_DIR/.docker-compose.yml.update.XXXXXX")
|
||||||
|
if ! curl -fL -o "$UPDATE_COMPOSE_CANDIDATE" "$compose_url"; then
|
||||||
|
rm -f "$UPDATE_COMPOSE_CANDIDATE"
|
||||||
|
UPDATE_COMPOSE_CANDIDATE=""
|
||||||
|
echo "❌ 下载最新 Compose 配置失败,更新终止"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
if [[ ! -s "$UPDATE_COMPOSE_CANDIDATE" ]]; then
|
||||||
|
rm -f "$UPDATE_COMPOSE_CANDIDATE"
|
||||||
|
UPDATE_COMPOSE_CANDIDATE=""
|
||||||
|
echo "❌ 下载的 Compose 配置为空,更新终止"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
validate_panel_update_compose() {
|
||||||
|
if ! FLUX_VERSION="$LATEST_VERSION" run_panel_compose -f "$UPDATE_COMPOSE_CANDIDATE" config -q; then
|
||||||
|
echo "❌ 新 Compose 配置校验失败,更新终止"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
backup_sqlite_for_update() (
|
||||||
|
local destination="$1"
|
||||||
|
local running paused="false"
|
||||||
|
|
||||||
|
cleanup_paused_backend() {
|
||||||
|
if [[ "$paused" == "true" ]]; then
|
||||||
|
docker unpause "$PANEL_BACKEND_CONTAINER" >/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
trap cleanup_paused_backend EXIT
|
||||||
|
|
||||||
|
running=$(docker inspect -f '{{.State.Running}}' "$PANEL_BACKEND_CONTAINER" 2>/dev/null || true)
|
||||||
|
if [[ "$running" == "true" ]]; then
|
||||||
|
if ! docker pause "$PANEL_BACKEND_CONTAINER" >/dev/null; then
|
||||||
|
echo "❌ 暂停后端以创建一致性 SQLite 备份失败"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
paused="true"
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "$destination"
|
||||||
|
if ! docker cp "$PANEL_BACKEND_CONTAINER:/app/data/." "$destination"; then
|
||||||
|
echo "❌ SQLite 数据备份失败"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$paused" == "true" ]] && ! docker unpause "$PANEL_BACKEND_CONTAINER" >/dev/null; then
|
||||||
|
echo "❌ SQLite 备份完成,但恢复后端运行失败"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
paused="false"
|
||||||
|
)
|
||||||
|
|
||||||
|
backup_postgres_for_update() {
|
||||||
|
local destination="$1"
|
||||||
|
local postgres_db postgres_user
|
||||||
|
|
||||||
|
postgres_db=$(get_env_var "POSTGRES_DB" || true)
|
||||||
|
postgres_user=$(get_env_var "POSTGRES_USER" || true)
|
||||||
|
postgres_db=${postgres_db:-flux_panel}
|
||||||
|
postgres_user=${postgres_user:-flux_panel}
|
||||||
|
|
||||||
|
if ! docker exec "$PANEL_POSTGRES_CONTAINER" pg_dump -U "$postgres_user" "$postgres_db" > "$destination"; then
|
||||||
|
rm -f "$destination"
|
||||||
|
echo "❌ PostgreSQL 数据备份失败"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
create_panel_update_backup() {
|
||||||
|
local db_type="$1"
|
||||||
|
local timestamp
|
||||||
|
|
||||||
|
timestamp=$(date '+%Y%m%d-%H%M%S')
|
||||||
|
if ! (umask 077 && mkdir -p "$PANEL_DEPLOY_DIR/backups"); then
|
||||||
|
echo "❌ 创建更新备份目录失败"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
UPDATE_BACKUP_DIR=$(umask 077 && mktemp -d "$PANEL_DEPLOY_DIR/backups/panel-update-$timestamp.XXXXXX") || {
|
||||||
|
echo "❌ 创建更新备份目录失败"
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
if ! cp -p .env docker-compose.yml "$UPDATE_BACKUP_DIR/"; then
|
||||||
|
echo "❌ 备份面板配置失败"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$db_type" == "postgres" ]]; then
|
||||||
|
backup_postgres_for_update "$UPDATE_BACKUP_DIR/postgres.sql" || return 1
|
||||||
|
else
|
||||||
|
backup_sqlite_for_update "$UPDATE_BACKUP_DIR/sqlite" || return 1
|
||||||
|
fi
|
||||||
|
echo "💾 更新备份:$UPDATE_BACKUP_DIR"
|
||||||
|
}
|
||||||
|
|
||||||
|
pull_panel_update_images() {
|
||||||
|
local db_type="$1"
|
||||||
|
|
||||||
|
if [[ "$db_type" == "postgres" ]]; then
|
||||||
|
FLUX_VERSION="$LATEST_VERSION" run_panel_compose -f "$UPDATE_COMPOSE_CANDIDATE" pull backend frontend postgres
|
||||||
|
else
|
||||||
|
FLUX_VERSION="$LATEST_VERSION" run_panel_compose -f "$UPDATE_COMPOSE_CANDIDATE" pull backend frontend
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
activate_panel_update_files() {
|
||||||
|
if ! chmod 0644 "$UPDATE_COMPOSE_CANDIDATE" || ! mv "$UPDATE_COMPOSE_CANDIDATE" docker-compose.yml; then
|
||||||
|
echo "❌ 替换 Compose 配置失败"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
UPDATE_COMPOSE_CANDIDATE=""
|
||||||
|
if ! upsert_env_var ".env" "FLUX_VERSION" "$LATEST_VERSION"; then
|
||||||
|
echo "❌ 更新版本配置失败"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
start_panel_after_update() {
|
||||||
|
local db_type="$1"
|
||||||
|
|
||||||
|
if [[ "$db_type" == "postgres" ]]; then
|
||||||
|
run_panel_compose up -d postgres || return 1
|
||||||
|
wait_for_postgres_healthy || return 1
|
||||||
|
fi
|
||||||
|
run_panel_compose up -d --force-recreate --remove-orphans backend frontend || return 1
|
||||||
|
wait_for_backend_healthy
|
||||||
|
}
|
||||||
|
|
||||||
|
rollback_panel_update() {
|
||||||
|
local db_type="$1"
|
||||||
|
|
||||||
|
echo "↩️ 正在恢复更新前配置..."
|
||||||
|
if ! cp -p "$UPDATE_BACKUP_DIR/.env" .env || ! cp -p "$UPDATE_BACKUP_DIR/docker-compose.yml" docker-compose.yml; then
|
||||||
|
echo "❌ 配置回滚失败,请从 $UPDATE_BACKUP_DIR 手动恢复"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
if [[ "$db_type" == "postgres" ]]; then
|
||||||
|
run_panel_compose up -d postgres || return 1
|
||||||
|
wait_for_postgres_healthy || return 1
|
||||||
|
fi
|
||||||
|
run_panel_compose up -d --force-recreate --remove-orphans backend frontend || return 1
|
||||||
|
wait_for_backend_healthy
|
||||||
|
}
|
||||||
|
|
||||||
wait_for_postgres_healthy() {
|
wait_for_postgres_healthy() {
|
||||||
local pg_health
|
local pg_health
|
||||||
|
local postgres_container="${PANEL_POSTGRES_CONTAINER:-$DEFAULT_PANEL_POSTGRES_CONTAINER}"
|
||||||
|
|
||||||
echo "🔍 检查 PostgreSQL 服务状态..."
|
echo "🔍 检查 PostgreSQL 服务状态..."
|
||||||
for i in {1..90}; do
|
for i in {1..90}; do
|
||||||
if docker ps --format "{{.Names}}" | grep -q "^flux-panel-postgres$"; then
|
if docker ps --format "{{.Names}}" | grep -Fxq "$postgres_container"; then
|
||||||
pg_health=$(docker inspect -f '{{.State.Health.Status}}' flux-panel-postgres 2>/dev/null || echo "unknown")
|
pg_health=$(docker inspect -f '{{.State.Health.Status}}' "$postgres_container" 2>/dev/null || echo "unknown")
|
||||||
if [[ "$pg_health" == "healthy" ]]; then
|
if [[ "$pg_health" == "healthy" ]]; then
|
||||||
echo "✅ PostgreSQL 服务健康检查通过"
|
echo "✅ PostgreSQL 服务健康检查通过"
|
||||||
return 0
|
return 0
|
||||||
@@ -335,7 +614,7 @@ wait_for_postgres_healthy() {
|
|||||||
|
|
||||||
if [ $i -eq 90 ]; then
|
if [ $i -eq 90 ]; then
|
||||||
echo "❌ PostgreSQL 启动超时(90秒)"
|
echo "❌ PostgreSQL 启动超时(90秒)"
|
||||||
echo "🔍 当前状态:$(docker inspect -f '{{.State.Health.Status}}' flux-panel-postgres 2>/dev/null || echo '容器不存在')"
|
echo "🔍 当前状态:$(docker inspect -f '{{.State.Health.Status}}' "$postgres_container" 2>/dev/null || echo '容器不存在')"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -348,11 +627,12 @@ wait_for_postgres_healthy() {
|
|||||||
|
|
||||||
wait_for_backend_healthy() {
|
wait_for_backend_healthy() {
|
||||||
local backend_health
|
local backend_health
|
||||||
|
local backend_container="${PANEL_BACKEND_CONTAINER:-$DEFAULT_PANEL_BACKEND_CONTAINER}"
|
||||||
|
|
||||||
echo "🔍 检查后端服务状态..."
|
echo "🔍 检查后端服务状态..."
|
||||||
for i in {1..90}; do
|
for i in {1..90}; do
|
||||||
if docker ps --format "{{.Names}}" | grep -q "^flux-panel-backend$"; then
|
if docker ps --format "{{.Names}}" | grep -Fxq "$backend_container"; then
|
||||||
backend_health=$(docker inspect -f '{{.State.Health.Status}}' flux-panel-backend 2>/dev/null || echo "unknown")
|
backend_health=$(docker inspect -f '{{.State.Health.Status}}' "$backend_container" 2>/dev/null || echo "unknown")
|
||||||
if [[ "$backend_health" == "healthy" ]]; then
|
if [[ "$backend_health" == "healthy" ]]; then
|
||||||
echo "✅ 后端服务健康检查通过"
|
echo "✅ 后端服务健康检查通过"
|
||||||
return 0
|
return 0
|
||||||
@@ -365,7 +645,7 @@ wait_for_backend_healthy() {
|
|||||||
|
|
||||||
if [ $i -eq 90 ]; then
|
if [ $i -eq 90 ]; then
|
||||||
echo "❌ 后端服务启动超时(90秒)"
|
echo "❌ 后端服务启动超时(90秒)"
|
||||||
echo "🔍 当前状态:$(docker inspect -f '{{.State.Health.Status}}' flux-panel-backend 2>/dev/null || echo '容器不存在')"
|
echo "🔍 当前状态:$(docker inspect -f '{{.State.Health.Status}}' "$backend_container" 2>/dev/null || echo '容器不存在')"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -380,9 +660,8 @@ wait_for_backend_healthy() {
|
|||||||
delete_self() {
|
delete_self() {
|
||||||
echo ""
|
echo ""
|
||||||
echo "🗑️ 操作已完成,正在清理脚本文件..."
|
echo "🗑️ 操作已完成,正在清理脚本文件..."
|
||||||
SCRIPT_PATH="$(readlink -f "$0" 2>/dev/null || realpath "$0" 2>/dev/null || echo "$0")"
|
|
||||||
sleep 1
|
sleep 1
|
||||||
rm -f "$SCRIPT_PATH" && echo "✅ 脚本文件已删除" || echo "❌ 删除脚本文件失败"
|
rm -f "$PANEL_SCRIPT_PATH" && echo "✅ 脚本文件已删除" || echo "❌ 删除脚本文件失败"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -486,12 +765,11 @@ EOF
|
|||||||
# 更新功能
|
# 更新功能
|
||||||
update_panel() {
|
update_panel() {
|
||||||
echo "🔄 开始更新面板..."
|
echo "🔄 开始更新面板..."
|
||||||
ask_proxy_config
|
|
||||||
check_docker
|
check_docker
|
||||||
|
resolve_panel_deployment || return 1
|
||||||
|
ask_proxy_config
|
||||||
|
validate_panel_update_environment || return 1
|
||||||
|
|
||||||
if [[ ! -f ".env" ]]; then
|
|
||||||
echo "⚠️ 未找到 .env,默认按 SQLite 模式更新"
|
|
||||||
fi
|
|
||||||
CURRENT_DB_TYPE=$(get_current_db_type)
|
CURRENT_DB_TYPE=$(get_current_db_type)
|
||||||
echo "🗄️ 当前数据库类型:$CURRENT_DB_TYPE"
|
echo "🗄️ 当前数据库类型:$CURRENT_DB_TYPE"
|
||||||
|
|
||||||
@@ -502,52 +780,45 @@ update_panel() {
|
|||||||
}
|
}
|
||||||
echo "🆕 最新版本:$LATEST_VERSION"
|
echo "🆕 最新版本:$LATEST_VERSION"
|
||||||
set_compose_urls_by_version "$LATEST_VERSION"
|
set_compose_urls_by_version "$LATEST_VERSION"
|
||||||
upsert_env_var ".env" "FLUX_VERSION" "$LATEST_VERSION"
|
|
||||||
|
|
||||||
echo "🔽 下载最新配置文件..."
|
echo "🔽 下载最新配置文件..."
|
||||||
DOCKER_COMPOSE_URL=$(get_docker_compose_url)
|
DOCKER_COMPOSE_URL=$(get_docker_compose_url)
|
||||||
echo "📡 选择配置文件:$(basename "$DOCKER_COMPOSE_URL")"
|
echo "📡 选择配置文件:$(basename "$DOCKER_COMPOSE_URL")"
|
||||||
curl -L -o docker-compose.yml "$DOCKER_COMPOSE_URL"
|
download_panel_update_compose "$DOCKER_COMPOSE_URL" || return 1
|
||||||
echo "✅ 下载完成"
|
if ! validate_panel_update_compose; then
|
||||||
|
rm -f "$UPDATE_COMPOSE_CANDIDATE"
|
||||||
# 自动检测并配置 IPv6 支持
|
UPDATE_COMPOSE_CANDIDATE=""
|
||||||
if check_ipv6_support; then
|
return 1
|
||||||
echo "🚀 系统支持 IPv6,自动启用 IPv6 配置..."
|
|
||||||
configure_docker_ipv6
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 先发送 SIGTERM 信号,让应用优雅关闭
|
echo "💾 备份当前配置和数据库..."
|
||||||
docker stop -t 30 flux-panel-backend 2>/dev/null || true
|
if ! create_panel_update_backup "$CURRENT_DB_TYPE"; then
|
||||||
docker stop -t 10 vite-frontend 2>/dev/null || true
|
rm -f "$UPDATE_COMPOSE_CANDIDATE"
|
||||||
|
UPDATE_COMPOSE_CANDIDATE=""
|
||||||
# 等待 WAL 文件同步
|
return 1
|
||||||
echo "⏳ 等待数据同步..."
|
fi
|
||||||
sleep 5
|
|
||||||
|
|
||||||
# 然后再完全停止
|
|
||||||
$DOCKER_CMD down
|
|
||||||
|
|
||||||
echo "⬇️ 拉取最新镜像..."
|
echo "⬇️ 拉取最新镜像..."
|
||||||
if [[ "$CURRENT_DB_TYPE" == "postgres" ]]; then
|
if ! pull_panel_update_images "$CURRENT_DB_TYPE"; then
|
||||||
$DOCKER_CMD pull backend frontend postgres
|
rm -f "$UPDATE_COMPOSE_CANDIDATE"
|
||||||
else
|
UPDATE_COMPOSE_CANDIDATE=""
|
||||||
$DOCKER_CMD pull backend frontend
|
echo "❌ 镜像拉取失败,现有服务保持运行"
|
||||||
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "🚀 启动更新后的服务..."
|
if ! activate_panel_update_files; then
|
||||||
if [[ "$CURRENT_DB_TYPE" == "postgres" ]]; then
|
rollback_panel_update "$CURRENT_DB_TYPE" || true
|
||||||
$DOCKER_CMD up -d postgres
|
return 1
|
||||||
wait_for_postgres_healthy
|
|
||||||
$DOCKER_CMD up -d backend frontend
|
|
||||||
else
|
|
||||||
$DOCKER_CMD up -d backend frontend
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 等待服务启动
|
echo "🚀 原地重建更新后的服务..."
|
||||||
echo "⏳ 等待服务启动..."
|
if ! start_panel_after_update "$CURRENT_DB_TYPE"; then
|
||||||
|
echo "🛑 新版本启动失败"
|
||||||
if ! wait_for_backend_healthy; then
|
if rollback_panel_update "$CURRENT_DB_TYPE"; then
|
||||||
echo "🛑 更新终止"
|
echo "✅ 已恢复更新前版本"
|
||||||
|
else
|
||||||
|
echo "❌ 自动回滚失败,请从 $UPDATE_BACKUP_DIR 手动恢复"
|
||||||
|
fi
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -277,6 +277,8 @@ EOF
|
|||||||
local expected=$'{\n "addr": "panel\\"addr",\n "secret": "sec\\\\ret\\"1"\n}'
|
local expected=$'{\n "addr": "panel\\"addr",\n "secret": "sec\\\\ret\\"1"\n}'
|
||||||
|
|
||||||
assert_equals "$expected" "$actual" "install_flux_agent should JSON-escape config values"
|
assert_equals "$expected" "$actual" "install_flux_agent should JSON-escape config values"
|
||||||
|
grep -Fqx 'Environment=GODEBUG=disablethp=1' "$FLUX_AGENT_SYSTEMD_SERVICE_FILE" || \
|
||||||
|
fail "systemd service should disable transparent huge pages for the Go heap"
|
||||||
)
|
)
|
||||||
|
|
||||||
test_install_script_bootstraps_bash_for_alpine() (
|
test_install_script_bootstraps_bash_for_alpine() (
|
||||||
@@ -399,6 +401,7 @@ test_cleanup_legacy_gost_installation_removes_service_and_binary() (
|
|||||||
LEGACY_GOST_SERVICE_FILE_LIB=$(mktemp -u)
|
LEGACY_GOST_SERVICE_FILE_LIB=$(mktemp -u)
|
||||||
LEGACY_GOST_SERVICE_FILE_USR_LIB=$(mktemp -u)
|
LEGACY_GOST_SERVICE_FILE_USR_LIB=$(mktemp -u)
|
||||||
LEGACY_GOST_CONFIG_DIR=$(mktemp -d)
|
LEGACY_GOST_CONFIG_DIR=$(mktemp -d)
|
||||||
|
SERVICE_MANAGER="systemd"
|
||||||
cat > "$LEGACY_GOST_SERVICE_FILE_ETC" <<EOF
|
cat > "$LEGACY_GOST_SERVICE_FILE_ETC" <<EOF
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Gost Proxy Service
|
Description=Gost Proxy Service
|
||||||
@@ -442,6 +445,7 @@ test_cleanup_legacy_gost_installation_preserves_unrelated_gost() (
|
|||||||
LEGACY_GOST_SERVICE_FILE_LIB=$(mktemp -u)
|
LEGACY_GOST_SERVICE_FILE_LIB=$(mktemp -u)
|
||||||
LEGACY_GOST_SERVICE_FILE_USR_LIB=$(mktemp -u)
|
LEGACY_GOST_SERVICE_FILE_USR_LIB=$(mktemp -u)
|
||||||
LEGACY_GOST_CONFIG_DIR=$(mktemp -d)
|
LEGACY_GOST_CONFIG_DIR=$(mktemp -d)
|
||||||
|
SERVICE_MANAGER="systemd"
|
||||||
cat > "$LEGACY_GOST_SERVICE_FILE_ETC" <<'EOF'
|
cat > "$LEGACY_GOST_SERVICE_FILE_ETC" <<'EOF'
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Unrelated Gost Service
|
Description=Unrelated Gost Service
|
||||||
@@ -469,6 +473,35 @@ EOF
|
|||||||
[[ "$systemctl_calls" != *"disable gost"* ]] || fail "cleanup_legacy_gost_installation should not disable unrelated gost services"
|
[[ "$systemctl_calls" != *"disable gost"* ]] || fail "cleanup_legacy_gost_installation should not disable unrelated gost services"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
test_cleanup_legacy_gost_installation_skips_systemd_on_openrc() (
|
||||||
|
set -euo pipefail
|
||||||
|
load_script_without_main "$ROOT_DIR/install.sh"
|
||||||
|
|
||||||
|
LEGACY_GOST_SERVICE_FILE_ETC=$(mktemp)
|
||||||
|
LEGACY_GOST_SERVICE_FILE_LIB=$(mktemp -u)
|
||||||
|
LEGACY_GOST_SERVICE_FILE_USR_LIB=$(mktemp -u)
|
||||||
|
LEGACY_GOST_CONFIG_DIR=$(mktemp -d)
|
||||||
|
SERVICE_MANAGER="openrc"
|
||||||
|
cat > "$LEGACY_GOST_SERVICE_FILE_ETC" <<EOF
|
||||||
|
[Unit]
|
||||||
|
WorkingDirectory=$LEGACY_GOST_CONFIG_DIR
|
||||||
|
ExecStart=$LEGACY_GOST_CONFIG_DIR/gost
|
||||||
|
EOF
|
||||||
|
: > "$LEGACY_GOST_CONFIG_DIR/config.json"
|
||||||
|
: > "$LEGACY_GOST_CONFIG_DIR/gost.json"
|
||||||
|
|
||||||
|
local systemctl_calls=""
|
||||||
|
systemctl() {
|
||||||
|
systemctl_calls+=$'\n'"$*"
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup_legacy_gost_installation >/dev/null
|
||||||
|
|
||||||
|
[[ -z "$systemctl_calls" ]] || fail "OpenRC cleanup should not invoke systemctl"
|
||||||
|
[[ ! -e "$LEGACY_GOST_SERVICE_FILE_ETC" ]] || fail "OpenRC cleanup should still remove the legacy service file"
|
||||||
|
)
|
||||||
|
|
||||||
test_install_script_accepts_proxy_url_env_without_prompt() (
|
test_install_script_accepts_proxy_url_env_without_prompt() (
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
load_script_without_main "$ROOT_DIR/install.sh"
|
load_script_without_main "$ROOT_DIR/install.sh"
|
||||||
@@ -525,6 +558,7 @@ test_update_panel_asks_for_proxy_config() (
|
|||||||
load_script_without_main "$ROOT_DIR/panel_install.sh"
|
load_script_without_main "$ROOT_DIR/panel_install.sh"
|
||||||
|
|
||||||
local ask_called="0"
|
local ask_called="0"
|
||||||
|
local calls=""
|
||||||
|
|
||||||
ask_proxy_config() {
|
ask_proxy_config() {
|
||||||
ask_called="1"
|
ask_called="1"
|
||||||
@@ -537,6 +571,15 @@ test_update_panel_asks_for_proxy_config() (
|
|||||||
DOCKER_CMD="true"
|
DOCKER_CMD="true"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
resolve_panel_deployment() {
|
||||||
|
calls+=" resolve"
|
||||||
|
PANEL_DEPLOY_DIR=$(mktemp -d)
|
||||||
|
}
|
||||||
|
|
||||||
|
validate_panel_update_environment() {
|
||||||
|
calls+=" validate-current"
|
||||||
|
}
|
||||||
|
|
||||||
get_current_db_type() {
|
get_current_db_type() {
|
||||||
echo "sqlite"
|
echo "sqlite"
|
||||||
}
|
}
|
||||||
@@ -545,13 +588,33 @@ test_update_panel_asks_for_proxy_config() (
|
|||||||
echo "v-test"
|
echo "v-test"
|
||||||
}
|
}
|
||||||
|
|
||||||
upsert_env_var() { :; }
|
download_panel_update_compose() {
|
||||||
|
calls+=" download"
|
||||||
|
UPDATE_COMPOSE_CANDIDATE="candidate"
|
||||||
|
}
|
||||||
|
|
||||||
|
validate_panel_update_compose() {
|
||||||
|
calls+=" validate-new"
|
||||||
|
}
|
||||||
|
|
||||||
|
create_panel_update_backup() {
|
||||||
|
calls+=" backup"
|
||||||
|
UPDATE_BACKUP_DIR="backup"
|
||||||
|
}
|
||||||
|
|
||||||
|
pull_panel_update_images() {
|
||||||
|
calls+=" pull"
|
||||||
|
}
|
||||||
|
|
||||||
|
activate_panel_update_files() {
|
||||||
|
calls+=" activate"
|
||||||
|
}
|
||||||
|
|
||||||
|
start_panel_after_update() {
|
||||||
|
calls+=" start"
|
||||||
|
}
|
||||||
|
|
||||||
check_ipv6_support() { return 1; }
|
check_ipv6_support() { return 1; }
|
||||||
configure_docker_ipv6() { :; }
|
|
||||||
docker() { return 0; }
|
|
||||||
wait_for_backend_healthy() { return 0; }
|
|
||||||
sleep() { :; }
|
|
||||||
curl() { :; }
|
|
||||||
|
|
||||||
update_panel >/dev/null
|
update_panel >/dev/null
|
||||||
|
|
||||||
@@ -560,6 +623,75 @@ test_update_panel_asks_for_proxy_config() (
|
|||||||
"https://github.com/${REPO}/releases/download/v-test/docker-compose-v4.yml" \
|
"https://github.com/${REPO}/releases/download/v-test/docker-compose-v4.yml" \
|
||||||
"$DOCKER_COMPOSEV4_URL" \
|
"$DOCKER_COMPOSEV4_URL" \
|
||||||
"update_panel should honor the prompted proxy choice"
|
"update_panel should honor the prompted proxy choice"
|
||||||
|
assert_equals \
|
||||||
|
" resolve validate-current download validate-new backup pull activate start" \
|
||||||
|
"$calls" \
|
||||||
|
"update_panel should validate, back up, and pull before activating the update"
|
||||||
|
)
|
||||||
|
|
||||||
|
test_resolve_panel_deployment_uses_container_labels() (
|
||||||
|
set -euo pipefail
|
||||||
|
load_script_without_main "$ROOT_DIR/panel_install.sh"
|
||||||
|
|
||||||
|
local expected_dir
|
||||||
|
expected_dir=$(mktemp -d)
|
||||||
|
expected_dir=$(cd "$expected_dir" && pwd -P)
|
||||||
|
printf 'JWT_SECRET=test\nBACKEND_PORT=6365\nFRONTEND_PORT=6366\nDB_TYPE=sqlite\n' > "$expected_dir/.env"
|
||||||
|
printf 'services: {}\n' > "$expected_dir/docker-compose.yml"
|
||||||
|
|
||||||
|
unset PANEL_DEPLOY_DIR COMPOSE_PROJECT_NAME
|
||||||
|
docker() {
|
||||||
|
if [[ "$1" == "inspect" && "$2" == "-f" ]]; then
|
||||||
|
case "$3" in
|
||||||
|
*working_dir*) printf '%s\n' "$expected_dir" ;;
|
||||||
|
*) printf '%s\n' "flvx-panel" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
resolve_panel_deployment >/dev/null
|
||||||
|
|
||||||
|
assert_equals "$expected_dir" "$PANEL_DEPLOY_DIR" "update should discover the Compose working directory from container labels"
|
||||||
|
assert_equals "flvx-panel" "$COMPOSE_PROJECT_NAME" "update should preserve the existing Compose project name"
|
||||||
|
assert_equals "$expected_dir" "$(pwd -P)" "update should run from the discovered deployment directory"
|
||||||
|
)
|
||||||
|
|
||||||
|
test_validate_panel_update_environment_rejects_empty_required_values() (
|
||||||
|
set -euo pipefail
|
||||||
|
load_script_without_main "$ROOT_DIR/panel_install.sh"
|
||||||
|
|
||||||
|
local deploy_dir rc="0"
|
||||||
|
deploy_dir=$(mktemp -d)
|
||||||
|
printf 'JWT_SECRET=\nBACKEND_PORT=6365\nFRONTEND_PORT=6366\nDB_TYPE=sqlite\n' > "$deploy_dir/.env"
|
||||||
|
printf 'services: {}\n' > "$deploy_dir/docker-compose.yml"
|
||||||
|
cd "$deploy_dir"
|
||||||
|
DOCKER_CMD="true"
|
||||||
|
|
||||||
|
validate_panel_update_environment >/dev/null || rc="$?"
|
||||||
|
|
||||||
|
assert_equals "1" "$rc" "update should reject an empty JWT secret before touching the running service"
|
||||||
|
)
|
||||||
|
|
||||||
|
test_backup_sqlite_for_update_pauses_copies_and_unpauses() (
|
||||||
|
set -euo pipefail
|
||||||
|
load_script_without_main "$ROOT_DIR/panel_install.sh"
|
||||||
|
|
||||||
|
local destination calls log_path
|
||||||
|
destination=$(mktemp -d)/sqlite
|
||||||
|
log_path=$(mktemp)
|
||||||
|
PANEL_BACKEND_CONTAINER="flux-panel-backend"
|
||||||
|
docker() {
|
||||||
|
if [[ "$1" == "inspect" ]]; then
|
||||||
|
printf 'true\n'
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
printf ' %s' "$1" >> "$log_path"
|
||||||
|
}
|
||||||
|
|
||||||
|
backup_sqlite_for_update "$destination" >/dev/null
|
||||||
|
calls=$(cat "$log_path")
|
||||||
|
|
||||||
|
assert_equals " pause cp unpause" "$calls" "SQLite backup should pause writes, copy the database volume, then resume the backend"
|
||||||
)
|
)
|
||||||
|
|
||||||
test_panel_install_script_accepts_proxy_url_env_without_prompt() (
|
test_panel_install_script_accepts_proxy_url_env_without_prompt() (
|
||||||
@@ -625,10 +757,14 @@ test_install_flux_agent_uses_openrc
|
|||||||
test_remove_flux_agent_service_uses_openrc
|
test_remove_flux_agent_service_uses_openrc
|
||||||
test_cleanup_legacy_gost_installation_removes_service_and_binary
|
test_cleanup_legacy_gost_installation_removes_service_and_binary
|
||||||
test_cleanup_legacy_gost_installation_preserves_unrelated_gost
|
test_cleanup_legacy_gost_installation_preserves_unrelated_gost
|
||||||
|
test_cleanup_legacy_gost_installation_skips_systemd_on_openrc
|
||||||
test_install_script_accepts_proxy_url_env_without_prompt
|
test_install_script_accepts_proxy_url_env_without_prompt
|
||||||
test_panel_install_script_can_disable_proxy
|
test_panel_install_script_can_disable_proxy
|
||||||
test_panel_install_script_recomputes_compose_urls_after_prompt
|
test_panel_install_script_recomputes_compose_urls_after_prompt
|
||||||
test_update_panel_asks_for_proxy_config
|
test_update_panel_asks_for_proxy_config
|
||||||
|
test_resolve_panel_deployment_uses_container_labels
|
||||||
|
test_validate_panel_update_environment_rejects_empty_required_values
|
||||||
|
test_backup_sqlite_for_update_pauses_copies_and_unpauses
|
||||||
test_panel_install_script_uses_default_proxy
|
test_panel_install_script_uses_default_proxy
|
||||||
test_panel_install_script_accepts_proxy_url_env_without_prompt
|
test_panel_install_script_accepts_proxy_url_env_without_prompt
|
||||||
test_panel_install_script_defaults_proxy_on_eof
|
test_panel_install_script_defaults_proxy_on_eof
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
# 多阶段构建 - 构建阶段
|
# 多阶段构建 - 构建阶段
|
||||||
FROM node:22-alpine AS builder
|
FROM --platform=$BUILDPLATFORM node:22-alpine AS builder
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY package.json pnpm-lock.yaml* ./
|
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
|
||||||
RUN corepack prepare pnpm@10 --activate && corepack enable pnpm && pnpm install --frozen-lockfile
|
RUN corepack enable pnpm && pnpm install --frozen-lockfile
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN pnpm run build
|
RUN pnpm run build
|
||||||
@@ -18,4 +18,4 @@ COPY --from=builder /app/dist /usr/share/nginx/html
|
|||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
CMD ["nginx", "-g", "daemon off;"]
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
"name": "flvx",
|
"name": "flvx",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
|
"packageManager": "pnpm@10.28.1",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
@@ -81,12 +82,5 @@
|
|||||||
"vite": "npm:rolldown-vite@^7.3.1",
|
"vite": "npm:rolldown-vite@^7.3.1",
|
||||||
"vite-plugin-pwa": "^1.1.0",
|
"vite-plugin-pwa": "^1.1.0",
|
||||||
"vite-tsconfig-paths": "^6.0.5"
|
"vite-tsconfig-paths": "^6.0.5"
|
||||||
},
|
|
||||||
"pnpm": {
|
|
||||||
"overrides": {
|
|
||||||
"@babel/plugin-transform-modules-systemjs": "7.29.4",
|
|
||||||
"fast-uri": "3.1.2",
|
|
||||||
"serialize-javascript": "7.0.5"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,2 +1,10 @@
|
|||||||
|
packages:
|
||||||
|
- '.'
|
||||||
|
|
||||||
|
overrides:
|
||||||
|
'@babel/plugin-transform-modules-systemjs': 7.29.4
|
||||||
|
fast-uri: 3.1.2
|
||||||
|
serialize-javascript: 7.0.5
|
||||||
|
|
||||||
allowBuilds:
|
allowBuilds:
|
||||||
'@tailwindcss/oxide': true
|
'@tailwindcss/oxide': true
|
||||||
|
|||||||
@@ -28,12 +28,13 @@ function DialogClose({
|
|||||||
return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
|
return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
function DialogOverlay({
|
const DialogOverlay = React.forwardRef<
|
||||||
className,
|
React.ElementRef<typeof DialogPrimitive.Overlay>,
|
||||||
...props
|
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
|
||||||
}: React.ComponentProps<typeof DialogPrimitive.Overlay>) {
|
>(({ className, ...props }, ref) => {
|
||||||
return (
|
return (
|
||||||
<DialogPrimitive.Overlay
|
<DialogPrimitive.Overlay
|
||||||
|
ref={ref}
|
||||||
className={cn(
|
className={cn(
|
||||||
"fixed inset-0 z-50 bg-black/30 backdrop-blur-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
|
"fixed inset-0 z-50 bg-black/30 backdrop-blur-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
|
||||||
className,
|
className,
|
||||||
@@ -42,7 +43,9 @@ function DialogOverlay({
|
|||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
|
||||||
|
|
||||||
function DialogContent({
|
function DialogContent({
|
||||||
className,
|
className,
|
||||||
|
|||||||
@@ -14,10 +14,14 @@ const PUBLIC_BRAND_CONFIG_KEYS = [
|
|||||||
"app_logo",
|
"app_logo",
|
||||||
"app_favicon",
|
"app_favicon",
|
||||||
"app_bg_image",
|
"app_bg_image",
|
||||||
|
"is_commercial",
|
||||||
|
"hide_footer_brand",
|
||||||
] as const;
|
] as const;
|
||||||
const SENSITIVE_CONFIG_KEYS = new Set([
|
const SENSITIVE_CONFIG_KEYS = new Set([
|
||||||
"jwt_secret",
|
"jwt_secret",
|
||||||
"license_key",
|
"license_key",
|
||||||
|
"license_machine_id",
|
||||||
|
"machine_fingerprint",
|
||||||
"cloudflare_secret_key",
|
"cloudflare_secret_key",
|
||||||
]);
|
]);
|
||||||
const GITHUB_REPO =
|
const GITHUB_REPO =
|
||||||
@@ -49,6 +53,30 @@ const readCachedConfigs = (keys: readonly string[]) => {
|
|||||||
return { cachedConfigs, hasCachedData };
|
return { cachedConfigs, hasCachedData };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const readAllCachedSafeConfigs = () => {
|
||||||
|
const cachedConfigs: Record<string, string> = {};
|
||||||
|
|
||||||
|
Object.keys(localStorage).forEach((storageKey) => {
|
||||||
|
if (!storageKey.startsWith(CACHE_PREFIX)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const key = storageKey.slice(CACHE_PREFIX.length).trim().toLowerCase();
|
||||||
|
|
||||||
|
if (!key || SENSITIVE_CONFIG_KEYS.has(key)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const value = localStorage.getItem(storageKey);
|
||||||
|
|
||||||
|
if (value !== null) {
|
||||||
|
cachedConfigs[key] = value;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return cachedConfigs;
|
||||||
|
};
|
||||||
|
|
||||||
const fetchPublicBrandConfigs = async (): Promise<Record<string, string>> => {
|
const fetchPublicBrandConfigs = async (): Promise<Record<string, string>> => {
|
||||||
const publicConfigMap: Record<string, string> = {};
|
const publicConfigMap: Record<string, string> = {};
|
||||||
|
|
||||||
@@ -106,15 +134,15 @@ const getInitialConfig = () => {
|
|||||||
|
|
||||||
if (cachedAppName) {
|
if (cachedAppName) {
|
||||||
return {
|
return {
|
||||||
name: cachedAppName,
|
name: isCommercial ? cachedAppName : "FLVX",
|
||||||
version: VERSION,
|
version: VERSION,
|
||||||
app_version: APP_VERSION,
|
app_version: APP_VERSION,
|
||||||
github_repo: GITHUB_REPO,
|
github_repo: GITHUB_REPO,
|
||||||
app_logo: cachedAppLogo,
|
app_logo: isCommercial ? cachedAppLogo : "",
|
||||||
app_favicon: cachedAppFavicon,
|
app_favicon: isCommercial ? cachedAppFavicon : "",
|
||||||
app_bg_image: cachedAppBgImage,
|
app_bg_image: cachedAppBgImage,
|
||||||
is_commercial: isCommercial,
|
is_commercial: isCommercial,
|
||||||
hide_footer_brand: hideFooterBrand,
|
hide_footer_brand: isCommercial && hideFooterBrand,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -123,11 +151,11 @@ const getInitialConfig = () => {
|
|||||||
version: VERSION,
|
version: VERSION,
|
||||||
app_version: APP_VERSION,
|
app_version: APP_VERSION,
|
||||||
github_repo: GITHUB_REPO,
|
github_repo: GITHUB_REPO,
|
||||||
app_logo: cachedAppLogo,
|
app_logo: isCommercial ? cachedAppLogo : "",
|
||||||
app_favicon: cachedAppFavicon,
|
app_favicon: isCommercial ? cachedAppFavicon : "",
|
||||||
app_bg_image: cachedAppBgImage,
|
app_bg_image: cachedAppBgImage,
|
||||||
is_commercial: isCommercial,
|
is_commercial: isCommercial,
|
||||||
hide_footer_brand: hideFooterBrand,
|
hide_footer_brand: isCommercial && hideFooterBrand,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -206,20 +234,24 @@ export const getCachedConfig = async (key: string): Promise<string | null> => {
|
|||||||
|
|
||||||
// 获取所有配置(优先从缓存)
|
// 获取所有配置(优先从缓存)
|
||||||
export const getCachedConfigs = async (): Promise<Record<string, string>> => {
|
export const getCachedConfigs = async (): Promise<Record<string, string>> => {
|
||||||
const { cachedConfigs, hasCachedData } = readCachedConfigs(
|
const {
|
||||||
PUBLIC_BRAND_CONFIG_KEYS,
|
cachedConfigs: publicCachedConfigs,
|
||||||
);
|
hasCachedData: hasPublicCachedData,
|
||||||
|
} = readCachedConfigs(PUBLIC_BRAND_CONFIG_KEYS);
|
||||||
|
|
||||||
if (!isLoggedIn()) {
|
if (!isLoggedIn()) {
|
||||||
const publicConfigs = await fetchPublicBrandConfigs();
|
const publicConfigs = await fetchPublicBrandConfigs();
|
||||||
|
|
||||||
if (Object.keys(publicConfigs).length > 0) {
|
if (Object.keys(publicConfigs).length > 0) {
|
||||||
return { ...cachedConfigs, ...publicConfigs };
|
return { ...publicCachedConfigs, ...publicConfigs };
|
||||||
}
|
}
|
||||||
|
|
||||||
return cachedConfigs;
|
return publicCachedConfigs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const cachedConfigs = readAllCachedSafeConfigs();
|
||||||
|
const hasCachedData = Object.keys(cachedConfigs).length > 0;
|
||||||
|
|
||||||
// 从API获取最新配置
|
// 从API获取最新配置
|
||||||
try {
|
try {
|
||||||
const response = await getConfigs();
|
const response = await getConfigs();
|
||||||
@@ -249,14 +281,20 @@ export const getCachedConfigs = async (): Promise<Record<string, string>> => {
|
|||||||
return cachedConfigs;
|
return cachedConfigs;
|
||||||
}
|
}
|
||||||
|
|
||||||
return await fetchPublicBrandConfigs();
|
const publicConfigs = await fetchPublicBrandConfigs();
|
||||||
|
|
||||||
|
return { ...publicCachedConfigs, ...publicConfigs };
|
||||||
} catch {
|
} catch {
|
||||||
// API失败时返回缓存的数据
|
// API失败时返回缓存的数据
|
||||||
if (hasCachedData) {
|
if (hasCachedData) {
|
||||||
return cachedConfigs;
|
return cachedConfigs;
|
||||||
}
|
}
|
||||||
|
|
||||||
return await fetchPublicBrandConfigs();
|
const publicConfigs = await fetchPublicBrandConfigs();
|
||||||
|
|
||||||
|
return hasPublicCachedData
|
||||||
|
? { ...publicCachedConfigs, ...publicConfigs }
|
||||||
|
: publicConfigs;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -345,6 +383,12 @@ export const updateSiteConfig = async (configMap?: Record<string, string>) => {
|
|||||||
"app_bg_image",
|
"app_bg_image",
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const resolvedCommercial = Object.prototype.hasOwnProperty.call(
|
||||||
|
resolvedConfigMap,
|
||||||
|
"is_commercial",
|
||||||
|
)
|
||||||
|
? resolvedConfigMap.is_commercial === "true"
|
||||||
|
: siteConfig.is_commercial;
|
||||||
const appName = hasAppName
|
const appName = hasAppName
|
||||||
? String(resolvedConfigMap.app_name || "").trim()
|
? String(resolvedConfigMap.app_name || "").trim()
|
||||||
: siteConfig.name;
|
: siteConfig.name;
|
||||||
@@ -358,15 +402,23 @@ export const updateSiteConfig = async (configMap?: Record<string, string>) => {
|
|||||||
? String(resolvedConfigMap.app_bg_image || "").trim()
|
? String(resolvedConfigMap.app_bg_image || "").trim()
|
||||||
: (siteConfig.app_bg_image || "").trim();
|
: (siteConfig.app_bg_image || "").trim();
|
||||||
|
|
||||||
if (appName && appName !== siteConfig.name) {
|
siteConfig.name = resolvedCommercial && appName ? appName : "FLVX";
|
||||||
siteConfig.name = appName;
|
siteConfig.app_logo = resolvedCommercial ? appLogo : "";
|
||||||
}
|
siteConfig.app_favicon = resolvedCommercial ? appFavicon : "";
|
||||||
|
|
||||||
siteConfig.app_logo = appLogo;
|
|
||||||
siteConfig.app_favicon = appFavicon;
|
|
||||||
siteConfig.app_bg_image = appBgImage;
|
siteConfig.app_bg_image = appBgImage;
|
||||||
siteConfig.is_commercial = resolvedConfigMap.is_commercial === "true";
|
if (
|
||||||
siteConfig.hide_footer_brand = resolvedConfigMap.hide_footer_brand === "true";
|
Object.prototype.hasOwnProperty.call(resolvedConfigMap, "is_commercial")
|
||||||
|
) {
|
||||||
|
siteConfig.is_commercial = resolvedCommercial;
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
Object.prototype.hasOwnProperty.call(resolvedConfigMap, "hide_footer_brand")
|
||||||
|
) {
|
||||||
|
siteConfig.hide_footer_brand =
|
||||||
|
resolvedCommercial && resolvedConfigMap.hide_footer_brand === "true";
|
||||||
|
} else if (!resolvedCommercial) {
|
||||||
|
siteConfig.hide_footer_brand = false;
|
||||||
|
}
|
||||||
|
|
||||||
if (typeof document !== "undefined") {
|
if (typeof document !== "undefined") {
|
||||||
document.title = siteConfig.name;
|
document.title = siteConfig.name;
|
||||||
|
|||||||
@@ -266,6 +266,9 @@ const getInitialConfigs = (): Record<string, string> => {
|
|||||||
"github_proxy_enabled",
|
"github_proxy_enabled",
|
||||||
"github_proxy_url",
|
"github_proxy_url",
|
||||||
"allow_local_remote_addr",
|
"allow_local_remote_addr",
|
||||||
|
"is_commercial",
|
||||||
|
"license_expiry",
|
||||||
|
"hide_footer_brand",
|
||||||
];
|
];
|
||||||
const initialConfigs: Record<string, string> = {};
|
const initialConfigs: Record<string, string> = {};
|
||||||
|
|
||||||
|
|||||||
@@ -492,21 +492,212 @@ const parseTunnelQualityChainDetails = (
|
|||||||
return {};
|
return {};
|
||||||
};
|
};
|
||||||
|
|
||||||
const candidateRoleLabel = (role: string) => {
|
type TunnelTopologyHop = TunnelQualityHopApiItem & {
|
||||||
switch (role) {
|
errorMessage?: string;
|
||||||
case "entry":
|
|
||||||
return "入口";
|
|
||||||
case "middle":
|
|
||||||
return "中转";
|
|
||||||
case "exit":
|
|
||||||
return "出口";
|
|
||||||
case "target":
|
|
||||||
return "测试目标";
|
|
||||||
default:
|
|
||||||
return role;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
interface TunnelTopologyPath {
|
||||||
|
key: string;
|
||||||
|
hops: TunnelTopologyHop[];
|
||||||
|
alternativeNodeIndex?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
const tunnelTopologyHopKey = (fromNodeId: number, toNodeId: number) =>
|
||||||
|
`${fromNodeId}:${toNodeId}`;
|
||||||
|
|
||||||
|
const buildTunnelTopologyPaths = (
|
||||||
|
details: TunnelQualityChainDetailsApiItem,
|
||||||
|
): TunnelTopologyPath[] => {
|
||||||
|
const primaryHops = details.primaryPath ?? [];
|
||||||
|
const candidates = details.candidateHops ?? [];
|
||||||
|
|
||||||
|
if (primaryHops.length === 0) {
|
||||||
|
const publicCandidates = candidates.filter(
|
||||||
|
(candidate) => candidate.toRole === "target",
|
||||||
|
);
|
||||||
|
const selected = publicCandidates.find((candidate) => candidate.selected);
|
||||||
|
const paths: TunnelTopologyPath[] = [];
|
||||||
|
|
||||||
|
if (selected) {
|
||||||
|
paths.push({ key: "primary-public", hops: [selected] });
|
||||||
|
}
|
||||||
|
for (const candidate of publicCandidates) {
|
||||||
|
if (candidate.selected) continue;
|
||||||
|
paths.push({
|
||||||
|
key: `alternative-public-${candidate.fromNodeId}`,
|
||||||
|
hops: [candidate],
|
||||||
|
alternativeNodeIndex: 0,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return paths;
|
||||||
|
}
|
||||||
|
|
||||||
|
const primaryNodeIds = [
|
||||||
|
primaryHops[0].fromNodeId,
|
||||||
|
...primaryHops.map((hop) => hop.toNodeId),
|
||||||
|
];
|
||||||
|
const internalCandidates = candidates.filter(
|
||||||
|
(candidate) => candidate.toRole !== "target",
|
||||||
|
);
|
||||||
|
const candidateHopMap = new Map<string, TunnelQualityCandidateHopApiItem>();
|
||||||
|
const alternativeNodes = new Map<
|
||||||
|
string,
|
||||||
|
{ column: number; nodeId: number }
|
||||||
|
>();
|
||||||
|
|
||||||
|
for (const candidate of internalCandidates) {
|
||||||
|
candidateHopMap.set(
|
||||||
|
tunnelTopologyHopKey(candidate.fromNodeId, candidate.toNodeId),
|
||||||
|
candidate,
|
||||||
|
);
|
||||||
|
|
||||||
|
const sourceColumn = candidate.hopIndex;
|
||||||
|
const targetColumn = candidate.hopIndex + 1;
|
||||||
|
|
||||||
|
if (
|
||||||
|
sourceColumn >= 0 &&
|
||||||
|
sourceColumn < primaryNodeIds.length &&
|
||||||
|
candidate.fromNodeId !== primaryNodeIds[sourceColumn]
|
||||||
|
) {
|
||||||
|
alternativeNodes.set(`${sourceColumn}:${candidate.fromNodeId}`, {
|
||||||
|
column: sourceColumn,
|
||||||
|
nodeId: candidate.fromNodeId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
targetColumn >= 0 &&
|
||||||
|
targetColumn < primaryNodeIds.length &&
|
||||||
|
candidate.toNodeId !== primaryNodeIds[targetColumn]
|
||||||
|
) {
|
||||||
|
alternativeNodes.set(`${targetColumn}:${candidate.toNodeId}`, {
|
||||||
|
column: targetColumn,
|
||||||
|
nodeId: candidate.toNodeId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const paths: TunnelTopologyPath[] = [{ key: "primary", hops: primaryHops }];
|
||||||
|
|
||||||
|
for (const alternative of alternativeNodes.values()) {
|
||||||
|
const nodeIds = [...primaryNodeIds];
|
||||||
|
|
||||||
|
nodeIds[alternative.column] = alternative.nodeId;
|
||||||
|
const hops: TunnelTopologyHop[] = [];
|
||||||
|
|
||||||
|
for (let index = 0; index < nodeIds.length - 1; index += 1) {
|
||||||
|
const fromNodeId = nodeIds[index];
|
||||||
|
const toNodeId = nodeIds[index + 1];
|
||||||
|
const usesPrimaryEdge =
|
||||||
|
fromNodeId === primaryNodeIds[index] &&
|
||||||
|
toNodeId === primaryNodeIds[index + 1];
|
||||||
|
const hop = usesPrimaryEdge
|
||||||
|
? primaryHops[index]
|
||||||
|
: candidateHopMap.get(tunnelTopologyHopKey(fromNodeId, toNodeId));
|
||||||
|
|
||||||
|
if (!hop) break;
|
||||||
|
hops.push(hop);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hops.length === primaryHops.length) {
|
||||||
|
paths.push({
|
||||||
|
key: `alternative-${alternative.column}-${alternative.nodeId}`,
|
||||||
|
hops,
|
||||||
|
alternativeNodeIndex: alternative.column,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return paths;
|
||||||
|
};
|
||||||
|
|
||||||
|
function TunnelTopologyPathRow({ path }: { path: TunnelTopologyPath }) {
|
||||||
|
return (
|
||||||
|
<div className="flex min-w-max items-center py-2">
|
||||||
|
{path.hops.map((hop, index) => {
|
||||||
|
const hasError =
|
||||||
|
Boolean(hop.errorMessage) || hop.latency < 0 || hop.loss > 0;
|
||||||
|
const colorClass =
|
||||||
|
hop.latency < 0 || hop.errorMessage
|
||||||
|
? "text-danger"
|
||||||
|
: hop.loss > 0
|
||||||
|
? "text-warning"
|
||||||
|
: "text-success";
|
||||||
|
const borderColor = hasError ? "border-danger" : "";
|
||||||
|
|
||||||
|
return (
|
||||||
|
<React.Fragment
|
||||||
|
key={`${path.key}-${hop.fromNodeId}-${hop.toNodeId}-${index}`}
|
||||||
|
>
|
||||||
|
{index === 0 ? (
|
||||||
|
<TopologyNodeChip
|
||||||
|
isAlternative={path.alternativeNodeIndex === 0}
|
||||||
|
name={hop.fromNodeName}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
<div
|
||||||
|
className="relative mx-1 flex min-w-[70px] shrink-0 flex-col items-center justify-center"
|
||||||
|
title={hop.errorMessage}
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
className={`mb-1 text-[10px] font-mono leading-none ${colorClass}`}
|
||||||
|
>
|
||||||
|
{hop.latency >= 0 && !hop.errorMessage
|
||||||
|
? `${hop.latency.toFixed(0)}ms`
|
||||||
|
: "超时"}
|
||||||
|
</span>
|
||||||
|
<div
|
||||||
|
className={`relative flex h-[2px] w-full items-center justify-end bg-default-200 ${hop.latency < 0 || hop.errorMessage ? "!bg-danger" : ""}`}
|
||||||
|
>
|
||||||
|
<ArrowRight
|
||||||
|
className={`absolute -right-2 z-10 h-3.5 w-3.5 rounded-full bg-background p-[1px] ${colorClass}`}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
className={`mt-1.5 text-[10px] font-mono leading-none ${hop.errorMessage || hop.loss > 0 ? "text-warning" : "text-default-400"}`}
|
||||||
|
>
|
||||||
|
{hop.errorMessage ? "探测失败" : `${hop.loss.toFixed(0)}% 丢包`}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<TopologyNodeChip
|
||||||
|
borderColor={borderColor}
|
||||||
|
isAlternative={path.alternativeNodeIndex === index + 1}
|
||||||
|
name={hop.toNodeName}
|
||||||
|
/>
|
||||||
|
</React.Fragment>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function TopologyNodeChip({
|
||||||
|
name,
|
||||||
|
isAlternative = false,
|
||||||
|
borderColor = "",
|
||||||
|
}: {
|
||||||
|
name: string;
|
||||||
|
isAlternative?: boolean;
|
||||||
|
borderColor?: string;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<Chip
|
||||||
|
className={`shrink-0 font-mono shadow-sm ${borderColor}`}
|
||||||
|
size="sm"
|
||||||
|
variant="flat"
|
||||||
|
>
|
||||||
|
<span className="flex items-center gap-1.5">
|
||||||
|
<span>{name}</span>
|
||||||
|
{isAlternative ? (
|
||||||
|
<span className="rounded-full bg-warning/20 px-1.5 py-0.5 text-[9px] font-semibold leading-none text-warning">
|
||||||
|
备选
|
||||||
|
</span>
|
||||||
|
) : null}
|
||||||
|
</span>
|
||||||
|
</Chip>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const ForwardingChainTopology = React.memo(function ForwardingChainTopology({
|
const ForwardingChainTopology = React.memo(function ForwardingChainTopology({
|
||||||
hopsStr,
|
hopsStr,
|
||||||
}: {
|
}: {
|
||||||
@@ -516,13 +707,12 @@ const ForwardingChainTopology = React.memo(function ForwardingChainTopology({
|
|||||||
() => parseTunnelQualityChainDetails(hopsStr),
|
() => parseTunnelQualityChainDetails(hopsStr),
|
||||||
[hopsStr],
|
[hopsStr],
|
||||||
);
|
);
|
||||||
const primaryHops = details.primaryPath ?? [];
|
const topologyPaths = useMemo(
|
||||||
const alternativeHops = useMemo(
|
() => buildTunnelTopologyPaths(details),
|
||||||
() => (details.candidateHops ?? []).filter((hop) => !hop.selected),
|
[details],
|
||||||
[details.candidateHops],
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if (primaryHops.length === 0 && alternativeHops.length === 0) return null;
|
if (topologyPaths.length === 0) return null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card className="border border-divider/60 shadow-sm transition-shadow bg-gradient-to-br from-background to-default-50/50 mt-4">
|
<Card className="border border-divider/60 shadow-sm transition-shadow bg-gradient-to-br from-background to-default-50/50 mt-4">
|
||||||
@@ -533,133 +723,25 @@ const ForwardingChainTopology = React.memo(function ForwardingChainTopology({
|
|||||||
</h3>
|
</h3>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardBody className="py-2 px-4 pb-4">
|
<CardBody className="py-2 px-4 pb-4">
|
||||||
{primaryHops.length > 0 ? (
|
<div className="max-h-80 space-y-1 overflow-auto pb-1">
|
||||||
<div className="flex items-center overflow-x-auto pb-2 py-2">
|
{topologyPaths.map((path, index) => (
|
||||||
{primaryHops.map((hop, index) => {
|
<div
|
||||||
const hasError = hop.latency < 0 || hop.loss > 0;
|
key={path.key}
|
||||||
const colorClass =
|
className={
|
||||||
hop.latency < 0
|
index === 0
|
||||||
? "text-danger"
|
? "overflow-x-auto"
|
||||||
: hop.loss > 0
|
: "overflow-x-auto border-t border-dashed border-divider/60"
|
||||||
? "text-warning"
|
}
|
||||||
: "text-success";
|
>
|
||||||
const borderColor = hasError ? "border-danger" : "";
|
<TunnelTopologyPathRow path={path} />
|
||||||
|
|
||||||
return (
|
|
||||||
<React.Fragment
|
|
||||||
key={`${hop.fromNodeId}-${hop.toNodeId}-${index}`}
|
|
||||||
>
|
|
||||||
{index === 0 ? (
|
|
||||||
<Chip
|
|
||||||
className="shrink-0 font-mono shadow-sm"
|
|
||||||
size="sm"
|
|
||||||
variant="flat"
|
|
||||||
>
|
|
||||||
{hop.fromNodeName}
|
|
||||||
</Chip>
|
|
||||||
) : null}
|
|
||||||
<div className="flex flex-col items-center justify-center min-w-[70px] mx-1 shrink-0 relative">
|
|
||||||
<span
|
|
||||||
className={`text-[10px] font-mono leading-none mb-1 ${colorClass}`}
|
|
||||||
>
|
|
||||||
{hop.latency >= 0
|
|
||||||
? `${hop.latency.toFixed(0)}ms`
|
|
||||||
: "超时"}
|
|
||||||
</span>
|
|
||||||
<div
|
|
||||||
className={`h-[2px] w-full relative flex items-center justify-end bg-default-200 ${hop.latency < 0 ? "!bg-danger" : ""}`}
|
|
||||||
>
|
|
||||||
<ArrowRight
|
|
||||||
className={`w-3.5 h-3.5 absolute -right-2 ${colorClass} bg-background rounded-full p-[1px] z-10`}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<span
|
|
||||||
className={`text-[10px] font-mono leading-none mt-1.5 ${hop.loss > 0 ? "text-warning" : "text-default-400"}`}
|
|
||||||
>
|
|
||||||
{hop.loss.toFixed(0)}% 丢包
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<Chip
|
|
||||||
className={`shrink-0 font-mono shadow-sm ${borderColor}`}
|
|
||||||
size="sm"
|
|
||||||
variant="flat"
|
|
||||||
>
|
|
||||||
{hop.toNodeName}
|
|
||||||
</Chip>
|
|
||||||
</React.Fragment>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
) : null}
|
|
||||||
|
|
||||||
{alternativeHops.length > 0 ? (
|
|
||||||
<div
|
|
||||||
className={`${primaryHops.length > 0 ? "mt-3 border-t border-divider/60 pt-3" : ""}`}
|
|
||||||
>
|
|
||||||
<div className="mb-2 flex items-center justify-between gap-2">
|
|
||||||
<span className="text-xs font-semibold text-default-600">
|
|
||||||
备选节点实时延迟
|
|
||||||
</span>
|
|
||||||
<span className="text-[10px] text-default-400">
|
|
||||||
{alternativeHops.length} 条候选链路
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
<div className="grid max-h-72 grid-cols-1 gap-2 overflow-y-auto pr-1 md:grid-cols-2">
|
))}
|
||||||
{alternativeHops.map((hop) => (
|
</div>
|
||||||
<CandidateHopLatency
|
|
||||||
key={`${hop.hopIndex}-${hop.fromNodeId}-${hop.toRole}-${hop.toNodeId || hop.toNodeName}`}
|
|
||||||
hop={hop}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
) : null}
|
|
||||||
</CardBody>
|
</CardBody>
|
||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
function CandidateHopLatency({
|
|
||||||
hop,
|
|
||||||
}: {
|
|
||||||
hop: TunnelQualityCandidateHopApiItem;
|
|
||||||
}) {
|
|
||||||
const hasError = Boolean(hop.errorMessage) || hop.latency < 0;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="rounded-xl border border-divider/60 bg-default-50/50 px-3 py-2.5">
|
|
||||||
<div className="flex items-center gap-2 text-xs">
|
|
||||||
<span className="min-w-0 truncate font-medium text-foreground">
|
|
||||||
{hop.fromNodeName}
|
|
||||||
</span>
|
|
||||||
<ArrowRight className="h-3.5 w-3.5 shrink-0 text-default-400" />
|
|
||||||
<span className="min-w-0 truncate font-medium text-foreground">
|
|
||||||
{hop.toNodeName}
|
|
||||||
</span>
|
|
||||||
<span className="ml-auto shrink-0">
|
|
||||||
<LatencyDisplay value={hop.latency} />
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="mt-1.5 flex items-center gap-2 text-[10px] text-default-400">
|
|
||||||
<span>
|
|
||||||
{candidateRoleLabel(hop.fromRole)} → {candidateRoleLabel(hop.toRole)}
|
|
||||||
</span>
|
|
||||||
{hasError ? (
|
|
||||||
<span className="ml-auto truncate text-danger">
|
|
||||||
{hop.errorMessage || "探测失败"}
|
|
||||||
</span>
|
|
||||||
) : (
|
|
||||||
<span
|
|
||||||
className={`ml-auto font-mono ${hop.loss > 0 ? "text-warning" : "text-default-500"}`}
|
|
||||||
>
|
|
||||||
{hop.loss.toFixed(0)}% 丢包
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function TunnelMonitorView({
|
export function TunnelMonitorView({
|
||||||
viewMode = "grid",
|
viewMode = "grid",
|
||||||
}: TunnelMonitorViewProps) {
|
}: TunnelMonitorViewProps) {
|
||||||
|
|||||||
@@ -49,6 +49,41 @@ function useModalContext() {
|
|||||||
return React.useContext(ModalContext);
|
return React.useContext(ModalContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface ScrollPosition {
|
||||||
|
element: HTMLElement | null;
|
||||||
|
left: number;
|
||||||
|
top: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
function captureScrollPositions(): ScrollPosition[] {
|
||||||
|
const positions: ScrollPosition[] = [
|
||||||
|
{ element: null, left: window.scrollX, top: window.scrollY },
|
||||||
|
];
|
||||||
|
|
||||||
|
for (const element of Array.from(
|
||||||
|
document.querySelectorAll<HTMLElement>("main, [data-scroll-container]"),
|
||||||
|
)) {
|
||||||
|
positions.push({
|
||||||
|
element,
|
||||||
|
left: element.scrollLeft,
|
||||||
|
top: element.scrollTop,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return positions;
|
||||||
|
}
|
||||||
|
|
||||||
|
function restoreScrollPositions(positions: ScrollPosition[]) {
|
||||||
|
for (const position of positions) {
|
||||||
|
if (position.element) {
|
||||||
|
position.element.scrollLeft = position.left;
|
||||||
|
position.element.scrollTop = position.top;
|
||||||
|
} else {
|
||||||
|
window.scrollTo(position.left, position.top);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
type ModalSize = "sm" | "md" | "lg" | "xl" | "2xl" | "4xl" | "full";
|
type ModalSize = "sm" | "md" | "lg" | "xl" | "2xl" | "4xl" | "full";
|
||||||
|
|
||||||
function mapSize(size: ModalSize | undefined) {
|
function mapSize(size: ModalSize | undefined) {
|
||||||
@@ -97,6 +132,46 @@ export function Modal({
|
|||||||
scrollBehavior,
|
scrollBehavior,
|
||||||
size,
|
size,
|
||||||
}: ModalProps) {
|
}: ModalProps) {
|
||||||
|
const previousScrollPositionsRef = React.useRef<ScrollPosition[] | null>(
|
||||||
|
null,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Radix focus management and scroll locking can move an ancestor scroll
|
||||||
|
// container when a modal is opened from a card/grid item. Capture the
|
||||||
|
// current positions before the open render and restore them after focus
|
||||||
|
// settles so opening a modal never changes the page position.
|
||||||
|
React.useLayoutEffect(() => {
|
||||||
|
return () => {
|
||||||
|
if (!isOpen) {
|
||||||
|
previousScrollPositionsRef.current = captureScrollPositions();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}, [isOpen]);
|
||||||
|
|
||||||
|
React.useLayoutEffect(() => {
|
||||||
|
const positions = previousScrollPositionsRef.current;
|
||||||
|
|
||||||
|
if (!isOpen || !positions) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
restoreScrollPositions(positions);
|
||||||
|
let nestedFrame = 0;
|
||||||
|
const frame = window.requestAnimationFrame(() => {
|
||||||
|
restoreScrollPositions(positions);
|
||||||
|
nestedFrame = window.requestAnimationFrame(() =>
|
||||||
|
restoreScrollPositions(positions),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
previousScrollPositionsRef.current = null;
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
window.cancelAnimationFrame(frame);
|
||||||
|
window.cancelAnimationFrame(nestedFrame);
|
||||||
|
};
|
||||||
|
}, [isOpen]);
|
||||||
|
|
||||||
const handleOpenChange = (open: boolean) => {
|
const handleOpenChange = (open: boolean) => {
|
||||||
onOpenChange?.(open);
|
onOpenChange?.(open);
|
||||||
if (!open) {
|
if (!open) {
|
||||||
|
|||||||
Reference in New Issue
Block a user