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.
91 lines
3.3 KiB
Go
91 lines
3.3 KiB
Go
package apply
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/tickcount/luci-app-dawnline/backend/health"
|
|
"github.com/tickcount/luci-app-dawnline/backend/model"
|
|
)
|
|
|
|
// Our own answers leave by the main table: the portal's (TCP) and each tunnel's (UDP). Proxies on the
|
|
// router mark the router's own traffic in an output route chain, which diverts replies to outside clients
|
|
// into lo; a later output chain of our own (table inet dawnline_reply) clears exactly those marks on
|
|
// packets from our listening ports (dawnline.fw sync_reply_routes).
|
|
|
|
const replyTable = "dawnline_reply"
|
|
|
|
// Older versions kept answers out of proxies with `ip rule` at priority 90; it never matched.
|
|
var oldReplyRule = regexp.MustCompile(`(iif lo )?ipproto (tcp|udp) sport ([0-9]+) lookup main`)
|
|
|
|
// Diverts is the policy rules that send marked traffic into a table with `local default`, the way
|
|
// transparent proxies capture the router's own traffic.
|
|
func (r *Router) Diverts() []health.Divert {
|
|
return health.ProxyDiverts(func(fam string) string {
|
|
out, _ := r.Exec("ip", fam, "rule", "show")
|
|
return out
|
|
}, func(fam, name string) string {
|
|
out, _ := r.Exec("ip", fam, "route", "show", "table", name)
|
|
return out
|
|
})
|
|
}
|
|
|
|
func (r *Router) replyLoaded() bool {
|
|
_, code := r.Exec("nft", "list", "table", "inet", replyTable)
|
|
return code == 0
|
|
}
|
|
|
|
// ReplyOK tells whether answers from our ports are kept out of these diverts right now (the watchdog's question).
|
|
func (r *Router) ReplyOK(m *model.Model, diverts []health.Divert) bool {
|
|
s := health.ReplyScript(m, diverts)
|
|
if s == "" {
|
|
return true
|
|
}
|
|
was, _ := os.ReadFile(r.RunDir + "/reply.nft")
|
|
return s == string(was) && r.replyLoaded()
|
|
}
|
|
|
|
// ReplyRoutes keeps the reply table in step with our ports and the proxies' diverts (an apply, and every
|
|
// tick: a proxy may start after Dawnline). Cheap when nothing changed.
|
|
func (r *Router) ReplyRoutes(m *model.Model) {
|
|
sig := r.RunDir + "/reply.nft"
|
|
for _, fam := range []string{"-4", "-6"} {
|
|
out, _ := r.Exec("ip", fam, "rule", "show", "priority", "90")
|
|
for _, line := range strings.Split(out, "\n") {
|
|
if mm := oldReplyRule.FindStringSubmatch(line); mm != nil {
|
|
args := []string{fam, "rule", "del", "priority", "90"}
|
|
if mm[1] != "" {
|
|
args = append(args, "iif", "lo")
|
|
}
|
|
r.Exec("ip", append(args, "ipproto", mm[2], "sport", mm[3], "lookup", "main")...)
|
|
}
|
|
}
|
|
}
|
|
s := health.ReplyScript(m, r.Diverts())
|
|
if s == "" {
|
|
if r.replyLoaded() {
|
|
r.say("info", "nftables", "table inet "+replyTable+": removed (no proxy to keep Dawnline's answers out of)")
|
|
r.Exec("nft", "delete", "table", "inet", replyTable)
|
|
}
|
|
os.Remove(sig)
|
|
return
|
|
}
|
|
if was, _ := os.ReadFile(sig); s == string(was) && r.replyLoaded() {
|
|
r.say("debug", "nftables", "table inet "+replyTable+": unchanged")
|
|
return
|
|
}
|
|
if err := r.load("table inet " + replyTable + "\ndelete table inet " + replyTable + "\n" + s); err != "" {
|
|
os.Remove(sig)
|
|
r.say("error", "nftables", "table inet "+replyTable+": loading failed · "+err)
|
|
return
|
|
}
|
|
r.say("info", "nftables", fmt.Sprintf("table inet %s: loaded · %d lines (Dawnline's own answers kept out of proxies)", replyTable, strings.Count(s, "\n")+1))
|
|
for _, l := range strings.Split(strings.TrimRight(s, "\n"), "\n") {
|
|
r.say("debug", "nftables", "table inet "+replyTable+": "+l)
|
|
}
|
|
os.MkdirAll(r.RunDir, 0o755)
|
|
os.WriteFile(sig, []byte(s), 0o644)
|
|
}
|