Files
dawnline/backend/apply/dry.go
T
Aemeath ac90575b0b
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
Dawnline 0.20.0
- **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.
2026-11-13 09:43:50 +03:00

140 lines
4.7 KiB
Go

package apply
import (
"os"
"regexp"
"strings"
"github.com/tickcount/luci-app-dawnline/backend/awg"
"github.com/tickcount/luci-app-dawnline/backend/model"
)
// A full apply with nothing applied: every step runs on copies of the files it would write, the commands
// that only ask the router something are run, and the ones that would change it are noted instead. For
// holding Go's apply to what a router runs now: after the ucode backend applied, it must find nothing to do.
var (
asksOnly = regexp.MustCompile(`^ip (-n dawnline )?(-j |-4 |-6 )*(neigh|link|rule|route|addr) show\b[^;|&]*( 2>/dev/null)?$`)
secret = regexp.MustCompile(`((private|preshared|protection)_?key) '[^']*'`)
)
func asks(name string, args []string) bool {
line := strings.Join(args, " ")
switch name {
case "sh":
return len(args) == 2 && args[0] == "-c" && asksOnly.MatchString(args[1])
case "ip":
return asksOnly.MatchString("ip " + line)
case "nft":
return len(args) > 0 && args[0] == "list"
case "ubus":
return len(args) == 3 && args[0] == "call" && strings.HasPrefix(args[1], "network.interface.") && args[2] == "status"
}
return false
}
// changes is the lines two texts differ in ("-" gone, "+" new), keys never shown.
func changes(was, now string) []string {
out := []string{}
if was == now {
return out
}
count := map[string]int{}
for _, l := range strings.Split(was, "\n") {
count[l]++
}
var added []string
for _, l := range strings.Split(now, "\n") {
if count[l] > 0 {
count[l]--
} else {
added = append(added, l)
}
}
for _, l := range strings.Split(was, "\n") {
if count[l] > 0 {
count[l]--
out = append(out, "- "+secret.ReplaceAllString(l, "$1 '***'"))
}
}
for _, l := range added {
out = append(out, "+ "+secret.ReplaceAllString(l, "$1 '***'"))
}
return out
}
// ApplyPlan is what a full apply would do now, with nothing done: which files would change (their lines),
// which commands would be run, what the home-like path would come to. The runtime sync is Plan's.
func (r *Router) ApplyPlan(m *model.Model, saved string, tools bool, caps awg.Caps) map[string]any {
dir, err := os.MkdirTemp("", "dawnline-plan-")
if err != nil {
return map[string]any{"error": err.Error()}
}
defer os.RemoveAll(dir)
read := func(path string) string {
raw, _ := os.ReadFile(path)
return string(raw)
}
etc := r.varEtc()
os.MkdirAll(dir+"/run", 0o755)
os.MkdirAll(dir+"/etc", 0o755)
for _, f := range []string{"netifd-blocked.json", "netifd-no-awg", "iface-intent.json", "loop.json", "reply.nft", "net.sig"} {
if raw, err := os.ReadFile(r.RunDir + "/" + f); err == nil {
os.WriteFile(dir+"/run/"+f, raw, 0o600)
}
}
for _, f := range []string{"dawnline-dns.conf", "dawnline-dns.resolv", "dawnline-ns.nft"} {
if raw, err := os.ReadFile(etc + "/" + f); err == nil {
os.WriteFile(dir+"/etc/"+f, raw, 0o600)
}
}
os.WriteFile(dir+"/network", []byte(read(r.Network)), 0o600)
os.WriteFile(dir+"/firewall", []byte(read(r.Firewall)), 0o600)
would := []string{}
d := *r
d.RunDir, d.VarEtc, d.Network, d.Firewall, d.Log, d.Remember, d.dry = dir+"/run", dir+"/etc", dir+"/network", dir+"/firewall", nil, nil, true
d.ResolverPid = r.resolverPid()
d.Exec = func(name string, args ...string) (string, int) {
if asks(name, args) {
return r.Exec(name, args...)
}
line := name + " " + strings.Join(args, " ")
if name == "sh" && len(args) == 2 {
line = args[1]
}
would = append(would, strings.ReplaceAll(line, dir+"/etc", etc))
return "", 0
}
out := map[string]any{}
out["network"] = d.Netifd(m, tools, caps)
out["network_lines"] = changes(read(r.Network), read(dir+"/network"))
out["firewall"] = d.Fw(m)
out["firewall_lines"] = changes(read(r.Firewall), read(dir+"/firewall"))
at := len(would)
lp := d.LoopEnsure(m, saved, false)
switch {
case lp.Off:
out["like_home"] = "off"
case lp.Error != nil:
out["like_home"] = lp.Error
default:
out["like_home"] = lp.Plan
}
out["like_home_runs"] = append([]string{}, would[at:]...)
out["like_home_state"] = changes(read(r.RunDir+"/loop.json"), read(dir+"/run/loop.json"))
out["resolver"] = d.SyncResolver(m)
out["resolver_lines"] = append(changes(read(etc+"/dawnline-dns.conf"), read(dir+"/etc/dawnline-dns.conf")),
changes(read(etc+"/dawnline-dns.resolv"), read(dir+"/etc/dawnline-dns.resolv"))...)
at = len(would)
d.ReplyRoutes(m)
out["reply_runs"] = append([]string{}, would[at:]...)
out["reply_lines"] = changes(read(r.RunDir+"/reply.nft"), read(dir+"/run/reply.nft"))
sig := r.NetSignature(m)
out["signature"] = sig == read(r.RunDir+"/net.sig")
if sig != read(r.RunDir+"/net.sig") {
out["signature_now"], out["signature_kept"] = sig, read(r.RunDir+"/net.sig")
}
out["would_run"] = would
return out
}