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.
147 lines
4.6 KiB
Go
147 lines
4.6 KiB
Go
package apply
|
|
|
|
import (
|
|
"encoding/json"
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/tickcount/luci-app-dawnline/backend/model"
|
|
"github.com/tickcount/luci-app-dawnline/backend/netview"
|
|
"github.com/tickcount/luci-app-dawnline/backend/uci"
|
|
)
|
|
|
|
// The router's firewall configuration through a row of changes to access's household: after each, the file
|
|
// ucode's firewall sync leaves, whether it changed and what it ran (testdata/fw.uc).
|
|
func TestFirewallAsUcode(t *testing.T) {
|
|
raw, err := os.ReadFile("testdata/fw.json")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
var trace struct {
|
|
Steps []struct {
|
|
What string `json:"what"`
|
|
Dry bool `json:"dry"`
|
|
Changed bool `json:"changed"`
|
|
Before string `json:"before"`
|
|
Firewall string `json:"firewall"`
|
|
Cmds []string `json:"cmds"`
|
|
} `json:"steps"`
|
|
}
|
|
if err := json.Unmarshal(raw, &trace); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(trace.Steps) != 11 {
|
|
t.Fatalf("%d steps", len(trace.Steps))
|
|
}
|
|
// 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"`
|
|
Links map[string]netview.Link `json:"links"`
|
|
}
|
|
if err := json.Unmarshal(raw, &router); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
dir := t.TempDir()
|
|
os.WriteFile(dir+"/firewall", []byte(trace.Steps[0].Before), 0o644)
|
|
var cmds []string
|
|
r := &Router{RunDir: dir + "/run", Firewall: dir + "/firewall", Exec: func(name string, args ...string) (string, int) {
|
|
cmds = append(cmds, strings.Join(append([]string{name}, args...), " "))
|
|
return "", 0
|
|
}}
|
|
// as ucode's: the zones are read anew from the firewall as it stands
|
|
r.Snapshot = func() *netview.Snapshot {
|
|
text, _ := os.ReadFile(dir + "/firewall")
|
|
fw, _ := uci.Parse(string(text))
|
|
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) }})
|
|
}
|
|
text, _ := os.ReadFile("../access/testdata/access.uci")
|
|
c, err := uci.Parse(string(text))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
for i, want := range trace.Steps {
|
|
switch i {
|
|
case 2:
|
|
c.Set("home", "port", "4501")
|
|
c.Set("cabin", "enabled", "0")
|
|
c.SetList("home", "lan_device", []string{"dlhome", "dlguest"})
|
|
case 3:
|
|
c.SetList("open", "lan_device", []string{"dlguest"})
|
|
case 4:
|
|
c.Set("settings", "portal_port", "443")
|
|
case 5:
|
|
c.Set("settings", "portal_port", "8443")
|
|
c.Delete("settings", "portal_alt")
|
|
case 6:
|
|
c.Set("home", "port", "4502")
|
|
case 7:
|
|
c.DeleteSection("cabin")
|
|
c.Set("home", "lan_like", "1")
|
|
case 8:
|
|
c.Set("home", "lan_like", "0")
|
|
c.Set("open", "lan_like", "0")
|
|
case 9:
|
|
text, _ := os.ReadFile(dir + "/firewall")
|
|
fw, _ := uci.Parse(string(text))
|
|
fw.DeleteSection("dawnline_home_zone")
|
|
fw.Add("rule", "dawnline_home_zone")
|
|
fw.Set("dawnline_home_zone", "name", "Not a zone")
|
|
fw.Add("forwarding", "dawnline_old_wan")
|
|
fw.Set("dawnline_old_wan", "src", "dawn9")
|
|
os.WriteFile(dir+"/firewall", []byte(fw.Format()), 0o644)
|
|
c.Set("settings", "portal_enabled", "0")
|
|
}
|
|
fail := func(what string, got, exp any) {
|
|
t.Errorf("step %d (%s): %s\n go: %v\n ucode: %v", i, want.What, what, got, exp)
|
|
}
|
|
if got, _ := os.ReadFile(dir + "/firewall"); string(got) != want.Before {
|
|
fail("the firewall the step starts from", string(got), want.Before)
|
|
}
|
|
cmds = nil
|
|
m := model.Load(c, nil)
|
|
var changed bool
|
|
if want.Dry {
|
|
changed = r.FirewallDiffers(m)
|
|
} else {
|
|
changed = r.Fw(m)
|
|
}
|
|
if changed != want.Changed {
|
|
fail("whether it changed", changed, want.Changed)
|
|
}
|
|
if got, _ := os.ReadFile(dir + "/firewall"); string(got) != want.Firewall {
|
|
g, w := strings.Split(string(got), "\n"), strings.Split(want.Firewall, "\n")
|
|
for n := 0; n < len(g) || n < len(w); n++ {
|
|
if n >= len(g) || n >= len(w) || g[n] != w[n] {
|
|
a, b := "(the end)", "(the end)"
|
|
if n < len(g) {
|
|
a = g[n]
|
|
}
|
|
if n < len(w) {
|
|
b = w[n]
|
|
}
|
|
fail("the firewall configuration, from a line on", a, b)
|
|
break
|
|
}
|
|
}
|
|
os.WriteFile(dir+"/firewall", []byte(want.Firewall), 0o644)
|
|
}
|
|
// the snapshot's own question to netifd is not the sync's
|
|
var ran []string
|
|
for _, l := range want.Cmds {
|
|
if l != "ubus call network.interface dump" {
|
|
ran = append(ran, l)
|
|
}
|
|
}
|
|
if strings.Join(cmds, "; ") != strings.Join(ran, "; ") {
|
|
fail("what was run", cmds, ran)
|
|
}
|
|
}
|
|
}
|