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.
90 lines
2.4 KiB
Go
90 lines
2.4 KiB
Go
package xray
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func TestRemoveUserGuardsNilHandlerClient(t *testing.T) {
|
|
err := (&XrayAPI{}).RemoveUser("in-443-tcp", "user@example.com")
|
|
if err == nil {
|
|
t.Fatal("RemoveUser with an uninitialized HandlerServiceClient must return an error")
|
|
}
|
|
}
|
|
|
|
func TestGetRequiredUserString_Present(t *testing.T) {
|
|
user := map[string]any{"email": "alice@example.com"}
|
|
got, err := getRequiredUserString(user, "email")
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if got != "alice@example.com" {
|
|
t.Fatalf("got %q, want %q", got, "alice@example.com")
|
|
}
|
|
}
|
|
|
|
func TestGetRequiredUserString_Missing(t *testing.T) {
|
|
user := map[string]any{}
|
|
if _, err := getRequiredUserString(user, "email"); err == nil {
|
|
t.Fatal("expected error for missing key")
|
|
}
|
|
}
|
|
|
|
func TestGetRequiredUserString_NilValue(t *testing.T) {
|
|
user := map[string]any{"email": nil}
|
|
if _, err := getRequiredUserString(user, "email"); err == nil {
|
|
t.Fatal("expected error for nil value")
|
|
}
|
|
}
|
|
|
|
func TestGetRequiredUserString_WrongType(t *testing.T) {
|
|
user := map[string]any{"email": 42}
|
|
_, err := getRequiredUserString(user, "email")
|
|
if err == nil {
|
|
t.Fatal("expected error for non-string value")
|
|
}
|
|
if !strings.Contains(err.Error(), "invalid type") {
|
|
t.Fatalf("expected %q in error, got: %v", "invalid type", err)
|
|
}
|
|
}
|
|
|
|
func TestGetOptionalUserString_Present(t *testing.T) {
|
|
user := map[string]any{"flow": "xtls-rprx-vision"}
|
|
got, err := getOptionalUserString(user, "flow")
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
if got != "xtls-rprx-vision" {
|
|
t.Fatalf("got %q, want %q", got, "xtls-rprx-vision")
|
|
}
|
|
}
|
|
|
|
func TestGetOptionalUserString_MissingReturnsEmptyNoError(t *testing.T) {
|
|
user := map[string]any{}
|
|
got, err := getOptionalUserString(user, "flow")
|
|
if err != nil {
|
|
t.Fatalf("unexpected error for missing optional field: %v", err)
|
|
}
|
|
if got != "" {
|
|
t.Fatalf("got %q, want empty string", got)
|
|
}
|
|
}
|
|
|
|
func TestGetOptionalUserString_NilReturnsEmptyNoError(t *testing.T) {
|
|
user := map[string]any{"flow": nil}
|
|
got, err := getOptionalUserString(user, "flow")
|
|
if err != nil {
|
|
t.Fatalf("unexpected error for nil optional field: %v", err)
|
|
}
|
|
if got != "" {
|
|
t.Fatalf("got %q, want empty string", got)
|
|
}
|
|
}
|
|
|
|
func TestGetOptionalUserString_WrongTypeErrors(t *testing.T) {
|
|
user := map[string]any{"flow": []string{"a", "b"}}
|
|
if _, err := getOptionalUserString(user, "flow"); err == nil {
|
|
t.Fatal("expected error for non-string optional value")
|
|
}
|
|
}
|