Dawnline 0.6.0
- Access rules fail closed: when the table cannot load, no device is loaded into the tunnels (the firewall alone would let every loaded device reach everything); an older table that survived a failed rebuild keeps its rules and a revoked device still leaves. The agent re-syncs within a minute when the table is gone - A change the router saved but could not put into effect (access rules that did not load, a server that refused its devices) is said in the admin UI instead of a plain "Saved" - The guard judges every packet, not only a connection's first: a change of access, a pause or a limit now cuts open connections too - Each server's home networks are its own: with several servers, "all home" on one no longer reaches the other's networks where firewall zones overlap - People limited to some home networks reach the router only on the addresses in those networks (LuCI and SSH on the main LAN stay closed) - Internet-only people can open their personal portal with the VPN on - Tunnel DNS reaches the resolver and the LAN's DNS from servers that do not forward to those zones on their own (Home-only names on servers without "like a home device", LAN DNS on servers with no home network) - A new personal link offers to remove the devices added through the old one, so a leaked link is really contained - Import and restore refuse an inconsistent file (devices with addresses outside their server, shared addresses, malformed keys, broken references); Health reports one, and the sync leaves such a device out instead of failing its server. A config write that did not reach flash is an error, not a silent success - Backups are kept per kind (nightly ones no longer push out manual or pre-delete ones), nightly and pre-change backups hold the config only, archives are written whole or not at all, and a failed nightly backup is logged. A restore no longer has its history overwritten by the agent's in-memory counters - Settings defaults and ranges come from one place (dawnline.schema) - Portal: anything not shaped like a personal link is answered by a shell before ucode starts (a scan on the root costs nothing); 4 portal processes at once instead of 16; a link may make 40 changes a quarter hour; over plain HTTP the page shows but configurations, new devices and new keys are refused with the HTTPS twin of the link; the connect sheet polls only while the first connection is awaited, with backoff, and stops once the link stopped working - Updates: after Dawnline's own package changes, a shell checks that LuCI reaches it and the agent runs, and puts the kept previous version back when they do not (automatic runs always keep it); the AmneziaWG module reload verifies rmmod and modprobe; installs check free space; on apk a reinstall that changed nothing is an error; uninstall.sh hands the update lock to the removal it calls; an upgrade restarts the service only where it was enabled; the release workflow pins the SDK images by digest and the actions by commit - AmneziaWG: features count only when both the tools and the kernel module have them; a server whose disguise this build cannot run (a 3.1 preset after a rollback to 2.0) is kept down and reported; Components tells 1.0 builds from 2.0 ones; `awg show dump` is parsed by shape; Maximum's DNS-shaped signature packets are made for each server and its keep-alive is a 25-35 s range - CI compiles every ucode file and runs the new tests/ucode unit tests (54 tests on the real libuci) in OpenWrt 24.10 and 25.12 rootfs containers; scripts/compile-ucode.sh does the same wherever ucode runs and scripts/ucode-container.sh locally with docker; lint-ucode checks POSIX regexes and module layering; a tag builds only after CI passes
This commit is contained in:
1 parent
2b98abdba4
commit
31a2065f05
70 files changed
+2008
-307
No files matched your search
@@ -360,7 +360,10 @@ function nightly_backup() {
|
||||
backup.backup_create('auto');
|
||||
write_json(`${DATA_DIR}/backup-state.json`, { auto: sum }, 0o600);
|
||||
}
|
||||
catch (e) {}
|
||||
catch (e) {
|
||||
// Tried again tomorrow; meanwhile the admin should know (a full flash, mostly).
|
||||
slog('dawnline', 'error', `nightly backup failed: ${e.message}`, null, 'Backup');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -391,7 +394,9 @@ function check_usage_reset(m) {
|
||||
|
||||
/*
|
||||
* Push devices and access rules when people's states changed, the config
|
||||
* file was written (by anyone: rpcd, the portal, the CLI, a restore), or
|
||||
* file was written (by anyone: rpcd, the portal, the CLI, a restore), the
|
||||
* access table is gone (a flushed ruleset: the firewall alone would let every
|
||||
* device reach everything, so the sync unloads them until it is back), or
|
||||
* every RESYNC_EVERY seconds anyway. apply.sync reads the model again itself.
|
||||
*/
|
||||
function sync_runtime(t) {
|
||||
@@ -400,7 +405,7 @@ function sync_runtime(t) {
|
||||
let mt = st ? `${st.mtime}/${st.inode}` : null;
|
||||
let changed = last_states == null || sprintf('%J', t.states) != sprintf('%J', last_states) ||
|
||||
(conf_mtime != null && mt != conf_mtime);
|
||||
if (changed || time() - last_sync > RESYNC_EVERY) {
|
||||
if (changed || time() - last_sync > RESYNC_EVERY || (length(t.m.servers) && !apply.table_present())) {
|
||||
apply.sync(t.m, usage);
|
||||
last_sync = time();
|
||||
}
|
||||
@@ -491,8 +496,13 @@ function step(i, s, fn) {
|
||||
function tick() {
|
||||
ensure_dir(RUN_DIR);
|
||||
writefile(watchdog.BEAT, `${time()}`);
|
||||
// A restore or import drops the live counters; start over from flash.
|
||||
if (!stat(`${RUN_DIR}/usage.json`) && usage.updated)
|
||||
// A restore or import put other counters on flash (dawnline.backup leaves
|
||||
// a marker): start over from them, whatever the watcher wrote since.
|
||||
if (stat(live.USAGE_RELOAD)) {
|
||||
unlink(live.USAGE_RELOAD);
|
||||
usage = live.load_usage(true);
|
||||
}
|
||||
else if (!stat(`${RUN_DIR}/usage.json`) && usage.updated)
|
||||
usage = live.load_usage();
|
||||
let t = { m: null, pol: null, reset: false, events: [] };
|
||||
for (let i, s in STEPS)
|
||||
@@ -535,7 +545,13 @@ if (was != VERSION) {
|
||||
writefile(`${DATA_DIR}/version`, VERSION);
|
||||
}
|
||||
slog_restore();
|
||||
if (was && was != VERSION)
|
||||
// postupdate put this (kept) version back because the new one did not come up.
|
||||
let rolled = trim(readfile(`${RUN_DIR}/update-rolled-back`) ?? '');
|
||||
unlink(`${RUN_DIR}/update-rolled-back`);
|
||||
if (rolled)
|
||||
slog('dawnline', 'error', `update to ${rolled} failed its check — rolled back to ${VERSION}`,
|
||||
'The new version did not answer in LuCI or its agent did not start. Try again from Components, or install it with install.sh to see why.', 'Dawnline');
|
||||
else if (was && was != VERSION)
|
||||
slog('dawnline', 'up', `updated · ${was} → ${VERSION}`, null, 'Dawnline');
|
||||
else if (crashed)
|
||||
slog('dawnline', 'repair', 'stopped unexpectedly — started again',
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
#!/bin/sh
|
||||
# Dawnline — after its own package was replaced: restart, check that the new
|
||||
# version answers (the LuCI link and the agent), and put the kept previous
|
||||
# version back when it does not. Started detached by the updater
|
||||
# (usr/libexec/dawnline/updater) with the version being installed.
|
||||
# postupdate <version>
|
||||
# Plain shell on purpose: a release whose ucode does not compile cannot check
|
||||
# or repair itself, and the admin cannot click Roll back in a page that this
|
||||
# same backend serves.
|
||||
RUN=/var/run/dawnline
|
||||
KEEP=/etc/dawnline/keep/app
|
||||
to="${1:-?}"
|
||||
|
||||
sleep 2
|
||||
/etc/init.d/rpcd reload >/dev/null 2>&1
|
||||
/etc/init.d/dawnline restart >/dev/null 2>&1
|
||||
|
||||
up() {
|
||||
ubus list luci.dawnline >/dev/null 2>&1 || return 1
|
||||
ubus -t 10 call luci.dawnline rev >/dev/null 2>&1 || return 1
|
||||
pgrep -f '^/usr/bin/ucode /usr/libexec/dawnline/agent' >/dev/null 2>&1
|
||||
}
|
||||
|
||||
i=0
|
||||
while [ "$i" -lt 12 ]; do
|
||||
sleep 5
|
||||
i=$((i + 1))
|
||||
up && exit 0
|
||||
done
|
||||
|
||||
logger -t dawnline "update to $to failed its check: luci.dawnline or the agent is not up"
|
||||
set --
|
||||
for f in "$KEEP"/*.ipk "$KEEP"/*.apk; do
|
||||
[ -f "$f" ] && set -- "$@" "$f"
|
||||
done
|
||||
if [ "$#" -eq 0 ]; then
|
||||
logger -t dawnline "no previous version is kept: nothing to roll back to"
|
||||
exit 1
|
||||
fi
|
||||
if command -v apk >/dev/null 2>&1; then
|
||||
apk add --allow-untrusted "$@" >/dev/null 2>&1
|
||||
else
|
||||
opkg install --force-reinstall --force-downgrade "$@" >/dev/null 2>&1
|
||||
fi
|
||||
/etc/init.d/rpcd restart >/dev/null 2>&1
|
||||
/etc/init.d/dawnline restart >/dev/null 2>&1
|
||||
mkdir -p "$RUN"
|
||||
# The restored agent reports it in the service log on its start.
|
||||
echo "$to" > "$RUN/update-rolled-back"
|
||||
logger -t dawnline "rolled back from $to to the kept version"
|
||||
exit 0
|
||||
@@ -72,6 +72,8 @@ const ctx = {
|
||||
pol: POL,
|
||||
work: `/tmp/dawnline-update.${PID}`,
|
||||
log, phase, run, save,
|
||||
// An automatic run (nobody is watching: the previous version is always kept).
|
||||
auto: () => job.auto,
|
||||
versions: (from, to) => {
|
||||
job.from = from;
|
||||
job.to = to;
|
||||
@@ -241,16 +243,23 @@ function auto() {
|
||||
install(todo);
|
||||
}
|
||||
|
||||
/** The restarts the job asked for, in one go, after its final state is saved. */
|
||||
/**
|
||||
* The restarts the job asked for, in one go, after its final state is saved.
|
||||
* Dawnline's own package is restarted by postupdate, a shell that also checks
|
||||
* the new version and rolls back to the kept one when it does not come up.
|
||||
*/
|
||||
function restarts() {
|
||||
if (after.app) {
|
||||
let to = replace(`${job.to ?? ''}`, /[^A-Za-z0-9.-]/g, '');
|
||||
system(`/usr/libexec/dawnline/postupdate '${to}' </dev/null >/dev/null 2>&1 &`);
|
||||
return;
|
||||
}
|
||||
let cmds = [];
|
||||
if (after.app)
|
||||
push(cmds, '/etc/init.d/rpcd reload');
|
||||
else if (after.apply)
|
||||
if (after.apply)
|
||||
push(cmds, '/usr/bin/dawnline apply');
|
||||
if (after.uhttpd)
|
||||
push(cmds, '/etc/init.d/uhttpd restart');
|
||||
if (after.app || after.apply || after.uhttpd)
|
||||
if (after.apply || after.uhttpd)
|
||||
push(cmds, '/etc/init.d/dawnline restart');
|
||||
if (length(cmds))
|
||||
system(`( sleep 2; ${join('; ', cmds)} ) </dev/null >/dev/null 2>&1 &`);
|
||||
|
||||
Reference in new issue
Block a user