update 2026-09-26 17:00:06

2026-10-26 21:12:51 +08:00 · 2026-09-26 17:00:06 +08:00
1 parent 97ae9f68da
commit bcc9ceb04a
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (C) 2023-2025 muink <https://github.com/muink>
+
+include $(TOPDIR)/rules.mk
+
+LUCI_NAME:=luci-app-dnsproxy
+
+LUCI_TITLE:=LuCI Support for dnsproxy
+LUCI_PKGARCH:=all
+LUCI_DEPENDS:=+dnsproxy
+LUCI_DESCRIPTION:=Simple DNS proxy with DoH, DoT, DoQ and DNSCrypt support
+
+PKG_LICENSE:=Apache-2.0
+PKG_MAINTAINER:=Anya Lin <hukk1996@gmail.com>
+
+include $(TOPDIR)/feeds/luci/luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
@@ -0,0 +1,54 @@
+# luci-app-dnsproxy
+
+> [dnsproxy][] is a simple DNS proxy server that supports all existing DNS protocols including
+`DNS-over-TLS`, `DNS-over-HTTPS`, `DNSCrypt`, and `DNS-over-QUIC`. Moreover,
+it can work as a `DNS-over-HTTPS`, `DNS-over-TLS` or `DNS-over-QUIC` server.
+
+The LuCI interface also supports reusable DNS profiles.  Each profile stores
+its own bootstrap, upstream, and fallback server lists and can apply all three
+lists at once.  Editable example profiles for Cloudflare, Quad9, Google, and a
+mixed parallel setup are included to demonstrate the feature.
+
+## Requirements
+
+- OpenWrt >= 24.10
+
+## How to install
+
+1. Go to [here](https://fantastic-packages.github.io/releases/)
+2. Download the latest version of ipk
+3. Login router and goto **System --> Software**
+4. Upload and install ipk
+5. Reboot if the app is not automatically added in page
+6. Goto **Services --> DNS Proxy**
+
+## Build
+
+Compile from OpenWrt/LEDE SDK
+
+```
+# Take the x86_64 platform as an example
+tar xjf openwrt-sdk-22.03.5-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz
+# Go to the SDK root dir
+cd OpenWrt-sdk-*-x86_64_*
+# First run to generate a .config file
+make menuconfig
+./scripts/feeds update -a
+./scripts/feeds install -a
+# Get Makefile
+git clone --depth 1 --branch master --single-branch --no-checkout https://github.com/muink/luci-app-dnsproxy.git package/luci-app-dnsproxy
+pushd package/luci-app-dnsproxy
+umask 022
+git checkout
+popd
+# Select the package LuCI -> Applications -> luci-app-dnsproxy
+make menuconfig
+# Start compiling
+make package/luci-app-dnsproxy/compile V=99
+```
+
+[dnsproxy]: https://github.com/AdguardTeam/dnsproxy
+
+## License
+
+This project is licensed under the [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0)
@@ -0,0 +1,409 @@
+'use strict';
+'require form';
+'require fs';
+'require uci';
+'require dom';
+'require rpc';
+'require poll';
+'require ui';
+'require view';
+'require validation';
+'require tools.widgets as widgets';
+
+const conf = 'dnsproxy';
+const instance = 'dnsproxy';
+const profileListOptions = ['bootstrap', 'upstream', 'fallback'];
+const upstream_mode = [
+	['load_balance', _('Load balance'), _('one upstream per request.')],
+	['parallel', _('Parallel'), _('first DNS response wins.')],
+	['fastest_addr', _('Fastest address'), _('tests returned IP addresses.')]
+];
+
+const callServiceList = rpc.declare({
+	object: 'service',
+	method: 'list',
+	params: ['name'],
+	expect: { '': {} }
+});
+
+const callHostHints = rpc.declare({
+	object: 'luci-rpc',
+	method: 'getHostHints',
+	expect: { '': {} }
+});
+
+function getServiceStatus() {
+	return L.resolveDefault(callServiceList(conf), {})
+		.then((res) => {
+			let isrunning = false;
+			try {
+				isrunning = res[conf]['instances'][instance]['running'];
+			} catch (e) { }
+			return isrunning;
+		});
+}
+
+function profileTitle(profile) {
+	return profile.label || profile['.name'];
+}
+
+function applyProfile(select) {
+	const profile = uci.sections(conf, 'profile').find((item) => item['.name'] === select.value);
+
+	if (!profile)
+		return ui.addNotification(null, E('p', _('The selected DNS profile no longer exists. Reload the page and try again.')), 'error');
+
+	const upstreams = L.toArray(profile.upstream).filter(Boolean);
+	if (!upstreams.length)
+		return ui.addNotification(null, E('p', _('The selected DNS profile has no upstream servers.')), 'error');
+
+	profileListOptions.forEach((option) => {
+		const values = L.toArray(profile[option]).filter(Boolean);
+		uci.set(conf, 'servers', option, values.length ? values : null);
+	});
+
+	if (profile.upstream_mode)
+		uci.set(conf, 'global', 'upstream_mode', profile.upstream_mode);
+
+	return uci.save()
+		.then(L.bind(this.map.load, this.map))
+		.then(L.bind(this.map.reset, this.map))
+		.then(() => {
+			ui.addNotification(null, E('p', _('DNS profile “%s” has been applied.').format(profileTitle(profile))), 'info');
+		})
+		.catch((err) => {
+			ui.addNotification(null, E('p', _('Failed to apply DNS profile: %s').format(err.message || err)), 'error');
+		});
+}
+
+function validateUniqueValue(section_id, value) {
+	if (!value)
+		return _('Expecting: %s').format(_('non-empty value'));
+
+	let duplicate = false;
+	uci.sections(this.config, this.section.sectiontype, (res) => {
+		if (res['.name'] !== section_id)
+			if (res[this.option] === value)
+				duplicate = true;
+	});
+	if (duplicate)
+		return _('Expecting: %s').format(_('unique value'));
+
+	return true;
+}
+
+function validateServerValue(section_id, value) {
+	if (!value)
+		return true;
+
+	if (!value.includes('://')) {
+		let stubValidator = {
+			factory: validation,
+			apply(type, value, args) {
+				if (value != null)
+					this.value = value;
+
+				return validation.types[type].apply(this, args);
+			},
+			assert(condition) {
+				return !!condition;
+			}
+		};
+
+		if (!stubValidator.apply('host', value) && !stubValidator.apply('hostport', value))
+			return _('Expecting: %s').format(_('valid host or hostport'));
+
+		return true;
+	}
+
+	try {
+		const url = new URL(value);
+		if (!url.hostname)
+			return _('Expecting: %s').format(_('valid URL'));
+
+		return true;
+	}
+	catch (e) {
+		return _('Invalid URI');
+	}
+}
+
+return view.extend({
+
+	load() {
+	return Promise.all([
+		getServiceStatus(),
+		callHostHints(),
+		uci.load('dnsproxy')
+	]);
+	},
+
+	poll_status(nodes, stat) {
+		const isRunning = stat[0];
+		let view = nodes.querySelector('#service_status');
+
+		if (isRunning) {
+			view.innerHTML = "<span style=\"color:green;font-weight:bold\">" + instance + " - " + _("SERVER RUNNING") + "</span>";
+		} else {
+			view.innerHTML = "<span style=\"color:red;font-weight:bold\">" + instance + " - " + _("SERVER NOT RUNNING") + "</span>";
+		}
+		return;
+	},
+
+	render(res) {
+		const isRunning = res[0];
+		const hosts = res[1];
+
+		let m, s, o, ss, so;
+
+		m = new form.Map('dnsproxy', _('DNS Proxy'));
+
+		s = m.section(form.NamedSection, '_status');
+		s.render = function (section_id) {
+			return E('div', { class: 'cbi-section' }, [
+				E('div', { id: 'service_status' }, _('Collecting data ...'))
+			]);
+		};
+
+		s = m.section(form.NamedSection, 'global', 'dnsproxy');
+
+		s.tab('main', _('Main'));
+
+		o = s.taboption('main', form.Flag, 'enabled', _('Enable'));
+		o.default = o.disabled;
+
+		o = s.taboption('main', form.Flag, 'verbose', _('Verbose'));
+
+		o = s.taboption('main', form.Value, 'log_file', _('Log file path'));
+		o.datatype = 'file';
+
+		o = s.taboption('main', form.DynamicList, 'listen_addr', _('Listen address'));
+		o.datatype = "list(ipaddr(1))";
+		o.value('127.0.0.1');
+		o.value('::1');
+
+		let ipaddrs = {}, ip6addrs = {};
+		for (let mac in hosts) {
+			let addrs = L.toArray(hosts[mac].ipaddrs || hosts[mac].ipv4);
+			let addrs6 = L.toArray(hosts[mac].ip6addrs || hosts[mac].ipv6);
+
+			for (let i = 0; i < addrs.length; i++)
+				ipaddrs[addrs[i]] = hosts[mac].name || mac;
+			for (let i = 0; i < addrs6.length; i++)
+				ip6addrs[addrs6[i]] = hosts[mac].name || mac;
+		};
+		L.sortedKeys(ipaddrs, null, 'addr').forEach((ipv4) => {
+			o.value(ipv4, ipaddrs[ipv4] ? '%s (%s)'.format(ipv4, ipaddrs[ipv4]) : ipv4);
+		});
+		L.sortedKeys(ip6addrs, null, 'addr').forEach((ipv6) => {
+			o.value(ipv6, ip6addrs[ipv6] ? '%s (%s)'.format(ipv6, ip6addrs[ipv6]) : ipv6);
+		});
+
+		o = s.taboption('main', form.DynamicList, 'listen_port', _('Listen ports'));
+		o.datatype = "list(and(port, min(1)))";
+		o.default = '5353';
+		o.rmempty = false;
+
+		o = s.taboption('main', form.Flag, 'ipv6_disabled', _('Disable IPv6'));
+
+		o = s.taboption('main', form.Flag, 'refuse_any', _('Refuse <code>ANY</code> requests'));
+
+		o = s.taboption('main', form.Flag, 'insecure', _('Disable secure TLS cert validation'));
+
+		o = s.taboption('main', form.Flag, 'http3', _('Enable HTTP/3 for DoH'));
+		o.description = _('Use HTTP/3 when it is faster. HTTPS fallback remains available.');
+
+		o = s.taboption('main', form.Value, 'timeout', _('Timeout for queries to remote upstream (default: 10s)'));
+		o.datatype = 'string';
+
+		o = s.taboption('main', form.Value, 'rate_limit', _('Ratelimit (requests per second)'));
+		o.datatype = "and(uinteger, min(1))";
+
+		o = s.taboption('main', form.Value, 'udp_buf_size', _('Size of the UDP buffer in bytes. Set 0 use the system default'));
+		o.datatype = 'uinteger';
+
+		o = s.taboption('main', form.RichListValue, 'upstream_mode', _('Upstream selection mode'),
+			_('For the lowest DNS response time choose Parallel.') + '</br>' +
+			_('Fastest address performs additional IP reachability tests and is a different, slower operation.'));
+		upstream_mode.forEach((res) => {
+			o.value.apply(o, res);
+		})
+		o.rmempty = false;
+
+		s.tab('cache', _('Cache'));
+
+		o = s.taboption('cache', form.SectionValue, '_cache', form.NamedSection, 'cache', 'dnsproxy');
+		ss = o.subsection;
+
+		so = ss.option(form.Flag, 'enabled', _('Enable Cache'));
+
+		so = ss.option(form.Flag, 'cache_optimistic', _('Optimistic Cache'));
+		so.retain = true;
+		so.depends('enabled', '1');
+
+		so = ss.option(form.Value, 'size', _('Cache size (in bytes)'));
+		so.datatype = "and(uinteger, min(512))";
+		so.default = '65535';
+		so.retain = true;
+		so.depends('enabled', '1');
+
+		so = ss.option(form.Value, 'min_ttl', _('Min TTL value for DNS entries, in seconds'));
+		so.datatype = "and(uinteger, range(1,3600))";
+		so.retain = true;
+		so.depends('enabled', '1');
+
+		so = ss.option(form.Value, 'max_ttl', _('Max TTL value for DNS entries, in seconds'));
+		so.datatype = "and(uinteger, min(60))";
+		so.retain = true;
+		so.depends('enabled', '1');
+
+		s.tab('dns64', _('DNS64'));
+
+		o = s.taboption('dns64', form.SectionValue, '_dns64', form.NamedSection, 'dns64', 'dnsproxy');
+		ss = o.subsection;
+
+		so = ss.option(form.Flag, 'enabled', _('Enable DNS64'));
+
+		so = ss.option(form.Value, 'dns64_prefix', _('DNS64 Prefix'));
+		so.datatype = "ip6addr(1)";
+		so.default = '64:ff9b::';
+		so.retain = true;
+		so.depends('enabled', '1');
+
+		s.tab('edns', _('EDNS'));
+
+		o = s.taboption('edns', form.SectionValue, '_edns', form.NamedSection, 'edns', 'dnsproxy');
+		ss = o.subsection;
+
+		so = ss.option(form.Flag, 'enabled', _('Enable EDNS'));
+
+		so = ss.option(form.Value, 'edns_addr', _('EDNS Client Address'));
+		so.datatype = "ipaddr(1)";
+		so.retain = true;
+		so.depends('enabled', '1');
+
+		s.tab('bogus_nxdomain', _('Bogus-NXDOMAIN'));
+
+		o = s.taboption('bogus_nxdomain', form.SectionValue, '_bogus_nxdomain', form.NamedSection, 'bogus_nxdomain', 'dnsproxy');
+		ss = o.subsection;
+
+		so = ss.option(form.DynamicList, 'ip_addr', _('Convert matching single IP responses to NXDOMAIN'));
+		so.datatype = "list(ipaddr)";
+
+		s.tab('servers', _('Upstreams'));
+
+		o = s.taboption('servers', form.DummyValue, '_profile_switcher', _('DNS profiles'),
+			_('A profile replaces Bootstrap, Upstream and Fallback lists together. Unsaved changes elsewhere on this page are not included.'));
+		o.renderWidget = function () {
+			const profiles = uci.sections(conf, 'profile');
+			const select = E('select', {
+				'id': 'dnsproxy-profile-select',
+				'class': 'cbi-input-select',
+				'disabled': profiles.length ? null : ''
+			}, profiles.map((profile) => E('option', {
+				'value': profile['.name']
+			}, profileTitle(profile))));
+
+			return E('div', {}, [
+				E('div', { 'style': 'display:flex;gap:.75em;align-items:center;flex-wrap:wrap' }, [
+					select,
+					E('button', {
+						'class': 'cbi-button cbi-button-positive important',
+						'disabled': profiles.length ? null : '',
+						'click': ui.createHandlerFn(this, applyProfile, select)
+					}, _('Use selected profile'))
+				]),
+				profiles.length ? '' : E('p', {}, _('Create and save a profile in the “DNS profile templates” section below first.'))
+			]);
+		};
+
+		o = s.taboption('servers', form.SectionValue, '_servers', form.NamedSection, 'servers', 'dnsproxy');
+		ss = o.subsection;
+
+		so = ss.option(form.DynamicList, 'bootstrap', _('Bootstrap DNS Server'));
+		so.readonly = true
+
+		so = ss.option(form.DynamicList, 'upstream', _('Upstream DNS Server'));
+		so.readonly = true
+		so.rmempty = false;
+
+		so = ss.option(form.DynamicList, 'fallback', _('Fallback DNS Server'));
+		so.readonly = true
+
+		o = s.taboption('servers', form.SectionValue, '_profiles', form.GridSection, 'profile', _('DNS profile templates'),
+			_('Create reusable templates here. Applying a template does not modify the template itself.'));
+		ss = o.subsection;
+		ss.anonymous = true;
+		ss.addremove = true;
+		ss.rowcolors = true;
+		ss.sortable = true;
+		ss.nodescriptions = true;
+		ss.addbtntitle = _('Add DNS profile');
+		ss.renderRowActions = function(section_id, more_label, trEl) {
+			trEl = form.GridSection.prototype.renderRowActions.apply(this, arguments);
+			const preset_ids = [
+				'default'
+			];
+
+			if (preset_ids.includes(section_id))
+				trEl?.lastChild.querySelector('.cbi-button-remove')?.remove();
+
+			return trEl;
+		}
+
+		so = ss.option(form.Value, 'label', _('Profile name'));
+		so.rmempty = false;
+		so.validate = validateUniqueValue;
+
+		so = ss.option(form.RichListValue, 'upstream_mode', _('Upstream selection mode'));
+		so.value(' ', _('Keep current mode'));
+		upstream_mode.forEach((res) => {
+			so.value.apply(so, res);
+		})
+		so.load = function(section_id) {
+			let value = this.super('load', section_id);
+			if (!value)
+				return ' ';
+
+			return value;
+		}
+		so.write = function(section_id, value) {
+			if (!value.trim())
+				return this.super('remove', section_id);
+
+			return form.RichListValue.prototype.write.call(this, section_id, value);
+		}
+		so.textvalue = function(section_id) {
+			let cval = this.cfgvalue(section_id);
+			let i = this.keylist.indexOf(cval);
+			let val = this.vallist[i];
+
+			return dom.elem(val) ? val.firstChild.textContent : val ?? cval;
+		}
+
+		so = ss.option(form.DynamicList, 'bootstrap', _('Bootstrap DNS'));
+		so.validate = validateServerValue;
+		so.modalonly = true;
+
+		so = ss.option(form.DynamicList, 'upstream', _('Upstream DNS'),
+			_('Allows the use of a specified upstream for specific domain. <a href="%s" target="_blank">Syntax reference</a>.')
+			.format('https://github.com/AdguardTeam/dnsproxy#specifying-upstreams-for-domains'));
+		so.rmempty = false;
+		//so.validate = validateServerValue; // See #11
+		so.modalonly = true;
+
+		so = ss.option(form.DynamicList, 'fallback', _('Fallback DNS'));
+		so.validate = validateServerValue;
+		so.modalonly = true;
+
+		return m.render()
+		.then(L.bind(function(m, nodes) {
+			poll.add(L.bind(function() {
+				return Promise.all([
+					getServiceStatus()
+				]).then(L.bind(this.poll_status, this, nodes));
+			}, this), 3);
+			return nodes;
+		}, this, m));
+	}
+});
@@ -0,0 +1,293 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:296
+msgid ""
+"A profile replaces Bootstrap, Upstream and Fallback lists together. Unsaved "
+"changes elsewhere on this page are not included."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:341
+msgid "Add DNS profile"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:389
+msgid ""
+"Allows the use of a specified upstream for specific domain. <a href=\"%s\" "
+"target=\"_blank\">Syntax reference</a>."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:285
+msgid "Bogus-NXDOMAIN"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:384
+msgid "Bootstrap DNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:323
+msgid "Bootstrap DNS Server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:233
+msgid "Cache"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:244
+msgid "Cache size (in bytes)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:164
+msgid "Collecting data ..."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:290
+msgid "Convert matching single IP responses to NXDOMAIN"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:316
+msgid ""
+"Create and save a profile in the “DNS profile templates” section below first."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:334
+msgid ""
+"Create reusable templates here. Applying a template does not modify the "
+"template itself."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:159
+#: root/usr/share/luci/menu.d/luci-app-dnsproxy.json:3
+msgid "DNS Proxy"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:333
+msgid "DNS profile templates"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:72
+msgid "DNS profile “%s” has been applied."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:295
+msgid "DNS profiles"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:260
+msgid "DNS64"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:267
+msgid "DNS64 Prefix"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:207
+msgid "Disable IPv6"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:211
+msgid "Disable secure TLS cert validation"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:273
+msgid "EDNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:280
+msgid "EDNS Client Address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:172
+msgid "Enable"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:238
+msgid "Enable Cache"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:265
+msgid "Enable DNS64"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:278
+msgid "Enable EDNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:213
+msgid "Enable HTTP/3 for DoH"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:81
+#: htdocs/luci-static/resources/view/dnsproxy.js:90
+#: htdocs/luci-static/resources/view/dnsproxy.js:114
+#: htdocs/luci-static/resources/view/dnsproxy.js:122
+msgid "Expecting: %s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:75
+msgid "Failed to apply DNS profile: %s"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:395
+msgid "Fallback DNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:330
+msgid "Fallback DNS Server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:19
+msgid "Fastest address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:227
+msgid ""
+"Fastest address performs additional IP reachability tests and is a "
+"different, slower operation."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:226
+msgid "For the lowest DNS response time choose Parallel."
+msgstr ""
+
+#: root/usr/share/rpcd/acl.d/luci-app-dnsproxy.json:3
+msgid "Grant access to LuCI app dnsproxy"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:127
+msgid "Invalid URI"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:359
+msgid "Keep current mode"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:180
+msgid "Listen address"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:202
+msgid "Listen ports"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:17
+msgid "Load balance"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:177
+msgid "Log file path"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:170
+msgid "Main"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:255
+msgid "Max TTL value for DNS entries, in seconds"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:250
+msgid "Min TTL value for DNS entries, in seconds"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:240
+msgid "Optimistic Cache"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:18
+msgid "Parallel"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:354
+msgid "Profile name"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:219
+msgid "Ratelimit (requests per second)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:209
+msgid "Refuse <code>ANY</code> requests"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:148
+msgid "SERVER NOT RUNNING"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:146
+msgid "SERVER RUNNING"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:222
+msgid "Size of the UDP buffer in bytes. Set 0 use the system default"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:58
+msgid "The selected DNS profile has no upstream servers."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:54
+msgid ""
+"The selected DNS profile no longer exists. Reload the page and try again."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:216
+msgid "Timeout for queries to remote upstream (default: 10s)"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:388
+msgid "Upstream DNS"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:326
+msgid "Upstream DNS Server"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:225
+#: htdocs/luci-static/resources/view/dnsproxy.js:358
+msgid "Upstream selection mode"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:293
+msgid "Upstreams"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:214
+msgid "Use HTTP/3 when it is faster. HTTPS fallback remains available."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:314
+msgid "Use selected profile"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:175
+msgid "Verbose"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:18
+msgid "first DNS response wins."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:81
+msgid "non-empty value"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:17
+msgid "one upstream per request."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:19
+msgid "tests returned IP addresses."
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:90
+msgid "unique value"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:122
+msgid "valid URL"
+msgstr ""
+
+#: htdocs/luci-static/resources/view/dnsproxy.js:114
+msgid "valid host or hostport"
+msgstr ""
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+add_cloudflare_profile() {
+	uci set      dnsproxy.preset_cloudflare='profile'
+	uci set      dnsproxy.preset_cloudflare.label='Preset: Cloudflare DoH'
+	uci add_list dnsproxy.preset_cloudflare.bootstrap='1.1.1.1:53'
+	uci add_list dnsproxy.preset_cloudflare.bootstrap='1.0.0.1:53'
+	uci add_list dnsproxy.preset_cloudflare.upstream='https://cloudflare-dns.com/dns-query'
+	uci add_list dnsproxy.preset_cloudflare.fallback='https://dns.quad9.net/dns-query'
+	uci set      dnsproxy.preset_cloudflare.upstream_mode='load_balance'
+}
+
+add_quad9_profile() {
+	uci set      dnsproxy.preset_quad9='profile'
+	uci set      dnsproxy.preset_quad9.label='Preset: Quad9 DoH'
+	uci add_list dnsproxy.preset_quad9.bootstrap='9.9.9.9:53'
+	uci add_list dnsproxy.preset_quad9.bootstrap='149.112.112.112:53'
+	uci add_list dnsproxy.preset_quad9.upstream='https://dns.quad9.net/dns-query'
+	uci add_list dnsproxy.preset_quad9.fallback='https://cloudflare-dns.com/dns-query'
+	uci set      dnsproxy.preset_quad9.upstream_mode='load_balance'
+}
+
+add_google_profile() {
+	uci set      dnsproxy.preset_google='profile'
+	uci set      dnsproxy.preset_google.label='Preset: Google DoH'
+	uci add_list dnsproxy.preset_google.bootstrap='8.8.8.8:53'
+	uci add_list dnsproxy.preset_google.bootstrap='8.8.4.4:53'
+	uci add_list dnsproxy.preset_google.upstream='https://dns.google/dns-query'
+	uci add_list dnsproxy.preset_google.fallback='https://cloudflare-dns.com/dns-query'
+	uci set      dnsproxy.preset_google.upstream_mode='load_balance'
+}
+
+add_fast_mixed_profile() {
+	uci set      dnsproxy.preset_fast_mixed='profile'
+	uci set      dnsproxy.preset_fast_mixed.label='Preset: Fast mixed DoH'
+	uci add_list dnsproxy.preset_fast_mixed.bootstrap='1.1.1.1:53'
+	uci add_list dnsproxy.preset_fast_mixed.bootstrap='9.9.9.9:53'
+	uci add_list dnsproxy.preset_fast_mixed.bootstrap='8.8.8.8:53'
+	uci add_list dnsproxy.preset_fast_mixed.upstream='https://cloudflare-dns.com/dns-query'
+	uci add_list dnsproxy.preset_fast_mixed.upstream='https://dns.quad9.net/dns-query'
+	uci add_list dnsproxy.preset_fast_mixed.fallback='https://dns.google/dns-query'
+	uci set      dnsproxy.preset_fast_mixed.upstream_mode='parallel'
+}
+
+# preset
+if [ -z "$(uci -q get dnsproxy.default)" ]; then
+	uci -q get dnsproxy.preset_cloudflare >/dev/null || add_cloudflare_profile
+	uci -q get dnsproxy.preset_quad9 >/dev/null || add_quad9_profile
+	uci -q get dnsproxy.preset_google >/dev/null || add_google_profile
+	uci -q get dnsproxy.preset_fast_mixed >/dev/null || add_fast_mixed_profile
+	uci commit dnsproxy
+	# default
+	echo "config profile 'default'" >> /etc/config/dnsproxy
+	echo "	option label 'Default'" >> /etc/config/dnsproxy
+	sed -n "/config dnsproxy 'servers'/,/^[^\t]/{/^\t/p}" /etc/config/dnsproxy >> /etc/config/dnsproxy
+fi
+
+exit 0
@@ -0,0 +1,12 @@
+{
+	"admin/services/dnsproxy": {
+		"title": "DNS Proxy",
+		"action": {
+			"type": "view",
+			"path": "dnsproxy"
+		},
+		"depends": {
+			"acl": [ "luci-app-dnsproxy" ]
+		}
+	}
+}
@@ -0,0 +1,15 @@
+{
+	"luci-app-dnsproxy": {
+		"description": "Grant access to LuCI app dnsproxy",
+		"read": {
+			"ubus": {
+				"luci-rpc": [ "getHostHints" ],
+				"service": [ "list" ]
+			},
+			"uci": ["dnsproxy"]
+		},
+		"write": {
+			"uci": ["dnsproxy"]
+		}
+	}
+}