mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-16 01:26:07 +00:00
fix(panel): normalize XHTTP/sockopt/Reality wire output and validate REALITY target (#4988)
* fix(panel): normalize XHTTP/sockopt/Reality wire output and validate REALITY target Strip mode-specific XHTTP fields for stream-one, reset harmful sockopt defaults to 0, split server/client Reality fields on save, validate target host:port in the inbound form, and expose Happy Eyeballs for the direct freedom outbound. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(panel): keep REALITY public key on the wire, guard freedom noises The REALITY server/client wire split deleted realitySettings.settings on save, but the panel stores the REALITY public key there and every share-link / subscription generator reads it back from that path (frontend inbound-link.ts, Go subService/subJsonService/subClashService). Stripping it produced empty pbk= links, breaking client connectivity after save+reload. Revert the reality normalization (drop normalizeRealityForWire and the key sets), restore the inbound REALITY form fields (uTLS, spiderX, publicKey, mldsa65Verify) while keeping the new validated target field, and restore the mldsa65Verify clear handler. Also guard freedomToWire against undefined noises/finalRules (same defensive treatment as the existing fragment guard, issue #4686) which the new freedom-outbound test surfaced as a crash. Tests now assert the public key is preserved. --------- Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: MHSanaei <ho3ein.sanaei@gmail.com>
This commit is contained in:
@@ -3,6 +3,7 @@ import { Button, Form, Input, InputNumber, Select, Space, Switch } from 'antd';
|
||||
import { ReloadOutlined } from '@ant-design/icons';
|
||||
|
||||
import { UTLS_FINGERPRINT } from '@/schemas/primitives';
|
||||
import { validateRealityTarget } from '@/lib/xray/stream-wire-normalize';
|
||||
|
||||
interface RealityFormProps {
|
||||
saving: boolean;
|
||||
@@ -44,10 +45,24 @@ export default function RealityForm({
|
||||
options={Object.values(UTLS_FINGERPRINT).map((fp) => ({ value: fp, label: fp }))}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item label={t('pages.inbounds.form.target')}>
|
||||
<Form.Item
|
||||
label={t('pages.inbounds.form.target')}
|
||||
extra={t('pages.inbounds.form.realityTargetHint')}
|
||||
>
|
||||
<Space.Compact block>
|
||||
<Form.Item name={['streamSettings', 'realitySettings', 'target']} noStyle>
|
||||
<Input style={{ width: 'calc(100% - 32px)' }} />
|
||||
<Form.Item
|
||||
name={['streamSettings', 'realitySettings', 'target']}
|
||||
noStyle
|
||||
rules={[
|
||||
{
|
||||
validator: async (_, value) => {
|
||||
const errKey = validateRealityTarget(typeof value === 'string' ? value : '');
|
||||
if (errKey) throw new Error(t(errKey));
|
||||
},
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Input style={{ width: 'calc(100% - 32px)' }} placeholder="example.com:443" />
|
||||
</Form.Item>
|
||||
<Button icon={<ReloadOutlined />} onClick={randomizeRealityTarget} />
|
||||
</Space.Compact>
|
||||
|
||||
@@ -60,6 +60,7 @@ export default function SockoptForm({
|
||||
<Form.Item
|
||||
name={['streamSettings', 'sockopt', 'tcpWindowClamp']}
|
||||
label={t('pages.inbounds.form.tcpWindowClamp')}
|
||||
tooltip={t('pages.inbounds.form.tcpWindowClampHint')}
|
||||
>
|
||||
<InputNumber min={0} />
|
||||
</Form.Item>
|
||||
|
||||
@@ -10,6 +10,7 @@ import {
|
||||
} from '@ant-design/icons';
|
||||
|
||||
import { OutboundDomainStrategies } from '@/schemas/primitives';
|
||||
import { HappyEyeballsSchema } from '@/schemas/protocols/stream/sockopt';
|
||||
import { SettingListItem } from '@/components/ui';
|
||||
import { useMediaQuery } from '@/hooks/useMediaQuery';
|
||||
import { catTabLabel } from '@/pages/settings/catTabLabel';
|
||||
@@ -84,6 +85,49 @@ export default function BasicsTab({
|
||||
| { domainStrategy?: string }
|
||||
| undefined)?.domainStrategy ?? 'AsIs';
|
||||
|
||||
const directFreedomOutbound = templateSettings?.outbounds?.find(
|
||||
(o) => o?.protocol === 'freedom' && o?.tag === 'direct',
|
||||
);
|
||||
const directHappyEyeballs = (() => {
|
||||
const sockopt = (directFreedomOutbound?.streamSettings as { sockopt?: { happyEyeballs?: unknown } } | undefined)
|
||||
?.sockopt;
|
||||
const raw = sockopt?.happyEyeballs;
|
||||
if (raw == null || typeof raw !== 'object') return null;
|
||||
return HappyEyeballsSchema.parse(raw);
|
||||
})();
|
||||
|
||||
const setDirectHappyEyeballs = useCallback(
|
||||
(next: ReturnType<typeof HappyEyeballsSchema.parse> | null) => {
|
||||
mutate((tt) => {
|
||||
if (!tt.outbounds) tt.outbounds = [];
|
||||
let idx = tt.outbounds.findIndex((o) => o?.protocol === 'freedom' && o?.tag === 'direct');
|
||||
if (idx < 0) {
|
||||
tt.outbounds.push({ protocol: 'freedom', tag: 'direct', settings: {} });
|
||||
idx = tt.outbounds.length - 1;
|
||||
}
|
||||
const ob = tt.outbounds[idx];
|
||||
const stream = (ob.streamSettings ?? {}) as Record<string, unknown>;
|
||||
const sockopt = (stream.sockopt ?? {}) as Record<string, unknown>;
|
||||
if (next == null) {
|
||||
delete sockopt.happyEyeballs;
|
||||
} else {
|
||||
sockopt.happyEyeballs = next;
|
||||
}
|
||||
if (Object.keys(sockopt).length === 0) {
|
||||
delete stream.sockopt;
|
||||
} else {
|
||||
stream.sockopt = sockopt;
|
||||
}
|
||||
if (Object.keys(stream).length === 0) {
|
||||
delete ob.streamSettings;
|
||||
} else {
|
||||
ob.streamSettings = stream;
|
||||
}
|
||||
});
|
||||
},
|
||||
[mutate],
|
||||
);
|
||||
|
||||
const routingStrategy = templateSettings?.routing?.domainStrategy ?? 'AsIs';
|
||||
const log = (templateSettings?.log || {}) as Record<string, unknown>;
|
||||
const policy = (templateSettings?.policy?.system || {}) as Record<string, boolean>;
|
||||
@@ -124,6 +168,53 @@ export default function BasicsTab({
|
||||
/>
|
||||
}
|
||||
/>
|
||||
<SettingListItem
|
||||
title={t('pages.xray.FreedomHappyEyeballs')}
|
||||
description={t('pages.xray.FreedomHappyEyeballsDesc')}
|
||||
paddings="small"
|
||||
control={
|
||||
<Switch
|
||||
checked={directHappyEyeballs != null}
|
||||
onChange={(checked) => {
|
||||
setDirectHappyEyeballs(checked ? HappyEyeballsSchema.parse({}) : null);
|
||||
}}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
{directHappyEyeballs != null && (
|
||||
<>
|
||||
<SettingListItem
|
||||
title={t('pages.inbounds.form.tryDelayMs')}
|
||||
description={t('pages.xray.FreedomHappyEyeballsTryDelayDesc')}
|
||||
paddings="small"
|
||||
control={
|
||||
<InputNumber
|
||||
min={0}
|
||||
style={{ width: '100%' }}
|
||||
value={directHappyEyeballs.tryDelayMs}
|
||||
placeholder="150"
|
||||
onChange={(v) => setDirectHappyEyeballs({
|
||||
...directHappyEyeballs,
|
||||
tryDelayMs: typeof v === 'number' ? v : 0,
|
||||
})}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
<SettingListItem
|
||||
title={t('pages.inbounds.form.prioritizeIPv6')}
|
||||
paddings="small"
|
||||
control={
|
||||
<Switch
|
||||
checked={directHappyEyeballs.prioritizeIPv6}
|
||||
onChange={(checked) => setDirectHappyEyeballs({
|
||||
...directHappyEyeballs,
|
||||
prioritizeIPv6: checked,
|
||||
})}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
<SettingListItem
|
||||
title={t('pages.xray.RoutingStrategy')}
|
||||
description={t('pages.xray.RoutingStrategyDesc')}
|
||||
|
||||
@@ -171,6 +171,7 @@ export default function SockoptForm({
|
||||
<Form.Item
|
||||
label={t('pages.inbounds.form.tcpWindowClamp')}
|
||||
name={['streamSettings', 'sockopt', 'tcpWindowClamp']}
|
||||
tooltip={t('pages.inbounds.form.tcpWindowClampHint')}
|
||||
>
|
||||
<InputNumber min={0} style={{ width: '100%' }} />
|
||||
</Form.Item>
|
||||
|
||||
Reference in New Issue
Block a user