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
+17
-10
@@ -1,15 +1,23 @@
|
||||
// luci.dawnline RPC bindings. The backend reports failures as { error }.
|
||||
// luci.dawnline RPC bindings. The backend reports failures as { error }, and
|
||||
// a change the router saved but could not fully put into effect (access rules
|
||||
// that did not load, a server that refused its devices) as { warning }.
|
||||
|
||||
import type { Network, PortHold } from './netcheck';
|
||||
import type { AwgCaps, AwgState, Circle, ClientConfig, DayUsage, HealthCheck, LogEvent, MeshMode, Person, Status } from '../shared/types';
|
||||
import { notify } from './ui/toast';
|
||||
|
||||
/** Throw a backend failure; show a warning the answer carries. */
|
||||
function settle<T>(r: any): T {
|
||||
if (r && typeof r === 'object') {
|
||||
if (typeof r.error === 'string') throw new Error(r.error);
|
||||
if (typeof r.warning === 'string' && r.warning) notify(r.warning, 'warning', 12000);
|
||||
}
|
||||
return r as T;
|
||||
}
|
||||
|
||||
function call<T>(method: string, params: string[] = []) {
|
||||
const fn = rpc.declare<any>({ object: 'luci.dawnline', method, params });
|
||||
return async (...args: unknown[]): Promise<T> => {
|
||||
const r = await fn(...args);
|
||||
if (r && typeof r === 'object' && typeof r.error === 'string') throw new Error(r.error);
|
||||
return r as T;
|
||||
};
|
||||
return async (...args: unknown[]): Promise<T> => settle<T>(await fn(...args));
|
||||
}
|
||||
|
||||
export interface SetupDefaults {
|
||||
@@ -360,9 +368,7 @@ async function personUpdate(id: string, patch: PersonPatch): Promise<{ person: P
|
||||
'dns_mode',
|
||||
] as const;
|
||||
const args: unknown[] = [id, ...keys.map((k) => patch[k]), patch.paused, patch.services, patch.circle, patch.home_nets];
|
||||
const r = await personUpdateRaw(...args);
|
||||
if (r && typeof r.error === 'string') throw new Error(r.error);
|
||||
return r;
|
||||
return settle(await personUpdateRaw(...args));
|
||||
}
|
||||
|
||||
const status = call<Status>('status', ['days']);
|
||||
@@ -459,7 +465,8 @@ export const api = {
|
||||
'quota_period',
|
||||
]),
|
||||
personPause: call<unknown>('person_pause', ['id', 'paused']),
|
||||
personRegen: call<{ link: string | null }>('person_regen', ['id']),
|
||||
/** A new link; `remove` lists devices (ids) to take away with the old one. */
|
||||
personRegen: call<{ link: string | null; removed: number }>('person_regen', ['id', 'remove']),
|
||||
personDelete: call<unknown>('person_delete', ['id']),
|
||||
personUsage: call<{ person: DayUsage[]; devices: Record<string, DayUsage[]> }>('person_usage', ['id', 'days']),
|
||||
deviceCreate: call<{ id: string; config: ClientConfig }>('device_create', ['person', 'name', 'kind']),
|
||||
|
||||
@@ -5,6 +5,8 @@ import { E } from './e';
|
||||
import { icon } from '../shared/icons';
|
||||
|
||||
export type Method = 'standard' | 'strong' | 'max' | 'off';
|
||||
/** The router features a method may need (the boolean ones of AwgCaps). */
|
||||
export type AwgNeed = 'v2' | 'v3';
|
||||
|
||||
export interface MethodInfo {
|
||||
id: Method;
|
||||
@@ -19,7 +21,7 @@ export interface MethodInfo {
|
||||
/** The same, short (server header). */
|
||||
short: string;
|
||||
/** Router capability it needs. */
|
||||
needs?: keyof AwgCaps;
|
||||
needs?: AwgNeed;
|
||||
}
|
||||
|
||||
export const METHODS: MethodInfo[] = [
|
||||
@@ -68,13 +70,13 @@ export const METHODS: MethodInfo[] = [
|
||||
|
||||
export const methodInfo = (id: string): MethodInfo | undefined => METHODS.find((x) => x.id === id);
|
||||
|
||||
const NEEDS: Record<keyof AwgCaps, string> = {
|
||||
const NEEDS: Record<AwgNeed, string> = {
|
||||
v2: 'Needs AmneziaWG 1.5 or newer on the router.',
|
||||
v3: 'Needs AmneziaWG 3.1 on the router (kmod-amneziawg and amneziawg-tools 3.1).',
|
||||
};
|
||||
|
||||
/** The same while no AmneziaWG is installed at all ("newer" would be misleading). */
|
||||
const NEEDS_NONE: Record<keyof AwgCaps, string> = {
|
||||
const NEEDS_NONE: Record<AwgNeed, string> = {
|
||||
v2: 'Needs AmneziaWG on the router.',
|
||||
v3: 'Needs AmneziaWG 3.1 on the router: install it first.',
|
||||
};
|
||||
|
||||
@@ -18,11 +18,40 @@ export function invite(page: PersonPage) {
|
||||
void inviteCard(page.p, server);
|
||||
}
|
||||
|
||||
/**
|
||||
* A new link locks the old one out of the portal, but not what it already
|
||||
* got: devices added through it keep their tunnel. They are offered for
|
||||
* removal here, ticked, so a leaked link is really contained.
|
||||
*/
|
||||
export async function newLink(page: PersonPage) {
|
||||
const p = page.p;
|
||||
if (!(await confirmDialog('Create a new link?', 'The old link stops working right away.', 'Create new link', true))) return;
|
||||
const r = await attempt(() => api.personRegen(p.id), 'New link created');
|
||||
if (r?.link) await copyText(r.link, 'New link copied');
|
||||
const since = p.code_set ?? 0;
|
||||
const suspect = p.devices.filter((d) => d.created_by === 'portal' && d.created >= since);
|
||||
const boxes = suspect.map(
|
||||
(d) => E('input', { type: 'checkbox', id: `dl-rm-${d.id}`, checked: 'checked', 'data-id': d.id }) as HTMLInputElement,
|
||||
);
|
||||
const body: Node[] = [E('p', {}, 'The old link stops working right away.')];
|
||||
if (suspect.length)
|
||||
body.push(
|
||||
E('p', {}, 'Devices added through the old link keep working until they are removed. Remove them too:'),
|
||||
E(
|
||||
'div',
|
||||
{ class: 'dl-checklist' },
|
||||
suspect.map((d, i) => E('label', { for: `dl-rm-${d.id}` }, [boxes[i], ` ${d.name}`])),
|
||||
),
|
||||
);
|
||||
const go = async () => {
|
||||
const remove = boxes.filter((b) => b.checked).map((b) => b.dataset.id as string);
|
||||
const r = await attempt(
|
||||
() => api.personRegen(p.id, remove),
|
||||
remove.length ? `New link created, ${remove.length} device${remove.length === 1 ? '' : 's'} removed` : 'New link created',
|
||||
);
|
||||
if (!r) return;
|
||||
closeModal();
|
||||
if (remove.length) await page.refresh();
|
||||
if (r.link) await copyText(r.link, 'New link copied');
|
||||
};
|
||||
modal('Create a new link?', body, [cancelButton(), ' ', button('Create new link', go, 'negative')]);
|
||||
}
|
||||
|
||||
export function editNote(page: PersonPage) {
|
||||
|
||||
@@ -16,6 +16,10 @@
|
||||
|
||||
/* dialogs */
|
||||
.dl-modal .cbi-tabmenu { margin-bottom: 16px; }
|
||||
/* A list of things to tick (devices to remove with an old link). */
|
||||
.dl-checklist { display: flex; flex-direction: column; gap: 6px; margin: 4px 0 8px; }
|
||||
.dl-checklist label { display: flex; align-items: center; gap: 8px; font-size: 14px; cursor: pointer; }
|
||||
.dl-checklist input { margin: 0; }
|
||||
.dl-invite { display: grid; grid-template-columns: 250px minmax(0, 1fr); gap: 22px; align-items: start; }
|
||||
.dl-invite img { display: block; width: 100%; border-radius: 18px; box-shadow: 0 0 0 1px var(--dl-line); }
|
||||
.dl-invite-side { display: flex; flex-direction: column; gap: 14px; min-width: 0; }
|
||||
|
||||
@@ -51,6 +51,7 @@ function checkIcon(id: string): string {
|
||||
if (id === 'clock') return 'clock';
|
||||
if (id === 'agent') return 'activity';
|
||||
if (id === 'nft') return 'lock';
|
||||
if (id === 'data') return 'users';
|
||||
return 'alert';
|
||||
}
|
||||
|
||||
|
||||
+88
-8
@@ -34,6 +34,8 @@ interface State {
|
||||
can_add: boolean;
|
||||
/** The admin stopped the person (paused, access ended): the page only shows. */
|
||||
locked?: boolean;
|
||||
/** Over plain HTTP: the same link over HTTPS, where the connection settings are. */
|
||||
https_url?: string | null;
|
||||
kinds: Kind[];
|
||||
version: string;
|
||||
/** The router's day (YYYY-MM-DD) when it sends one; the browser's otherwise. */
|
||||
@@ -87,6 +89,8 @@ class ApiError extends Error {
|
||||
constructor(
|
||||
public status: number,
|
||||
message: string,
|
||||
/** The HTTPS twin of this link, when the answer was "not over plain HTTP". */
|
||||
public httpsUrl?: string,
|
||||
) {
|
||||
super(message);
|
||||
}
|
||||
@@ -106,7 +110,7 @@ async function call<T>(path: string, body?: unknown): Promise<T> {
|
||||
} catch {
|
||||
/* empty */
|
||||
}
|
||||
if (!res.ok) throw new ApiError(res.status, data?.error ?? `Request failed (${res.status})`);
|
||||
if (!res.ok) throw new ApiError(res.status, data?.error ?? `Request failed (${res.status})`, data?.https_url || undefined);
|
||||
return data as T;
|
||||
}
|
||||
|
||||
@@ -682,11 +686,44 @@ function main(st: State) {
|
||||
|
||||
/* ---------- device flows ---------- */
|
||||
|
||||
/**
|
||||
* A plain-HTTP link (an IP address) shows the page, but keys only travel
|
||||
* encrypted: the connection settings are on the HTTPS twin. Its certificate
|
||||
* is the router's own, so the browser warns once; say so.
|
||||
*/
|
||||
function secureSheet(url: string) {
|
||||
sheet(
|
||||
'Open the link securely',
|
||||
'Connection settings only travel encrypted',
|
||||
h(
|
||||
'div',
|
||||
{ class: 'stack gap' },
|
||||
h('p', { class: 'muted' }, 'This page is open without encryption. To add or set up a device, open the same link over HTTPS:'),
|
||||
h('a', { class: 'btn primary block big', href: url }, ic('lock'), h('span', {}, 'Open securely')),
|
||||
h(
|
||||
'p',
|
||||
{ class: 'faint s' },
|
||||
'The browser may warn that the certificate is not trusted: it is this router’s own. Choose to continue (“Advanced” → “Proceed”).',
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/** The secure twin when this page is plain HTTP, else null. */
|
||||
const httpsTwin = () => state?.https_url || null;
|
||||
|
||||
async function getConfig(d: Device): Promise<ClientConfig | null> {
|
||||
const twin = httpsTwin();
|
||||
if (twin) {
|
||||
secureSheet(twin);
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return await call<ClientConfig>(`devices/${d.id}/config`);
|
||||
} catch (e) {
|
||||
toast((e as Error).message, true);
|
||||
const er = e as ApiError;
|
||||
if (er.httpsUrl) secureSheet(er.httpsUrl);
|
||||
else toast(er.message, true);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -844,15 +881,47 @@ async function connect(d: Device, initial?: 'app' | 'qr' | 'key' | 'file', cfgIn
|
||||
else live.replaceChildren(h('span', { class: 'warn' }, 'Waiting for the first connection…'));
|
||||
};
|
||||
paintLive(d);
|
||||
const watch = window.setInterval(async () => {
|
||||
// Only while the first connection is awaited (every poll is a process on
|
||||
// the router): 5 s at first, then slower, for ten minutes at most, not
|
||||
// while the tab is hidden, and never again once the link stopped working
|
||||
// (a replaced link would otherwise count as guesses from this network).
|
||||
let timer = 0,
|
||||
polls = 0,
|
||||
done = !!d.handshake || d.disabled;
|
||||
const started = Date.now();
|
||||
const poll = async () => {
|
||||
timer = 0;
|
||||
if (done || Date.now() - started > 600_000) return;
|
||||
if (document.hidden) {
|
||||
schedule();
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const st = await call<State>('state');
|
||||
state = st;
|
||||
paintLive(st.person.devices.find((x) => x.id === d.id));
|
||||
} catch {
|
||||
/* ignore */
|
||||
const dev = st.person.devices.find((x) => x.id === d.id);
|
||||
paintLive(dev);
|
||||
if (dev?.online || dev?.handshake) {
|
||||
done = true;
|
||||
return;
|
||||
}
|
||||
} catch (e) {
|
||||
if ((e as ApiError).status === 404 || (e as ApiError).status === 401) {
|
||||
done = true;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}, 5000);
|
||||
polls++;
|
||||
schedule();
|
||||
};
|
||||
const schedule = () => {
|
||||
if (!done && !timer) timer = window.setTimeout(poll, polls < 6 ? 5000 : polls < 12 ? 15000 : 30000);
|
||||
};
|
||||
const onVisible = () => {
|
||||
if (!document.hidden && !done && !timer) void poll();
|
||||
};
|
||||
document.addEventListener('visibilitychange', onVisible);
|
||||
schedule();
|
||||
sheet(
|
||||
d.handshake ? `Connect ${d.name}` : `${d.name} is ready`,
|
||||
mobile ? 'Add it to AmneziaVPN on this phone' : 'Scan with the phone’s camera or AmneziaVPN',
|
||||
@@ -861,7 +930,9 @@ async function connect(d: Device, initial?: 'app' | 'qr' | 'key' | 'file', cfgIn
|
||||
live,
|
||||
);
|
||||
sheetClosed = () => {
|
||||
clearInterval(watch);
|
||||
done = true;
|
||||
if (timer) clearTimeout(timer);
|
||||
document.removeEventListener('visibilitychange', onVisible);
|
||||
if (state) main(state);
|
||||
};
|
||||
}
|
||||
@@ -1023,6 +1094,11 @@ function guessName(kind: Kind): string {
|
||||
|
||||
function addDevice() {
|
||||
if (!state) return;
|
||||
const twin = httpsTwin();
|
||||
if (twin) {
|
||||
secureSheet(twin);
|
||||
return;
|
||||
}
|
||||
let kind: Kind = guessKind();
|
||||
const taken = new Set(state.person.devices.map((d) => d.name.toLowerCase()));
|
||||
const suggest = (k: Kind) => {
|
||||
@@ -1084,6 +1160,10 @@ function addDevice() {
|
||||
const dev = r.state.person.devices.find((d) => d.id === r.id)!;
|
||||
await connect(dev, undefined, r.config);
|
||||
} catch (er) {
|
||||
if ((er as ApiError).httpsUrl) {
|
||||
secureSheet((er as ApiError).httpsUrl as string);
|
||||
return;
|
||||
}
|
||||
err.textContent = (er as Error).message;
|
||||
submit.disabled = false;
|
||||
}
|
||||
|
||||
@@ -64,6 +64,8 @@ export interface Person {
|
||||
/** Circle id on their server (when the server uses circles); admin only. */
|
||||
circle?: string;
|
||||
created?: number;
|
||||
/** When the personal link was last made (0: unknown); admin only. */
|
||||
code_set?: number;
|
||||
}
|
||||
|
||||
export type MeshMode = 'off' | 'all' | 'circles';
|
||||
@@ -170,6 +172,11 @@ export interface Geo {
|
||||
export interface AwgCaps {
|
||||
v2: boolean;
|
||||
v3: boolean;
|
||||
/** Generations of the tools and the kernel module ('1.0' | '2.0' | '3.1'; null unknown). */
|
||||
tools?: string | null;
|
||||
kmod?: string | null;
|
||||
/** The two differ: a feature counts only when both have it. */
|
||||
mismatch?: boolean;
|
||||
}
|
||||
|
||||
/** Whether AmneziaWG can run here: tools and kernel module installed, the module loaded, netifd's proto handler present. */
|
||||
|
||||
Reference in new issue
Block a user