Dawnline 0.20.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 / Backend (Go: vet, tests, a real ubusd and uhttpd) (push) Blocked by required conditions
CI / Package files (push) Blocked by required conditions

- **Backend rewritten in Go.** One daemon, `dawnlined`, replaces the whole ucode backend: the rpcd plugin, the agent, the CLI and the updater. The package no longer depends on ucode.
- **Per-architecture builds.** The release carries the backend for arm64, ARMv7, mips, mipsle and amd64; the router fetches its own after the package is installed and checks its sha256. Dawnline does not run on other architectures (older ARM, 32-bit x86, RISC-V).
- **Faster on the router.** A firewall sync takes 0.06 s instead of 0.9 s; a full apply takes about 300 ms. The portal is served by the daemon itself, without a CGI process per request.
- **Live pages.** The admin and the portal follow a live stream from the router instead of re-fetching the whole state every 30 seconds.
- **Admin redesigned in the portal's style.** Three sections (Overview · Log · Settings); a server is a page of its own with People, Places and Settings; a device opens as a dialog over its person.
- **Changes wait for «Apply».** Every setting, and a person's access, is staged in one dock before it reaches the router.
- **Configuration rollout.** After a change that makes devices fetch their configuration again, the admin shows how many have fetched it and who has not. Every setting shows beforehand (⟳N) how many devices it will touch.
- **Waiting for a decision.** Overview and People put first the people who need one (access ended, limit reached, a device that does not connect), each with its one action a tap away.
- **Bulk actions on people.** «Select» (or a long press on a card) picks several people to extend by a month, pause or resume at once.
- **Undo.** An action done from a card or a request is undone from its toast.
- **Update dialogs redesigned.** An update is one view from its question to its result; Dawnline's own update runs in it like every other, and the page reloads itself once the new version answers. Other versions are a list, each with its notes and Install on a page of its own.
- **Site to site: networks behind a router.** A router connected as a device can have networks behind it (up to eight, /16 to /30): the server routes them and applies the router's access to them. A network that shares addresses with a tunnel, the router's own networks or another site is refused by name.
- **Routers from the portal.** People can add a router and name its networks on their own page; the admin accepts or declines with a reason, or lets them through without asking.
- **Check access and Health know the networks behind routers.**
- **Usage limits reworked.** A monthly limit no longer follows the calendar. A person's month starts with their first traffic and ends a month later; the next one starts only when they connect again, so time away uses up none of it. Before, everyone's limit reset on the 1st.
- Extra data lasts until that person's month ends; «Reset usage» starts the month anew.
- A limit is for a month or for the whole term; the admin and the portal show when it resets.
- Charts that said «this month» show the last 30 days.
- After the update nobody loses what was counted: the month that was running becomes the person's first and ends on the 1st.
- **Access by time of day removed.** The Hours limit is gone from the admin, the portal and the backend; saved hours are dropped.
- **Expiry simplified.** An end date always stops access, with a heads-up three days before; the per-person choice is gone.
- **No false disconnects from sleeping phones.** A phone or a tablet stays online through ten minutes of silence.
- **Mobile Safari fixes.** Pressing a control no longer sends the page to its top; tab tracks that do not fit scroll; switches animate after a press.
This commit is contained in:
Aemeath committed 2026-11-13 09:43:50 +03:00
1 parent f8130e39a8
commit ac90575b0b
788 files changed
+139244 -41720

No files matched your search

+227
View File
@@ -0,0 +1,227 @@
// Package servicelog writes the service log and syslog as dawnline.util slog() and syslog() do: an entry a
// line of JSON in run/service.log (what the admin's Service log shows), and the same in words in syslog as
// "dawnline: [info] [awg] Home started", at the matching priority, when the admin's level takes it.
package servicelog
import (
"encoding/json"
"os"
"os/exec"
"regexp"
"strings"
"time"
)
var (
rank = map[string]int{"error": 0, "warn": 1, "info": 2, "debug": 3}
prio = map[string]string{"error": "err", "warn": "warning", "info": "info", "debug": "debug"}
// a line break or a tab with the blanks around it: one space in a syslog line
lineBreak = regexp.MustCompile(`[ \t\r\n]*[\t\r\n][ \t\r\n]*`)
breaks = regexp.MustCompile(`[\r\n\t]+`)
)
const space = " \t\r\n\v\f"
// Extra is the admin's own fields of an entry: { By: "admin", Kind: "server", Note: "port 50115" } reads
// "You <msg> <kind> <who> · <note>"; SID is the server's id.
type Extra struct {
By, Kind, Note, SID string
}
// Entry is one service log entry as slog() writes it: the subject first, the admin's own fields, the detail capped.
func Entry(src, level, msg, detail, who string, x Extra, ts int64) map[string]any {
e := map[string]any{"ts": ts, "src": src, "level": level, "msg": msg}
if who != "" {
e["who"] = who
}
for k, v := range map[string]string{"by": x.By, "kind": x.Kind, "note": x.Note, "sid": x.SID} {
if v != "" {
e[k] = v
}
}
if d := strings.Trim(detail, space); d != "" {
if len(d) > 2000 {
d = d[:2000]
}
e["detail"] = d
}
return e
}
// Line is one syslog line's words: "[level] [src] line", on one line, at most 1000 characters.
func Line(level, src, line string) string {
if _, known := rank[level]; !known {
level = "info"
}
if src == "" {
src = "dawnline"
}
out := "[" + level + "] [" + src + "] " + lineBreak.ReplaceAllString(strings.Trim(line, space), " ")
if len(out) > 1000 {
out = out[:1000]
}
return out
}
// Words is an entry as its syslog line tells it, and the level it goes out at.
func Words(src, level, msg, detail, who string, x Extra) (lvl, line string) {
line = msg
if x.By == "admin" {
parts := []string{"admin", msg}
for _, p := range []string{x.Kind, who} {
if p != "" {
parts = append(parts, p)
}
}
if x.Note != "" {
parts = append(parts, "· "+x.Note)
}
line = strings.Join(parts, " ")
} else if who != "" {
line = who + " " + msg
}
lvl = map[string]string{"error": "error", "repair": "warn", "down": "warn"}[level]
if lvl == "" {
lvl = "info"
}
// problems carry what went wrong
if d := strings.Trim(detail, space); d != "" && lvl != "info" {
if len(d) > 2000 {
d = d[:2000]
}
d = breaks.ReplaceAllString(d, " | ")
if len(d) > 400 {
d = d[:400]
}
line += " · " + d
}
return lvl, line
}
// Log writes to a router's logs. Level is the admin's syslog level (error | warn | info | debug).
type Log struct {
RunDir string
Level func() string
// Syslog hands a line to syslog (nil: `logger`).
Syslog func(priority, line string)
Now func() time.Time
}
// Write puts an entry in the service log and in syslog.
func (l Log) Write(src, level, msg, detail, who string, x Extra) {
now := time.Now
if l.Now != nil {
now = l.Now
}
raw, _ := json.Marshal(Entry(src, level, msg, detail, who, x, now().Unix()))
os.MkdirAll(l.RunDir, 0o755)
if f, err := os.OpenFile(l.RunDir+"/service.log", os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0o600); err == nil {
f.Write(append(raw, '\n'))
f.Close()
}
lvl, line := Words(src, level, msg, detail, who, x)
l.Say(lvl, src, line)
}
// Say puts a line in syslog at a level, when the admin's level takes it.
func (l Log) Say(level, src, line string) {
at := "info"
if l.Level != nil {
at = l.Level()
}
r, known := rank[level]
if !known {
r = 2
}
if r > rank[at] {
return
}
p := prio[level]
if p == "" {
p = "info"
}
if l.Syslog != nil {
l.Syslog("daemon."+p, Line(level, src, line))
return
}
exec.Command("logger", "-t", "dawnline", "-p", "daemon."+p, Line(level, src, line)).Run()
}
// Admin records a change the admin made in LuCI.
func (l Log) Admin(src, msg, kind, who, note string) {
l.Write(src, "info", msg, "", who, Extra{By: "admin", Kind: kind, Note: note})
}
// Clear removes entries from the service log, all of them or those older than `days` days, in the live
// copy and the one on flash (dataDir) when there is one; it returns how many went (dawnline.util slog_clear).
func (l Log) Clear(dataDir string, days int64) int {
now := time.Now
if l.Now != nil {
now = l.Now
}
raw, err := os.ReadFile(l.RunDir + "/service.log")
if err != nil {
raw, _ = os.ReadFile(dataDir + "/service.log")
}
var keep []string
removed := 0
for _, line := range strings.Split(string(raw), "\n") {
if line == "" {
continue
}
var e struct {
TS *float64 `json:"ts"`
}
json.Unmarshal([]byte(line), &e)
if days > 0 && e.TS != nil && *e.TS >= float64(now().Unix()-days*86400) {
keep = append(keep, line)
} else {
removed++
}
}
data := ""
if len(keep) > 0 {
data = strings.Join(keep, "\n") + "\n"
}
os.MkdirAll(l.RunDir, 0o755)
os.WriteFile(l.RunDir+"/service.log", []byte(data), 0o600)
if _, err := os.Stat(dataDir + "/service.log"); err == nil {
os.WriteFile(dataDir+"/service.log", []byte(data), 0o600)
}
return removed
}
// keep is how many entries the service log holds.
const keep = 300
// Trim keeps the last entries only, and copies them to flash (dataDir) when asked and something was
// written since the last copy.
func (l Log) Trim(dataDir string, save bool) {
path := l.RunDir + "/service.log"
raw, err := os.ReadFile(path)
if err != nil {
return
}
var lines []string
for _, s := range strings.Split(string(raw), "\n") {
if s != "" {
lines = append(lines, s)
}
}
if len(lines) > keep+50 {
lines = lines[len(lines)-keep:]
os.WriteFile(path, []byte(strings.Join(lines, "\n")+"\n"), 0o600)
}
if !save || len(lines) == 0 {
return
}
live, err := os.Stat(path)
if err != nil {
return
}
if kept, err := os.Stat(dataDir + "/service.log"); err == nil && !live.ModTime().After(kept.ModTime()) {
return
}
os.MkdirAll(dataDir, 0o700)
os.WriteFile(dataDir+"/service.log", []byte(strings.Join(lines, "\n")+"\n"), 0o600)
}
+40
View File
@@ -0,0 +1,40 @@
package servicelog
import (
"os"
"strings"
"testing"
"time"
)
func TestWrite(t *testing.T) {
dir := t.TempDir()
var said []string
level := "info"
l := Log{RunDir: dir, Level: func() string { return level }, Syslog: func(p, line string) { said = append(said, p+" "+line) },
Now: func() time.Time { return time.Unix(1_800_000_000, 0) }}
l.Admin("dawnline", "exported", "", "all settings", "the file holds private keys")
l.Write("awg", "error", "did not start", " line one\n\tline two ", "Home", Extra{})
l.Write("agent", "repair", "restarted", "why", "", Extra{})
l.Say("debug", "apply", "a step")
level = "error"
l.Write("portal", "info", "started", "", "Personal portal", Extra{})
raw, _ := os.ReadFile(dir + "/service.log")
want := `{"by":"admin","level":"info","msg":"exported","note":"the file holds private keys","src":"dawnline","ts":1800000000,"who":"all settings"}
{"detail":"line one\n\tline two","level":"error","msg":"did not start","src":"awg","ts":1800000000,"who":"Home"}
{"detail":"why","level":"repair","msg":"restarted","src":"agent","ts":1800000000}
{"level":"info","msg":"started","src":"portal","ts":1800000000,"who":"Personal portal"}
`
if string(raw) != want {
t.Fatalf("the service log:\n%s", raw)
}
// syslog: the admin's own words, a problem with what went wrong on one line; nothing below the admin's level
wantSaid := "daemon.info [info] [dawnline] admin exported all settings · the file holds private keys\n" +
"daemon.err [error] [awg] Home did not start · line one | line two\ndaemon.warning [warn] [agent] restarted · why"
if got := strings.Join(said, "\n"); got != wantSaid {
t.Fatalf("syslog:\n%s", got)
}
if Line("odd", "", " a\n b\tc ") != "[info] [dawnline] a b c" {
t.Fatal("a line's words")
}
}