Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/MHSanaei/3x-ui.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpwnnex <pwnnex@proton.me>2026-04-28 18:49:39 +0300
committerGitHub <noreply@github.com>2026-04-28 18:49:39 +0300
commit22de983752fb4cc10bd16b756c4ccaab239e2e3b (patch)
treec527ca1ef767587b7fff1cfcb07293b7fc6fcd2e /web/service/xray_setting.go
parent0b5c239f98fd112df10ed4846377563a391ebf60 (diff)
xray-setting: pin api routing rule to index 0 on save (#4124)
when the admin adds a custom outbound (eg vless cascade to a second server) and a routing rule sending all inbound traffic to it, that catch-all gets evaluated before the existing api->api rule, so the panel's internal stats inbound's traffic ends up on the cascade outbound. the grpc stats query then can't see anything, GetTraffic returns no inbound/user counters, and every client appears offline with zero traffic even though the actual proxy path works fine. before save, find the api rule and move it to the front of routing.rules. if it's missing entirely, insert a default. other rules keep their relative order. closes #4113. probably also fixes the long-standing #2818 where the documented workaround was "manually move the api rule to the top".
Diffstat (limited to 'web/service/xray_setting.go')
-rw-r--r--web/service/xray_setting.go120
1 files changed, 120 insertions, 0 deletions
diff --git a/web/service/xray_setting.go b/web/service/xray_setting.go
index 4c3892e4..da77404a 100644
--- a/web/service/xray_setting.go
+++ b/web/service/xray_setting.go
@@ -24,6 +24,9 @@ func (s *XraySettingService) SaveXraySetting(newXraySettings string) error {
if err := s.CheckXrayConfig(newXraySettings); err != nil {
return err
}
+ if hoisted, err := EnsureStatsRouting(newXraySettings); err == nil {
+ newXraySettings = hoisted
+ }
return s.SettingService.saveSetting("xrayTemplateConfig", newXraySettings)
}
@@ -83,3 +86,120 @@ func UnwrapXrayTemplateConfig(raw string) string {
}
return raw
}
+
+// EnsureStatsRouting hoists the `api -> api` routing rule to the front
+// of routing.rules so the stats query path is never starved by a
+// catch-all rule the admin may have added or reordered above it.
+//
+// Why this matters (#4113, #2818): an admin who adds a cascade outbound
+// (e.g. vless to another server) and a routing rule sending all inbound
+// traffic to it ends up sending the internal stats inbound's traffic to
+// that cascade too, since rules are evaluated top-to-bottom and the
+// catch-all matches first. The panel's gRPC stats query then can't reach
+// the running xray instance, GetTraffic returns nothing, and every
+// client appears offline with zero traffic even though the actual proxy
+// path works fine.
+//
+// The api inbound is special-cased internal infrastructure for the
+// panel, not something the admin should ever route to a real outbound.
+// Keeping its rule pinned at index 0 is the only correct configuration.
+//
+// If the api rule is already at index 0 the input is returned unchanged.
+// If it exists somewhere else it is moved. If it is missing entirely a
+// default rule (`type=field, inboundTag=[api], outboundTag=api`) is
+// inserted at the front. Other routing entries keep their relative order.
+func EnsureStatsRouting(raw string) (string, error) {
+ var cfg map[string]json.RawMessage
+ if err := json.Unmarshal([]byte(raw), &cfg); err != nil {
+ return raw, err
+ }
+
+ var routing map[string]json.RawMessage
+ if r, ok := cfg["routing"]; ok && len(r) > 0 {
+ if err := json.Unmarshal(r, &routing); err != nil {
+ return raw, err
+ }
+ }
+ if routing == nil {
+ routing = make(map[string]json.RawMessage)
+ }
+
+ var rules []map[string]any
+ if r, ok := routing["rules"]; ok && len(r) > 0 {
+ if err := json.Unmarshal(r, &rules); err != nil {
+ return raw, err
+ }
+ }
+
+ apiIdx := findApiRule(rules)
+ if apiIdx == 0 {
+ return raw, nil // already correct, don't churn the JSON
+ }
+
+ var apiRule map[string]any
+ if apiIdx > 0 {
+ apiRule = rules[apiIdx]
+ rules = append(rules[:apiIdx], rules[apiIdx+1:]...)
+ } else {
+ apiRule = map[string]any{
+ "type": "field",
+ "inboundTag": []string{"api"},
+ "outboundTag": "api",
+ }
+ }
+ rules = append([]map[string]any{apiRule}, rules...)
+
+ rulesJSON, err := json.Marshal(rules)
+ if err != nil {
+ return raw, err
+ }
+ routing["rules"] = rulesJSON
+
+ routingJSON, err := json.Marshal(routing)
+ if err != nil {
+ return raw, err
+ }
+ cfg["routing"] = routingJSON
+
+ out, err := json.Marshal(cfg)
+ if err != nil {
+ return raw, err
+ }
+ return string(out), nil
+}
+
+// findApiRule returns the index of the routing rule that targets the
+// internal api inbound (inboundTag contains "api" and outboundTag is
+// "api"), or -1 if no such rule exists.
+func findApiRule(rules []map[string]any) int {
+ for i, rule := range rules {
+ if outTag, _ := rule["outboundTag"].(string); outTag != "api" {
+ continue
+ }
+ raw, ok := rule["inboundTag"]
+ if !ok {
+ continue
+ }
+ // inboundTag is usually []string but can come as []any from a
+ // roundtrip through map[string]any. Accept both shapes.
+ switch tags := raw.(type) {
+ case []any:
+ for _, t := range tags {
+ if s, ok := t.(string); ok && s == "api" {
+ return i
+ }
+ }
+ case []string:
+ for _, s := range tags {
+ if s == "api" {
+ return i
+ }
+ }
+ case string:
+ if tags == "api" {
+ return i
+ }
+ }
+ }
+ return -1
+}