mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-16 01:26:07 +00:00
claude[bot]
fbad71d620
Second-pass review of the 54-commit self-correcting audit. Each item below was confirmed by reading the surrounding source (and, where practical, the pre-fix code) before being changed; regression tests are included for every behavioral fix. Concurrency: - eventbus: Bus.Subscribe called wg.Add with no synchronization against a concurrent Bus.Stop's wg.Wait, a real "WaitGroup misuse" panic risk (e.g. a Telegram-bot settings save racing panel shutdown/restart). Stop now flips a mu-guarded `stopped` flag before waiting, and Subscribe checks it under the same lock, so Add and Wait can no longer race. Security: - login_limiter: evictForRoom's fallback eviction picked an arbitrary map key, including ones still under an active cooldown - an attacker flooding /login with fresh usernames could evict their own (or anyone's) blocked record and reset the lockout. The fallback now skips actively-blocked records, only falling back to an unconditional evict if the map is somehow entirely full of active blocks (preserves the hard memory cap). Subscription-endpoint panics (reachable by any client hitting /sub): - internal/sub/service.go: applyPathAndHostParams/Obj (ws/httpupgrade/xhttp with no path settings object) and the TLS alpn readers in three places used unchecked type assertions - exactly the bug classabab7cd0patched elsewhere in the same switch statements, just not these call sites. - internal/sub/json_service.go, clash_service.go: the externalProxy loops in the JSON and Clash generators used unchecked assertions on a legacy/admin-supplied field (missing "port", non-object entry, etc.). - internal/sub/json_service.go: realityData's shortId/serverName selection could assert a non-string array element. Other correctness: - client_traffic.go: ResetAllTraffics (touched by3eb214d0) still skipped clearing NodeClientTraffic node-sync baselines, unlike its sibling reset paths in the same file - a node's next sync would re-add pre-reset delta on top of the freshly-zeroed counter. - inbound_traffic.go: the traffic-tick tx's Commit/Rollback errors were silently discarded; now logged so a backend-level commit failure (e.g. an aborted Postgres tx from a best-effort helper) doesn't masquerade as a successful tick. - outbound_subscription.go: the new subscriptionFetchClient doc comment was wedged between fetchAndStore's existing comment and fetchAndStore itself, leaving fetchAndStore undocumented and the comment describing the wrong function. Convention cleanup: - Removed narrative // comments added by the audit that violate this repo's no-inline-comment rule (mostly narrating the specific bug/fix rather than a lasting contract, and mostly on new Test functions, which this repo's existing tests never comment) - calibrated against this exact codebase's own pre-existing comment style so legitimate godoc-style doc comments were left alone.
69 lines
1.7 KiB
Go
69 lines
1.7 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/runtime"
|
|
)
|
|
|
|
type blockingResetRuntime struct {
|
|
fakeNodeRuntime
|
|
reached chan struct{}
|
|
release chan struct{}
|
|
}
|
|
|
|
func (b *blockingResetRuntime) ResetAllTraffics(context.Context) error {
|
|
close(b.reached)
|
|
<-b.release
|
|
return nil
|
|
}
|
|
|
|
func TestResetAllTrafficsDoesNotBlockWriterOnNodeCall(t *testing.T) {
|
|
db := initTrafficTestDB(t)
|
|
resetTrafficWriterForTest(t)
|
|
StartTrafficWriter()
|
|
|
|
mgr := runtime.NewManager(runtime.LocalDeps{APIPort: func() int { return 0 }})
|
|
runtime.SetManager(mgr)
|
|
t.Cleanup(func() { runtime.SetManager(nil) })
|
|
|
|
node := &model.Node{Name: "n1", Address: "127.0.0.1", Port: 2096, ApiToken: "tok", Enable: true, Status: "online"}
|
|
if err := db.Create(node).Error; err != nil {
|
|
t.Fatalf("create node: %v", err)
|
|
}
|
|
fake := &blockingResetRuntime{reached: make(chan struct{}), release: make(chan struct{})}
|
|
mgr.SetRuntimeOverride(node.Id, fake)
|
|
|
|
done := make(chan error, 1)
|
|
go func() { done <- (&InboundService{}).ResetAllTraffics() }()
|
|
|
|
select {
|
|
case <-fake.reached:
|
|
case <-time.After(3 * time.Second):
|
|
close(fake.release)
|
|
t.Fatal("node ResetAllTraffics was never reached")
|
|
}
|
|
|
|
writerFree := make(chan error, 1)
|
|
go func() { writerFree <- submitTrafficWrite(func() error { return nil }) }()
|
|
select {
|
|
case err := <-writerFree:
|
|
if err != nil {
|
|
close(fake.release)
|
|
t.Fatalf("concurrent writer submit failed: %v", err)
|
|
}
|
|
case <-time.After(2 * time.Second):
|
|
close(fake.release)
|
|
<-done
|
|
t.Fatal("the serial traffic writer was blocked by a node reset HTTP call")
|
|
}
|
|
|
|
close(fake.release)
|
|
if err := <-done; err != nil {
|
|
t.Fatalf("ResetAllTraffics: %v", err)
|
|
}
|
|
}
|