Dawnline 0.20.0
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
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.
This commit is contained in:
1 parent
f8130e39a8
commit
ac90575b0b
788 files changed
+139244
-41720
No files matched your search
@@ -0,0 +1,122 @@
|
||||
// Package resolve finds where a name points, as dawnline.lookup does: public resolvers first (local DNS
|
||||
// often rewrites the router's own name to its LAN address), then the router's own; every server is asked at
|
||||
// once for A and AAAA with a short timeout, and the first in that order that answers wins. Answers are kept
|
||||
// five minutes, failures one.
|
||||
package resolve
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net"
|
||||
"regexp"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
// Servers are asked in this order of preference.
|
||||
var Servers = []string{"1.1.1.1", "8.8.8.8", "127.0.0.1"}
|
||||
|
||||
const (
|
||||
keep = 5 * time.Minute
|
||||
keepFail = time.Minute
|
||||
timeout = 2 * time.Second
|
||||
)
|
||||
|
||||
var name = regexp.MustCompile(`^[A-Za-z0-9]([A-Za-z0-9.-]*[A-Za-z0-9])?$`)
|
||||
|
||||
type answer struct {
|
||||
at time.Time
|
||||
ips []string
|
||||
}
|
||||
|
||||
// A Resolver keeps what it found. Lookup is how one server is asked for one kind of address ("ip4", "ip6");
|
||||
// nil asks the real one.
|
||||
type Resolver struct {
|
||||
Lookup func(ctx context.Context, server, network, host string) []string
|
||||
Now func() time.Time
|
||||
|
||||
mu sync.Mutex
|
||||
cache map[string]answer
|
||||
}
|
||||
|
||||
func ask(ctx context.Context, server, network, host string) []string {
|
||||
r := &net.Resolver{PreferGo: true, Dial: func(ctx context.Context, n, _ string) (net.Conn, error) {
|
||||
return (&net.Dialer{}).DialContext(ctx, n, net.JoinHostPort(server, "53"))
|
||||
}}
|
||||
ips, _ := r.LookupIP(ctx, network, host)
|
||||
out := make([]string, 0, len(ips))
|
||||
for _, ip := range ips {
|
||||
out = append(out, ip.String())
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// Addresses is a name's addresses, IPv4 before IPv6; an address is itself; nothing for what does not resolve.
|
||||
func (r *Resolver) Addresses(host string) []string {
|
||||
if net.ParseIP(host) != nil {
|
||||
return []string{host}
|
||||
}
|
||||
if len(host) > 253 || !name.MatchString(host) {
|
||||
return nil
|
||||
}
|
||||
now := time.Now
|
||||
if r.Now != nil {
|
||||
now = r.Now
|
||||
}
|
||||
r.mu.Lock()
|
||||
c, has := r.cache[host]
|
||||
r.mu.Unlock()
|
||||
if has && ((len(c.ips) > 0 && now().Sub(c.at) < keep) || (len(c.ips) == 0 && now().Sub(c.at) < keepFail)) {
|
||||
return c.ips
|
||||
}
|
||||
lookup := r.Lookup
|
||||
if lookup == nil {
|
||||
lookup = ask
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
||||
defer cancel()
|
||||
found := make([][2][]string, len(Servers))
|
||||
var wg sync.WaitGroup
|
||||
for i, server := range Servers {
|
||||
for j, network := range []string{"ip4", "ip6"} {
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
found[i][j] = lookup(ctx, server, network, host)
|
||||
}()
|
||||
}
|
||||
}
|
||||
wg.Wait()
|
||||
var ips []string
|
||||
for _, f := range found {
|
||||
if ips = append(append(ips, f[0]...), f[1]...); len(ips) > 0 {
|
||||
break
|
||||
}
|
||||
}
|
||||
r.mu.Lock()
|
||||
if r.cache == nil {
|
||||
r.cache = map[string]answer{}
|
||||
}
|
||||
for h, c := range r.cache {
|
||||
if now().Sub(c.at) >= keep {
|
||||
delete(r.cache, h)
|
||||
}
|
||||
}
|
||||
r.cache[host] = answer{now(), ips}
|
||||
r.mu.Unlock()
|
||||
return ips
|
||||
}
|
||||
|
||||
// HostIP is the address to give an app that takes no name for the server: IPv4 first, as a phone on mobile
|
||||
// data may have no IPv6. "" when the name does not resolve.
|
||||
func (r *Resolver) HostIP(host string) string {
|
||||
ips := r.Addresses(host)
|
||||
for _, ip := range ips {
|
||||
if net.ParseIP(ip).To4() != nil {
|
||||
return ip
|
||||
}
|
||||
}
|
||||
if len(ips) > 0 {
|
||||
return ips[0]
|
||||
}
|
||||
return ""
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package resolve
|
||||
|
||||
import (
|
||||
"context"
|
||||
"reflect"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestAddresses(t *testing.T) {
|
||||
var asked atomic.Int32
|
||||
now := time.Unix(1_800_000_000, 0)
|
||||
r := &Resolver{Now: func() time.Time { return now }, Lookup: func(_ context.Context, server, network, host string) []string {
|
||||
asked.Add(1)
|
||||
switch {
|
||||
case host == "vpn.example.org" && server == "8.8.8.8" && network == "ip4":
|
||||
return []string{"203.0.113.7"}
|
||||
case host == "vpn.example.org" && server == "8.8.8.8" && network == "ip6":
|
||||
return []string{"2001:db8::7"}
|
||||
// the router's own resolver rewrites the name: it is believed only when the public ones say nothing
|
||||
case host == "vpn.example.org" && server == "127.0.0.1" && network == "ip4":
|
||||
return []string{"192.168.1.1"}
|
||||
case host == "six.example.org" && server == "1.1.1.1" && network == "ip6":
|
||||
return []string{"2001:db8::6"}
|
||||
case host == "home.lan" && server == "127.0.0.1" && network == "ip4":
|
||||
return []string{"192.168.1.20"}
|
||||
}
|
||||
return nil
|
||||
}}
|
||||
for host, want := range map[string][]string{
|
||||
"vpn.example.org": {"203.0.113.7", "2001:db8::7"}, "six.example.org": {"2001:db8::6"}, "home.lan": {"192.168.1.20"},
|
||||
"nowhere.example": nil, "198.51.100.4": {"198.51.100.4"}, "2001:db8::1": {"2001:db8::1"}, "not a name": nil, "": nil,
|
||||
} {
|
||||
if got := r.Addresses(host); !reflect.DeepEqual(got, want) {
|
||||
t.Errorf("%q: %v", host, got)
|
||||
}
|
||||
}
|
||||
if r.HostIP("vpn.example.org") != "203.0.113.7" || r.HostIP("six.example.org") != "2001:db8::6" || r.HostIP("nowhere.example") != "" {
|
||||
t.Fatal("HostIP")
|
||||
}
|
||||
// kept: an answer five minutes, a failure one
|
||||
n := asked.Load()
|
||||
now = now.Add(4 * time.Minute)
|
||||
r.Addresses("vpn.example.org")
|
||||
if asked.Load() != n {
|
||||
t.Fatal("asked again within five minutes")
|
||||
}
|
||||
r.Addresses("nowhere.example")
|
||||
if asked.Load() == n {
|
||||
t.Fatal("a failure was kept longer than a minute")
|
||||
}
|
||||
n = asked.Load()
|
||||
now = now.Add(2 * time.Minute)
|
||||
if r.Addresses("vpn.example.org"); asked.Load() == n {
|
||||
t.Fatal("an answer was kept longer than five minutes")
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user