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,233 @@
|
||||
package methods
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"os"
|
||||
"regexp"
|
||||
"sort"
|
||||
"strings"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
backend "github.com/tickcount/luci-app-dawnline/backend"
|
||||
"github.com/tickcount/luci-app-dawnline/backend/files"
|
||||
"github.com/tickcount/luci-app-dawnline/backend/github"
|
||||
"github.com/tickcount/luci-app-dawnline/backend/i18n"
|
||||
"github.com/tickcount/luci-app-dawnline/backend/view"
|
||||
)
|
||||
|
||||
// Repo is where Dawnline's releases are.
|
||||
const Repo = "tickcount/luci-app-dawnline"
|
||||
|
||||
var (
|
||||
releaseLine = regexp.MustCompile(`^DISTRIB_(RELEASE|TARGET|ARCH)='([^']*)'`)
|
||||
catalogFile = regexp.MustCompile(`^dawnline\.([A-Za-z_-]+)\.lmo$`)
|
||||
)
|
||||
|
||||
// updating tells whether an update job runs: its worker holds the update lock for the whole job.
|
||||
func updating(run string) bool {
|
||||
f, err := os.OpenFile(run+"/update.lock", os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0o644)
|
||||
if err != nil {
|
||||
return true
|
||||
}
|
||||
defer f.Close()
|
||||
if syscall.Flock(int(f.Fd()), syscall.LOCK_EX|syscall.LOCK_NB) != nil {
|
||||
return true
|
||||
}
|
||||
syscall.Flock(int(f.Fd()), syscall.LOCK_UN)
|
||||
return false
|
||||
}
|
||||
|
||||
// kept is the version a component had before its last update, when its files are still there.
|
||||
func kept(dir, component, firmware string) any {
|
||||
var k struct {
|
||||
Version string `json:"version"`
|
||||
Build any `json:"build"`
|
||||
Firmware string `json:"firmware"`
|
||||
Files []string `json:"files"`
|
||||
Saved any `json:"saved"`
|
||||
}
|
||||
if !files.ReadJSON(dir+"/"+component+"/meta.json", &k) || k.Version == "" || len(k.Files) == 0 {
|
||||
return nil
|
||||
}
|
||||
for _, f := range k.Files {
|
||||
if !exists(f) {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
// a kept AmneziaWG build is for one firmware only
|
||||
if component == "amneziawg" && k.Firmware != "" && firmware != "" && k.Firmware != firmware {
|
||||
return nil
|
||||
}
|
||||
return map[string]any{"version": k.Version, "build": k.Build, "saved": k.Saved}
|
||||
}
|
||||
|
||||
// updatesStatus is the Components tab's data (dawnline.rpc.updates status): what is installed, the last
|
||||
// check and job, the policy, what is kept for a rollback.
|
||||
func updatesStatus(w *view.World, t *i18n.Catalog, d Deps) map[string]any {
|
||||
rel := map[string]string{}
|
||||
release, _ := os.ReadFile("/etc/openwrt_release")
|
||||
for _, line := range strings.Split(string(release), "\n") {
|
||||
if m := releaseLine.FindStringSubmatch(line); m != nil {
|
||||
rel[strings.ToLower(m[1])] = m[2]
|
||||
}
|
||||
}
|
||||
home := false
|
||||
for _, s := range w.M.Servers {
|
||||
home = home || s.LanLike
|
||||
}
|
||||
var check, job any
|
||||
files.ReadJSON(d.RunDir+"/update-check.json", &check)
|
||||
files.ReadJSON(d.RunDir+"/update-job.json", &job)
|
||||
// a running job whose worker is gone reads as failed
|
||||
if j, ok := job.(map[string]any); ok && j["state"] == "running" && !updating(d.RunDir) {
|
||||
j["state"], j["error"] = "failed", t.T("The update stopped unexpectedly.")
|
||||
if j["finished"] == nil {
|
||||
j["finished"] = time.Now().Unix()
|
||||
}
|
||||
}
|
||||
auto := map[string]any{}
|
||||
files.ReadJSON(d.DataDir+"/update-auto.json", &auto)
|
||||
var history []any
|
||||
files.ReadJSON(d.DataDir+"/update-history.json", &history)
|
||||
if history == nil {
|
||||
history = []any{}
|
||||
}
|
||||
if len(history) > 12 {
|
||||
history = history[:12]
|
||||
}
|
||||
// this firmware as the AmneziaWG builds name it
|
||||
firmware := ""
|
||||
if d.Board != nil {
|
||||
r, _ := d.Board()["release"].(map[string]any)
|
||||
target := strings.Split(text(r["target"]), "/")
|
||||
arch := text(r["arch"])
|
||||
if arch == "" {
|
||||
arch = rel["arch"]
|
||||
}
|
||||
if v := text(r["version"]); v != "" && len(target) == 2 && arch != "" {
|
||||
firmware = "_v" + v + "_" + arch + "_" + target[0] + "_" + target[1]
|
||||
}
|
||||
}
|
||||
langs := []string{}
|
||||
entries, _ := os.ReadDir(d.Catalogs)
|
||||
for _, e := range entries {
|
||||
if m := catalogFile.FindStringSubmatch(e.Name()); m != nil {
|
||||
langs = append(langs, m[1])
|
||||
}
|
||||
}
|
||||
sort.Strings(langs)
|
||||
tunnels := []string{}
|
||||
if network := parseFile("/etc/config/network"); network != nil {
|
||||
for _, s := range network.OfType("interface") {
|
||||
proto, _ := s.Get("proto")
|
||||
if off, _ := s.Get("disabled"); proto != "amneziawg" || off == "1" {
|
||||
continue
|
||||
}
|
||||
name := s.Name
|
||||
if n, ok := s.Get("_dawnline_name"); ok {
|
||||
name = n
|
||||
}
|
||||
tunnels = append(tunnels, name)
|
||||
}
|
||||
}
|
||||
return map[string]any{
|
||||
"version": backend.Version,
|
||||
"firmware": map[string]any{"version": rel["release"], "target": rel["target"], "arch": rel["arch"]},
|
||||
"portal": w.M.Settings.PortalEnabled, "home": home, "needs": Needs(), "check": check, "job": job, "now": time.Now().Unix(), "repo": Repo,
|
||||
"policy": w.M.Settings.Updates, "auto": auto,
|
||||
"kept": map[string]any{"app": kept(d.DataDir+"/keep", "app", firmware), "amneziawg": kept(d.DataDir+"/keep", "amneziawg", firmware)},
|
||||
"translations": langs, "history": history, "tunnels": tunnels,
|
||||
}
|
||||
}
|
||||
|
||||
// The AmneziaWG builds' repositories (dawnline.awg_builds SOURCES).
|
||||
var awgRepos = map[string]string{"slava": "Slava-Shchipunov/awg-openwrt", "grey": "2Grey/awg-openwrt"}
|
||||
|
||||
var tagName = regexp.MustCompile(`^v?[0-9][0-9A-Za-z.+~-]{0,40}$`)
|
||||
|
||||
// shown is a release as the page gets it: what only the updater needs is left out.
|
||||
func shown(r map[string]any, more map[string]any) map[string]any {
|
||||
out := map[string]any{}
|
||||
for k, v := range r {
|
||||
out[k] = v
|
||||
}
|
||||
out["digests"], out["ids"] = nil, nil
|
||||
for k, v := range more {
|
||||
out[k] = v
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// releases is Dawnline's releases for the Versions list, five a page.
|
||||
func releases(gh *github.Client, page any) (map[string]any, error) {
|
||||
n := 1.0
|
||||
if page != nil {
|
||||
n = num(page)
|
||||
}
|
||||
if n != float64(int(n)) || n < 1 || n > 50 {
|
||||
return nil, errors.New("Unknown page.")
|
||||
}
|
||||
list, err := gh.Releases(Repo, int(n))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out := []any{}
|
||||
for _, r := range list {
|
||||
m, _ := r.(map[string]any)
|
||||
out = append(out, shown(m, map[string]any{"body": nil}))
|
||||
}
|
||||
return map[string]any{"releases": out, "page": int(n)}, nil
|
||||
}
|
||||
|
||||
// notes is a release's notes for What's new: Dawnline's by tag, or an AmneziaWG build's.
|
||||
func notes(gh *github.Client, component, tag, build string) (map[string]any, error) {
|
||||
repo := Repo
|
||||
if component == "amneziawg" {
|
||||
if build == "" {
|
||||
build = "slava"
|
||||
}
|
||||
repo = awgRepos[build]
|
||||
}
|
||||
if repo == "" || !tagName.MatchString(tag) {
|
||||
return nil, errors.New("Unknown release.")
|
||||
}
|
||||
r, err := gh.Release(repo, tag)
|
||||
if err == nil && r == nil && component != "amneziawg" && !strings.HasPrefix(tag, "v") {
|
||||
r, err = gh.Release(repo, "v"+tag)
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if r == nil {
|
||||
return nil, said{"No release %s in %s.", []any{tag, repo}}
|
||||
}
|
||||
return shown(r, map[string]any{"repo": repo}), nil
|
||||
}
|
||||
|
||||
// changes is what changed between the installed Dawnline and a release, as points.
|
||||
func changes(gh *github.Client, from, to string) (map[string]any, error) {
|
||||
if !tagName.MatchString(to) || (from != "" && !tagName.MatchString(from)) {
|
||||
return nil, errors.New("Unknown release.")
|
||||
}
|
||||
// the installed version as a tag when it was released (a build ahead of the releases has none)
|
||||
base := ""
|
||||
if from != "" {
|
||||
bare := strings.TrimPrefix(from, "v")
|
||||
for _, t := range []string{"v" + bare, bare} {
|
||||
if r, err := gh.Release(Repo, t); err != nil {
|
||||
return nil, err
|
||||
} else if base == "" && r != nil {
|
||||
base = t
|
||||
}
|
||||
}
|
||||
}
|
||||
items, err := gh.Changes(Repo, base, to)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return map[string]any{"items": items}, nil
|
||||
}
|
||||
|
||||
// Updating tells whether an update job runs.
|
||||
func Updating(run string) bool { return updating(run) }
|
||||
Reference in new issue
Block a user