mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-18 11:05:02 +03:00
6ed6f57b5c
* 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>
298 lines
13 KiB
TypeScript
298 lines
13 KiB
TypeScript
import { useTranslation } from 'react-i18next';
|
||
import { Button, Form, Input, InputNumber, Select, Space, Switch, type FormInstance } from 'antd';
|
||
|
||
import { DOMAIN_STRATEGY_OPTION, TCP_CONGESTION_OPTION } from '@/schemas/primitives';
|
||
import { HappyEyeballsSchema, SockoptStreamSettingsSchema } from '@/schemas/protocols/stream/sockopt';
|
||
import type { OutboundFormValues } from '@/schemas/forms/outbound-form';
|
||
|
||
import { ADDRESS_PORT_STRATEGY_OPTIONS } from '../outbound-form-constants';
|
||
|
||
export default function SockoptForm({
|
||
form,
|
||
outboundTags = [],
|
||
}: {
|
||
form: FormInstance<OutboundFormValues>;
|
||
outboundTags?: string[];
|
||
}) {
|
||
const { t } = useTranslation();
|
||
return (
|
||
<Form.Item shouldUpdate noStyle>
|
||
{() => {
|
||
const hasSockopt = !!form.getFieldValue([
|
||
'streamSettings',
|
||
'sockopt',
|
||
]);
|
||
const dialerProxy = (form.getFieldValue([
|
||
'streamSettings',
|
||
'sockopt',
|
||
'dialerProxy',
|
||
]) ?? '') as string;
|
||
const dialerProxyOptions = Array.from(
|
||
new Set([...outboundTags, dialerProxy].filter(Boolean)),
|
||
).map((tg) => ({ value: tg, label: tg }));
|
||
return (
|
||
<>
|
||
<Form.Item label={t('pages.xray.outboundForm.sockopts')}>
|
||
<Switch
|
||
checked={hasSockopt}
|
||
onChange={(checked) => {
|
||
form.setFieldValue(
|
||
['streamSettings', 'sockopt'],
|
||
checked ? SockoptStreamSettingsSchema.parse({}) : undefined,
|
||
);
|
||
}}
|
||
/>
|
||
</Form.Item>
|
||
{hasSockopt && (
|
||
<>
|
||
<Form.Item
|
||
label={t('pages.inbounds.form.dialerProxy')}
|
||
name={['streamSettings', 'sockopt', 'dialerProxy']}
|
||
tooltip={t('pages.xray.outboundForm.dialerProxyHint')}
|
||
>
|
||
<Select
|
||
allowClear
|
||
showSearch
|
||
placeholder={t('pages.xray.outboundForm.dialerProxyPlaceholder')}
|
||
options={dialerProxyOptions}
|
||
/>
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.xray.wireguard.domainStrategy')}
|
||
name={['streamSettings', 'sockopt', 'domainStrategy']}
|
||
>
|
||
<Select
|
||
options={Object.values(DOMAIN_STRATEGY_OPTION).map((v) => ({
|
||
value: v,
|
||
label: v,
|
||
}))}
|
||
/>
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.inbounds.form.addressPortStrategy')}
|
||
name={['streamSettings', 'sockopt', 'addressPortStrategy']}
|
||
>
|
||
<Select options={ADDRESS_PORT_STRATEGY_OPTIONS} />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.xray.outboundForm.keepAliveInterval')}
|
||
name={['streamSettings', 'sockopt', 'tcpKeepAliveInterval']}
|
||
>
|
||
<InputNumber min={0} />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.inbounds.form.tcpFastOpen')}
|
||
name={['streamSettings', 'sockopt', 'tcpFastOpen']}
|
||
valuePropName="checked"
|
||
>
|
||
<Switch />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.inbounds.form.multipathTcp')}
|
||
name={['streamSettings', 'sockopt', 'tcpMptcp']}
|
||
valuePropName="checked"
|
||
>
|
||
<Switch />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.inbounds.form.penetrate')}
|
||
name={['streamSettings', 'sockopt', 'penetrate']}
|
||
valuePropName="checked"
|
||
>
|
||
<Switch />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.xray.outboundForm.markFwmark')}
|
||
name={['streamSettings', 'sockopt', 'mark']}
|
||
>
|
||
<InputNumber min={0} />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.xray.outboundForm.interface')}
|
||
name={['streamSettings', 'sockopt', 'interface']}
|
||
>
|
||
<Input />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label="TProxy"
|
||
name={['streamSettings', 'sockopt', 'tproxy']}
|
||
>
|
||
<Select
|
||
options={[
|
||
{ value: 'off', label: 'off' },
|
||
{ value: 'redirect', label: 'redirect' },
|
||
{ value: 'tproxy', label: 'tproxy' },
|
||
]}
|
||
/>
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.inbounds.form.tcpCongestion')}
|
||
name={['streamSettings', 'sockopt', 'tcpcongestion']}
|
||
>
|
||
<Select
|
||
options={Object.values(TCP_CONGESTION_OPTION).map((v) => ({
|
||
value: v,
|
||
label: v,
|
||
}))}
|
||
/>
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.xray.outboundForm.ipv6Only')}
|
||
name={['streamSettings', 'sockopt', 'V6Only']}
|
||
valuePropName="checked"
|
||
>
|
||
<Switch />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.xray.outboundForm.acceptProxyProtocol')}
|
||
name={['streamSettings', 'sockopt', 'acceptProxyProtocol']}
|
||
valuePropName="checked"
|
||
>
|
||
<Switch />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.xray.outboundForm.tcpUserTimeoutMs')}
|
||
name={['streamSettings', 'sockopt', 'tcpUserTimeout']}
|
||
>
|
||
<InputNumber min={0} style={{ width: '100%' }} />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.xray.outboundForm.tcpKeepAliveIdleS')}
|
||
name={['streamSettings', 'sockopt', 'tcpKeepAliveIdle']}
|
||
>
|
||
<InputNumber min={0} style={{ width: '100%' }} />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.inbounds.form.tcpMaxSeg')}
|
||
name={['streamSettings', 'sockopt', 'tcpMaxSeg']}
|
||
>
|
||
<InputNumber min={0} style={{ width: '100%' }} />
|
||
</Form.Item>
|
||
<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>
|
||
<Form.Item
|
||
label={t('pages.inbounds.form.trustedXForwardedFor')}
|
||
name={['streamSettings', 'sockopt', 'trustedXForwardedFor']}
|
||
>
|
||
<Select
|
||
mode="tags"
|
||
tokenSeparators={[',', ' ']}
|
||
placeholder="trusted-proxy.example,10.0.0.0/8"
|
||
/>
|
||
</Form.Item>
|
||
<Form.Item shouldUpdate noStyle>
|
||
{() => {
|
||
const he = form.getFieldValue([
|
||
'streamSettings', 'sockopt', 'happyEyeballs',
|
||
]);
|
||
const hasHe = he != null;
|
||
return (
|
||
<>
|
||
<Form.Item label="Happy Eyeballs">
|
||
<Switch
|
||
checked={hasHe}
|
||
onChange={(v) => {
|
||
form.setFieldValue(
|
||
['streamSettings', 'sockopt', 'happyEyeballs'],
|
||
v ? HappyEyeballsSchema.parse({}) : undefined,
|
||
);
|
||
}}
|
||
/>
|
||
</Form.Item>
|
||
{hasHe && (
|
||
<>
|
||
<Form.Item
|
||
label={t('pages.inbounds.form.tryDelayMs')}
|
||
name={['streamSettings', 'sockopt', 'happyEyeballs', 'tryDelayMs']}
|
||
>
|
||
<InputNumber min={0} style={{ width: '100%' }} placeholder="0 (disabled) — 250 recommended" />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.inbounds.form.prioritizeIPv6')}
|
||
name={['streamSettings', 'sockopt', 'happyEyeballs', 'prioritizeIPv6']}
|
||
valuePropName="checked"
|
||
>
|
||
<Switch />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.inbounds.form.interleave')}
|
||
name={['streamSettings', 'sockopt', 'happyEyeballs', 'interleave']}
|
||
>
|
||
<InputNumber min={1} style={{ width: '100%' }} />
|
||
</Form.Item>
|
||
<Form.Item
|
||
label={t('pages.inbounds.form.maxConcurrentTry')}
|
||
name={['streamSettings', 'sockopt', 'happyEyeballs', 'maxConcurrentTry']}
|
||
>
|
||
<InputNumber min={0} style={{ width: '100%' }} />
|
||
</Form.Item>
|
||
</>
|
||
)}
|
||
</>
|
||
);
|
||
}}
|
||
</Form.Item>
|
||
<Form.List name={['streamSettings', 'sockopt', 'customSockopt']}>
|
||
{(fields, { add, remove }) => (
|
||
<>
|
||
<Form.Item label={t('pages.inbounds.form.customSockopt')}>
|
||
<Button
|
||
type="dashed"
|
||
size="small"
|
||
onClick={() => add({ type: 'int', level: '6', opt: '', value: '' })}
|
||
>
|
||
+ {t('pages.inbounds.form.addCustomOption')}
|
||
</Button>
|
||
</Form.Item>
|
||
{fields.map((field) => (
|
||
<Space.Compact key={field.key} style={{ display: 'flex', marginBottom: 8 }}>
|
||
<Form.Item name={[field.name, 'system']} noStyle>
|
||
<Select
|
||
placeholder="all"
|
||
allowClear
|
||
style={{ width: 100 }}
|
||
options={[
|
||
{ value: 'linux', label: 'linux' },
|
||
{ value: 'windows', label: 'windows' },
|
||
{ value: 'darwin', label: 'darwin' },
|
||
]}
|
||
/>
|
||
</Form.Item>
|
||
<Form.Item name={[field.name, 'type']} noStyle>
|
||
<Select
|
||
style={{ width: 80 }}
|
||
options={[
|
||
{ value: 'int', label: 'int' },
|
||
{ value: 'str', label: 'str' },
|
||
]}
|
||
/>
|
||
</Form.Item>
|
||
<Form.Item name={[field.name, 'level']} noStyle>
|
||
<Input placeholder="level (6=TCP)" style={{ width: 100 }} />
|
||
</Form.Item>
|
||
<Form.Item name={[field.name, 'opt']} noStyle>
|
||
<Input placeholder="opt (decimal)" style={{ width: 120 }} />
|
||
</Form.Item>
|
||
<Form.Item name={[field.name, 'value']} noStyle>
|
||
<Input placeholder="value" style={{ flex: 1 }} />
|
||
</Form.Item>
|
||
<Button danger onClick={() => remove(field.name)}>−</Button>
|
||
</Space.Compact>
|
||
))}
|
||
</>
|
||
)}
|
||
</Form.List>
|
||
</>
|
||
)}
|
||
</>
|
||
);
|
||
}}
|
||
</Form.Item>
|
||
);
|
||
}
|