pjandro/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-11-10 23:25:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(routing): insert new rules after api instead of appending at the end"

Browse Source 
This reverts commit 638458bd. Reordering new rules to the top by
creation-time was a blunt heuristic: it fixed a rule silently shadowed
by an unrestricted catch-all above it, but breaks the opposite,
equally valid setup -- e.g. a pre-existing "youtube -> interfaceA" rule
(no inboundTag restriction, meant to apply everywhere) followed by a
new "amneziawg -> interfaceB" rule. Under the reverted logic the newer,
broader-matching amneziawg rule would jump above the youtube rule and
shadow it for amneziawg-sourced traffic -- the exact same class of bug
this was meant to fix, just aimed the other way.

Xray's rule order encodes real admin intent (which rule should win for
overlapping traffic) that creation time can't safely stand in for.
Back to plain append-at-the-end; admins reorder manually with the
existing moveUp/moveDown controls, same as upstream's own behavior.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Kuzz007
2026-07-26 19:14:56 +03:00
parent 638458bdea
commit f70002d9a6
2 changed files with 3 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/xray/routing/RoutingTab.tsx
+3 -15
View File
@@ -21,7 +21,7 @@ import RuleFormModal from './RuleFormModal';
import type { RoutingRule } from './RuleFormModal';
import RuleCardList from './RuleCardList';
import { useRoutingColumns } from './useRoutingColumns';
import { arrJoin, originalRuleIndex, isApiRule } from './helpers';
import { arrJoin, originalRuleIndex } from './helpers';
import type { RuleRow } from './types';
import type { XraySettingsValue, SetTemplate } from '@/hooks/useXraySetting';
import type { RuleObject } from '@/schemas/routing';
@@ -209,20 +209,8 @@ export default function RoutingTab({
if (!tt.routing) tt.routing = { rules: [] };
if (!Array.isArray(tt.routing.rules)) tt.routing.rules = [];
const typed = rule as unknown as RuleObject;
if (editingIndex == null) {
// Rules match top-to-bottom, first hit wins, so a brand-new rule
// appended at the end is silently shadowed by any earlier
// broader/catch-all rule that also happens to match its traffic —
// a real trap: the rule looks saved and enabled, but never actually
// fires. Insert it as early as possible instead (right after the
// pinned api rule, if present) so a newly created rule takes effect
// by default; the admin can still drag it lower with moveDown if
// that's genuinely what they want.
const insertAt = isApiRule(tt.routing.rules[0] as RuleObject) ? 1 : 0;
tt.routing.rules.splice(insertAt, 0, typed);
} else {
tt.routing.rules[editingIndex] = typed;
}
if (editingIndex == null) tt.routing.rules.push(typed);
else tt.routing.rules[editingIndex] = typed;
});
setRuleModalOpen(false);
}