Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adding a DNS option to the wireguard peer config generator.

Browse source 
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)
This commit is contained in:
Nicholaos Mouzourakis 2023-04-19 00:24:00 -04:00 committed by Paul Donald
parent 85ad07c59e
commit 5b26887c52
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
View file

@ -686,7 +686,7 @@ return network.registerProtocol('wireguard', {
o.modalonly = true; 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'), var pub = s.formvalue(s.section, 'public_key'),
port = s.formvalue(s.section, 'listen_port') || '51820', port = s.formvalue(s.section, 'listen_port') || '51820',
prv = this.section.formvalue(section_id, 'private_key'), prv = this.section.formvalue(section_id, 'private_key'),
@ -704,6 +704,7 @@ return network.registerProtocol('wireguard', {
'PrivateKey = ' + prv, 'PrivateKey = ' + prv,
eips && eips.length ? 'Address = ' + eips.join(', ') : '# Address not defined', eips && eips.length ? 'Address = ' + eips.join(', ') : '# Address not defined',
eport ? 'ListenPort = ' + eport : '# ListenPort not defined', eport ? 'ListenPort = ' + eport : '# ListenPort not defined',
dns && dns.length ? 'DNS = ' + dns.join(', ') : '# DNS not defined',
'', '',
'[Peer]', '[Peer]',
'PublicKey = ' + pub, 'PublicKey = ' + pub,
@ -724,6 +725,7 @@ return network.registerProtocol('wireguard', {
return Promise.all([ return Promise.all([
network.getWANNetworks(), network.getWANNetworks(),
network.getWAN6Networks(), network.getWAN6Networks(),
network.getNetwork('lan'),
L.resolveDefault(uci.load('ddns')), L.resolveDefault(uci.load('ddns')),
L.resolveDefault(uci.load('system')), L.resolveDefault(uci.load('system')),
parent.save(null, true) parent.save(null, true)
@ -748,9 +750,19 @@ return network.registerProtocol('wireguard', {
var ips = [ '0.0.0.0/0', '::/0' ]; 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; 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; qrm.parent = parent;
qrs = qrm.section(form.NamedSection, 'config'); qrs = qrm.section(form.NamedSection, 'config');
@ -761,9 +773,10 @@ return network.registerProtocol('wireguard', {
endpoint = this.section.getUIElement(section_id, 'endpoint'), endpoint = this.section.getUIElement(section_id, 'endpoint'),
ips = this.section.getUIElement(section_id, 'allowed_ips'); ips = this.section.getUIElement(section_id, 'allowed_ips');
eips = this.section.getUIElement(section_id, 'addresses'); eips = this.section.getUIElement(section_id, 'addresses');
dns = this.section.getUIElement(section_id, 'dns_servers');
if (this.isValid(section_id)) { 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'; code.style.opacity = '.5';
invokeQREncode(conf.firstChild.data, code); invokeQREncode(conf.firstChild.data, code);
@ -784,12 +797,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 = 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.datatype = 'ipaddr';
qro.default = eips; qro.default = eips;
qro.default = dns;
eips.forEach(function(eip) { qro.value(eip) }); eips.forEach(function(eip) { qro.value(eip) });
qro.onchange = handleConfigChange; qro.onchange = handleConfigChange;
qro = qrs.option(form.DummyValue, 'output'); qro = qrs.option(form.DummyValue, 'output');
qro.renderWidget = function() { qro.renderWidget = function() {
var peer_config = configGenerator(hostnames[0], ips, eips); var peer_config = configGenerator(hostnames[0], ips, eips, dns);
var node = E('div', { var node = E('div', {
'style': 'display:flex;flex-wrap:wrap;align-items:center;gap:.5em;width:100%' 'style': 'display:flex;flex-wrap:wrap;align-items:center;gap:.5em;width:100%'