mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-17 02:25:02 +03:00
fix(finalmask): validate fragment mask length so empty/zero-min can't crash xray
A fragment TCP finalmask with an empty length (the form's default for a newly added mask) serializes to a 0-0 range, and xray-core rejects LengthMin == 0 with a fatal config error that aborts the whole process, taking every inbound offline. Default a new fragment mask to length 100-200 and add a form validator rejecting an empty value or a zero minimum range before save. Verified against xray 26.6.1 (#4998).
This commit is contained in:
@@ -26,7 +26,7 @@ function asPath(name: NamePath): (string | number)[] {
|
|||||||
function defaultTcpMaskSettings(type: string): Record<string, unknown> {
|
function defaultTcpMaskSettings(type: string): Record<string, unknown> {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case 'fragment':
|
case 'fragment':
|
||||||
return { packets: '1-3', length: '', delay: '', maxSplit: '' };
|
return { packets: '1-3', length: '100-200', delay: '', maxSplit: '' };
|
||||||
case 'sudoku':
|
case 'sudoku':
|
||||||
return {
|
return {
|
||||||
password: '', ascii: '', customTable: '', customTables: [''],
|
password: '', ascii: '', customTable: '', customTables: [''],
|
||||||
@@ -210,8 +210,12 @@ function TcpMaskItem({
|
|||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item label="Length" name={[fieldName, 'settings', 'length']}>
|
<Form.Item
|
||||||
<Input />
|
label="Length"
|
||||||
|
name={[fieldName, 'settings', 'length']}
|
||||||
|
rules={[{ validator: validateFragmentLength }]}
|
||||||
|
>
|
||||||
|
<Input placeholder="e.g. 100-200" />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item label="Delay" name={[fieldName, 'settings', 'delay']}>
|
<Form.Item label="Delay" name={[fieldName, 'settings', 'delay']}>
|
||||||
<Input />
|
<Input />
|
||||||
@@ -259,6 +263,18 @@ function TcpMaskItem({
|
|||||||
// Walks a deep object path safely. Used inside shouldUpdate which gets
|
// Walks a deep object path safely. Used inside shouldUpdate which gets
|
||||||
// the whole form values blob; we need to compare a deep field across
|
// the whole form values blob; we need to compare a deep field across
|
||||||
// prev/curr without crashing on missing intermediates.
|
// prev/curr without crashing on missing intermediates.
|
||||||
|
function validateFragmentLength(_rule: unknown, value: unknown): Promise<void> {
|
||||||
|
const str = typeof value === 'string' ? value.trim() : String(value ?? '').trim();
|
||||||
|
if (str.length === 0) {
|
||||||
|
return Promise.reject(new Error('Length is required — xray rejects a fragment mask whose LengthMin is 0'));
|
||||||
|
}
|
||||||
|
const min = Number(str.split('-')[0]);
|
||||||
|
if (!Number.isFinite(min) || min <= 0) {
|
||||||
|
return Promise.reject(new Error('Length minimum must be greater than 0 (e.g. 100-200)'));
|
||||||
|
}
|
||||||
|
return Promise.resolve();
|
||||||
|
}
|
||||||
|
|
||||||
function getDeep(obj: unknown, path: (string | number)[]): unknown {
|
function getDeep(obj: unknown, path: (string | number)[]): unknown {
|
||||||
let cur: unknown = obj;
|
let cur: unknown = obj;
|
||||||
for (const key of path) {
|
for (const key of path) {
|
||||||
|
|||||||
Reference in New Issue
Block a user