daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge: add ability to set DNS upstream per domain #445

Browse Source 
* commit 'f7860c893da81bc23220bcdec8161ce7b36dc558':
  * client: removed links from upstream DNS translations
  * control, client: fix issues from review
  + control, dns, client: add ability to set DNS upstream per domain
This commit is contained in:
Alexey Dmitrievskiy
2019-03-20 18:15:31 +03:00
parent b6d0d94990 f7860c893d
commit 5b417d9f17
20 changed files with 289 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
client/src/components/Settings/Upstream/Examples.js
View File

@@ -10,16 +10,69 @@ const Examples = props => (
<code>1.1.1.1</code> - { props.t('example_upstream_regular') }
</li>
<li>
<code>tls://1dot1dot1dot1.cloudflare-dns.com</code> - <span dangerouslySetInnerHTML={{ __html: props.t('example_upstream_dot') }} />
<code>tls://1dot1dot1dot1.cloudflare-dns.com</code> –&nbsp;
<span>
<Trans
components={[
<a href="https://en.wikipedia.org/wiki/DNS_over_TLS" target="_blank" rel="noopener noreferrer" key="0">
DNS-over-TLS
</a>,
]}
>
example_upstream_dot
</Trans>
</span>
</li>
<li>
<code>https://cloudflare-dns.com/dns-query</code> - <span dangerouslySetInnerHTML={{ __html: props.t('example_upstream_doh') }} />
<code>https://cloudflare-dns.com/dns-query</code> –&nbsp;
<span>
<Trans
components={[
<a href="https://en.wikipedia.org/wiki/DNS_over_HTTPS" target="_blank" rel="noopener noreferrer" key="0">
DNS-over-HTTPS
</a>,
]}
>
example_upstream_doh
</Trans>
</span>
</li>
<li>
<code>tcp://1.1.1.1</code> - { props.t('example_upstream_tcp') }
<code>tcp://1.1.1.1</code> – <Trans>example_upstream_tcp</Trans>
</li>
<li>
<code>sdns://...</code> - <span dangerouslySetInnerHTML={{ __html: props.t('example_upstream_sdns') }} />
<code>sdns://...</code> –&nbsp;
<span>
<Trans
components={[
<a href="https://dnscrypt.info/stamps/" target="_blank" rel="noopener noreferrer" key="0">
DNS Stamps
</a>,
<a href="https://dnscrypt.info/" target="_blank" rel="noopener noreferrer" key="1">
DNSCrypt
</a>,
<a href="https://en.wikipedia.org/wiki/DNS_over_HTTPS" target="_blank" rel="noopener noreferrer" key="2">
DNS-over-HTTPS
</a>,
]}
>
example_upstream_sdns
</Trans>
</span>
</li>
<li>
<code>[/example.local/]1.1.1.1</code> –&nbsp;
<span>
<Trans
components={[
<a href="https://github.com/AdguardTeam/dnsproxy#specifying-upstreams-for-domains" target="_blank" rel="noopener noreferrer" key="0">
Link
</a>,
]}
>
example_upstream_reserved
</Trans>
</span>
</li>
</ol>
</div>

5
client/src/components/Settings/Upstream/Form.js
View File

@@ -7,6 +7,7 @@ import flow from 'lodash/flow';
import classnames from 'classnames';
import { renderSelectField } from '../../../helpers/form';
import Examples from './Examples';
let Form = (props) => {
const {
@@ -55,6 +56,10 @@ let Form = (props) => {
/>
</div>
</div>
<div className="col-12">
<Examples />
<hr/>
</div>
<div className="col-12">
<div className="form__group">
<label className="form__label" htmlFor="bootstrap_dns">

3
client/src/components/Settings/Upstream/index.js
View File

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
import { withNamespaces } from 'react-i18next';
import Form from './Form';
import Examples from './Examples';
import Card from '../../ui/Card';
class Upstream extends Component {
@@ -44,8 +43,6 @@ class Upstream extends Component {
processingTestUpstream={processingTestUpstream}
processingSetUpstream={processingSetUpstream}
/>
<hr/>
<Examples />
</div>
</div>
</Card>