Adding a DNS option to the wireguard peer config generator.

Some clients like iOS require this explicitly, and so this change
adds the appropriate config with some sensible defaults.

Closes #6351

Signed-off-by: Nicholaos Mouzourakis <nevumx@gmail.com>
Signed-off-by: Paul Donald <newtwen@gmail.com>
Tested-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 990696d73f982de015df7c7d552daef1a03f50c5)
(cherry picked from commit 5b26887c52097dc9364c9b4f4dfb2d6ba2f08818)

diff --git a/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js b/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
index 96014c5a7b4f288cef36f1f97d4476dbbdad2af7..72885f094c2235ee2614c471fd7c58c2041a8d41 100644 (file)
--- a/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
+++ b/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
@@ -688,7 +688,7 @@ return network.registerProtocol('wireguard', {
 
                o.modalonly = true;
 
-               o.createPeerConfig = function(section_id, endpoint, ips, eips) {
+               o.createPeerConfig = function(section_id, endpoint, ips, eips, dns) {
                        var pub = s.formvalue(s.section, 'public_key'),
                            port = s.formvalue(s.section, 'listen_port') || '51820',
                            prv = this.section.formvalue(section_id, 'private_key'),
@@ -701,6 +701,7 @@ return network.registerProtocol('wireguard', {
                                'PrivateKey = ' + prv,
                                eips && eips.length ? 'Address = ' + eips.join(', ') : '# Address not defined',
                                eport ? 'ListenPort = ' + eport : '# ListenPort not defined',
+                               dns && dns.length ? 'DNS = ' + dns.join(', ') : '# DNS not defined',
                                '',
                                '[Peer]',
                                'PublicKey = ' + pub,
@@ -721,6 +722,7 @@ return network.registerProtocol('wireguard', {
                        return Promise.all([
                                network.getWANNetworks(),
                                network.getWAN6Networks(),
+                               network.getNetwork('lan'),
                                L.resolveDefault(uci.load('ddns')),
                                L.resolveDefault(uci.load('system')),
                                parent.save(null, true)
@@ -745,9 +747,19 @@ return network.registerProtocol('wireguard', {
 
                                var ips = [ '0.0.0.0/0', '::/0' ];
 
+                               var dns = [];
+
+                               var lan = data[2];
+                               if (lan) {
+                                       var lanIp = lan.getIPAddr();
+                                       if (lanIp) {
+                                               dns.unshift(lanIp)
+                                       }
+                               }
+
                                var qrm, qrs, qro;
 
-                               qrm = new form.JSONMap({ config: { endpoint: hostnames[0], allowed_ips: ips, addresses: eips } }, null, _('The generated configuration can be imported into a WireGuard client application to set up a connection towards this device.'));
+                               qrm = new form.JSONMap({ config: { endpoint: hostnames[0], allowed_ips: ips, addresses: eips, dns_servers: dns } }, null, _('The generated configuration can be imported into a WireGuard client application to set up a connection towards this device.'));
                                qrm.parent = parent;
 
                                qrs = qrm.section(form.NamedSection, 'config');
@@ -758,9 +770,10 @@ return network.registerProtocol('wireguard', {
                                            endpoint = this.section.getUIElement(section_id, 'endpoint'),
                                            ips = this.section.getUIElement(section_id, 'allowed_ips');
                                            eips = this.section.getUIElement(section_id, 'addresses');
+                                           dns = this.section.getUIElement(section_id, 'dns_servers');
 
                                        if (this.isValid(section_id)) {
-                                               conf.firstChild.data = configGenerator(endpoint.getValue(), ips.getValue(), eips.getValue());
+                                               conf.firstChild.data = configGenerator(endpoint.getValue(), ips.getValue(), eips.getValue(), dns.getValue());
                                                code.style.opacity = '.5';
 
                                                invokeQREncode(conf.firstChild.data, code);
@@ -781,12 +794,13 @@ return network.registerProtocol('wireguard', {
                                qro = qrs.option(form.DynamicList, 'addresses', _('Addresses'), _('IP addresses for the peer to use inside the tunnel. Some clients require this setting.'));
                                qro.datatype = 'ipaddr';
                                qro.default = eips;
+                               qro.default = dns;
                                eips.forEach(function(eip) { qro.value(eip) });
                                qro.onchange = handleConfigChange;
 
                                qro = qrs.option(form.DummyValue, 'output');
                                qro.renderWidget = function() {
-                                       var peer_config = configGenerator(hostnames[0], ips, eips);
+                                       var peer_config = configGenerator(hostnames[0], ips, eips, dns);
 
                                        var node = E('div', {
                                                'style': 'display:flex;flex-wrap:wrap;align-items:center;gap:.5em;width:100%'