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.
148 lines
4.2 KiB
Go
148 lines
4.2 KiB
Go
package methods
|
|
|
|
import (
|
|
"errors"
|
|
"os"
|
|
"sort"
|
|
"strings"
|
|
"time"
|
|
|
|
backend "github.com/tickcount/luci-app-dawnline/backend"
|
|
"github.com/tickcount/luci-app-dawnline/backend/ipnet"
|
|
"github.com/tickcount/luci-app-dawnline/backend/view"
|
|
)
|
|
|
|
// homeHosts is the devices at home for the Home services picker: DHCP leases and static hosts in a
|
|
// server's home networks, with the services they announce (Bonjour, when umdns runs). A server not named
|
|
// is the first one. Each device's services are in the order of their type, then their name.
|
|
func homeHosts(w *view.World, d Deps, id, leases, dhcp string) (map[string]any, error) {
|
|
srv := w.M.Servers[id]
|
|
if ids := w.M.ServerIDs(); srv == nil && len(ids) > 0 {
|
|
srv = w.M.Servers[ids[0]]
|
|
}
|
|
if srv == nil || d.Snapshot == nil {
|
|
return nil, errors.New("No server yet.")
|
|
}
|
|
_, _, cidrs, _ := d.Snapshot().ServerNet(srv)
|
|
var nets []ipnet.Net
|
|
for _, c := range cidrs {
|
|
if n, ok := ipnet.Any(c); ok && strings.Contains(c, "/") {
|
|
nets = append(nets, n)
|
|
}
|
|
}
|
|
inside := func(ip string) bool {
|
|
n, ok := ipnet.IP(ip)
|
|
if !ok {
|
|
return false
|
|
}
|
|
for _, r := range nets {
|
|
if r.Holds(n) {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
type host struct {
|
|
Address string `json:"address"`
|
|
Name string `json:"name"`
|
|
MAC string `json:"mac"`
|
|
Services []map[string]any `json:"services"`
|
|
}
|
|
hosts := map[string]*host{}
|
|
raw, _ := os.ReadFile(leases)
|
|
for _, line := range strings.Split(string(raw), "\n") {
|
|
if f := strings.Split(line, " "); len(f) >= 4 && inside(f[2]) {
|
|
name := f[3]
|
|
if name == "*" {
|
|
name = ""
|
|
}
|
|
hosts[f[2]] = &host{Address: f[2], Name: name, MAC: f[1], Services: []map[string]any{}}
|
|
}
|
|
}
|
|
if c := parseFile(dhcp); c != nil {
|
|
for _, h := range c.OfType("host") {
|
|
ip, _ := h.Get("ip")
|
|
if ip == "" || !inside(ip) || hosts[ip] != nil {
|
|
continue
|
|
}
|
|
name, _ := h.Get("name")
|
|
mac := h.Values["mac"]
|
|
if mac.IsList && len(mac.List) > 0 {
|
|
mac.Str = mac.List[0]
|
|
}
|
|
hosts[ip] = &host{Address: ip, Name: name, MAC: mac.Str, Services: []map[string]any{}}
|
|
}
|
|
}
|
|
// what is announced on the home networks, from OpenWrt's mDNS daemon while it answers
|
|
var browse map[string]any
|
|
if d.Bus != nil {
|
|
browse = d.Bus("umdns", "browse", map[string]any{"address": true, "array": true})
|
|
}
|
|
types := make([]string, 0, len(browse))
|
|
for t := range browse {
|
|
types = append(types, t)
|
|
}
|
|
sort.Strings(types)
|
|
for _, t := range types {
|
|
insts, _ := browse[t].(map[string]any)
|
|
names := make([]string, 0, len(insts))
|
|
for n := range insts {
|
|
names = append(names, n)
|
|
}
|
|
sort.Strings(names)
|
|
for _, name := range names {
|
|
i, _ := insts[name].(map[string]any)
|
|
addr := text(i["ipv4"])
|
|
if list, ok := i["ipv4"].([]any); ok && len(list) > 0 {
|
|
addr = text(list[0])
|
|
}
|
|
if addr == "" {
|
|
continue
|
|
}
|
|
port := i["port"]
|
|
if port == nil {
|
|
port = 0
|
|
}
|
|
svc := map[string]any{"type": t, "name": name, "port": port}
|
|
if h := hosts[addr]; h != nil {
|
|
h.Services = append(h.Services, svc)
|
|
} else if inside(addr) {
|
|
hn := strings.TrimSuffix(strings.TrimSuffix(text(i["host"]), "."), ".local")
|
|
hosts[addr] = &host{Address: addr, Name: hn, Services: []map[string]any{svc}}
|
|
}
|
|
}
|
|
}
|
|
list := make([]*host, 0, len(hosts))
|
|
for _, h := range hosts {
|
|
list = append(list, h)
|
|
}
|
|
sort.Slice(list, func(i, j int) bool {
|
|
a, _ := ipnet.IP(list[i].Address)
|
|
b, _ := ipnet.IP(list[j].Address)
|
|
return a < b
|
|
})
|
|
return map[string]any{"hosts": list, "mdns": browse != nil}, nil
|
|
}
|
|
|
|
// export is every section of the settings as written, for the admin to keep (it holds private keys).
|
|
func export(d Deps) (map[string]any, error) {
|
|
sections := []map[string]any{}
|
|
if c := parseFile(d.Config); c != nil {
|
|
for _, s := range c.Sections {
|
|
o := map[string]any{".type": s.Type, ".name": s.Name}
|
|
for k, v := range s.Values {
|
|
if v.IsList {
|
|
o[k] = v.List
|
|
} else {
|
|
o[k] = v.Str
|
|
}
|
|
}
|
|
sections = append(sections, o)
|
|
}
|
|
}
|
|
if d.Log != nil {
|
|
d.Log.Admin("dawnline", "exported", "", "all settings", "the file holds private keys")
|
|
}
|
|
return map[string]any{"format": "dawnline", "version": backend.Version, "exported": time.Now().Unix(), "sections": sections}, nil
|
|
}
|