mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-03-14 14:38:29 +03:00
Merge in DNS/adguard-home from AG-28194-plain-dns to master Squashed commit of the following: commit a033982b949217d46a8ea609f63198916f779a61 Merge: 03fc2821179d7a1ef4
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Dec 12 12:07:39 2023 +0200 Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns commit 03fc282119a6372fcb4ce17a5d89779ad84589f5 Merge: e31a6593134a34dc05
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Dec 12 11:07:46 2023 +0200 Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns # Conflicts: # CHANGELOG.md commit e31a659312fffe0cd5f57710843c8a6818515502 Merge: 0b735eb427b5cce517
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 11 11:09:07 2023 +0200 Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns # Conflicts: # CHANGELOG.md commit 0b735eb4261883961058aed562c1e72ad1a20915 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 15:22:27 2023 +0200 Revert "safesearch: imp docs" This reverts commit bab6bf3467f8914a34413bbbcdc37e89ff0401a5. commit bab6bf3467f8914a34413bbbcdc37e89ff0401a5 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 15:21:23 2023 +0200 safesearch: imp docs commit aa5e6e30e01bf947d645ac4a9578eeac09c92a19 Merge: 503888447 2b62901fe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 14:48:13 2023 +0200 Merge remote-tracking branch 'origin/AG-28194-plain-dns' into AG-28194-plain-dns commit 503888447aaf30d48c3fb9a414e8a65beb1a4e23 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 14:47:23 2023 +0200 home: imp code commit 2b62901feb29c9613ae648fa5e83598157207a17 Author: Ildar Kamalov <ik@adguard.com> Date: Fri Dec 8 11:55:25 2023 +0300 client: add plain dns description commit 3d51fc8ea1955e599953070a4b330dd4e2fd44bc Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 10:15:53 2023 +0200 all: changelog commit 59697b5f1ab049bd2259ffe42cef7223531ef7aa Merge: 81a15d081b668c04ea
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 10:11:59 2023 +0200 Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns commit 81a15d0818b18f99e651311a8502082b4a539e4b Author: Natalia Sokolova <n.sokolova@adguard.com> Date: Thu Dec 7 17:30:05 2023 +0300 client/src/__locales/en.json edited online with Bitbucket commit 0cf2f880fbd1592c02e6df42319cba357f0d7bc8 Author: Natalia Sokolova <n.sokolova@adguard.com> Date: Thu Dec 7 17:29:51 2023 +0300 client/src/__locales/en.json edited online with Bitbucket commit 2f32c59b8b1d764d060a69c35787566cf5210063 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 7 13:14:04 2023 +0200 home: imp code commit 01e21a26bdd13c42c55c8ea3b5bbe84933bf0c04 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 7 12:14:02 2023 +0200 all: imp docs commit b6beec6df7c2a9077ddce018656c701b7e875b53 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Dec 7 12:42:21 2023 +0300 client: fix reset settings commit 93448500d56a4652a3a060b274936c40015ac8ec Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 7 10:55:25 2023 +0200 home: imp code commit eb32f8268bee097a81463ba29f7ea52be6e7d88b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 7 10:42:23 2023 +0200 home: imp code commit 873d1412cf7c07ed985985a47325779bcfbf650a Merge: 627659680214175eb4
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 7 10:22:25 2023 +0200 Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns commit 627659680da8e973a3878d1722b276d30c7a27bb Author: Ildar Kamalov <ik@adguard.com> Date: Wed Dec 6 17:39:14 2023 +0300 client: handle plain dns setting commit ffdbf05fede721d271a84482a5759284d18eb189 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 1 15:12:50 2023 +0200 home: http dns plain ... and 1 more commit
139 lines
4.1 KiB
JavaScript
139 lines
4.1 KiB
JavaScript
import React, { Component } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { withTranslation } from 'react-i18next';
|
|
import debounce from 'lodash/debounce';
|
|
|
|
import { DEBOUNCE_TIMEOUT, ENCRYPTION_SOURCE } from '../../../helpers/constants';
|
|
import Form from './Form';
|
|
import Card from '../../ui/Card';
|
|
import PageTitle from '../../ui/PageTitle';
|
|
import Loading from '../../ui/Loading';
|
|
|
|
class Encryption extends Component {
|
|
componentDidMount() {
|
|
const { validateTlsConfig, encryption } = this.props;
|
|
|
|
if (encryption.enabled) {
|
|
validateTlsConfig(encryption);
|
|
}
|
|
}
|
|
|
|
handleFormSubmit = (values) => {
|
|
const submitValues = this.getSubmitValues(values);
|
|
this.props.setTlsConfig(submitValues);
|
|
};
|
|
|
|
handleFormChange = debounce((values) => {
|
|
const submitValues = this.getSubmitValues(values);
|
|
|
|
if (submitValues.enabled || submitValues.serve_plain_dns) {
|
|
this.props.validateTlsConfig(submitValues);
|
|
}
|
|
}, DEBOUNCE_TIMEOUT);
|
|
|
|
getInitialValues = (data) => {
|
|
const { certificate_chain, private_key, private_key_saved } = data;
|
|
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 {
|
|
...data,
|
|
certificate_source,
|
|
key_source,
|
|
};
|
|
};
|
|
|
|
getSubmitValues = (values) => {
|
|
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;
|
|
};
|
|
|
|
render() {
|
|
const { encryption, t } = this.props;
|
|
const {
|
|
enabled,
|
|
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,
|
|
serve_plain_dns,
|
|
} = encryption;
|
|
|
|
const initialValues = this.getInitialValues({
|
|
enabled,
|
|
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,
|
|
serve_plain_dns,
|
|
});
|
|
|
|
return (
|
|
<div className="encryption">
|
|
<PageTitle title={t('encryption_settings')} />
|
|
{encryption.processing && <Loading />}
|
|
{!encryption.processing && (
|
|
<Card
|
|
title={t('encryption_title')}
|
|
subtitle={t('encryption_desc')}
|
|
bodyType="card-body box-body--settings"
|
|
>
|
|
<Form
|
|
initialValues={initialValues}
|
|
onSubmit={this.handleFormSubmit}
|
|
onChange={this.handleFormChange}
|
|
setTlsConfig={this.props.setTlsConfig}
|
|
validateTlsConfig={this.props.validateTlsConfig}
|
|
{...this.props.encryption}
|
|
/>
|
|
</Card>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|
|
}
|
|
|
|
Encryption.propTypes = {
|
|
setTlsConfig: PropTypes.func.isRequired,
|
|
validateTlsConfig: PropTypes.func.isRequired,
|
|
encryption: PropTypes.object.isRequired,
|
|
t: PropTypes.func.isRequired,
|
|
};
|
|
|
|
export default withTranslation()(Encryption);
|