Dawnline 0.5.2

- Fixed: a new server with the Maximum disguise could not be created ("jmin=10
  (64-1024)"): the 3.1 preset's small junk packets failed Dawnline's own check
- Fixed: guesses from a shared address (every visitor behind Cloudflare) could
  lock people with valid links out of the portal for 15 minutes; a valid link
  always opens now, only wrong guesses are counted
- Fixed: a disabled Dawnline still loaded every device into the tunnels when
  netifd brought them up, with nothing enforcing end dates or limits afterwards
- Fixed: an MTU of 1380 chosen by hand was deleted on every apply (the one-time
  switch to automatic MTU now runs once)
- Locations (city lookups) are off by default on new installs: they send
  people's addresses to a third party. Routers that had them on keep them on
- "Don't warn" before an end date is honoured, and the warning window is the
  one chosen for the person on the Overview, People, the person page and the
  portal alike (People and Overview used to warn 3 days before whatever was set)
- "Ends today" and "ends tomorrow" instead of "ends in 1 day"
- Renaming a person keeps the dialog open when the router refuses the name
- Settings → Portal no longer saves a listening port its own help line marks
  as taken
- "Remove Dawnline" is live only once "remove" is typed
- Downloaded .conf files are named after the device first, and two devices
  whose names only differ past the 15th character no longer get the same file
  (and tunnel name in the app)
This commit is contained in:
Aemeath committed 2026-10-18 14:42:01 +03:00
1 parent 1a2f0b327e
commit 2b98abdba4
23 files changed
+197 -88

No files matched your search

@@ -118,7 +118,9 @@ export function server_keys() {
/* ---------- obfuscation ---------- */
const OBF_SPEC = { jc: [ 0, 10 ], jmin: [ 64, 1024 ], jmax: [ 64, 1024 ], s1: [ 0, 64 ], s2: [ 0, 64 ], s3: [ 0, 64 ], s4: [ 0, 32 ] };
// Junk packets may be tiny (the 3.1 preset sends 10-50 bytes, as AmneziaVPN
// does); the ceiling keeps them under the path MTU.
const OBF_SPEC = { jc: [ 0, 10 ], jmin: [ 0, 1024 ], jmax: [ 0, 1024 ], s1: [ 0, 64 ], s2: [ 0, 64 ], s3: [ 0, 64 ], s4: [ 0, 32 ] };
function rand_h(used) {
for (let i = 0; i < 50; i++) {
@@ -194,10 +196,8 @@ export function obf_errors(o) {
let v = o[k];
if (v == null || v == '')
continue;
if (!match(v, /^[0-9]+$/) || +v < r[0] || +v > r[1]) {
if (!(v == '0' && (k == 'jmin' || k == 'jmax')))
push(errs, `${k}=${v} (${r[0]}-${r[1]})`);
}
if (!match(v, /^[0-9]+$/) || +v < r[0] || +v > r[1])
push(errs, `${k}=${v} (${r[0]}-${r[1]})`);
}
if (o.jmin != null && o.jmax != null && +o.jmin > +o.jmax)
push(errs, 'jmin > jmax');
@@ -252,6 +252,25 @@ export function obf_neutral(o) {
return true;
};
/*
* The .conf file name doubles as the tunnel name in WireGuard apps (15
* characters at most): the device first, so a person's devices stay apart,
* and a number when the cut would still make two of them alike.
*/
function conf_filename(m, p, dev) {
let label = (d) => trim(substr(trim(replace(lc(d.name + '-' + p.id), /[^a-z0-9]+/g, '-'), '-'), 0, 15), '-');
let order = sort(map(p.devices, (id) => m.devices[id]),
(a, b) => (a.created - b.created) || (a.id < b.id ? -1 : a.id > b.id ? 1 : 0));
let seen = {};
for (let d in order) {
let l = label(d);
let n = seen[l] = (seen[l] ?? 0) + 1;
if (d.id == dev.id)
return (n > 1 ? trim(substr(l, 0, 15 - length(`-${n}`)), '-') + `-${n}` : l) + '.conf';
}
return label(dev) + '.conf';
}
export function client_config(m, dev) {
let p = m.people[dev.person];
let srv = p ? m.servers[p.server] : null;
@@ -286,7 +305,7 @@ export function client_config(m, dev) {
name: dev.name,
person: p.name,
server: srv.name,
filename: `${substr(replace(lc(p.id + '-' + dev.name), /[^a-z0-9]+/g, '-'), 0, 15)}.conf`,
filename: conf_filename(m, p, dev),
conf: join('\n', lines) + '\n',
has_private_key: dev.private_key != '',
amnezia: {
@@ -81,7 +81,7 @@ export function load(c) {
// Where unknown portal links go instead of a bare 404 (empty = 404).
portal_redirect: s.portal_redirect ?? '',
default_device_limit: toint(s.default_device_limit, 3),
geo_enabled: bool(s.geo_enabled, true),
geo_enabled: bool(s.geo_enabled, false),
geo_provider: s.geo_provider == 'ipapi.co' ? 'ipapi.co' : 'ipwho.is',
hostnames: bool(s.hostnames, true),
domain: s.domain ?? 'lan',
@@ -57,24 +57,43 @@ export function uhttpd() {
store.transact((w, m) => w.delete('dawnline', 'settings', 'portal_443'));
};
/** 1380 was every server's stored MTU before it became automatic (by device type and disguise). */
/*
* Steps that cannot tell from the config whether they ran are recorded in
* `settings.migrated` (a list), so they run exactly once.
*/
function migrated(c, name) {
let done = c.get('dawnline', 'settings', 'migrated') ?? [];
return index(type(done) == 'array' ? done : [ done ], name) >= 0;
}
function mark_migrated(w, name) {
let done = w.get('dawnline', 'settings', 'migrated') ?? [];
w.set('dawnline', 'settings', 'migrated', [ ...(type(done) == 'array' ? done : [ done ]), name ]);
}
/*
* 1380 was every server's stored MTU before it became automatic (by device
* type and disguise). Once only: an admin may choose 1380 again on purpose.
*/
function auto_mtu() {
let c = cursor();
c.load('dawnline');
if (migrated(c, 'auto_mtu'))
return;
let any = false;
c.foreach('dawnline', 'server', (s) => {
if (s.mtu == '1380')
any = true;
});
if (!any)
return;
store.transact((w, m) => {
w.foreach('dawnline', 'server', (s) => {
if (s.mtu == '1380')
w.delete('dawnline', s['.name'], 'mtu');
});
mark_migrated(w, 'auto_mtu');
});
slog('dawnline', 'info', 'MTU is now automatic', null, 'Servers');
if (any)
slog('dawnline', 'info', 'MTU is now automatic', null, 'Servers');
}
/** All of them, in order. */
@@ -452,12 +452,13 @@ export function handle(io) {
if (p.code == code)
r.person = p;
// A wrong code or a blocked client: indistinguishable from a path that does
// not exist. Only well-formed guesses count towards the limit.
if (rate_blocked(r))
not_found(r);
// A wrong code is indistinguishable from a path that does not exist. Only
// well-formed guesses count towards the limit, and a client over it is just
// no longer counted: a valid link always opens, so guesses from a shared
// address (every Cloudflare visitor) cannot lock its owner out.
if (r.person == null) {
rate_fail(r);
if (!rate_blocked(r))
rate_fail(r);
not_found(r);
}
r.base = `/${code}`;
@@ -124,7 +124,8 @@ export const SETTINGS = {
default_device_limit: { type: 'int', dflt: 3, min: 1, max: 32, msg: 'Default device limit must be 1-32.' },
hostnames: { type: 'bool', dflt: true },
domain: { type: 'domain', dflt: 'lan', msg: 'Domain may use lowercase letters, digits, dashes and dots.' },
geo_enabled: { type: 'bool', dflt: true },
// Off until the admin turns it on: lookups send people's addresses to a third party.
geo_enabled: { type: 'bool', dflt: false },
geo_provider: { type: 'enum', dflt: 'ipwho.is', values: [ 'ipwho.is', 'ipapi.co' ], msg: 'Unknown location service.' },
log_connections: { type: 'bool', dflt: true },
watchdog: { type: 'bool', dflt: true },
@@ -4,7 +4,7 @@
import { open, readfile, writefile, rename, mkdir, stat, unlink, popen, lsdir } from 'fs';
export const VERSION = '0.5.1';
export const VERSION = '0.5.2';
/** GitHub repository with Dawnline releases (updates and the installer). */
export const REPO = 'tickcount/luci-app-dawnline';
export const RUN_DIR = '/var/run/dawnline';