feat(inbounds): restore "Set Cert from Panel" / Clear buttons in TLS certs
Some checks are pending
CI / go-test (push) Waiting to run
CI / govulncheck (push) Waiting to run
CI / frontend (push) Waiting to run
CodeQL Advanced / Analyze (go) (push) Waiting to run
CodeQL Advanced / Analyze (actions) (push) Waiting to run
CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
Release 3X-UI / build (386) (push) Waiting to run
Release 3X-UI / build (amd64) (push) Waiting to run
Release 3X-UI / build (arm64) (push) Waiting to run
Release 3X-UI / build (armv5) (push) Waiting to run
Release 3X-UI / build (armv6) (push) Waiting to run
Release 3X-UI / build (armv7) (push) Waiting to run
Release 3X-UI / build (s390x) (push) Waiting to run
Release 3X-UI / Build for Windows (push) Waiting to run

Bring back the per-certificate buttons in the inbound TLS section (File Path
mode): "Set Cert from Panel" fetches the panel's own webCertFile/webKeyFile via
/panel/setting/all and fills the cert's certificateFile/keyFile, warning when no
panel cert is configured; "Clear" empties both paths.

Reuses the existing pages.inbounds.setDefaultCert label and adds a
setDefaultCertEmpty warning string.
This commit is contained in:
MHSanaei 2026-05-28 02:41:39 +02:00
parent 486ac9c28d
commit 9e005ffcf9
No known key found for this signature in database
GPG key ID: 7E4060F2FBE5AB7A
2 changed files with 50 additions and 0 deletions

View file

@ -572,6 +572,41 @@ export default function InboundFormModal({
form.setFieldValue(['streamSettings', 'tlsSettings', 'settings', 'echConfigList'], ''); form.setFieldValue(['streamSettings', 'tlsSettings', 'settings', 'echConfigList'], '');
}; };
const setCertFromPanel = async (certName: number) => {
setSaving(true);
try {
const msg = await HttpUtil.post('/panel/setting/all', undefined, { silent: true });
if (msg?.success) {
const obj = msg.obj as { webCertFile?: string; webKeyFile?: string };
if (!obj.webCertFile && !obj.webKeyFile) {
messageApi.warning(t('pages.inbounds.setDefaultCertEmpty'));
return;
}
form.setFieldValue(
['streamSettings', 'tlsSettings', 'certificates', certName, 'certificateFile'],
obj.webCertFile ?? '',
);
form.setFieldValue(
['streamSettings', 'tlsSettings', 'certificates', certName, 'keyFile'],
obj.webKeyFile ?? '',
);
}
} finally {
setSaving(false);
}
};
const clearCertFiles = (certName: number) => {
form.setFieldValue(
['streamSettings', 'tlsSettings', 'certificates', certName, 'certificateFile'],
'',
);
form.setFieldValue(
['streamSettings', 'tlsSettings', 'certificates', certName, 'keyFile'],
'',
);
};
const onSecurityChange = async (next: string) => { const onSecurityChange = async (next: string) => {
const current = (form.getFieldValue('streamSettings') as Record<string, unknown>) ?? {}; const current = (form.getFieldValue('streamSettings') as Record<string, unknown>) ?? {};
const cleaned: Record<string, unknown> = { ...current, security: next }; const cleaned: Record<string, unknown> = { ...current, security: next };
@ -2649,6 +2684,20 @@ export default function InboundFormModal({
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item label=" ">
<Space>
<Button
type="primary"
loading={saving}
onClick={() => setCertFromPanel(certField.name)}
>
{t('pages.inbounds.setDefaultCert')}
</Button>
<Button danger onClick={() => clearCertFiles(certField.name)}>
Clear
</Button>
</Space>
</Form.Item>
</> </>
) : ( ) : (
<> <>

View file

@ -355,6 +355,7 @@
"IPLimitlogDesc": "The IP history log. (to re-enable the inbound after disabling, clear the log)", "IPLimitlogDesc": "The IP history log. (to re-enable the inbound after disabling, clear the log)",
"IPLimitlogclear": "Clear the Log", "IPLimitlogclear": "Clear the Log",
"setDefaultCert": "Set Cert from Panel", "setDefaultCert": "Set Cert from Panel",
"setDefaultCertEmpty": "No certificate is configured for the panel. Set one under Settings first.",
"streamTab": "Stream", "streamTab": "Stream",
"securityTab": "Security", "securityTab": "Security",
"sniffingTab": "Sniffing", "sniffingTab": "Sniffing",