mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-09-28 20:56:42 +08:00
8f1201553e
* fix(ip-limit): CAS-retry inbound_client_ips merges under Postgres Two writers RMW the same ips JSON blob; on PostgreSQL a lost update drops remote IPs that partitionLiveIps only sees through that blob (#6587). Compare-and-set on the previous blob with re-merge on miss, matching the repo's conditional Where+RowsAffected pattern. Fixes #6587 * ci: retrigger frontend after npm registry maintenance The frontend job failed solely on `npm audit` while registry.npmjs.org returned 503 (Service Under Maintenance). Lint, typecheck, vitest, vite build, and storybook all passed. Local `npm audit --omit=dev --audit-level=high` now reports 0 vulnerabilities. * test(ip-limit): cover the scan's CAS against a mid-scan node sync The job-side compare-and-set had no test of its own. A write injected between the scan's read and its update now has to keep the node's remote IP; main's blind Save drops it. Also keeps the new comments to two lines, as CLAUDE.md requires. --------- Co-authored-by: mrchatam <mrchatam@users.noreply.github.com> Co-authored-by: MHSanaei <ho3ein.sanaei@gmail.com>
321 lines
9.4 KiB
Go
321 lines
9.4 KiB
Go
package service
|
|
|
|
import (
|
|
"encoding/json"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
// setupClientIpTestDB spins up a throwaway SQLite database (migrations + seeders)
|
|
// for a single test, mirroring the harness used by the other service tests.
|
|
func setupClientIpTestDB(t *testing.T) {
|
|
t.Helper()
|
|
dbDir := t.TempDir()
|
|
t.Setenv("XUI_DB_FOLDER", dbDir)
|
|
if err := database.InitDB(filepath.Join(dbDir, "x-ui.db")); err != nil {
|
|
t.Fatalf("InitDB: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = database.CloseDB() })
|
|
}
|
|
|
|
func marshalIps(t *testing.T, entries ...clientIpEntry) string {
|
|
t.Helper()
|
|
b, err := json.Marshal(entries)
|
|
if err != nil {
|
|
t.Fatalf("marshal ips: %v", err)
|
|
}
|
|
return string(b)
|
|
}
|
|
|
|
// readClientIps returns the stored IP entries for an email as a map[ip]timestamp,
|
|
// plus whether the row exists at all.
|
|
func readClientIps(t *testing.T, email string) (map[string]int64, bool) {
|
|
t.Helper()
|
|
var row model.InboundClientIps
|
|
err := database.GetDB().Where("client_email = ?", email).First(&row).Error
|
|
if database.IsNotFound(err) {
|
|
return nil, false
|
|
}
|
|
if err != nil {
|
|
t.Fatalf("read client ips for %s: %v", email, err)
|
|
}
|
|
var entries []clientIpEntry
|
|
if row.Ips != "" {
|
|
if err := json.Unmarshal([]byte(row.Ips), &entries); err != nil {
|
|
t.Fatalf("unmarshal stored ips for %s: %v", email, err)
|
|
}
|
|
}
|
|
out := make(map[string]int64, len(entries))
|
|
for _, e := range entries {
|
|
out[e.IP] = e.Timestamp
|
|
}
|
|
return out, true
|
|
}
|
|
|
|
func TestMergeInboundClientIps_CreatesNodeOnlyRowIgnoringRemoteId(t *testing.T) {
|
|
setupClientIpTestDB(t)
|
|
db := database.GetDB()
|
|
now := time.Now().Unix()
|
|
|
|
// Local client occupies id 1.
|
|
local := &model.InboundClientIps{ClientEmail: "local@x", Ips: marshalIps(t, clientIpEntry{IP: "1.1.1.1", Timestamp: now})}
|
|
if err := db.Create(local).Error; err != nil {
|
|
t.Fatalf("seed local row: %v", err)
|
|
}
|
|
|
|
// Incoming node-only client carries the remote node's id 1, which must not
|
|
// collide with the local row.
|
|
incoming := []model.InboundClientIps{{
|
|
Id: 1,
|
|
ClientEmail: "node@x",
|
|
Ips: marshalIps(t, clientIpEntry{IP: "2.2.2.2", Timestamp: now}),
|
|
}}
|
|
if err := (&InboundService{}).MergeInboundClientIps(incoming); err != nil {
|
|
t.Fatalf("merge: %v", err)
|
|
}
|
|
|
|
// Local row is untouched.
|
|
if ips, ok := readClientIps(t, "local@x"); !ok || ips["1.1.1.1"] != now {
|
|
t.Fatalf("local@x changed unexpectedly: %v (exists=%v)", ips, ok)
|
|
}
|
|
|
|
// Node row exists with its own ip and a freshly assigned id (not the remote 1).
|
|
var nodeRow model.InboundClientIps
|
|
if err := db.Where("client_email = ?", "node@x").First(&nodeRow).Error; err != nil {
|
|
t.Fatalf("node@x not created: %v", err)
|
|
}
|
|
if nodeRow.Id == local.Id {
|
|
t.Fatalf("node@x reused local id %d instead of a fresh one", nodeRow.Id)
|
|
}
|
|
if ips, _ := readClientIps(t, "node@x"); ips["2.2.2.2"] != now {
|
|
t.Fatalf("node@x missing expected ip: %v", ips)
|
|
}
|
|
}
|
|
|
|
func TestMergeInboundClientIps_DedupKeepsMaxTimestamp(t *testing.T) {
|
|
setupClientIpTestDB(t)
|
|
db := database.GetDB()
|
|
now := time.Now().Unix()
|
|
|
|
if err := db.Create(&model.InboundClientIps{
|
|
ClientEmail: "a@x",
|
|
Ips: marshalIps(t, clientIpEntry{IP: "1.1.1.1", Timestamp: now - 100}),
|
|
}).Error; err != nil {
|
|
t.Fatalf("seed: %v", err)
|
|
}
|
|
|
|
incoming := []model.InboundClientIps{{
|
|
ClientEmail: "a@x",
|
|
Ips: marshalIps(t,
|
|
clientIpEntry{IP: "1.1.1.1", Timestamp: now - 50}, // newer than stored -> wins
|
|
clientIpEntry{IP: "2.2.2.2", Timestamp: now - 10},
|
|
),
|
|
}}
|
|
if err := (&InboundService{}).MergeInboundClientIps(incoming); err != nil {
|
|
t.Fatalf("merge: %v", err)
|
|
}
|
|
|
|
ips, _ := readClientIps(t, "a@x")
|
|
if len(ips) != 2 {
|
|
t.Fatalf("want 2 ips, got %v", ips)
|
|
}
|
|
if ips["1.1.1.1"] != now-50 {
|
|
t.Fatalf("1.1.1.1 should keep max timestamp %d, got %d", now-50, ips["1.1.1.1"])
|
|
}
|
|
if ips["2.2.2.2"] != now-10 {
|
|
t.Fatalf("2.2.2.2 missing/incorrect: %d", ips["2.2.2.2"])
|
|
}
|
|
}
|
|
|
|
func TestMergeInboundClientIps_DropsStaleIps(t *testing.T) {
|
|
setupClientIpTestDB(t)
|
|
db := database.GetDB()
|
|
now := time.Now().Unix()
|
|
|
|
if err := db.Create(&model.InboundClientIps{
|
|
ClientEmail: "a@x",
|
|
Ips: marshalIps(t,
|
|
clientIpEntry{IP: "old", Timestamp: now - 3600}, // > 30m -> stale
|
|
clientIpEntry{IP: "fresh", Timestamp: now - 60},
|
|
),
|
|
}).Error; err != nil {
|
|
t.Fatalf("seed: %v", err)
|
|
}
|
|
|
|
incoming := []model.InboundClientIps{{
|
|
ClientEmail: "a@x",
|
|
Ips: marshalIps(t,
|
|
clientIpEntry{IP: "incStale", Timestamp: now - 4000}, // > 30m -> stale
|
|
clientIpEntry{IP: "incFresh", Timestamp: now - 10},
|
|
),
|
|
}}
|
|
if err := (&InboundService{}).MergeInboundClientIps(incoming); err != nil {
|
|
t.Fatalf("merge: %v", err)
|
|
}
|
|
|
|
ips, _ := readClientIps(t, "a@x")
|
|
if len(ips) != 2 {
|
|
t.Fatalf("want only fresh ips, got %v", ips)
|
|
}
|
|
if _, ok := ips["old"]; ok {
|
|
t.Fatalf("stale local ip not dropped: %v", ips)
|
|
}
|
|
if _, ok := ips["incStale"]; ok {
|
|
t.Fatalf("stale incoming ip not dropped: %v", ips)
|
|
}
|
|
if ips["fresh"] != now-60 || ips["incFresh"] != now-10 {
|
|
t.Fatalf("fresh ips wrong: %v", ips)
|
|
}
|
|
}
|
|
|
|
func TestMergeInboundClientIps_SkipsAllStaleCreate(t *testing.T) {
|
|
setupClientIpTestDB(t)
|
|
now := time.Now().Unix()
|
|
|
|
incoming := []model.InboundClientIps{{
|
|
ClientEmail: "b@x",
|
|
Ips: marshalIps(t, clientIpEntry{IP: "1.1.1.1", Timestamp: now - 9999}),
|
|
}}
|
|
if err := (&InboundService{}).MergeInboundClientIps(incoming); err != nil {
|
|
t.Fatalf("merge: %v", err)
|
|
}
|
|
|
|
if _, ok := readClientIps(t, "b@x"); ok {
|
|
t.Fatalf("all-stale node-only client should not create a row")
|
|
}
|
|
}
|
|
|
|
func TestMergeInboundClientIps_SkipsBlankRows(t *testing.T) {
|
|
setupClientIpTestDB(t)
|
|
now := time.Now().Unix()
|
|
|
|
incoming := []model.InboundClientIps{
|
|
{ClientEmail: "", Ips: marshalIps(t, clientIpEntry{IP: "1.1.1.1", Timestamp: now})},
|
|
{ClientEmail: "c@x", Ips: ""},
|
|
}
|
|
if err := (&InboundService{}).MergeInboundClientIps(incoming); err != nil {
|
|
t.Fatalf("merge: %v", err)
|
|
}
|
|
|
|
var count int64
|
|
if err := database.GetDB().Model(&model.InboundClientIps{}).Count(&count).Error; err != nil {
|
|
t.Fatalf("count: %v", err)
|
|
}
|
|
if count != 0 {
|
|
t.Fatalf("blank rows should be skipped, but %d row(s) created", count)
|
|
}
|
|
}
|
|
|
|
func TestCasUpdateInboundClientIps_MatchAndMismatch(t *testing.T) {
|
|
setupClientIpTestDB(t)
|
|
db := database.GetDB()
|
|
now := time.Now().Unix()
|
|
|
|
seed := &model.InboundClientIps{
|
|
ClientEmail: "cas@x",
|
|
Ips: marshalIps(t, clientIpEntry{IP: "1.1.1.1", Timestamp: now}),
|
|
}
|
|
if err := db.Create(seed).Error; err != nil {
|
|
t.Fatalf("seed: %v", err)
|
|
}
|
|
|
|
next := marshalIps(t, clientIpEntry{IP: "2.2.2.2", Timestamp: now})
|
|
ok, err := CasUpdateInboundClientIps(db, seed.Id, "not-the-blob", next)
|
|
if err != nil {
|
|
t.Fatalf("stale CAS: %v", err)
|
|
}
|
|
if ok {
|
|
t.Fatalf("CAS with wrong expected must not update")
|
|
}
|
|
ips, _ := readClientIps(t, "cas@x")
|
|
if ips["1.1.1.1"] != now || len(ips) != 1 {
|
|
t.Fatalf("row changed on stale CAS: %v", ips)
|
|
}
|
|
|
|
ok, err = CasUpdateInboundClientIps(db, seed.Id, seed.Ips, next)
|
|
if err != nil {
|
|
t.Fatalf("fresh CAS: %v", err)
|
|
}
|
|
if !ok {
|
|
t.Fatalf("CAS with matching expected must update")
|
|
}
|
|
ips, _ = readClientIps(t, "cas@x")
|
|
if ips["2.2.2.2"] != now || len(ips) != 1 {
|
|
t.Fatalf("fresh CAS did not land: %v", ips)
|
|
}
|
|
}
|
|
|
|
// A job write landing between the merge's read and its Update must not drop the
|
|
// node's report (#6587); a Before(update) hook injects it, since SQLite serializes writers.
|
|
func TestMergeInboundClientIps_RetriesAfterConcurrentWriter(t *testing.T) {
|
|
setupClientIpTestDB(t)
|
|
db := database.GetDB()
|
|
now := time.Now().Unix()
|
|
|
|
seed := &model.InboundClientIps{
|
|
ClientEmail: "race@x",
|
|
Ips: marshalIps(t, clientIpEntry{IP: "10.0.0.1", Timestamp: now - 30}),
|
|
}
|
|
if err := db.Create(seed).Error; err != nil {
|
|
t.Fatalf("seed: %v", err)
|
|
}
|
|
|
|
jobBlob := marshalIps(t, clientIpEntry{IP: "10.0.0.2", Timestamp: now - 10})
|
|
const callback = "test:inbound_client_ips_cas_inject"
|
|
injected := false
|
|
if err := db.Callback().Update().Before("gorm:update").Register(callback, func(tx *gorm.DB) {
|
|
if injected {
|
|
return
|
|
}
|
|
table := tx.Statement.Table
|
|
if table == "" && tx.Statement.Schema != nil {
|
|
table = tx.Statement.Schema.Table
|
|
}
|
|
if table != "inbound_client_ips" {
|
|
return
|
|
}
|
|
injected = true
|
|
// Same connection, SkipHooks: simulate the job committing a different
|
|
// blob before this merge's CAS Update runs.
|
|
if err := tx.Session(&gorm.Session{SkipHooks: true}).
|
|
Model(&model.InboundClientIps{}).
|
|
Where("id = ?", seed.Id).
|
|
Update("ips", jobBlob).Error; err != nil {
|
|
tx.AddError(err)
|
|
}
|
|
}); err != nil {
|
|
t.Fatalf("register callback: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = db.Callback().Update().Remove(callback) })
|
|
|
|
incoming := []model.InboundClientIps{{
|
|
ClientEmail: "race@x",
|
|
Ips: marshalIps(t, clientIpEntry{IP: "10.0.0.3", Timestamp: now}),
|
|
}}
|
|
if err := (&InboundService{}).MergeInboundClientIps(incoming); err != nil {
|
|
t.Fatalf("merge: %v", err)
|
|
}
|
|
if !injected {
|
|
t.Fatalf("inject callback never fired; CAS path untested")
|
|
}
|
|
|
|
ips, _ := readClientIps(t, "race@x")
|
|
// After the injected job write (only .2) and the node's .3 report, both
|
|
// must survive. .1 was only in the pre-job snapshot and is correctly gone.
|
|
if _, ok := ips["10.0.0.2"]; !ok {
|
|
t.Fatalf("job IP lost after merge retry: %v", ips)
|
|
}
|
|
if _, ok := ips["10.0.0.3"]; !ok {
|
|
t.Fatalf("node IP lost (the #6587 failure mode): %v", ips)
|
|
}
|
|
if _, ok := ips["10.0.0.1"]; ok {
|
|
t.Fatalf("pre-job IP should not resurrect after job replaced the blob: %v", ips)
|
|
}
|
|
}
|