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.
209 lines
5.3 KiB
Go
209 lines
5.3 KiB
Go
// Package migrate is the one-time steps for routers set up by older versions (dawnline.migrate). Each one
|
|
// checks first and writes nothing when there is nothing to do; a full apply runs them before it takes its
|
|
// own lock (changes to the settings go through the store and its config lock).
|
|
package migrate
|
|
|
|
import (
|
|
"os"
|
|
"regexp"
|
|
|
|
"github.com/tickcount/luci-app-dawnline/backend/model"
|
|
"github.com/tickcount/luci-app-dawnline/backend/servicelog"
|
|
"github.com/tickcount/luci-app-dawnline/backend/store"
|
|
"github.com/tickcount/luci-app-dawnline/backend/uci"
|
|
)
|
|
|
|
// Router is where the steps work.
|
|
type Router struct {
|
|
Store store.Store
|
|
// NewCode draws a personal code of words.
|
|
NewCode func() string
|
|
// Uhttpd is the LuCI web server's configuration, CGI the portal's old script under it.
|
|
Uhttpd, CGI string
|
|
// ReloadUhttpd has the web server read its configuration again.
|
|
ReloadUhttpd func()
|
|
Log *servicelog.Log
|
|
}
|
|
|
|
var wordCode = regexp.MustCompile(`^[a-z]{6}-[a-z]{6}-[a-z]{6}$`)
|
|
|
|
const cgiURL = "/cgi-bin/dawnline-portal"
|
|
|
|
func (r Router) settings() *uci.Config {
|
|
c, _, err := r.Store.Read()
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
return c
|
|
}
|
|
|
|
func (r Router) note(msg, who string) {
|
|
if r.Log != nil {
|
|
r.Log.Write("dawnline", "info", msg, "", who, servicelog.Extra{})
|
|
}
|
|
}
|
|
|
|
// wordCodes: every personal code is a word code; older random ones are replaced (their links stop working).
|
|
func (r Router) wordCodes() {
|
|
old := func(s *uci.Section) bool {
|
|
code, has := s.Get("code")
|
|
return has && !wordCode.MatchString(code)
|
|
}
|
|
c := r.settings()
|
|
if c == nil {
|
|
return
|
|
}
|
|
any := false
|
|
for _, s := range c.OfType("person") {
|
|
any = any || old(s)
|
|
}
|
|
if !any {
|
|
return
|
|
}
|
|
err := r.Store.Transact(func(w *uci.Config, _ *model.Model) error {
|
|
for _, s := range w.OfType("person") {
|
|
if old(s) {
|
|
w.Set(s.Name, "code", r.NewCode())
|
|
w.Delete(s.Name, "words")
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
if err == nil {
|
|
r.note("moved to word codes", "Personal links")
|
|
}
|
|
}
|
|
|
|
// uhttpd: older versions answered on 443 at home through LuCI's web server (its error page ran the
|
|
// portal's CGI). The portal keeps its own port now: that is removed, with the old setting itself.
|
|
func (r Router) uhttpd() {
|
|
if raw, err := os.ReadFile(r.Uhttpd); err == nil {
|
|
if c, err := uci.Parse(string(raw)); err == nil {
|
|
if page, _ := c.Section("main").Get("error_page"); c.Section("main") != nil && page == cgiURL {
|
|
c.Delete("main", "error_page")
|
|
mode := os.FileMode(0o644)
|
|
if st, err := os.Stat(r.Uhttpd); err == nil {
|
|
mode = st.Mode().Perm()
|
|
}
|
|
tmp := r.Uhttpd + ".dl-new"
|
|
if os.WriteFile(tmp, []byte(c.Format()), mode) == nil && os.Rename(tmp, r.Uhttpd) == nil {
|
|
if r.ReloadUhttpd != nil {
|
|
r.ReloadUhttpd()
|
|
}
|
|
if r.Log != nil {
|
|
r.Log.Say("info", "portal", "portal removed from the LuCI web server")
|
|
}
|
|
} else {
|
|
os.Remove(tmp)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if r.CGI != "" {
|
|
os.Remove(r.CGI)
|
|
}
|
|
r.dropSetting("portal_443")
|
|
}
|
|
|
|
func (r Router) dropSetting(key string) {
|
|
c := r.settings()
|
|
if c == nil || c.Section("settings") == nil {
|
|
return
|
|
}
|
|
if _, has := c.Section("settings").Values[key]; !has {
|
|
return
|
|
}
|
|
r.Store.Transact(func(w *uci.Config, _ *model.Model) error {
|
|
w.Delete("settings", key)
|
|
return nil
|
|
})
|
|
}
|
|
|
|
// dropPersonOption removes an option older versions kept on a person, from everyone who still has it.
|
|
func (r Router) dropPersonOption(key string) {
|
|
c := r.settings()
|
|
if c == nil {
|
|
return
|
|
}
|
|
has := func(s *uci.Section) bool {
|
|
_, kept := s.Values[key]
|
|
return kept
|
|
}
|
|
any := false
|
|
for _, s := range c.OfType("person") {
|
|
any = any || has(s)
|
|
}
|
|
if !any {
|
|
return
|
|
}
|
|
r.Store.Transact(func(w *uci.Config, _ *model.Model) error {
|
|
for _, s := range w.OfType("person") {
|
|
if has(s) {
|
|
w.Delete(s.Name, key)
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
}
|
|
|
|
// done lists the steps that cannot tell from the settings whether they ran (settings.migrated).
|
|
func done(c *uci.Config) []string {
|
|
s := c.Section("settings")
|
|
if s == nil {
|
|
return nil
|
|
}
|
|
v := s.Values["migrated"]
|
|
if v.IsList {
|
|
return v.List
|
|
}
|
|
if v.Str != "" {
|
|
return []string{v.Str}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// autoMTU: 1380 was every server's stored MTU before it became automatic (by device type and disguise).
|
|
// Once only: an admin may choose 1380 again on purpose.
|
|
func (r Router) autoMTU() {
|
|
c := r.settings()
|
|
if c == nil {
|
|
return
|
|
}
|
|
for _, d := range done(c) {
|
|
if d == "auto_mtu" {
|
|
return
|
|
}
|
|
}
|
|
any := false
|
|
err := r.Store.Transact(func(w *uci.Config, _ *model.Model) error {
|
|
for _, s := range w.OfType("server") {
|
|
if mtu, _ := s.Get("mtu"); mtu == "1380" {
|
|
w.Delete(s.Name, "mtu")
|
|
any = true
|
|
}
|
|
}
|
|
if w.Section("settings") == nil {
|
|
w.Add("settings", "settings")
|
|
}
|
|
w.SetList("settings", "migrated", append(append([]string{}, done(w)...), "auto_mtu"))
|
|
return nil
|
|
})
|
|
if err == nil && any {
|
|
r.note("MTU is now automatic", "Servers")
|
|
}
|
|
}
|
|
|
|
// Run is all of them, in order.
|
|
func (r Router) Run() {
|
|
r.wordCodes()
|
|
r.uhttpd()
|
|
r.autoMTU()
|
|
// the portal names itself after the server now: its own title setting is gone
|
|
r.dropSetting("portal_title")
|
|
// nobody is limited by the time of day any more: the hours older versions kept for a person are gone
|
|
r.dropPersonOption("hours")
|
|
}
|
|
|
|
// UhttpdOnly is the uhttpd step alone (an uninstall runs it too).
|
|
func (r Router) UhttpdOnly() { r.uhttpd() }
|