- Components tab replaces Updates: Dawnline, the AmneziaWG build for this firmware (Slava-Shchipunov 2.0 or 2Grey 3.1, Russian translation) and the system packages Dawnline adds, each checked, installed, reinstalled or rolled back in place, with What's new, versions and an activity log - Automatic updates: daily check, install at a set time or right away, per component; AmneziaWG is left out by default and an automatic run never switches its build or generation - Downloads verified against GitHub's sha256; mirrors are used only when GitHub is unreachable and the hash is known - New installer: checks firmware, clock, space and DNS, lets you pick a release, shows the plan and asks first; --dry-run - New uninstaller removes everything Dawnline added (cron, nft, firewall, routing, interfaces, packages it installed); --dry-run - Works without AmneziaWG on the router: Overview, the setup wizard, Health and Components say what is missing and offer to install it - Overview shows failed health checks as notices with their fix - People list no longer reads the config from the browser: private keys stay on the router; personal links are fetched on demand - Config changes are serialized under one lock, the nft table loads atomically and fails closed, and Dawnline never touches network sections it did not create - The portal never opens system ports, keeps disabled devices disabled, rate-limits per address and counts days by the router's clock - Settings and Diagnostics load their heavy parts in the background - Release notes are written from the commits since the previous release - Backend and admin UI split into small single-purpose modules
This commit is contained in:
1 parent
70a932b8ea
commit
34293fb8e5
158 files changed
+17418
-10022
No files matched your search
@@ -0,0 +1,64 @@
|
||||
import { beforeAll, describe, expect, it } from 'vitest';
|
||||
import { installFakeDom, text } from './fakedom';
|
||||
import { csvCell, toCsv } from '../src/admin/events/csv';
|
||||
import { categoryOf, eventBy, isProblem } from '../src/admin/events/model';
|
||||
import { eventText } from '../src/admin/events/render';
|
||||
import type { LogEvent, Person } from '../src/shared/types';
|
||||
|
||||
beforeAll(installFakeDom);
|
||||
|
||||
describe('csv', () => {
|
||||
it('quotes and defuses formulas', () => {
|
||||
expect(csvCell('plain')).toBe('plain');
|
||||
expect(csvCell('a,b')).toBe('"a,b"');
|
||||
expect(csvCell('say "hi"')).toBe('"say ""hi"""');
|
||||
expect(csvCell('line\r\nbreak')).toBe('"line\r\nbreak"');
|
||||
expect(csvCell('=HYPERLINK("x")')).toBe(`"'=HYPERLINK(""x"")"`);
|
||||
expect(csvCell('+1')).toBe("'+1");
|
||||
expect(csvCell('-1')).toBe("'-1");
|
||||
expect(csvCell('@SUM(A1)')).toBe("'@SUM(A1)");
|
||||
expect(csvCell('\tx')).toBe("'\tx");
|
||||
expect(csvCell(null)).toBe('');
|
||||
expect(csvCell(5)).toBe('5');
|
||||
});
|
||||
it('builds a table', () => {
|
||||
expect(toCsv(['a', 'b'] as const, [{ a: 1, b: 'x,y' }])).toBe('a,b\n1,"x,y"');
|
||||
});
|
||||
});
|
||||
|
||||
describe('events', () => {
|
||||
const people = [{ id: 'p1', name: 'Myata', devices: [{ id: 'd1', name: 'Phone' }] }] as unknown as Person[];
|
||||
const ev = (e: Partial<LogEvent>) => ({ ts: 1, type: 'connect', ...e }) as LogEvent;
|
||||
it('knows who did it', () => {
|
||||
expect(eventBy(ev({ type: 'person_added' }))).toBe('admin');
|
||||
expect(eventBy(ev({ type: 'device_added', detail: 'Phone (portal)' }))).toBe('portal');
|
||||
expect(eventBy(ev({ type: 'connect' }))).toBeNull();
|
||||
expect(eventBy(ev({ type: 'connect', by: 'admin' }))).toBe('admin');
|
||||
});
|
||||
it('sorts events into categories and problems', () => {
|
||||
expect(categoryOf('roam')).toBe('connections');
|
||||
expect(categoryOf('portal_blocked')).toBe('problems');
|
||||
expect(categoryOf('something_new')).toBe('problems');
|
||||
expect(isProblem({ ts: 1, sys: { ts: 1, src: 'awg', level: 'down', msg: '' } })).toBe(true);
|
||||
expect(isProblem({ ts: 1, ev: ev({ type: 'connect' }) })).toBe(false);
|
||||
});
|
||||
it('says what happened', () => {
|
||||
const st = { people };
|
||||
expect(text(eventText(st, ev({ person: 'p1', device: 'd1', detail: '1.2.3.4', where: 'Berlin' })))).toBe(
|
||||
'Device Myata · Phone connected from 1.2.3.4 · Berlin',
|
||||
);
|
||||
expect(text(eventText(st, ev({ type: 'device_added', by: 'admin', person: 'p1', detail: 'Laptop' })))).toBe(
|
||||
'You added device Laptop for Myata',
|
||||
);
|
||||
expect(text(eventText(st, ev({ type: 'device_changed', by: 'admin', person: 'p1', device: 'd1', detail: 'renamed from Old' })))).toBe(
|
||||
'You renamed device Phone of Myata · was Old',
|
||||
);
|
||||
// Removed since: the name from the time of the event.
|
||||
expect(text(eventText(st, ev({ type: 'disconnect', person: 'gone', pname: 'Anna', dname: 'Tablet', device: 'x' })))).toBe(
|
||||
'Device Anna · Tablet went offline',
|
||||
);
|
||||
expect(
|
||||
text(eventText(st, ev({ type: 'roam', person: 'p1', device: 'd1', detail: '10.0.0.2 → 5.6.7.8', hosts: { '10.0.0.2': 'nas' } }))),
|
||||
).toBe('Device Myata · Phone changed network nas (10.0.0.2) → 5.6.7.8');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,30 @@
|
||||
// Just enough of LuCI's E() and Node for modules that build elements, in Node.
|
||||
|
||||
export class FakeNode {}
|
||||
|
||||
export class El extends FakeNode {
|
||||
children: (El | string)[] = [];
|
||||
constructor(
|
||||
public tag: string,
|
||||
public attrs: Record<string, unknown> = {},
|
||||
children: (El | string)[] = [],
|
||||
) {
|
||||
super();
|
||||
this.children = [...children];
|
||||
}
|
||||
appendChild<T extends El | string>(c: T): T {
|
||||
this.children.push(c);
|
||||
return c;
|
||||
}
|
||||
get textContent(): string {
|
||||
return this.children.map((c) => (typeof c === 'string' ? c : c.textContent)).join('');
|
||||
}
|
||||
}
|
||||
|
||||
export const text = (nodes: unknown[]) => nodes.map((n) => (typeof n === 'string' ? n : (n as El).textContent)).join('');
|
||||
|
||||
export function installFakeDom() {
|
||||
const g = globalThis as unknown as Record<string, unknown>;
|
||||
g.Node = FakeNode;
|
||||
g.window = { E: (tag: string, attrs: Record<string, unknown>, children: (El | string)[]) => new El(tag, attrs, children) };
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import { addDays, addMonthsClamped, date, dayDiff, daysLeft, fmtDay, kb, plural, shiftDay, todayOf } from '../src/shared/format';
|
||||
|
||||
describe('months', () => {
|
||||
it('clamps the day to the end of the month', () => {
|
||||
expect(addMonthsClamped('2026-01-31', 1)).toBe('2026-02-28');
|
||||
expect(addMonthsClamped('2024-01-31', 1)).toBe('2024-02-29');
|
||||
expect(addMonthsClamped('2026-03-31', -1)).toBe('2026-02-28');
|
||||
expect(addMonthsClamped('2026-08-31', 1)).toBe('2026-09-30');
|
||||
expect(addMonthsClamped('2026-10-15', 3)).toBe('2027-01-15');
|
||||
expect(addMonthsClamped('2024-02-29', 12)).toBe('2025-02-28');
|
||||
});
|
||||
it('shifts an end date by steps, from today when there is none', () => {
|
||||
expect(shiftDay('2026-01-31', 'month', 1, '2026-01-01')).toBe('2026-02-28');
|
||||
expect(shiftDay('', 'week', 1, '2026-10-16')).toBe('2026-10-23');
|
||||
expect(shiftDay('2026-12-31', 'day', 1, '2026-10-16')).toBe('2027-01-01');
|
||||
expect(shiftDay('2024-02-29', 'year', 1, '2026-10-16')).toBe('2025-02-28');
|
||||
expect(shiftDay('2026-10-01', 'custom', -1, '2026-10-16', 30)).toBe('2026-09-01');
|
||||
});
|
||||
});
|
||||
|
||||
describe('router days', () => {
|
||||
it('counts days between calendar days, across DST changes', () => {
|
||||
expect(dayDiff('2026-10-20', '2026-10-14')).toBe(6);
|
||||
expect(dayDiff('2026-03-30', '2026-03-28')).toBe(2);
|
||||
expect(addDays('2026-10-25', 1)).toBe('2026-10-26');
|
||||
});
|
||||
it('counts days left against the router day', () => {
|
||||
expect(daysLeft('2026-10-14', '2026-10-14')).toBe(1);
|
||||
expect(daysLeft('2026-10-20', '2026-10-14')).toBe(7);
|
||||
expect(daysLeft('2026-10-13', '2026-10-14')).toBe(-1);
|
||||
expect(daysLeft('', '2026-10-14')).toBeNull();
|
||||
});
|
||||
it('takes today from a series', () => {
|
||||
expect(todayOf([{ day: '2026-10-15' }, { day: '2026-10-16' }])).toBe('2026-10-16');
|
||||
});
|
||||
it('shows a router day as that day in any time zone', () => {
|
||||
expect(fmtDay('2026-10-01')).toBe('1 Oct 2026');
|
||||
expect(date('2026-10-01')).toBe('1 Oct 2026');
|
||||
expect(date('')).toBe('');
|
||||
});
|
||||
});
|
||||
|
||||
describe('numbers', () => {
|
||||
it('pluralises and sizes', () => {
|
||||
expect(plural(1, 'event')).toBe('1 event');
|
||||
expect(plural(2000, 'address', 'addresses')).toBe('2,000 addresses');
|
||||
expect(kb(512)).toBe('512 B');
|
||||
expect(kb(1536)).toBe('1.5 KB');
|
||||
expect(kb(3 * 1048576)).toBe('3.0 MB');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,75 @@
|
||||
import { beforeAll, describe, expect, it } from 'vitest';
|
||||
import { El, installFakeDom } from './fakedom';
|
||||
import { checkVerdict, isOurJob, jobComponent, verText } from '../src/admin/updater/jobs';
|
||||
import { forRouter, markdown, safeHref } from '../src/admin/updater/markdown';
|
||||
import type { UpdatesStatus } from '../src/admin/api';
|
||||
|
||||
beforeAll(installFakeDom);
|
||||
|
||||
describe('jobs', () => {
|
||||
it('names the component of a job', () => {
|
||||
expect(jobComponent('app@0.3.1')).toBe('app');
|
||||
expect(jobComponent('check:amneziawg')).toBe('amneziawg');
|
||||
expect(jobComponent('check')).toBe('all');
|
||||
expect(jobComponent('pkgs:a,b')).toBe('pkgs');
|
||||
expect(jobComponent('amneziawg:auto')).toBe('amneziawg');
|
||||
});
|
||||
it('shows versions', () => {
|
||||
expect(verText({ from: '0.3.0', to: '0.3.1' }, 'x')).toBe('0.3.0 → 0.3.1');
|
||||
expect(verText({ from: null, to: null }, 'x')).toBe('x');
|
||||
expect(verText({ from: '1', to: '1' }, 'x')).toBe('1');
|
||||
});
|
||||
it('accepts only the job this click started', () => {
|
||||
const since = 1000;
|
||||
// The previous job, finished: never.
|
||||
expect(isOurJob({ id: 'old', state: 'done', started: 900 }, undefined, 'old', since)).toBe(false);
|
||||
// A finished job from before the click without a known previous id: no.
|
||||
expect(isOurJob({ id: 'x', state: 'done', started: 900 }, undefined, undefined, since)).toBe(false);
|
||||
// Running, or started at/after the click: yes.
|
||||
expect(isOurJob({ id: 'new', state: 'running', started: 999 }, undefined, 'old', since)).toBe(true);
|
||||
expect(isOurJob({ id: 'new', state: 'done', started: 1001 }, undefined, 'old', since)).toBe(true);
|
||||
// Once the id is known, only that one.
|
||||
expect(isOurJob({ id: 'other', state: 'running', started: 1001 }, 'new', 'old', since)).toBe(false);
|
||||
});
|
||||
it('sums up a check', () => {
|
||||
const st = (components: Record<string, unknown>) => ({ check: { time: 1, components } }) as unknown as UpdatesStatus;
|
||||
expect(checkVerdict(st({ app: { update: true, installed: '0.3.0', latest: '0.3.1' } }), 'app')).toEqual({
|
||||
tone: 'acc',
|
||||
text: 'Update available: Dawnline 0.3.1',
|
||||
update: '0.3.1',
|
||||
});
|
||||
expect(checkVerdict(st({ app: {}, amneziawg: {}, packages: { updates: 2 } }), 'all').text).toBe('Update available: 2 system packages');
|
||||
expect(checkVerdict(st({ app: { error: 'GitHub is unreachable' } }), 'app')).toEqual({ tone: 'warn', text: 'GitHub is unreachable' });
|
||||
expect(checkVerdict(st({ app: { status: 'dev', latest: '0.3.0' } }), 'app').text).toContain('newer than the release');
|
||||
expect(checkVerdict(st({ app: {}, amneziawg: {}, packages: {} }), 'all')).toEqual({ tone: 'ok', text: 'Everything is up to date' });
|
||||
});
|
||||
});
|
||||
|
||||
describe('release notes', () => {
|
||||
it('drops the What’s new heading and the Install section', () => {
|
||||
const md = "## What's new\n- One\n- Two\n\n## Install\nopkg install x\n\n**Full Changelog**: a...b";
|
||||
expect(forRouter(md)).toBe('- One\n- Two\n\n**Full Changelog**: a...b');
|
||||
});
|
||||
it('builds headings, lists, code, bold and safe links', () => {
|
||||
const out = markdown('# Title\n- `code` and **bold**\n- [site](https://example.com)\n\nSee javascript:alert(1)') as unknown as El[];
|
||||
expect(out.map((n) => n.tag)).toEqual(['h5', 'ul', 'p']);
|
||||
const items = out[1].children as El[];
|
||||
expect(items[0].children.map((c) => (typeof c === 'string' ? c : c.tag))).toEqual(['code', ' and ', 'b']);
|
||||
const a = items[1].children[0] as El;
|
||||
expect(a.tag).toBe('a');
|
||||
expect(a.attrs.href).toBe('https://example.com');
|
||||
// Not a link: only http(s) addresses become one.
|
||||
expect(out[2].children).toEqual(['See javascript:alert(1)']);
|
||||
});
|
||||
it('keeps fenced code as it is', () => {
|
||||
const out = markdown('```\n# not a heading\n```') as unknown as El[];
|
||||
expect(out[0].tag).toBe('pre');
|
||||
expect(out[0].textContent).toBe('# not a heading');
|
||||
});
|
||||
it('allows only https release pages', () => {
|
||||
expect(safeHref('https://github.com/x/y/releases/tag/v1')).toBe('https://github.com/x/y/releases/tag/v1');
|
||||
expect(safeHref('javascript:alert(1)')).toBeNull();
|
||||
expect(safeHref('http://example.com')).toBeNull();
|
||||
expect(safeHref(null)).toBeNull();
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user