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
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:
1 parent
f8130e39a8
commit
ac90575b0b
788 files changed
+139244
-41720
No files matched your search
@@ -0,0 +1,173 @@
|
||||
package methods
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"os"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/tickcount/luci-app-dawnline/backend/awg"
|
||||
"github.com/tickcount/luci-app-dawnline/backend/netview"
|
||||
"github.com/tickcount/luci-app-dawnline/backend/store"
|
||||
"github.com/tickcount/luci-app-dawnline/backend/uci"
|
||||
"github.com/tickcount/luci-app-dawnline/backend/view"
|
||||
)
|
||||
|
||||
// A row of changes to access's household: after each, the settings file is the one the ucode backend's
|
||||
// own method leaves, and a refusal has its words (testdata/write.uc, scripts/ucode-golden.sh).
|
||||
func TestChangesAsUcode(t *testing.T) {
|
||||
raw, err := os.ReadFile("testdata/write.json")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var golden struct {
|
||||
Steps []struct {
|
||||
Method string `json:"method"`
|
||||
Args map[string]any `json:"args"`
|
||||
Error *string `json:"error"`
|
||||
File string `json:"file"`
|
||||
} `json:"steps"`
|
||||
}
|
||||
if err := json.Unmarshal(raw, &golden); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(golden.Steps) < 287 {
|
||||
t.Fatal("the golden is too small")
|
||||
}
|
||||
dir := t.TempDir()
|
||||
text, _ := os.ReadFile("../access/testdata/access.uci")
|
||||
// as libuci keeps it: the golden's first commit rewrites the file whole
|
||||
c, _ := uci.Parse(string(text))
|
||||
os.WriteFile(dir+"/dawnline", []byte(c.Format()), 0o600)
|
||||
// the router the golden ran on: what its container said of itself (netview's golden, the same run)
|
||||
raw, err = os.ReadFile("../netview/testdata/trace.json")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var router struct {
|
||||
Routes json.RawMessage `json:"routes"`
|
||||
Addrs json.RawMessage `json:"addrs"`
|
||||
Firewall string `json:"firewall"`
|
||||
Links map[string]netview.Link `json:"links"`
|
||||
}
|
||||
if err := json.Unmarshal(raw, &router); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
fw, _ := uci.Parse(router.Firewall)
|
||||
snapshot := func() *netview.Snapshot {
|
||||
return netview.Take(netview.Sources{Routes: func() []byte { return router.Routes }, Addrs: func() []byte { return router.Addrs },
|
||||
Links: func() map[string]netview.Link { return router.Links }, Zones: func() netview.Zones { return netview.ZonesOf(fw) }})
|
||||
}
|
||||
installed := true
|
||||
d := Deps{World: func() *view.World { return &view.World{} }, Store: &store.Store{Config: dir + "/dawnline", RunDir: dir}, Snapshot: snapshot,
|
||||
Config: dir + "/dawnline", RunDir: dir, DataDir: dir + "/data",
|
||||
// as in the golden's container: no AmneziaWG at all
|
||||
Caps: func() awg.Caps { return awg.Caps{} }, AWG: func() map[string]any {
|
||||
// the made-up device steps stand for a router that has it (they pass ucode's check by going around it)
|
||||
return map[string]any{"tools": installed, "kmod": installed, "loaded": installed, "handler": true, "missing": []any{"kmod-amneziawg", "amneziawg-tools"}}
|
||||
}}
|
||||
changed, refused := 0, 0
|
||||
before := c.Format()
|
||||
made := regexp.MustCompile(`config circle 'c_([0-9a-f]+)'`)
|
||||
codeOf := regexp.MustCompile(`option code '([a-z]{6}-[a-z]{6}-[a-z]{6})'`)
|
||||
momentOf := regexp.MustCompile(`option (?:code_set|created) '([0-9]+)'`)
|
||||
device := regexp.MustCompile(`config device 'd_([0-9a-f]+)'`)
|
||||
portOf := regexp.MustCompile(`option port '([0-9]+)'`)
|
||||
for i, step := range golden.Steps {
|
||||
// an id made at random is the one ucode's dice gave: the golden's file names it
|
||||
randHex = func(int) string {
|
||||
for _, m := range made.FindAllStringSubmatch(step.File, -1) {
|
||||
if !strings.Contains(before, "config circle 'c_"+m[1]+"'") {
|
||||
return m[1]
|
||||
}
|
||||
}
|
||||
return "none"
|
||||
}
|
||||
// a code and a moment likewise: the ones the golden's file has and the file before did not
|
||||
newCode = func() string {
|
||||
for _, m := range codeOf.FindAllStringSubmatch(step.File, -1) {
|
||||
if !strings.Contains(before, "'"+m[1]+"'") {
|
||||
return m[1]
|
||||
}
|
||||
}
|
||||
return "none"
|
||||
}
|
||||
clock = func() int64 {
|
||||
var latest int64
|
||||
for _, m := range momentOf.FindAllStringSubmatch(step.File, -1) {
|
||||
if n, _ := strconv.ParseInt(m[1], 10, 64); n > latest {
|
||||
latest = n
|
||||
}
|
||||
}
|
||||
return latest
|
||||
}
|
||||
// the keys the golden made up, and the device id its dice gave
|
||||
method := strings.TrimPrefix(step.Method, "x_")
|
||||
installed = step.Method != "server_obfuscation" && step.Method != "server_create"
|
||||
needLoaded = step.Method != "server_create"
|
||||
// a port drawn when the usual one is taken is ucode's dice too
|
||||
randPort = func() int {
|
||||
for _, m := range portOf.FindAllStringSubmatch(step.File, -1) {
|
||||
if !strings.Contains(before, "option port '"+m[1]+"'") {
|
||||
n, _ := strconv.Atoi(m[1])
|
||||
return n
|
||||
}
|
||||
}
|
||||
return 51830
|
||||
}
|
||||
if step.Method == "server_create" {
|
||||
// the keys the golden's stand-in tool gives
|
||||
newKeys = func() Keys {
|
||||
return Keys{Private: strings.Repeat("S", 42) + "A=", Public: strings.Repeat("T", 42) + "A="}
|
||||
}
|
||||
}
|
||||
if k, _ := step.Args["key"].(string); k != "" {
|
||||
key := func(c string) string { return strings.Repeat(c, 42)[:42*len(c)] + "A=" }
|
||||
newKeys = func() Keys { return Keys{Private: key(k + "x"), Public: key(k), Preshared: key(k + "y")} }
|
||||
randHex = func(int) string {
|
||||
for _, m := range device.FindAllStringSubmatch(step.File, -1) {
|
||||
if !strings.Contains(before, "config device 'd_"+m[1]+"'") {
|
||||
return m[1]
|
||||
}
|
||||
}
|
||||
return "none"
|
||||
}
|
||||
}
|
||||
res := ask(t, d, method, step.Args)
|
||||
got, _ := os.ReadFile(dir + "/dawnline")
|
||||
// ucode's full apply, which the server methods end with, notes a migration in the settings the first
|
||||
// time it runs; here nothing applies, so the note is put where that apply puts it
|
||||
const note = "\tlist migrated 'auto_mtu'\n"
|
||||
if strings.Contains(step.File, note) && !strings.Contains(string(got), note) {
|
||||
c, _ := uci.Parse(string(got))
|
||||
c.SetList("settings", "migrated", []string{"auto_mtu"})
|
||||
got = []byte(c.Format())
|
||||
os.WriteFile(dir+"/dawnline", got, 0o600)
|
||||
}
|
||||
if string(got) != step.File {
|
||||
t.Fatalf("step %d %s %v: the file differs\n%s\n--- ucode:\n%s", i, step.Method, step.Args, got, step.File)
|
||||
}
|
||||
if string(got) == before {
|
||||
// nothing was written: a refusal in the same words, or a change that changes nothing
|
||||
var want any
|
||||
if step.Error != nil {
|
||||
want = *step.Error
|
||||
refused++
|
||||
}
|
||||
if res["error"] != want {
|
||||
t.Errorf("step %d %s %v: refused with %v, ucode %v", i, step.Method, step.Args, res["error"], want)
|
||||
}
|
||||
} else {
|
||||
changed++
|
||||
if res["error"] != nil {
|
||||
t.Errorf("step %d %s %v: written, and yet %v", i, step.Method, step.Args, res["error"])
|
||||
}
|
||||
}
|
||||
before = string(got)
|
||||
}
|
||||
if changed < 115 || refused < 106 {
|
||||
t.Fatalf("the golden exercises too little: %d changes, %d refusals", changed, refused)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user