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,90 @@
|
||||
// Package store is changes to /etc/config/dawnline, the one way, as dawnline.store: under the config lock
|
||||
// (the same lock file the ucode backend takes, so neither writes on the other's stale model), against the
|
||||
// settings read inside that lock, written whole and kept readable by root only. A change that fails, or
|
||||
// did not reach flash, never happened: nothing is written and the caller is told why.
|
||||
package store
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/tickcount/luci-app-dawnline/backend/files"
|
||||
"github.com/tickcount/luci-app-dawnline/backend/model"
|
||||
"github.com/tickcount/luci-app-dawnline/backend/uci"
|
||||
)
|
||||
|
||||
// Store is where the settings are.
|
||||
type Store struct {
|
||||
// Config is the settings file; RunDir holds the lock and which servers are kept down.
|
||||
Config, RunDir string
|
||||
}
|
||||
|
||||
// Unsaved is a change that could not be written: the flash is full or read-only.
|
||||
type Unsaved struct{ Why error }
|
||||
|
||||
func (u Unsaved) Error() string {
|
||||
return fmt.Sprintf("Couldn't save /etc/config/dawnline: %s. Is the flash full?", u.Why)
|
||||
}
|
||||
|
||||
// Read is the settings as they stand now, parsed and as a model.
|
||||
func (s Store) Read() (*uci.Config, *model.Model, error) {
|
||||
text, err := os.ReadFile(s.Config)
|
||||
if err != nil && !os.IsNotExist(err) {
|
||||
return nil, nil, err
|
||||
}
|
||||
c, err := uci.Parse(string(text))
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
var blocked map[string]any
|
||||
files.ReadJSON(s.RunDir+"/netifd-blocked.json", &blocked)
|
||||
return c, model.Load(c, blocked), nil
|
||||
}
|
||||
|
||||
// Transact runs fn on the settings with the config lock held and writes them when fn returns nil. Whatever
|
||||
// fn returns as an error aborts: nothing is written, and the error is passed on. fn changes c; m is the
|
||||
// model of the settings before the change.
|
||||
func (s Store) Transact(fn func(c *uci.Config, m *model.Model) error) error {
|
||||
defer files.Lock(s.RunDir, "config")()
|
||||
c, m, err := s.Read()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := fn(c, m); err != nil {
|
||||
return err
|
||||
}
|
||||
return s.write(c.Format())
|
||||
}
|
||||
|
||||
// write puts the file in place whole: beside it under a hidden name (never a name `uci` would list as a
|
||||
// configuration), on disk, then renamed over it.
|
||||
func (s Store) write(text string) error {
|
||||
var r [4]byte
|
||||
rand.Read(r[:])
|
||||
tmp := filepath.Join(filepath.Dir(s.Config), "."+filepath.Base(s.Config)+".dl-"+hex.EncodeToString(r[:]))
|
||||
f, err := os.OpenFile(tmp, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0o600)
|
||||
if err != nil {
|
||||
return Unsaved{err}
|
||||
}
|
||||
_, err = f.WriteString(text)
|
||||
if err == nil {
|
||||
err = f.Sync()
|
||||
}
|
||||
if cerr := f.Close(); err == nil {
|
||||
err = cerr
|
||||
}
|
||||
if err == nil {
|
||||
err = os.Chmod(tmp, 0o600)
|
||||
}
|
||||
if err == nil {
|
||||
err = os.Rename(tmp, s.Config)
|
||||
}
|
||||
if err != nil {
|
||||
os.Remove(tmp)
|
||||
return Unsaved{err}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"os"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"github.com/tickcount/luci-app-dawnline/backend/model"
|
||||
"github.com/tickcount/luci-app-dawnline/backend/uci"
|
||||
)
|
||||
|
||||
const file = "\nconfig settings 'settings'\n\toption portal_port '4500'\n\nconfig server 'home'\n\toption name 'Home'\n\n"
|
||||
|
||||
func TestTransact(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
s := Store{Config: dir + "/dawnline", RunDir: dir + "/run"}
|
||||
os.WriteFile(s.Config, []byte(file), 0o644)
|
||||
// a change that fails leaves the file as it was
|
||||
refused := errors.New("Unknown person.")
|
||||
if err := s.Transact(func(c *uci.Config, m *model.Model) error {
|
||||
c.Set("home", "name", "Changed")
|
||||
return refused
|
||||
}); err != refused {
|
||||
t.Fatalf("the refusal: %v", err)
|
||||
}
|
||||
if raw, _ := os.ReadFile(s.Config); string(raw) != file {
|
||||
t.Fatalf("a refused change was written:\n%s", raw)
|
||||
}
|
||||
// one that passes is written whole, against the model as it was, private to root
|
||||
if err := s.Transact(func(c *uci.Config, m *model.Model) error {
|
||||
if m.Servers["home"].Name != "Home" || m.Settings.PortalPort != 4500 {
|
||||
t.Errorf("the model inside: %+v", m.Servers["home"])
|
||||
}
|
||||
c.Set("home", "name", "Cabin")
|
||||
c.Add("person", "anna")
|
||||
c.Set("anna", "server", "home")
|
||||
return nil
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
raw, _ := os.ReadFile(s.Config)
|
||||
want := "\nconfig settings 'settings'\n\toption portal_port '4500'\n\nconfig server 'home'\n\toption name 'Cabin'\n\nconfig person 'anna'\n\toption server 'home'\n\n"
|
||||
if st, _ := os.Stat(s.Config); string(raw) != want || st.Mode().Perm() != 0o600 {
|
||||
t.Fatalf("written (%v):\n%s", st.Mode().Perm(), raw)
|
||||
}
|
||||
left, _ := os.ReadDir(dir)
|
||||
for _, e := range left {
|
||||
if strings.HasPrefix(e.Name(), ".") {
|
||||
t.Fatalf("a temporary file stays: %s", e.Name())
|
||||
}
|
||||
}
|
||||
// writers wait for each other: none works on another's stale settings
|
||||
var wg sync.WaitGroup
|
||||
for i := 0; i < 20; i++ {
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
s.Transact(func(c *uci.Config, m *model.Model) error {
|
||||
n, _ := c.Section("settings").Get("count")
|
||||
c.Set("settings", "count", n+"x")
|
||||
return nil
|
||||
})
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
c, _, _ := s.Read()
|
||||
if n, _ := c.Section("settings").Get("count"); len(n) != 20 {
|
||||
t.Fatalf("twenty writers left %q", n)
|
||||
}
|
||||
// a directory that cannot be written: told as ucode tells it, the file untouched
|
||||
gone := Store{Config: dir + "/nowhere/dawnline", RunDir: dir + "/run"}
|
||||
err := gone.Transact(func(*uci.Config, *model.Model) error { return nil })
|
||||
if _, unsaved := err.(Unsaved); !unsaved || !strings.HasPrefix(err.Error(), "Couldn't save /etc/config/dawnline: ") {
|
||||
t.Fatalf("a write that fails: %v", err)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user