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.
128 lines
4.3 KiB
Go
128 lines
4.3 KiB
Go
package apply
|
|
|
|
import (
|
|
"encoding/json"
|
|
"os"
|
|
"sort"
|
|
|
|
"github.com/tickcount/luci-app-dawnline/backend/health"
|
|
"github.com/tickcount/luci-app-dawnline/backend/model"
|
|
"github.com/tickcount/luci-app-dawnline/backend/servicelog"
|
|
)
|
|
|
|
// The networks behind people's routers, as the router's own routes: a packet for one leaves through the
|
|
// tunnel of the router it stands behind (the tunnel then picks the device by the peers' AllowedIPs).
|
|
//
|
|
// Reconciled, not patched: every route of ours carries one routing protocol number, so what the main table
|
|
// holds of them is read back and brought to what the settings and people's states want. Netifd takes a
|
|
// tunnel's routes away with its interface; the sync that follows the interface coming up puts them back.
|
|
|
|
// routeProto marks the routes Dawnline keeps (/etc/iproute2/rt_protos has no name for it).
|
|
const routeProto = "205"
|
|
|
|
// RoutesWanted is the networks that get a route, by the tunnel's interface, sorted: those behind the
|
|
// devices a tunnel was given (peers: each server's "ok"), so a route never leads into a tunnel that would
|
|
// drop the packet.
|
|
func RoutesWanted(m *model.Model, states, peers map[string]string, behind map[string][]string) map[string][]string {
|
|
want := map[string][]string{}
|
|
for _, id := range m.ServerIDs() {
|
|
srv := m.Servers[id]
|
|
if !srv.Enabled || !tunnelOK(srv) || peers[id] != "ok" {
|
|
continue
|
|
}
|
|
for _, d := range health.TunnelDevices(m, id, states) {
|
|
want[srv.Ifname] = append(want[srv.Ifname], behind[d.ID]...)
|
|
}
|
|
sort.Strings(want[srv.Ifname])
|
|
if len(want[srv.Ifname]) == 0 {
|
|
delete(want, srv.Ifname)
|
|
}
|
|
}
|
|
return want
|
|
}
|
|
|
|
// IPRoute is a route as `ip -j -4 route show` prints it.
|
|
type IPRoute struct {
|
|
Dst string `json:"dst"`
|
|
Dev string `json:"dev"`
|
|
}
|
|
|
|
// RouteCmds is the `ip` arguments that turn the routes of ours there are into the wanted ones: the missing
|
|
// ones first, then the ones nobody has any more. None when they are as wanted.
|
|
func RouteCmds(want map[string][]string, have []IPRoute) [][]string {
|
|
there, wanted := map[string]bool{}, map[string]bool{}
|
|
for _, x := range have {
|
|
there[x.Dev+" "+x.Dst] = true
|
|
}
|
|
var cmds [][]string
|
|
ifnames := make([]string, 0, len(want))
|
|
for ifname := range want {
|
|
ifnames = append(ifnames, ifname)
|
|
}
|
|
sort.Strings(ifnames)
|
|
for _, ifname := range ifnames {
|
|
for _, n := range want[ifname] {
|
|
if k := ifname + " " + n; !there[k] && !wanted[k] {
|
|
cmds = append(cmds, []string{"-4", "route", "replace", n, "dev", ifname, "proto", routeProto, "scope", "link"})
|
|
}
|
|
wanted[ifname+" "+n] = true
|
|
}
|
|
}
|
|
for _, x := range have {
|
|
if !wanted[x.Dev+" "+x.Dst] {
|
|
cmds = append(cmds, []string{"-4", "route", "del", x.Dst, "dev", x.Dev, "proto", routeProto})
|
|
}
|
|
}
|
|
return cmds
|
|
}
|
|
|
|
// routes keeps the routes to the networks behind routers as RoutesWanted says: "" when they are, else what
|
|
// `ip` said of the first that failed. states is whose devices were loaded, peers what each tunnel answered.
|
|
func (r *Router) routes(m *model.Model, states, peers map[string]string, behind map[string][]string) string {
|
|
out, code := r.Exec("ip", "-j", "-4", "route", "show", "proto", routeProto)
|
|
var have []IPRoute
|
|
if code == 0 {
|
|
json.Unmarshal([]byte(trimmed(out)), &have)
|
|
}
|
|
failed := ""
|
|
var added, removed []string
|
|
for _, args := range RouteCmds(RoutesWanted(m, states, peers, behind), have) {
|
|
said, code := r.Exec("ip", args...)
|
|
what := args[3] + " dev " + args[5]
|
|
switch {
|
|
case code != 0 && args[2] == "replace":
|
|
if failed == "" {
|
|
failed = what + ": " + trimmed(said)
|
|
}
|
|
case args[2] == "replace":
|
|
added = append(added, what)
|
|
case code == 0:
|
|
removed = append(removed, what)
|
|
}
|
|
}
|
|
if len(added) > 0 || len(removed) > 0 {
|
|
line := "networks behind routers:"
|
|
if len(added) > 0 {
|
|
line += " added " + someOf(added)
|
|
}
|
|
if len(removed) > 0 {
|
|
line += " removed " + someOf(removed)
|
|
}
|
|
r.say("info", "routes", line)
|
|
}
|
|
// once per distinct failure, as the access table's
|
|
path := r.RunDir + "/routes.err"
|
|
was, werr := os.ReadFile(path)
|
|
switch {
|
|
case failed == "" && werr == nil:
|
|
os.Remove(path)
|
|
case failed != "" && (werr != nil || string(was) != failed):
|
|
if r.Log != nil {
|
|
r.Log.Write("dawnline", "error", "couldn't set a route to a network behind a router", failed, "Routes", servicelog.Extra{})
|
|
}
|
|
os.MkdirAll(r.RunDir, 0o755)
|
|
os.WriteFile(path, []byte(failed), 0o644)
|
|
}
|
|
return failed
|
|
}
|