- Find home devices (Bonjour) removed: iOS looks for services over the tunnel only under a search domain, and Android and Chromecast only over multicast, which WireGuard does not carry. Upgrading removes its server option and dnsmasq records - Home services still show the ports devices announce when umdns runs
This commit is contained in:
1 parent
e657742b52
commit
70a932b8ea
16 files changed
+25
-229
No files matched your search
@@ -20,7 +20,6 @@ import * as ops from 'dawnline.ops';
|
||||
import * as geo from 'dawnline.geo';
|
||||
import * as watchdog from 'dawnline.watchdog';
|
||||
import * as net from 'dawnline.net';
|
||||
import * as bonjour from 'dawnline.bonjour';
|
||||
|
||||
const TICK = 60 * 1000;
|
||||
const FLUSH_EVERY = 3600;
|
||||
@@ -357,12 +356,6 @@ function tick() {
|
||||
check_wan(m);
|
||||
}
|
||||
catch (e) {}
|
||||
try {
|
||||
bonjour.sync(m);
|
||||
}
|
||||
catch (e) {
|
||||
slog('dawnline', 'error', `failed: ${e.message}`, null, 'Find home devices');
|
||||
}
|
||||
nightly_backup();
|
||||
try {
|
||||
check_geo(m);
|
||||
|
||||
@@ -28,7 +28,7 @@ const AWG_RU = 'luci-i18n-amneziawg-ru';
|
||||
// OpenWrt packages Dawnline runs on (the Updates tab groups and names them).
|
||||
// What Dawnline itself adds to OpenWrt (the rest of LuCI, ucode, rpcd and uhttpd is the
|
||||
// stock system): the home-like link, and HTTPS plus certificates for the personal portal.
|
||||
const SYS_PKGS = [ 'ip-full', 'kmod-veth', 'libustream-openssl', 'openssl-util', 'acme', 'acme-acmesh-dnsapi', 'luci-app-acme', 'umdns' ];
|
||||
const SYS_PKGS = [ 'ip-full', 'kmod-veth', 'libustream-openssl', 'openssl-util', 'acme', 'acme-acmesh-dnsapi', 'luci-app-acme' ];
|
||||
// Packages released together with each of the above, updated as a set so OpenSSL never ends up
|
||||
// half old and half new.
|
||||
const PKG_FAMILY = [
|
||||
@@ -463,9 +463,6 @@ function install_pkgs(arg) {
|
||||
// The portal's HTTPS runs in uhttpd. Restart after this job saved its state.
|
||||
let touched = [ ...names, ...have ];
|
||||
// A missing piece arrived: set up what waited for it (the portal, the home-like link).
|
||||
// Bonjour: OpenWrt's mDNS daemon starts at once; the agent publishes what it finds.
|
||||
if (index(missing, 'umdns') >= 0)
|
||||
run('/etc/init.d/umdns enable; /etc/init.d/umdns start');
|
||||
if (length(missing) && length(filter(missing, (n) => match(n, /^(openssl-util|libustream|ip-full|kmod-veth)/))))
|
||||
run('( sleep 3; /usr/bin/dawnline apply; /etc/init.d/uhttpd restart; /etc/init.d/dawnline restart ) </dev/null >/dev/null 2>&1 &');
|
||||
else if (length(filter(touched, (n) => match(n, /^(libustream|libopenssl)/))))
|
||||
|
||||
@@ -17,7 +17,6 @@ import * as net from 'dawnline.net';
|
||||
import * as loop from 'dawnline.loop';
|
||||
import * as watchdog from 'dawnline.watchdog';
|
||||
import * as access from 'dawnline.access';
|
||||
import * as bonjour from 'dawnline.bonjour';
|
||||
|
||||
function wrap(fn) {
|
||||
return function(req) {
|
||||
@@ -426,7 +425,6 @@ function interfaces_view(srv, snap) {
|
||||
device_mesh: srv.device_mesh, mesh: srv.mesh },
|
||||
like_home: loop.status(),
|
||||
needs: ops.needs().home,
|
||||
bonjour: { on: srv.bonjour, needs: ops.needs().bonjour, ...bonjour.view(core.load()) },
|
||||
effective: sn,
|
||||
zones: snap.zones,
|
||||
devices,
|
||||
@@ -551,12 +549,6 @@ function server_update(a) {
|
||||
}
|
||||
if (v.enabled != null)
|
||||
set('enabled', v.enabled === true || v.enabled == '1' ? '1' : '0');
|
||||
let bj = v.bonjour == null ? null : (v.bonjour === true || v.bonjour == '1');
|
||||
if (bj != null) {
|
||||
if (bj && length(ops.needs().bonjour))
|
||||
die('Install umdns first.');
|
||||
set('bonjour', bj ? '1' : null);
|
||||
}
|
||||
if (v.device_mesh != null && v.mesh == null)
|
||||
v.mesh = v.device_mesh === true || v.device_mesh == '1' ? 'all' : 'off';
|
||||
if (v.mesh != null) {
|
||||
@@ -604,12 +596,6 @@ function server_update(a) {
|
||||
admin_log('awg', on ? 'turned on' : 'turned off', 'server', name);
|
||||
if (length(what))
|
||||
admin_log('awg', 'changed', 'server', name, join(', ', what));
|
||||
if (bj != null && bj != srv.bonjour) {
|
||||
admin_log('awg', bj ? 'turned on' : 'turned off', 'server', name, 'finding home devices (Bonjour)');
|
||||
if (bj)
|
||||
bonjour.start_mdns();
|
||||
bonjour.sync(core.load(), true);
|
||||
}
|
||||
if (mesh != null && mesh != srv.mesh)
|
||||
admin_log('awg', 'changed', 'server', name,
|
||||
{ off: 'devices kept apart', all: 'devices reach each other', circles: 'devices reach each other in circles' }[mesh]);
|
||||
|
||||
@@ -1,149 +0,0 @@
|
||||
// Dawnline: "Find home devices" (Bonjour over the tunnel). Multicast DNS does
|
||||
// not cross WireGuard, so what umdns sees on the home networks is published
|
||||
// as unicast DNS-SD records in dnsmasq: iPhone, iPad and Mac look there
|
||||
// (browse domains under the home domain and the reverse zone of their own
|
||||
// tunnel address) and list AirPlay, printers and shared Macs as at home.
|
||||
|
||||
'use strict';
|
||||
|
||||
import { readfile, writefile, unlink, lsdir, stat } from 'fs';
|
||||
import { read_json, write_json, ensure_dir, RUN_DIR } from 'dawnline.util';
|
||||
import * as ops from 'dawnline.ops';
|
||||
|
||||
const FILE = 'dawnline-bonjour.conf';
|
||||
const STATE = `${RUN_DIR}/bonjour.json`;
|
||||
/** dnsmasq restarts to read the records: at most this often when only TXT data changed. */
|
||||
const QUIET = 600;
|
||||
/** Not useful from a phone, or not a service at all. */
|
||||
const SKIP = [ '_device-info._tcp', '_companion-link._tcp', '_sleep-proxy._udp', '_workstation._tcp', '_rdlink._tcp', '_hap._udp' ];
|
||||
|
||||
export function enabled(m) {
|
||||
for (let id, srv in m.servers)
|
||||
if (srv.bonjour && srv.private_key)
|
||||
return true;
|
||||
return false;
|
||||
};
|
||||
|
||||
/** dnsmasq's conf-dirs (one per instance), from its generated configs. */
|
||||
function conf_dirs() {
|
||||
let out = [];
|
||||
for (let f in lsdir('/var/etc') ?? []) {
|
||||
if (!match(f, /^dnsmasq\.conf\./))
|
||||
continue;
|
||||
for (let line in split(readfile(`/var/etc/${f}`) ?? '', '\n')) {
|
||||
let mm = match(line, /^conf-dir=([^,]+)/);
|
||||
if (mm && index(out, mm[1]) < 0)
|
||||
push(out, mm[1]);
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
/** An instance name as dnsmasq takes it: printable ASCII, no dots or commas. */
|
||||
function instance(s) {
|
||||
s = replace(s ?? '', /[\u2018\u2019]/g, "'");
|
||||
s = replace(s, /[\u201c\u201d]/g, '');
|
||||
s = replace(s, /[^\x20-\x7e]/g, '');
|
||||
s = replace(s, /[.,"\\]/g, ' ');
|
||||
s = trim(replace(s, / +/g, ' '));
|
||||
return substr(s, 0, 63);
|
||||
}
|
||||
|
||||
function label(s) {
|
||||
return substr(trim(replace(replace(s ?? '', /[^A-Za-z0-9-]+/g, '-'), /^-+|-+$/g, '')), 0, 63);
|
||||
}
|
||||
|
||||
/** Reverse zone of a server's tunnel network (its /24), where devices look for browse domains. */
|
||||
function reverse24(subnet) {
|
||||
let mm = match(subnet ?? '', /^([0-9]+)\.([0-9]+)\.([0-9]+)\.[0-9]+\//);
|
||||
return mm ? `0.${mm[3]}.${mm[2]}.${mm[1]}.in-addr.arpa` : null;
|
||||
}
|
||||
|
||||
/** The records, and a signature of what matters without TXT data. */
|
||||
export function records(m, services) {
|
||||
let dom = m.settings.domain || 'lan';
|
||||
let lines = [], sig = [];
|
||||
let zones = [ dom ];
|
||||
for (let id, srv in m.servers)
|
||||
if (srv.bonjour && reverse24(srv.subnet))
|
||||
push(zones, reverse24(srv.subnet));
|
||||
for (let z in zones)
|
||||
for (let b in [ 'b', 'db', 'lb' ])
|
||||
push(lines, `ptr-record=${b}._dns-sd._udp.${z},${dom}`);
|
||||
let types = {}, hosts = {};
|
||||
for (let s in services) {
|
||||
if (!s.port || index(SKIP, s.type) >= 0 || !match(s.type, /^_[A-Za-z0-9-]+\._(tcp|udp)$/))
|
||||
continue;
|
||||
let name = instance(s.name), host = label(s.host) || label(replace(s.address, /\./g, '-'));
|
||||
if (name == '')
|
||||
continue;
|
||||
let full = `${name}.${s.type}.${dom}`;
|
||||
types[s.type] = true;
|
||||
hosts[host] = s.address;
|
||||
push(lines, `ptr-record=${s.type}.${dom},${full}`);
|
||||
push(lines, `srv-host=${full},${host}.${dom},${s.port}`);
|
||||
let txt = filter(s.txt ?? [], (t) => type(t) == 'string' && length(t) <= 255 && !match(t, /["\\\n]/));
|
||||
push(lines, length(txt) ? `txt-record=${full},${join(',', map(txt, (t) => `"${t}"`))}` : `txt-record=${full}`);
|
||||
push(sig, `${full}|${host}|${s.port}`);
|
||||
}
|
||||
for (let t in sort(keys(types)))
|
||||
push(lines, `ptr-record=_services._dns-sd._udp.${dom},${t}.${dom}`);
|
||||
for (let h in sort(keys(hosts))) {
|
||||
push(lines, `host-record=${h}.${dom},${hosts[h]}`);
|
||||
push(sig, `${h}=${hosts[h]}`);
|
||||
}
|
||||
return { conf: '# Written by Dawnline: home devices for Bonjour over the tunnel.\n' + join('\n', lines) + '\n', sig: join('\n', sort(sig)) };
|
||||
};
|
||||
|
||||
function restart_dnsmasq() {
|
||||
system('/etc/init.d/dnsmasq restart >/dev/null 2>&1');
|
||||
}
|
||||
|
||||
/**
|
||||
* Keep the records in step with what umdns sees (agent tick and apply).
|
||||
* Turned off: the records go away.
|
||||
*/
|
||||
export function sync(m, force) {
|
||||
let dirs = conf_dirs();
|
||||
if (!enabled(m) || !ops.mdns_running()) {
|
||||
let removed = false;
|
||||
for (let d in dirs)
|
||||
if (stat(`${d}/${FILE}`)) {
|
||||
unlink(`${d}/${FILE}`);
|
||||
removed = true;
|
||||
}
|
||||
if (removed)
|
||||
restart_dnsmasq();
|
||||
unlink(STATE);
|
||||
return false;
|
||||
}
|
||||
let r = records(m, ops.mdns_services());
|
||||
let st = read_json(STATE, {});
|
||||
let now = time();
|
||||
let same = st.conf == r.conf;
|
||||
let quiet = !force && st.sig == r.sig && now - (st.ts ?? 0) < QUIET;
|
||||
let missing = length(filter(dirs, (d) => !stat(`${d}/${FILE}`)));
|
||||
if ((same || quiet) && !missing)
|
||||
return false;
|
||||
for (let d in dirs) {
|
||||
ensure_dir(d);
|
||||
writefile(`${d}/${FILE}`, r.conf);
|
||||
system(`chmod 644 ${d}/${FILE}`);
|
||||
}
|
||||
write_json(STATE, { conf: r.conf, sig: r.sig, ts: now }, 0o644);
|
||||
restart_dnsmasq();
|
||||
return true;
|
||||
};
|
||||
|
||||
/** Turning it on: umdns must run and look at the home networks. */
|
||||
export function start_mdns() {
|
||||
system('/etc/init.d/umdns enable >/dev/null 2>&1; /etc/init.d/umdns start >/dev/null 2>&1');
|
||||
};
|
||||
|
||||
export function view(m) {
|
||||
let s = ops.mdns_running() ? ops.mdns_services() : [];
|
||||
return {
|
||||
running: ops.mdns_running(),
|
||||
services: length(filter(s, (x) => x.port && index(SKIP, x.type) < 0)),
|
||||
};
|
||||
};
|
||||
@@ -137,8 +137,6 @@ export function load(c) {
|
||||
// (Older configs: device_mesh 0/1.)
|
||||
mesh: index(MESH, r.mesh) >= 0 ? r.mesh : (bool(r.device_mesh, true) ? 'all' : 'off'),
|
||||
enabled: bool(r.enabled, true),
|
||||
// Home devices found over Bonjour are published as DNS-SD records (needs umdns).
|
||||
bonjour: bool(r.bonjour, false),
|
||||
obf: {},
|
||||
};
|
||||
// A person's own devices reach each other whenever the mesh is not off.
|
||||
|
||||
@@ -34,7 +34,6 @@ export function needs() {
|
||||
acme: miss([ [ file_exists('/usr/lib/acme/client/acme.sh'), 'acme' ], [ file_exists('/usr/lib/acme/client/dnsapi/dns_cf.sh'), 'acme-acmesh-dnsapi' ],
|
||||
[ file_exists('/www/luci-static/resources/view/acme.js'), 'luci-app-acme' ] ]),
|
||||
home: miss([ [ file_exists('/usr/libexec/ip-full'), 'ip-full' ], [ veth, 'kmod-veth' ] ]),
|
||||
bonjour: miss([ [ file_exists('/usr/sbin/umdns'), 'umdns' ] ]),
|
||||
};
|
||||
};
|
||||
|
||||
@@ -52,7 +51,7 @@ export function mdns_services() {
|
||||
return [];
|
||||
let r = {};
|
||||
try {
|
||||
r = json(sh_out(`ubus call umdns browse '{"address":true}' 2>/dev/null`) || '{}') ?? {};
|
||||
r = json(sh_out(`ubus call umdns browse '{"address":true,"array":true}' 2>/dev/null`) || '{}') ?? {};
|
||||
}
|
||||
catch (e) {
|
||||
r = {};
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
import { open, readfile, writefile, rename, mkdir, stat, unlink, popen, lsdir } from 'fs';
|
||||
|
||||
export const VERSION = '0.3.0';
|
||||
export const VERSION = '0.3.1';
|
||||
/** GitHub repository with Dawnline releases (updates and the installer). */
|
||||
export const REPO = 'tickcount/luci-app-dawnline';
|
||||
export const RUN_DIR = '/var/run/dawnline';
|
||||
|
||||
Reference in new issue
Block a user