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.
133 lines
4.1 KiB
Go
133 lines
4.1 KiB
Go
//go:build ubusd
|
|
|
|
// Against a real ubusd, with OpenWrt's own ubus tool on the other side
|
|
// (scripts/backend-container.sh runs it in the rootfs containers).
|
|
package ubus
|
|
|
|
import (
|
|
"bufio"
|
|
"context"
|
|
"encoding/json"
|
|
"os/exec"
|
|
"reflect"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func TestRealBus(t *testing.T) {
|
|
ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
|
|
defer cancel()
|
|
|
|
watched := make(chan bool, 4)
|
|
obj := &Object{
|
|
Name: "dawnline.selftest",
|
|
Methods: []Method{
|
|
{Name: "echo", Params: map[string]Kind{"value": Table}, Handle: func(_ context.Context, args map[string]any) (map[string]any, error) {
|
|
return args, nil
|
|
}},
|
|
{Name: "nothing", Handle: func(context.Context, map[string]any) (map[string]any, error) { return nil, nil }},
|
|
{Name: "refuse", Handle: func(context.Context, map[string]any) (map[string]any, error) {
|
|
return nil, StatusPermissionDenied
|
|
}},
|
|
},
|
|
Watched: func(on bool) { watched <- on },
|
|
}
|
|
bus := NewBus(Socket, obj)
|
|
bus.Log = t.Logf
|
|
go bus.Run(ctx)
|
|
// On the bus once the tool sees it.
|
|
for exec.CommandContext(ctx, "ubus", "list", obj.Name).Run() != nil {
|
|
if ctx.Err() != nil {
|
|
t.Fatal("the object never appeared on the bus")
|
|
}
|
|
time.Sleep(50 * time.Millisecond)
|
|
}
|
|
|
|
// The signature, as `ubus -v list` prints it.
|
|
out, err := exec.CommandContext(ctx, "ubus", "-v", "list", obj.Name).CombinedOutput()
|
|
if err != nil {
|
|
t.Fatalf("ubus -v list: %v\n%s", err, out)
|
|
}
|
|
t.Logf("%s", out)
|
|
|
|
// A call from the tool: what comes back is what went in.
|
|
in := `{"s":"x","n":1,"big":5000000000,"f":2.5,"b":true,"z":null,"l":[1,"two",{"k":false}],"t":{"u":{}}}`
|
|
out, err = exec.CommandContext(ctx, "ubus", "call", obj.Name, "echo", in).Output()
|
|
if err != nil {
|
|
t.Fatalf("ubus call: %v", err)
|
|
}
|
|
var want, got any
|
|
json.Unmarshal([]byte(in), &want)
|
|
if err := json.Unmarshal(out, &got); err != nil {
|
|
t.Fatalf("answer is not JSON: %s", out)
|
|
}
|
|
if !reflect.DeepEqual(got, want) {
|
|
t.Fatalf("echo: got %s", out)
|
|
}
|
|
if out, err := exec.CommandContext(ctx, "ubus", "call", obj.Name, "nothing").CombinedOutput(); err != nil {
|
|
t.Fatalf("a call answered with nothing failed: %v %s", err, out)
|
|
}
|
|
// A handler's status is the tool's exit code, negated (an 8-bit one: 256 - 6).
|
|
err = exec.CommandContext(ctx, "ubus", "call", obj.Name, "refuse").Run()
|
|
if ee, ok := err.(*exec.ExitError); !ok || ee.ExitCode() != 256-int(StatusPermissionDenied) {
|
|
t.Fatalf("refuse: %v", err)
|
|
}
|
|
if err := exec.CommandContext(ctx, "ubus", "call", obj.Name, "absent").Run(); err == nil {
|
|
t.Fatal("a method that is not there answered")
|
|
}
|
|
|
|
// A call from our side, on a second connection.
|
|
c, err := Dial(Socket)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer c.Close()
|
|
res, err := c.Call(ctx, obj.Name, "echo", map[string]any{"hello": "bus", "n": 7})
|
|
if err != nil || res["hello"] != "bus" || res["n"] != int64(7) {
|
|
t.Fatalf("Call: %v %v", res, err)
|
|
}
|
|
if _, err := c.Call(ctx, "no.such.object", "x", nil); err == nil {
|
|
t.Fatal("a call on an object that is not there answered")
|
|
}
|
|
|
|
// A subscriber: we are told it came, it gets the notification, we are told it left.
|
|
sub := exec.CommandContext(ctx, "ubus", "subscribe", obj.Name)
|
|
pipe, _ := sub.StdoutPipe()
|
|
if err := sub.Start(); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
select {
|
|
case on := <-watched:
|
|
if !on {
|
|
t.Fatal("told the subscriber left before it came")
|
|
}
|
|
case <-ctx.Done():
|
|
t.Fatal("never told of the subscriber")
|
|
}
|
|
if err := bus.Notify(obj, "patch", map[string]any{"rev": 12, "ops": map[string]any{"online": true}}); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
line, err := bufio.NewReader(pipe).ReadString('\n')
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
var note map[string]any
|
|
if err := json.Unmarshal([]byte(line), ¬e); err != nil {
|
|
t.Fatalf("notification is not JSON: %s", line)
|
|
}
|
|
wantNote := map[string]any{"patch": map[string]any{"rev": float64(12), "ops": map[string]any{"online": true}}}
|
|
if !reflect.DeepEqual(note, wantNote) {
|
|
t.Fatalf("notification: %s", line)
|
|
}
|
|
sub.Process.Kill()
|
|
sub.Wait()
|
|
select {
|
|
case on := <-watched:
|
|
if on {
|
|
t.Fatal("told a subscriber came when it left")
|
|
}
|
|
case <-ctx.Done():
|
|
t.Fatal("never told the subscriber left")
|
|
}
|
|
}
|