Dawnline 0.20.0
Build packages / CI (push) Blocked by required conditions
Build packages / Version (push) Waiting to run
CI / Web (format, types, tests, bundles) (push) Blocked by required conditions
CI / ShellCheck (push) Blocked by required conditions
CI / Backend (Go: vet, tests, a real ubusd and uhttpd) (push) Blocked by required conditions
CI / Package files (push) Blocked by required conditions
Build packages / CI (push) Blocked by required conditions
Build packages / Version (push) Waiting to run
CI / Web (format, types, tests, bundles) (push) Blocked by required conditions
CI / ShellCheck (push) Blocked by required conditions
CI / Backend (Go: vet, tests, a real ubusd and uhttpd) (push) Blocked by required conditions
CI / Package files (push) Blocked by required conditions
- **Backend rewritten in Go.** One daemon, `dawnlined`, replaces the whole ucode backend: the rpcd plugin, the agent, the CLI and the updater. The package no longer depends on ucode. - **Per-architecture builds.** The release carries the backend for arm64, ARMv7, mips, mipsle and amd64; the router fetches its own after the package is installed and checks its sha256. Dawnline does not run on other architectures (older ARM, 32-bit x86, RISC-V). - **Faster on the router.** A firewall sync takes 0.06 s instead of 0.9 s; a full apply takes about 300 ms. The portal is served by the daemon itself, without a CGI process per request. - **Live pages.** The admin and the portal follow a live stream from the router instead of re-fetching the whole state every 30 seconds. - **Admin redesigned in the portal's style.** Three sections (Overview · Log · Settings); a server is a page of its own with People, Places and Settings; a device opens as a dialog over its person. - **Changes wait for «Apply».** Every setting, and a person's access, is staged in one dock before it reaches the router. - **Configuration rollout.** After a change that makes devices fetch their configuration again, the admin shows how many have fetched it and who has not. Every setting shows beforehand (⟳N) how many devices it will touch. - **Waiting for a decision.** Overview and People put first the people who need one (access ended, limit reached, a device that does not connect), each with its one action a tap away. - **Bulk actions on people.** «Select» (or a long press on a card) picks several people to extend by a month, pause or resume at once. - **Undo.** An action done from a card or a request is undone from its toast. - **Update dialogs redesigned.** An update is one view from its question to its result; Dawnline's own update runs in it like every other, and the page reloads itself once the new version answers. Other versions are a list, each with its notes and Install on a page of its own. - **Site to site: networks behind a router.** A router connected as a device can have networks behind it (up to eight, /16 to /30): the server routes them and applies the router's access to them. A network that shares addresses with a tunnel, the router's own networks or another site is refused by name. - **Routers from the portal.** People can add a router and name its networks on their own page; the admin accepts or declines with a reason, or lets them through without asking. - **Check access and Health know the networks behind routers.** - **Usage limits reworked.** A monthly limit no longer follows the calendar. A person's month starts with their first traffic and ends a month later; the next one starts only when they connect again, so time away uses up none of it. Before, everyone's limit reset on the 1st. - Extra data lasts until that person's month ends; «Reset usage» starts the month anew. - A limit is for a month or for the whole term; the admin and the portal show when it resets. - Charts that said «this month» show the last 30 days. - After the update nobody loses what was counted: the month that was running becomes the person's first and ends on the 1st. - **Access by time of day removed.** The Hours limit is gone from the admin, the portal and the backend; saved hours are dropped. - **Expiry simplified.** An end date always stops access, with a heads-up three days before; the per-person choice is gone. - **No false disconnects from sleeping phones.** A phone or a tablet stays online through ten minutes of silence. - **Mobile Safari fixes.** Pressing a control no longer sends the page to its top; tab tracks that do not fit scroll; switches animate after a press.
This commit is contained in:
1 parent
f8130e39a8
commit
ac90575b0b
788 files changed
+139244
-41720
No files matched your search
@@ -1,344 +1,8 @@
|
||||
#!/usr/bin/ucode
|
||||
// Dawnline command line: `dawnline help`.
|
||||
'use strict';
|
||||
|
||||
import * as core from 'dawnline.core';
|
||||
import * as live from 'dawnline.live';
|
||||
import * as apply from 'dawnline.apply';
|
||||
import * as view from 'dawnline.view';
|
||||
import * as health from 'dawnline.health';
|
||||
import * as backup from 'dawnline.backup';
|
||||
import * as pc from 'dawnline.portalcert';
|
||||
import * as watchdog from 'dawnline.watchdog';
|
||||
import * as awg from 'dawnline.awg';
|
||||
import * as store from 'dawnline.store';
|
||||
import * as devices from 'dawnline.devices';
|
||||
import { L_ } from 'dawnline.i18n';
|
||||
import {
|
||||
VERSION, slog, syslog, slog_read, sh_out, q, take_iface_intent, read_json, write_json, ensure_dir, with_lock, RUN_DIR
|
||||
} from 'dawnline.util';
|
||||
|
||||
/** Options that take no value. */
|
||||
const FLAGS = [ 'json', 'yes', 'conf' ];
|
||||
|
||||
// Options (--name value, or a bare --flag) can go anywhere; what is left are the words.
|
||||
const opts = {};
|
||||
const args = [];
|
||||
for (let i = 0; i < length(ARGV); i++) {
|
||||
let a = ARGV[i];
|
||||
if (a == '-n')
|
||||
a = '--n';
|
||||
if (substr(a, 0, 2) == '--') {
|
||||
let name = substr(a, 2);
|
||||
if (index(FLAGS, name) >= 0)
|
||||
opts[name] = true;
|
||||
else
|
||||
opts[name] = ARGV[++i] ?? '';
|
||||
}
|
||||
else
|
||||
push(args, a);
|
||||
}
|
||||
const cmd = args[0] ?? 'help';
|
||||
|
||||
function out(v) {
|
||||
print(type(v) == 'string' ? v + '\n' : sprintf('%.J\n', v));
|
||||
}
|
||||
|
||||
function opt(name, dflt) {
|
||||
return opts[name] ?? dflt;
|
||||
}
|
||||
|
||||
/** Fixed-width columns: a header, then one line per row. */
|
||||
function table(cols, rows) {
|
||||
let w = map(cols, (c) => length(c));
|
||||
for (let r in rows)
|
||||
for (let i, v in r)
|
||||
w[i] = max(w[i], length(`${v}`));
|
||||
let line = (r) => rtrim(join(' ', map(r, (v, i) => sprintf(`%-${w[i]}s`, `${v}`))));
|
||||
out(line(cols));
|
||||
for (let r in rows)
|
||||
out(line(r));
|
||||
}
|
||||
|
||||
/** `--since 30m|2h|3d|YYYY-MM-DD` as a time, or null. */
|
||||
function since_time(s) {
|
||||
if (!s)
|
||||
return null;
|
||||
let m = match(s, /^([0-9]+)([mhd])$/);
|
||||
if (m)
|
||||
return time() - +m[1] * { m: 60, h: 3600, d: 86400 }[m[2]];
|
||||
m = match(s, /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/);
|
||||
if (m)
|
||||
return timelocal({ year: +m[1], mon: +m[2], mday: +m[3], hour: 0, min: 0, sec: 0 });
|
||||
die('--since takes 30m, 2h, 3d or a date like 2026-10-18.');
|
||||
}
|
||||
|
||||
/** "5m", "3h", "2d": how long ago, for the lists. */
|
||||
function ago(secs) {
|
||||
return secs < 3600 ? `${int(secs / 60)}m` : secs < 86400 ? `${int(secs / 3600)}h` : `${int(secs / 86400)}d`;
|
||||
}
|
||||
|
||||
function the_person(m, slug) {
|
||||
return m.people[slug ?? ''] ?? die(slug ? `Unknown person: ${slug}.` : 'Which person? Give their id (dawnline person ls).');
|
||||
}
|
||||
|
||||
function help() {
|
||||
out(`Dawnline ${VERSION}
|
||||
|
||||
Usage: dawnline <command>
|
||||
|
||||
apply Reconcile router configuration and runtime state
|
||||
sync Push devices and access rules to the tunnels
|
||||
status People and devices with live state (JSON)
|
||||
health Run health checks (JSON)
|
||||
person ls [--json] Everyone: id, name, access, state, devices, last seen
|
||||
person add <name> [--slug s] [--access lan|internet|both] [--devices n]
|
||||
[--expires YYYY-MM-DD] [--quota GB] [--server id]
|
||||
person link <id> Print the personal portal link
|
||||
person rm <id> [--yes] Remove a person and their devices (--yes when they have any)
|
||||
device ls [person] [--json]
|
||||
device add <person> <name> [--kind phone|computer|tablet|router] [--conf]
|
||||
device conf <id> Print a device configuration (.conf)
|
||||
device rm <id> Remove a device
|
||||
backup Create a backup in /etc/dawnline/backups
|
||||
portal-cert Print the certificate and key the portal uses
|
||||
portal-http-port Print the plain-HTTP port when an IP is among the portal addresses
|
||||
log [-n N] [--since 2h|3d|date] [--level error|down|repair|up|info] [--src awg|dawnline|portal] [--json]
|
||||
Service log: tunnel and service starts, stops, repairs (newest first)
|
||||
teardown Remove everything Dawnline created on the router
|
||||
version
|
||||
|
||||
Exit codes: 0 done, 1 refused or failed, 2 unknown command. health exits 1 when a check fails.`);
|
||||
}
|
||||
|
||||
/*
|
||||
* netifd retries a tunnel that fails to start every few seconds (a kernel
|
||||
* module that won't load, AmneziaWG removed): one line per interface every
|
||||
* 10 minutes, with how many attempts failed meanwhile. A start clears it.
|
||||
*/
|
||||
const FAILS = `${RUN_DIR}/ifup-failed.json`;
|
||||
const FAIL_EVERY = 600;
|
||||
|
||||
function ifup_failed(ifname, who) {
|
||||
let now = time();
|
||||
// Attempts since the last line (a quiet spell starts a new count), and over how long.
|
||||
let r = with_lock('ifup-failed', () => {
|
||||
let all = read_json(FAILS, {});
|
||||
let f = all[ifname];
|
||||
if (!f || now - f.last > FAIL_EVERY)
|
||||
f = all[ifname] = { logged: 0, count: 0, since: now };
|
||||
f.count++;
|
||||
f.last = now;
|
||||
let out = null;
|
||||
if (now - f.logged >= FAIL_EVERY) {
|
||||
out = { n: f.count, mins: int((now - f.since) / 60) };
|
||||
f.logged = f.since = now;
|
||||
f.count = 0;
|
||||
}
|
||||
ensure_dir(RUN_DIR);
|
||||
write_json(FAILS, all, 0o600);
|
||||
return out;
|
||||
});
|
||||
if (r)
|
||||
slog('awg', 'error', r.n > 1 ? sprintf(L_("couldn't start · %d failed attempts in %d min"), r.n, r.mins) : L_("couldn't start"),
|
||||
watchdog.iface_errors(ifname), who);
|
||||
}
|
||||
|
||||
function ifup_ok(ifname) {
|
||||
with_lock('ifup-failed', () => {
|
||||
let all = read_json(FAILS, {});
|
||||
if (all[ifname]) {
|
||||
delete all[ifname];
|
||||
write_json(FAILS, all, 0o600);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
try {
|
||||
if (cmd == 'apply')
|
||||
out(apply.apply());
|
||||
else if (cmd == 'sync')
|
||||
out(apply.sync());
|
||||
else if (cmd == 'status') {
|
||||
let m = core.load(), u = core.load_usage(), d = live.dump(m), st = view.states(m, u);
|
||||
out(map(values(m.people), (p) => view.person_view(m, p, u, d, st, { admin: true })));
|
||||
}
|
||||
else if (cmd == 'health') {
|
||||
let checks = health.health();
|
||||
out(checks);
|
||||
if (length(filter(checks, (c) => c.status == 'error')))
|
||||
exit(1);
|
||||
}
|
||||
else if (cmd == 'person' && args[1] == 'ls') {
|
||||
let m = core.load(), u = core.load_usage(), d = live.dump(m), st = view.states(m, u);
|
||||
let people = sort(map(values(m.people), (p) => view.person_view(m, p, u, d, st, { admin: true })), (a, b) => a.name < b.name ? -1 : 1);
|
||||
if (opts.json)
|
||||
out(people);
|
||||
else
|
||||
table([ 'ID', 'NAME', 'SERVER', 'ACCESS', 'STATE', 'DEVICES', 'LAST SEEN' ], map(people, (p) => [
|
||||
p.id, p.name, p.server, p.access, p.state, `${length(p.devices)}${p.online ? ` (${p.online} online)` : ''}`,
|
||||
p.online ? 'now' : p.last_seen ? ago(time() - p.last_seen) + ' ago' : 'never',
|
||||
]));
|
||||
}
|
||||
else if (cmd == 'person' && args[1] == 'add') {
|
||||
let id = store.transact((c, m) => core.create_person(c, m, {
|
||||
name: args[2], slug: opt('slug'), access: opt('access', 'internet'), server: opt('server'),
|
||||
device_limit: opt('devices'), expires: opt('expires'), quota_gb: opt('quota'),
|
||||
}));
|
||||
let m2 = core.load();
|
||||
live.add_event({ type: 'person_added', person: id, detail: m2.people[id].name, by: 'admin' });
|
||||
out(`Added ${m2.people[id].name} (${id})`);
|
||||
out(core.portal_url(m2, m2.people[id]) ?? 'No personal link: the portal is off.');
|
||||
}
|
||||
else if (cmd == 'person' && args[1] == 'link') {
|
||||
let m = core.load();
|
||||
let p = the_person(m, args[2]);
|
||||
out(core.portal_url(m, p) ?? 'No personal link: the portal is off.');
|
||||
}
|
||||
else if (cmd == 'person' && args[1] == 'rm') {
|
||||
let m = core.load();
|
||||
let p = the_person(m, args[2]);
|
||||
let n = length(p.devices);
|
||||
if (n && !opts.yes)
|
||||
die(`${p.name} has ${n} device${n == 1 ? '' : 's'}: add --yes to remove them too.`);
|
||||
store.transact((c, m) => core.delete_person(c, m, p.id));
|
||||
live.add_event({ type: 'person_removed', person: p.id, detail: p.name, pname: p.name, by: 'admin' });
|
||||
let s = apply.sync();
|
||||
out(`Removed ${p.name}${n ? ` and ${n} device${n == 1 ? '' : 's'}` : ''}.`);
|
||||
if (s.warning)
|
||||
warn(`dawnline: ${s.warning}\n`);
|
||||
}
|
||||
else if (cmd == 'device' && args[1] == 'ls') {
|
||||
let m = core.load(), d = live.dump(m);
|
||||
let who = args[2] ? the_person(m, args[2]) : null;
|
||||
let rows = [];
|
||||
for (let id, dev in m.devices) {
|
||||
let p = m.people[dev.person];
|
||||
if (!p || (who && p.id != who.id))
|
||||
continue;
|
||||
let peer = d.peers[dev.public_key];
|
||||
let online = live.online(d, id, peer);
|
||||
push(rows, { id, person: p.id, name: dev.name, kind: dev.kind, address: dev.address, disabled: dev.disabled,
|
||||
online, handshake: +(peer?.handshake ?? 0) });
|
||||
}
|
||||
rows = sort(rows, (a, b) => (a.person < b.person ? -1 : a.person > b.person ? 1 : 0) || (a.name < b.name ? -1 : 1));
|
||||
if (opts.json)
|
||||
out(rows);
|
||||
else
|
||||
table([ 'ID', 'PERSON', 'NAME', 'KIND', 'ADDRESS', 'STATE' ], map(rows, (r) => [
|
||||
r.id, r.person, r.name, r.kind, r.address,
|
||||
r.disabled ? 'off' : r.online ? 'online' : r.handshake ? `seen ${ago(time() - r.handshake)} ago` : 'never connected',
|
||||
]));
|
||||
}
|
||||
else if (cmd == 'device' && args[1] == 'add') {
|
||||
// Through the same door as LuCI and the portal: event, "issued" marker, capability check.
|
||||
let m = core.load();
|
||||
let p = the_person(m, args[2]);
|
||||
if (!args[3])
|
||||
die('Which name? dawnline device add <person> <name>.');
|
||||
let r = devices.add(p.id, args[3], opt('kind', 'phone'), { by: 'admin' });
|
||||
if (opts.conf)
|
||||
print(r.config.conf);
|
||||
else
|
||||
out(`${r.id} (dawnline device conf ${r.id} prints its configuration)`);
|
||||
if (r.warning)
|
||||
warn(`dawnline: ${r.warning}\n`);
|
||||
}
|
||||
else if (cmd == 'device' && args[1] == 'conf') {
|
||||
let m = core.load();
|
||||
let d = m.devices[args[2] ?? ''] ?? die('Unknown device.');
|
||||
awg.mark_issued(m, d.id);
|
||||
print(awg.client_config(m, d).conf);
|
||||
}
|
||||
else if (cmd == 'device' && args[1] == 'rm') {
|
||||
let m = core.load();
|
||||
let d = m.devices[args[2] ?? ''] ?? die('Unknown device.');
|
||||
let r = devices.remove(d.id, { by: 'admin' });
|
||||
out(`Removed ${d.name} (${m.people[d.person]?.name ?? d.person}).`);
|
||||
if (r.warning)
|
||||
warn(`dawnline: ${r.warning}\n`);
|
||||
}
|
||||
else if (cmd == 'backup')
|
||||
out(backup.backup_create(opt('reason')));
|
||||
else if (cmd == 'portal-cert') {
|
||||
let c = pc.portal_cert(core.load().settings);
|
||||
out(`${c.cert} ${c.key}`);
|
||||
}
|
||||
else if (cmd == 'portal-http-port') {
|
||||
let m = core.load();
|
||||
if (core.portal_http(m))
|
||||
out(`${core.portal_http_port(m)}`);
|
||||
}
|
||||
else if (cmd == 'log') {
|
||||
let n = +opt('n', 0) || 0;
|
||||
let since = since_time(opt('since'));
|
||||
let level = opt('level'), src = opt('src');
|
||||
if (level && index([ 'info', 'up', 'down', 'repair', 'error' ], level) < 0)
|
||||
die('--level takes error, down, repair, up or info.');
|
||||
if (src && index([ 'awg', 'dawnline', 'portal' ], src) < 0)
|
||||
die('--src takes awg, dawnline or portal.');
|
||||
let log = filter(slog_read(n && !since && !level && !src ? n : null),
|
||||
(e) => (!since || e.ts >= since) && (!level || e.level == level) && (!src || e.src == src));
|
||||
if (n && length(log) > n)
|
||||
log = slice(log, 0, n);
|
||||
if (opts.json) {
|
||||
out(log);
|
||||
exit(0);
|
||||
}
|
||||
for (let e in log) {
|
||||
let t = localtime(e.ts);
|
||||
let text = e.by == 'admin'
|
||||
? join(' ', filter([ 'You', e.msg, e.kind, e.who, e.note ? '· ' + e.note : null ], (x) => x))
|
||||
: (e.who ? e.who + ' ' : '') + e.msg;
|
||||
out(sprintf('%02d-%02d %02d:%02d %-8s %-6s %s', t.mon, t.mday, t.hour, t.min, e.src, e.level, text));
|
||||
if (e.detail)
|
||||
out(' ' + replace(e.detail, '\n', '\n '));
|
||||
}
|
||||
}
|
||||
else if (cmd == 'iface-event') {
|
||||
// From the iface hotplug script: a tunnel started, stopped or failed to start.
|
||||
let ifname = args[2] ?? '';
|
||||
if (!match(ifname, /^[a-z][a-z0-9_]{0,15}$/))
|
||||
die('Bad interface.');
|
||||
// Dawnline leaves a note before it takes a tunnel down itself; anything else is unexpected.
|
||||
let it = args[1] == 'ifdown' ? take_iface_intent(ifname) : null;
|
||||
let who = it?.name ?? ifname;
|
||||
for (let id, srv in core.load().servers)
|
||||
if (srv.ifname == ifname)
|
||||
who = srv.name;
|
||||
if (args[1] == 'ifup') {
|
||||
ifup_ok(ifname);
|
||||
let port = sh_out(`awg show ${q(ifname)} listen-port 2>/dev/null`);
|
||||
slog('awg', 'up', port ? sprintf(L_('started · accepting connections on port %s'), port) : L_('started'), null, who);
|
||||
}
|
||||
else if (args[1] == 'ifdown') {
|
||||
// Stops Dawnline made itself are explained by the admin's own line
|
||||
// (changed, turned off, removed); only an AmneziaWG update gets one here.
|
||||
if (it?.reason == 'update')
|
||||
slog('awg', 'info', L_('restarting for the AmneziaWG update'), null, who);
|
||||
else if (!it)
|
||||
slog('awg', 'down', L_('stopped unexpectedly'), join('\n', filter([
|
||||
L_("Dawnline didn't stop it: the router's network restarted, someone stopped it by hand, or it failed."),
|
||||
watchdog.iface_errors(ifname),
|
||||
], (x) => x)), who);
|
||||
}
|
||||
else if (args[1] == 'ifup-failed')
|
||||
ifup_failed(ifname, who);
|
||||
}
|
||||
else if (cmd == 'teardown')
|
||||
apply.teardown();
|
||||
else if (cmd == 'version')
|
||||
out(VERSION);
|
||||
else if (cmd == 'help' || cmd == '--help' || cmd == '-h')
|
||||
help();
|
||||
else {
|
||||
warn(`dawnline: unknown command "${join(' ', slice(args, 0, 2))}" (dawnline help)\n`);
|
||||
exit(2);
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
warn(`dawnline: ${e.message}\n`);
|
||||
// Run from the init script or cron, stderr goes nowhere: syslog keeps why.
|
||||
syslog('error', 'cli', `dawnline ${cmd} failed: ${e.message}`);
|
||||
exit(1);
|
||||
}
|
||||
#!/bin/sh
|
||||
# Dawnline's command line: `dawnline help`. It is the backend's own (dawnlined cli, backend/cli).
|
||||
b=/usr/libexec/dawnline/dawnlined
|
||||
if [ -x "$b" ] && "$b" -version >/dev/null 2>&1; then
|
||||
exec "$b" cli "$@"
|
||||
fi
|
||||
echo "dawnline: the backend is not on this router yet (/usr/libexec/dawnline/fetch-backend puts it in place; logread -e dawnline says why it is missing)" >&2
|
||||
exit 1
|
||||
Reference in new issue
Block a user