Merge in DNS/adguard-home from ADG-9415 to master Squashed commit of the following: commit76bf99499aMerge:29529970a0389515eeAuthor: Ildar Kamalov <ik@adguard.com> Date: Wed Feb 26 18:31:41 2025 +0300 Merge branch 'master' into ADG-9415 commit29529970a3Merge:b49790daf782a1a982Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Feb 24 15:44:38 2025 +0300 Merge branch 'master' into ADG-9415 commitb49790daf8Author: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 15:30:18 2025 +0300 fix default lease duration value commitcb307472ecAuthor: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 10:35:26 2025 +0300 fix default response status commit115e743e1aAuthor: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 10:32:46 2025 +0300 fix upstream description commit26b0eddacaAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 18 17:40:41 2025 +0300 use const for test config file commit58faa7c537Author: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 18 17:31:04 2025 +0300 fix install config commit0a3346d911Author: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 17 15:25:23 2025 +0300 fix install check config commit17c4c26ea8Author: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 17:18:20 2025 +0300 fix query log commit14a2685ae3Author: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 15:52:36 2025 +0300 fix dhcp initial values commite7a8db7afdAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 14:37:24 2025 +0300 fix encryption form values commit1c8917f7acAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 14:07:29 2025 +0300 fix blocked services submit commit4dfa536ceaAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 13:50:47 2025 +0300 dns config ip validation commit4fee83fe13Author: Ildar Kamalov <ik@adguard.com> Date: Wed Feb 12 17:49:54 2025 +0300 add playwright warning commit8c2f36e7a6Author: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 18:36:18 2025 +0300 fix config file name commit83db5f33dcAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 16:16:43 2025 +0300 temp config file commit9080c1620fAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 15:01:46 2025 +0300 update readme commitee1520307fMerge:fd12e33c02fe2d254bAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 14:44:06 2025 +0300 Merge branch 'master' into ADG-9415 commitfd12e33c06Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Feb 10 10:29:43 2025 +0100 added typecheck on build, fixed eslint commitb3849eebc4Merge:225167a8b9bf3ee128Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Feb 10 09:43:32 2025 +0100 Merge branch 'ADG-9415' of https://bit.int.agrd.dev/scm/dns/adguard-home into ADG-9415 ... and 94 more commits
122 lines
3.8 KiB
TypeScript
122 lines
3.8 KiB
TypeScript
import React, { useCallback, useMemo } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { debounce } from 'lodash';
|
|
import { DEBOUNCE_TIMEOUT, ENCRYPTION_SOURCE } from '../../../helpers/constants';
|
|
|
|
import { EncryptionFormValues, Form } from './Form';
|
|
import Card from '../../ui/Card';
|
|
import PageTitle from '../../ui/PageTitle';
|
|
import Loading from '../../ui/Loading';
|
|
import { EncryptionData } from '../../../initialState';
|
|
|
|
type Props = {
|
|
encryption: EncryptionData;
|
|
setTlsConfig: (values: Partial<EncryptionData>) => void;
|
|
validateTlsConfig: (values: Partial<EncryptionData>) => void;
|
|
};
|
|
|
|
export const Encryption = ({ encryption, setTlsConfig, validateTlsConfig }: Props) => {
|
|
const { t } = useTranslation();
|
|
|
|
const initialValues = useMemo((): EncryptionFormValues => {
|
|
const {
|
|
enabled,
|
|
serve_plain_dns,
|
|
server_name,
|
|
force_https,
|
|
port_https,
|
|
port_dns_over_tls,
|
|
port_dns_over_quic,
|
|
certificate_chain,
|
|
private_key,
|
|
certificate_path,
|
|
private_key_path,
|
|
private_key_saved,
|
|
} = encryption;
|
|
const certificate_source = certificate_chain ? ENCRYPTION_SOURCE.CONTENT : ENCRYPTION_SOURCE.PATH;
|
|
const key_source = private_key || private_key_saved ? ENCRYPTION_SOURCE.CONTENT : ENCRYPTION_SOURCE.PATH;
|
|
|
|
return {
|
|
enabled,
|
|
serve_plain_dns,
|
|
server_name,
|
|
force_https,
|
|
port_https,
|
|
port_dns_over_tls,
|
|
port_dns_over_quic,
|
|
certificate_chain,
|
|
private_key,
|
|
certificate_path,
|
|
private_key_path,
|
|
private_key_saved,
|
|
certificate_source,
|
|
key_source,
|
|
};
|
|
}, [encryption]);
|
|
|
|
const getSubmitValues = useCallback((values: any) => {
|
|
const { certificate_source, key_source, private_key_saved, ...config } = values;
|
|
|
|
if (certificate_source === ENCRYPTION_SOURCE.PATH) {
|
|
config.certificate_chain = '';
|
|
} else {
|
|
config.certificate_path = '';
|
|
}
|
|
|
|
if (key_source === ENCRYPTION_SOURCE.PATH) {
|
|
config.private_key = '';
|
|
} else {
|
|
config.private_key_path = '';
|
|
|
|
if (private_key_saved) {
|
|
config.private_key = '';
|
|
config.private_key_saved = private_key_saved;
|
|
}
|
|
}
|
|
|
|
return config;
|
|
}, []);
|
|
|
|
const handleFormSubmit = useCallback(
|
|
(values: any) => {
|
|
const submitValues = getSubmitValues(values);
|
|
setTlsConfig(submitValues);
|
|
},
|
|
[getSubmitValues, setTlsConfig],
|
|
);
|
|
|
|
const validateConfig = useCallback((values) => {
|
|
const submitValues = getSubmitValues(values);
|
|
|
|
if (submitValues.enabled) {
|
|
validateTlsConfig(submitValues);
|
|
}
|
|
}, []);
|
|
|
|
const debouncedConfigValidation = useMemo(() => debounce(validateConfig, DEBOUNCE_TIMEOUT), [validateConfig]);
|
|
|
|
return (
|
|
<div className="encryption">
|
|
<PageTitle title={t('encryption_settings')} />
|
|
|
|
{encryption.processing ? (
|
|
<Loading />
|
|
) : (
|
|
<Card
|
|
title={t('encryption_title')}
|
|
subtitle={t('encryption_desc')}
|
|
bodyType="card-body box-body--settings">
|
|
<Form
|
|
initialValues={initialValues}
|
|
onSubmit={handleFormSubmit}
|
|
debouncedConfigValidation={debouncedConfigValidation}
|
|
setTlsConfig={setTlsConfig}
|
|
validateTlsConfig={validateTlsConfig}
|
|
encryption={encryption}
|
|
/>
|
|
</Card>
|
|
)}
|
|
</div>
|
|
);
|
|
};
|