Dawnline 0.10.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 / ucode static checks (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 24.10) (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 25.12) (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 / ucode static checks (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 24.10) (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 25.12) (push) Blocked by required conditions
- Portal redesigned from scratch. No header bar: the page opens with the server's name and the person's and fades under the edges. Device cards show the status, the last 7 days (hover a day for its figures) and a Connect or Update button; "Your access" folds into rows: what they can reach (with the names at home), data this month day by day, and when access ends. The page follows the system's light or dark theme - Adding a device: pick the kind (PC, Mobile, Router, Other) and a name, or add it from the device itself with the page's QR code. The set-up sheet then shows the app for that system and the connection, waits for the first connection, says "<device> connected" and closes on its own - Switching apps in the set-up sheet changes only what differs: the old words blur into the new ones, and the menu path is shown for iOS and Android in one line. Names, numbers and statuses that change on the page morph in place - Dialogs open in the middle on a computer, on the same spring as the menu; buttons that wait for the router show a spinner at once - A paused account gets one card that says so; the page's messages are short and no longer send people to the admin. A QR code of the page sits beside the breadcrumb, to open it on another device - Allowed hours are shown in the visitor's own time zone - The portal's Title setting is gone: the page and its tab take the server's name. A title set before is removed on upgrade - The admin names .conf files after the server too, as the portal does (Outline-Home.conf); its device menu says "Download AmneziaWG config" and "Copy AmneziaVPN config", and its QR codes use the portal's round look in the admin's light or dark colours - README rewritten, with screenshots made from a demo cast (scripts/capture-screenshots.mjs --demo)
This commit is contained in:
1 parent
edeb1506fd
commit
4f12ca19e7
94 files changed
+8076
-5009
No files matched your search
@@ -6,7 +6,7 @@
|
||||
|
||||
import { readfile, stat, unlink } from 'fs';
|
||||
import {
|
||||
q, sh, sh_out, rand_int, rand_bytes, valid_key, ip2int, translit, ensure_dir, write_file, read_json, write_json, lock, unlock,
|
||||
q, sh, sh_out, rand_int, rand_bytes, valid_key, ip2int, tunnel_name, ensure_dir, write_file, read_json, write_json, lock, unlock,
|
||||
slog, iface_status, DATA_DIR, RUN_DIR
|
||||
} from 'dawnline.util';
|
||||
import * as core from 'dawnline.core';
|
||||
@@ -336,25 +336,6 @@ 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(translit(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';
|
||||
}
|
||||
|
||||
/**
|
||||
* The junk a device sends is its own: within the preset's own ranges, the
|
||||
* count and sizes are shifted a little by the device (deterministic, so the
|
||||
@@ -423,7 +404,8 @@ export function client_config(m, dev) {
|
||||
name: dev.name,
|
||||
person: p.name,
|
||||
server: srv.name,
|
||||
filename: conf_filename(m, p, dev),
|
||||
// The file name is the tunnel's name in WireGuard apps: the server's, in the portal and the admin alike.
|
||||
filename: `${tunnel_name(srv.name)}.conf`,
|
||||
conf: join('\n', lines) + '\n',
|
||||
has_private_key: dev.private_key != '',
|
||||
amnezia: {
|
||||
|
||||
@@ -81,7 +81,6 @@ export function load(c) {
|
||||
portal_alt: g('portal_alt'),
|
||||
portal_cert: g('portal_cert'),
|
||||
portal_key: g('portal_key'),
|
||||
portal_title: g('portal_title'),
|
||||
// Where unknown portal links go instead of a bare 404 (empty = 404).
|
||||
portal_redirect: g('portal_redirect'),
|
||||
default_device_limit: g('default_device_limit'),
|
||||
|
||||
@@ -57,6 +57,14 @@ export function uhttpd() {
|
||||
store.transact((w, m) => w.delete('dawnline', 'settings', 'portal_443'));
|
||||
};
|
||||
|
||||
/** The portal names itself after the server now (the breadcrumb, the tab): its own title setting is gone. */
|
||||
function portal_title() {
|
||||
let c = cursor();
|
||||
c.load('dawnline');
|
||||
if (c.get('dawnline', 'settings', 'portal_title') != null)
|
||||
store.transact((w, m) => w.delete('dawnline', 'settings', 'portal_title'));
|
||||
}
|
||||
|
||||
/*
|
||||
* Steps that cannot tell from the config whether they ran are recorded in
|
||||
* `settings.migrated` (a list), so they run exactly once.
|
||||
@@ -101,4 +109,5 @@ export function run() {
|
||||
word_codes();
|
||||
uhttpd();
|
||||
auto_mtu();
|
||||
portal_title();
|
||||
};
|
||||
@@ -29,7 +29,7 @@
|
||||
// that answers anything not shaped like a link (its not_found() twin).
|
||||
|
||||
import { stat, readfile } from 'fs';
|
||||
import { read_json, write_json, ensure_dir, lock, unlock, cloudflare_ip, ip2int, today, tunnel_name, VERSION, RUN_DIR } from 'dawnline.util';
|
||||
import { read_json, write_json, ensure_dir, lock, unlock, cloudflare_ip, ip2int, today, VERSION, RUN_DIR } from 'dawnline.util';
|
||||
import * as core from 'dawnline.core';
|
||||
import * as awg from 'dawnline.awg';
|
||||
import * as live from 'dawnline.live';
|
||||
@@ -64,8 +64,8 @@ const NOT_READY = "Adding devices isn't available right now: the VPN server isn'
|
||||
|
||||
// States the admin stopped the person in: the portal only shows, it changes nothing.
|
||||
const LOCKED = {
|
||||
paused: 'Your access is paused by the admin.',
|
||||
expired: 'Your access has ended. Ask the admin to extend it.',
|
||||
paused: 'Your access is paused.',
|
||||
expired: 'Your access has ended.',
|
||||
};
|
||||
|
||||
function html_escape(s) {
|
||||
@@ -241,11 +241,16 @@ function rate_action(r) {
|
||||
|
||||
/* ---------- pages ---------- */
|
||||
|
||||
/** What the page is called (the tab, the first crumb): the person's server, or Dawnline. */
|
||||
function place(r) {
|
||||
return r.person ? r.m.servers[r.person.server]?.name || 'Dawnline' : 'Dawnline';
|
||||
}
|
||||
|
||||
/** The app shell; it reads the code from its own URL and sends it along. */
|
||||
function shell(r) {
|
||||
// The build's time joins the version so every update busts the hour-long asset cache.
|
||||
let v = `?v=${VERSION}.${stat(`${ASSETS}/portal.js`)?.mtime ?? 0}`;
|
||||
let base = r.base, title = r.title;
|
||||
let base = r.base, title = place(r);
|
||||
headers(r, '200 OK', {
|
||||
'Content-Type': 'text/html; charset=utf-8',
|
||||
'Content-Security-Policy': "default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self' data: blob:; font-src 'self'; " +
|
||||
@@ -338,17 +343,24 @@ function need_https(r) {
|
||||
send_json(r, '403 Forbidden', { error: 'Open this link over HTTPS to get the connection settings.', https_url: u });
|
||||
}
|
||||
|
||||
/** The router's offset from UTC in minutes: the admin sets hours in its time, the page shows the visitor's. */
|
||||
function tz_offset() {
|
||||
let t = time();
|
||||
return int((timegm(localtime(t)) - t) / 60);
|
||||
}
|
||||
|
||||
/** Everything the page shows. */
|
||||
function state(r) {
|
||||
let m = r.m, person = r.person;
|
||||
let usage = core.load_usage();
|
||||
let v = view.person_view(m, person, usage, live.dump(m), view.states(m, usage));
|
||||
v.state = person_state(m, person, usage);
|
||||
// Day by day this month, for the page's chart (the admin's views have no use for it).
|
||||
v.month_days = view.month_days(usage.people?.[person.id]);
|
||||
let srv = m.servers[person.server];
|
||||
// The device this page was opened from, through the tunnel or beside it.
|
||||
let here = view.device_here(v.devices, r.peer);
|
||||
return {
|
||||
title: r.title,
|
||||
person: v,
|
||||
here,
|
||||
server: {
|
||||
@@ -367,6 +379,8 @@ function state(r) {
|
||||
today: today(),
|
||||
// Its clock too: "last connected 3 min ago" is measured against it, not the phone's.
|
||||
now: time(),
|
||||
// And its time zone: hours are set in the router's time, shown in the visitor's.
|
||||
tz_offset: tz_offset(),
|
||||
version: VERSION,
|
||||
};
|
||||
}
|
||||
@@ -383,15 +397,6 @@ function api_state(r) {
|
||||
send_json(r, '200 OK', state(r));
|
||||
}
|
||||
|
||||
/**
|
||||
* A configuration as the person gets it: the file, and so the tunnel the apps
|
||||
* name after it, is the server's name. The admin's downloads keep the device
|
||||
* in the name: one browser fetches many of them.
|
||||
*/
|
||||
function own_config(c) {
|
||||
return c ? { ...c, filename: `${tunnel_name(c.server)}.conf` } : c;
|
||||
}
|
||||
|
||||
function api_add(r) {
|
||||
need_open(r);
|
||||
need_https(r);
|
||||
@@ -401,7 +406,7 @@ function api_add(r) {
|
||||
rate_action(r);
|
||||
let res = guard(r, () => devices.add(r.person.id, b.name, b.kind, { by: 'portal', public_key: b.public_key }));
|
||||
reload(r);
|
||||
send_json(r, '200 OK', { id: res.id, config: own_config(res.config), state: state(r) });
|
||||
send_json(r, '200 OK', { id: res.id, config: res.config, state: state(r) });
|
||||
}
|
||||
|
||||
function api_config(r, id) {
|
||||
@@ -409,7 +414,7 @@ function api_config(r, id) {
|
||||
need_open(r);
|
||||
need_https(r);
|
||||
awg.mark_issued(r.m, d.id);
|
||||
send_json(r, '200 OK', own_config(awg.client_config(r.m, d)));
|
||||
send_json(r, '200 OK', awg.client_config(r.m, d));
|
||||
}
|
||||
|
||||
/** POST /devices/<id> { action }: what each action does; the answer carries the new state. */
|
||||
@@ -424,7 +429,7 @@ const ACTIONS = {
|
||||
if (!devices.ready())
|
||||
fail(r, '503 Service Unavailable', NOT_READY);
|
||||
let config = guard(r, () => devices.reconnect(d.id, { by: 'portal', person: r.person.id, defer: d.address == r.peer }));
|
||||
return { config: own_config(config) };
|
||||
return { config };
|
||||
},
|
||||
'delete': (r, d, b) => {
|
||||
guard(r, () => devices.remove(d.id, { by: 'portal', person: r.person.id }));
|
||||
@@ -490,7 +495,6 @@ export function handle(io) {
|
||||
method: env.REQUEST_METHOD ?? 'GET',
|
||||
peer: env.REMOTE_ADDR ?? '',
|
||||
buckets: buckets(env),
|
||||
title: m.settings.portal_title || 'Dawnline',
|
||||
// The port in the visitor's address bar ([v6]:port, name:port, or the default).
|
||||
hsts: https && (match(host, /:([0-9]+)$/)?.[1] ?? '443') == '443',
|
||||
person: null,
|
||||
|
||||
@@ -107,9 +107,9 @@ export function to_int(v, dflt, lo, hi) {
|
||||
/* ---------- the settings section ---------- */
|
||||
|
||||
/*
|
||||
* type: bool | int | enum | host | hosts | url | file | domain | ipv4 | time | text | targets
|
||||
* type: bool | int | enum | host | hosts | url | file | domain | ipv4 | time | targets
|
||||
* dflt: the parsed default; restart: the portal (uhttpd) must restart when it changes;
|
||||
* min/max: ints and text length; values: enums; msg: the error for a bad value.
|
||||
* min/max: ints; values: enums; msg: the error for a bad value.
|
||||
*/
|
||||
export const SETTINGS = {
|
||||
portal_enabled: { type: 'bool', dflt: false, restart: true },
|
||||
@@ -117,7 +117,6 @@ export const SETTINGS = {
|
||||
portal_alt: { type: 'hosts', dflt: [], restart: true, msg: 'Other addresses must be hostnames or IP addresses.' },
|
||||
portal_port: { type: 'int', dflt: 8443, min: 1, max: 65535, restart: true,
|
||||
msg: 'Choose a free port between 1 and 65535 (not 22, 53, 80 or 443).' },
|
||||
portal_title: { type: 'text', dflt: 'Dawnline', max: 64, msg: 'Portal title: up to 64 characters on one line.' },
|
||||
portal_redirect: { type: 'url', dflt: '', msg: 'Redirect must be a full http:// or https:// address.' },
|
||||
portal_cert: { type: 'file', dflt: '', restart: true },
|
||||
portal_key: { type: 'file', dflt: '', restart: true },
|
||||
@@ -226,10 +225,6 @@ export function validate(key, val) {
|
||||
if (!match(val, /^([01]?[0-9]|2[0-3]):[0-5][0-9]$/))
|
||||
bad(spec, key);
|
||||
}
|
||||
else if (t == 'text') {
|
||||
if (ulength(val) > spec.max || match(val, /[[:cntrl:]]/))
|
||||
bad(spec, key);
|
||||
}
|
||||
return val;
|
||||
};
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
import { open, readfile, writefile, rename, mkdir, stat, unlink, popen, lsdir } from 'fs';
|
||||
|
||||
export const VERSION = '0.9.0';
|
||||
export const VERSION = '0.10.0';
|
||||
/** GitHub repository with Dawnline releases (updates and the installer). */
|
||||
export const REPO = 'tickcount/luci-app-dawnline';
|
||||
export const RUN_DIR = '/var/run/dawnline';
|
||||
|
||||
@@ -16,6 +16,11 @@ export function spark(rec, n) {
|
||||
return out;
|
||||
};
|
||||
|
||||
/** Daily totals (rx+tx) from the 1st of this month to today, oldest first (the portal's month chart). */
|
||||
export function month_days(rec) {
|
||||
return spark(rec, +substr(day_key_ago(0), 8, 2));
|
||||
};
|
||||
|
||||
/** The device holds an older configuration than the one it would get now. */
|
||||
function config_stale(m, d) {
|
||||
m._issued ??= awg.issued();
|
||||
|
||||
Reference in new issue
Block a user