BlueGit

timfa bluegit

Merge branch 'cursor/self-update-65da' into 'master'

Self-update van BlueGit zonder op de AUR te wachten

See merge request Timfa/bluegit!30

timfa Tim Falken · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
062d3da57f1093efea561d1d92bba8cd8182a5cf
24 files changed +1227 −6
blue-ci-cd.yml +18 −1
@@ -6,7 +6,7 @@
6 6 # branch nog kan uitrollen. Dan komen die geheimen alleen mee op een
7 7 # beschermde branch.
8 8
9 stages: [test, build, release, deploy]
9 stages: [test, build, release, deploy, update]
10 10
11 11 variables:
12 12 CGO_ENABLED: "0"
@@ -71,3 +71,20 @@ jobs:
71 71 - chmod +x scripts/aur-ssh-setup.sh scripts/publish-aur.sh
72 72 - ./scripts/aur-ssh-setup.sh
73 73 - ./scripts/publish-aur.sh
74
75 # Parallel aan publish_aur: needs noemt alleen test, niet de AUR-job.
76 # BLUEGIT_UPDATE_TOKEN is een gemaskeerde, beschermde CI-variabele met
77 # dezelfde waarde als BLUEGIT_UPDATE_TOKEN in /etc/bluegit/env.
78 self_update:
79 stage: update
80 image: curlimages/curl:8.11.0
81 needs: [test]
82 rules:
83 - if: $CI_COMMIT_BRANCH == "master"
84 - if: $CI_COMMIT_BRANCH == "main"
85 script:
86 - >-
87 curl -fsS -X POST "$CI_API_URL/admin/self-update"
88 -H "Authorization: Bearer $BLUEGIT_UPDATE_TOKEN"
89 -H "Content-Type: application/json"
90 -d "{\"ref\":\"${CI_COMMIT_SHA}\"}"
@@ -6,7 +6,7 @@
6# branch nog kan uitrollen. Dan komen die geheimen alleen mee op een
6# branch nog kan uitrollen. Dan komen die geheimen alleen mee op een
7# beschermde branch.
7# beschermde branch.
8
8
9stages: [test, build, release, deploy]
9stages: [test, build, release, deploy, update]
10
10
11variables:
11variables:
12 CGO_ENABLED: "0"
12 CGO_ENABLED: "0"
@@ -71,3 +71,20 @@ jobs:
71 - chmod +x scripts/aur-ssh-setup.sh scripts/publish-aur.sh
71 - chmod +x scripts/aur-ssh-setup.sh scripts/publish-aur.sh
72 - ./scripts/aur-ssh-setup.sh
72 - ./scripts/aur-ssh-setup.sh
73 - ./scripts/publish-aur.sh
73 - ./scripts/publish-aur.sh
74
75 # Parallel aan publish_aur: needs noemt alleen test, niet de AUR-job.
76 # BLUEGIT_UPDATE_TOKEN is een gemaskeerde, beschermde CI-variabele met
77 # dezelfde waarde als BLUEGIT_UPDATE_TOKEN in /etc/bluegit/env.
78 self_update:
79 stage: update
80 image: curlimages/curl:8.11.0
81 needs: [test]
82 rules:
83 - if: $CI_COMMIT_BRANCH == "master"
84 - if: $CI_COMMIT_BRANCH == "main"
85 script:
86 - >-
87 curl -fsS -X POST "$CI_API_URL/admin/self-update"
88 -H "Authorization: Bearer $BLUEGIT_UPDATE_TOKEN"
89 -H "Content-Type: application/json"
90 -d "{\"ref\":\"${CI_COMMIT_SHA}\"}"
docs/AUR.md +21 −0
@@ -45,6 +45,27 @@ De checkout moet op `master` staan, schoon zijn en gelijk aan `origin/master`. H
45 45
46 46 Het clonet of werkt `ssh://aur@aur.archlinux.org/bluegit.git` bij in `~/.cache/bluegit-aur` (`BLUEGIT_AUR_CACHE` wijzigt die map), kopieert `packaging/aur/*`, zet `_commit` en `pkgver`, en draait `updpkgsums` en `makepkg --printsrcinfo`. Daarna commit het `upstream <pkgver>` en pusht het naar `master`. `updpkgsums` komt uit `pacman-contrib`.
47 47
48 ## Self-update
49
50 Een push naar `master` hoeft niet op de AUR te wachten. `publish_aur` publiceert parallel (`needs: []`, `allow_failure: true`). De laatste job, `self_update`, wacht alleen op `test` en doet dan:
51
52 ```yaml
53 curl -fsS -X POST "$CI_API_URL/admin/self-update" \
54 -H "Authorization: Bearer $BLUEGIT_UPDATE_TOKEN" \
55 -H "Content-Type: application/json" \
56 -d "{\"ref\":\"${CI_COMMIT_SHA}\"}"
57 ```
58
59 `BLUEGIT_UPDATE_TOKEN` is een gemaskeerde, beschermde CI-variabele. Dezelfde waarde staat op de mini-PC in `/etc/bluegit/env` (EnvironmentFile, optioneel). Zonder die variabele antwoordt `POST /api/v1/admin/self-update` met 404. De vergelijking is constant-time, en een burst krijgt 429. De body mag leeg zijn of `ref` / `sha` bevatten. Het endpoint schrijft die ref naar `/var/lib/bluegit/update-request` en start alleen `bluegit-update.service` (`systemctl start --no-block`). Het wacht de oneshot niet af: anders blijft de CI-job `running` en wacht de updater op de job die hem aanriep.
60
61 De polkit-regel `packaging/bluegit-update.rules` laat gebruiker `bluegit` uitsluitend `start` van die ene unit toe. Geen stop, geen restart, geen andere unit. De unit is een oneshot als root.
62
63 `/usr/lib/bluegit/update` (uit `packaging/bluegit-update.sh`) wacht tot `GET /api/v1/admin/self-update` `"running":0` meldt, ook na de bouw en vóór `pacman -U`. Hij cloont niet van GitLab: `BLUEGIT_UPDATE_REPO` in `/etc/bluegit/env` wijst naar de lokale bare repo, bijvoorbeeld `/srv/bluegit/tim/bluegit.git`. `pkgver` is de UTC-committertijd van die commit (`YYYYMMDDHHMMSS`), dezelfde regel als het lokale AUR-script, zodat `yay` later geen downgrade of upgrade verzint voor dezelfde sha. `makepkg` draait als `bluegit-build`. Die gebruiker maakt de install-hook aan via `systemd-sysusers` (`packaging/sysusers.conf`). `pacman -U --noconfirm` installeert het pakket. `post_upgrade` in `bluegit.install` doet `systemctl try-restart bluegit.service`.
64
65 Mislukt de bouw of de installatie, dan blijft de oude versie staan. De uitvoer staat in het journal van `bluegit-update.service`. Het script schrijft `/var/lib/bluegit/update-status.json` met tijd, sha en resultaat (`running`, `ok`, `failed`). Een installatiebeheerder ziet dat op de Info-pagina en op de setup-pagina.
66
67 De mini-PC heeft `base-devel`, `go` en `pacman-contrib` niet als package-dependency. Die moeten geïnstalleerd zijn, anders stopt het script vóór `pacman -U`.
68
48 69 ## Archief
49 70
50 71 Het archief is anoniem te downloaden:
@@ -45,6 +45,27 @@ De checkout moet op `master` staan, schoon zijn en gelijk aan `origin/master`. H
45
45
46Het clonet of werkt `ssh://aur@aur.archlinux.org/bluegit.git` bij in `~/.cache/bluegit-aur` (`BLUEGIT_AUR_CACHE` wijzigt die map), kopieert `packaging/aur/*`, zet `_commit` en `pkgver`, en draait `updpkgsums` en `makepkg --printsrcinfo`. Daarna commit het `upstream <pkgver>` en pusht het naar `master`. `updpkgsums` komt uit `pacman-contrib`.
46Het clonet of werkt `ssh://aur@aur.archlinux.org/bluegit.git` bij in `~/.cache/bluegit-aur` (`BLUEGIT_AUR_CACHE` wijzigt die map), kopieert `packaging/aur/*`, zet `_commit` en `pkgver`, en draait `updpkgsums` en `makepkg --printsrcinfo`. Daarna commit het `upstream <pkgver>` en pusht het naar `master`. `updpkgsums` komt uit `pacman-contrib`.
47
47
48## Self-update
49
50Een push naar `master` hoeft niet op de AUR te wachten. `publish_aur` publiceert parallel (`needs: []`, `allow_failure: true`). De laatste job, `self_update`, wacht alleen op `test` en doet dan:
51
52```yaml
53curl -fsS -X POST "$CI_API_URL/admin/self-update" \
54 -H "Authorization: Bearer $BLUEGIT_UPDATE_TOKEN" \
55 -H "Content-Type: application/json" \
56 -d "{\"ref\":\"${CI_COMMIT_SHA}\"}"
57```
58
59`BLUEGIT_UPDATE_TOKEN` is een gemaskeerde, beschermde CI-variabele. Dezelfde waarde staat op de mini-PC in `/etc/bluegit/env` (EnvironmentFile, optioneel). Zonder die variabele antwoordt `POST /api/v1/admin/self-update` met 404. De vergelijking is constant-time, en een burst krijgt 429. De body mag leeg zijn of `ref` / `sha` bevatten. Het endpoint schrijft die ref naar `/var/lib/bluegit/update-request` en start alleen `bluegit-update.service` (`systemctl start --no-block`). Het wacht de oneshot niet af: anders blijft de CI-job `running` en wacht de updater op de job die hem aanriep.
60
61De polkit-regel `packaging/bluegit-update.rules` laat gebruiker `bluegit` uitsluitend `start` van die ene unit toe. Geen stop, geen restart, geen andere unit. De unit is een oneshot als root.
62
63`/usr/lib/bluegit/update` (uit `packaging/bluegit-update.sh`) wacht tot `GET /api/v1/admin/self-update` `"running":0` meldt, ook na de bouw en vóór `pacman -U`. Hij cloont niet van GitLab: `BLUEGIT_UPDATE_REPO` in `/etc/bluegit/env` wijst naar de lokale bare repo, bijvoorbeeld `/srv/bluegit/tim/bluegit.git`. `pkgver` is de UTC-committertijd van die commit (`YYYYMMDDHHMMSS`), dezelfde regel als het lokale AUR-script, zodat `yay` later geen downgrade of upgrade verzint voor dezelfde sha. `makepkg` draait als `bluegit-build`. Die gebruiker maakt de install-hook aan via `systemd-sysusers` (`packaging/sysusers.conf`). `pacman -U --noconfirm` installeert het pakket. `post_upgrade` in `bluegit.install` doet `systemctl try-restart bluegit.service`.
64
65Mislukt de bouw of de installatie, dan blijft de oude versie staan. De uitvoer staat in het journal van `bluegit-update.service`. Het script schrijft `/var/lib/bluegit/update-status.json` met tijd, sha en resultaat (`running`, `ok`, `failed`). Een installatiebeheerder ziet dat op de Info-pagina en op de setup-pagina.
66
67De mini-PC heeft `base-devel`, `go` en `pacman-contrib` niet als package-dependency. Die moeten geïnstalleerd zijn, anders stopt het script vóór `pacman -U`.
68
48## Archief
69## Archief
49
70
50Het archief is anoniem te downloaden:
71Het archief is anoniem te downloaden:
internal/ci/example_test.go +16 −2
@@ -2,6 +2,7 @@ package ci
2 2
3 3 import (
4 4 "os"
5 "strings"
5 6 "testing"
6 7 )
7 8
@@ -14,7 +15,7 @@ func TestBlueGitExampleFile(t *testing.T) {
14 15 if err != nil {
15 16 t.Fatal(err)
16 17 }
17 if len(p.Jobs) != 5 {
18 if len(p.Jobs) != 6 {
18 19 t.Fatalf("jobs %d", len(p.Jobs))
19 20 }
20 21 active, err := p.ActiveJobs(map[string]string{"CI_COMMIT_BRANCH": "feature"})
@@ -25,7 +26,7 @@ func TestBlueGitExampleFile(t *testing.T) {
25 26 t.Fatalf("feature hoort alleen test en build te doen, kreeg %d", len(active))
26 27 }
27 28 active, err = p.ActiveJobs(map[string]string{"CI_COMMIT_BRANCH": "master"})
28 if err != nil || len(active) != 5 {
29 if err != nil || len(active) != 6 {
29 30 t.Fatalf("master %d %v", len(active), err)
30 31 }
31 32 var aur Job
@@ -37,6 +38,19 @@ func TestBlueGitExampleFile(t *testing.T) {
37 38 if !aur.AllowFailure || !aur.NeedsSet || len(aur.Needs) != 0 {
38 39 t.Fatalf("publish_aur: %+v", aur)
39 40 }
41 var upd Job
42 for _, j := range active {
43 if j.Name == "self_update" {
44 upd = j
45 }
46 }
47 if !upd.NeedsSet || len(upd.Needs) != 1 || upd.Needs[0] != "test" {
48 t.Fatalf("self_update hoort alleen op test te wachten: %+v", upd)
49 }
50 joined := strings.Join(upd.Script, "\n")
51 if !strings.Contains(joined, "/admin/self-update") || !strings.Contains(joined, "BLUEGIT_UPDATE_TOKEN") {
52 t.Fatalf("self_update: %s", joined)
53 }
40 54 if Gate(p.Jobs, map[string]string{"test": "success", "build": "success", "release": "queued", "deploy": "queued"}, p.Jobs[3]) != "wait" {
41 55 t.Fatal("deploy wacht op release")
42 56 }
@@ -2,6 +2,7 @@ package ci
2
2
3import (
3import (
4 "os"
4 "os"
5 "strings"
5 "testing"
6 "testing"
6)
7)
7
8
@@ -14,7 +15,7 @@ func TestBlueGitExampleFile(t *testing.T) {
14 if err != nil {
15 if err != nil {
15 t.Fatal(err)
16 t.Fatal(err)
16 }
17 }
17 if len(p.Jobs) != 5 {
18 if len(p.Jobs) != 6 {
18 t.Fatalf("jobs %d", len(p.Jobs))
19 t.Fatalf("jobs %d", len(p.Jobs))
19 }
20 }
20 active, err := p.ActiveJobs(map[string]string{"CI_COMMIT_BRANCH": "feature"})
21 active, err := p.ActiveJobs(map[string]string{"CI_COMMIT_BRANCH": "feature"})
@@ -25,7 +26,7 @@ func TestBlueGitExampleFile(t *testing.T) {
25 t.Fatalf("feature hoort alleen test en build te doen, kreeg %d", len(active))
26 t.Fatalf("feature hoort alleen test en build te doen, kreeg %d", len(active))
26 }
27 }
27 active, err = p.ActiveJobs(map[string]string{"CI_COMMIT_BRANCH": "master"})
28 active, err = p.ActiveJobs(map[string]string{"CI_COMMIT_BRANCH": "master"})
28 if err != nil || len(active) != 5 {
29 if err != nil || len(active) != 6 {
29 t.Fatalf("master %d %v", len(active), err)
30 t.Fatalf("master %d %v", len(active), err)
30 }
31 }
31 var aur Job
32 var aur Job
@@ -37,6 +38,19 @@ func TestBlueGitExampleFile(t *testing.T) {
37 if !aur.AllowFailure || !aur.NeedsSet || len(aur.Needs) != 0 {
38 if !aur.AllowFailure || !aur.NeedsSet || len(aur.Needs) != 0 {
38 t.Fatalf("publish_aur: %+v", aur)
39 t.Fatalf("publish_aur: %+v", aur)
39 }
40 }
41 var upd Job
42 for _, j := range active {
43 if j.Name == "self_update" {
44 upd = j
45 }
46 }
47 if !upd.NeedsSet || len(upd.Needs) != 1 || upd.Needs[0] != "test" {
48 t.Fatalf("self_update hoort alleen op test te wachten: %+v", upd)
49 }
50 joined := strings.Join(upd.Script, "\n")
51 if !strings.Contains(joined, "/admin/self-update") || !strings.Contains(joined, "BLUEGIT_UPDATE_TOKEN") {
52 t.Fatalf("self_update: %s", joined)
53 }
40 if Gate(p.Jobs, map[string]string{"test": "success", "build": "success", "release": "queued", "deploy": "queued"}, p.Jobs[3]) != "wait" {
54 if Gate(p.Jobs, map[string]string{"test": "success", "build": "success", "release": "queued", "deploy": "queued"}, p.Jobs[3]) != "wait" {
41 t.Fatal("deploy wacht op release")
55 t.Fatal("deploy wacht op release")
42 }
56 }
internal/i18n/catalog_update.go added +52 −0
@@ -0,0 +1,52 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, updateEN)
5 addCatalog(nl, updateNL)
6 addCatalog(de, updateDE)
7 addCatalog(fr, updateFR)
8 }
9
10 var updateEN = map[string]string{
11 "update.title": "Last update",
12 "update.none": "No self-update yet.",
13 "update.when": "Time",
14 "update.sha": "Commit",
15 "update.result": "Result",
16 "update.result.ok": "succeeded",
17 "update.result.failed": "failed",
18 "update.result.running": "running",
19 }
20
21 var updateNL = map[string]string{
22 "update.title": "Laatste update",
23 "update.none": "Nog geen self-update.",
24 "update.when": "Tijd",
25 "update.sha": "Commit",
26 "update.result": "Resultaat",
27 "update.result.ok": "gelukt",
28 "update.result.failed": "mislukt",
29 "update.result.running": "bezig",
30 }
31
32 var updateDE = map[string]string{
33 "update.title": "Letztes Update",
34 "update.none": "Noch kein Self-Update.",
35 "update.when": "Zeit",
36 "update.sha": "Commit",
37 "update.result": "Ergebnis",
38 "update.result.ok": "gelungen",
39 "update.result.failed": "fehlgeschlagen",
40 "update.result.running": "läuft",
41 }
42
43 var updateFR = map[string]string{
44 "update.title": "Dernière mise à jour",
45 "update.none": "Pas encore de mise à jour interne.",
46 "update.when": "Heure",
47 "update.sha": "Commit",
48 "update.result": "Résultat",
49 "update.result.ok": "réussie",
50 "update.result.failed": "échouée",
51 "update.result.running": "en cours",
52 }
@@ -0,0 +1,52 @@
1package i18n
2
3func init() {
4 addCatalog(en, updateEN)
5 addCatalog(nl, updateNL)
6 addCatalog(de, updateDE)
7 addCatalog(fr, updateFR)
8}
9
10var updateEN = map[string]string{
11 "update.title": "Last update",
12 "update.none": "No self-update yet.",
13 "update.when": "Time",
14 "update.sha": "Commit",
15 "update.result": "Result",
16 "update.result.ok": "succeeded",
17 "update.result.failed": "failed",
18 "update.result.running": "running",
19}
20
21var updateNL = map[string]string{
22 "update.title": "Laatste update",
23 "update.none": "Nog geen self-update.",
24 "update.when": "Tijd",
25 "update.sha": "Commit",
26 "update.result": "Resultaat",
27 "update.result.ok": "gelukt",
28 "update.result.failed": "mislukt",
29 "update.result.running": "bezig",
30}
31
32var updateDE = map[string]string{
33 "update.title": "Letztes Update",
34 "update.none": "Noch kein Self-Update.",
35 "update.when": "Zeit",
36 "update.sha": "Commit",
37 "update.result": "Ergebnis",
38 "update.result.ok": "gelungen",
39 "update.result.failed": "fehlgeschlagen",
40 "update.result.running": "läuft",
41}
42
43var updateFR = map[string]string{
44 "update.title": "Dernière mise à jour",
45 "update.none": "Pas encore de mise à jour interne.",
46 "update.when": "Heure",
47 "update.sha": "Commit",
48 "update.result": "Résultat",
49 "update.result.ok": "réussie",
50 "update.result.failed": "échouée",
51 "update.result.running": "en cours",
52}
internal/server/info.go +1 −0
@@ -20,6 +20,7 @@ func (s *Server) infoPage(w http.ResponseWriter, r *http.Request) {
20 20 v.Info = true
21 21 v.Spec = doc
22 22 v.SpecJSON = template.JS(raw)
23 s.attachUpdate(&v, s.langOf(r))
23 24 s.render(w, "info", v)
24 25 }
25 26
@@ -20,6 +20,7 @@ func (s *Server) infoPage(w http.ResponseWriter, r *http.Request) {
20 v.Info = true
20 v.Info = true
21 v.Spec = doc
21 v.Spec = doc
22 v.SpecJSON = template.JS(raw)
22 v.SpecJSON = template.JS(raw)
23 s.attachUpdate(&v, s.langOf(r))
23 s.render(w, "info", v)
24 s.render(w, "info", v)
24}
25}
25
26
internal/server/selfupdate.go added +196 −0
@@ -0,0 +1,196 @@
1 package server
2
3 import (
4 "context"
5 "encoding/json"
6 "io"
7 "net"
8 "net/http"
9 "strings"
10 "sync"
11 "time"
12
13 "gitlab.com/Timfa/bluegit/internal/i18n"
14 "gitlab.com/Timfa/bluegit/internal/update"
15 )
16
17 const (
18 updateLimit = 5
19 updateWindow = time.Minute
20 updateRunning = 30 * time.Minute
21 )
22
23 // UpdateView is de laatste self-update op de Info- en setup-pagina.
24 type UpdateView struct {
25 When, SHA, Result, ResultLabel, Error string
26 Has bool
27 }
28
29 // UpdateStarter start de unit. Tests zetten een stub. Nil gebruikt systemctl.
30 type UpdateStarter func(ctx context.Context, ref string) error
31
32 type updateLimiter struct {
33 mu sync.Mutex
34 at map[string][]time.Time
35 }
36
37 func (l *updateLimiter) allow(ip string, now time.Time) bool {
38 l.mu.Lock()
39 defer l.mu.Unlock()
40 if l.at == nil {
41 l.at = map[string][]time.Time{}
42 }
43 cut := now.Add(-updateWindow)
44 keep := l.at[ip][:0]
45 for _, ts := range l.at[ip] {
46 if ts.After(cut) {
47 keep = append(keep, ts)
48 }
49 }
50 if len(keep) >= updateLimit {
51 l.at[ip] = keep
52 return false
53 }
54 l.at[ip] = append(keep, now)
55 return true
56 }
57
58 func (s *Server) selfUpdate(w http.ResponseWriter, r *http.Request) {
59 if !update.Enabled() {
60 http.NotFound(w, r)
61 return
62 }
63 if !s.updateHits.allow(clientIP(r), time.Now()) {
64 http.Error(w, "too many requests\n", http.StatusTooManyRequests)
65 return
66 }
67 if !update.Equal(update.Token(), bearer(r)) {
68 http.Error(w, "unauthorized\n", http.StatusUnauthorized)
69 return
70 }
71 ref, err := updateRef(r)
72 if err != nil {
73 http.Error(w, "bad request\n", http.StatusBadRequest)
74 return
75 }
76 if !update.ValidRef(ref) {
77 http.Error(w, "bad request\n", http.StatusBadRequest)
78 return
79 }
80 st, _ := update.ReadStatus(s.StateDir)
81 if update.FreshRunning(st, time.Now(), updateRunning) {
82 http.Error(w, "update already running\n", http.StatusConflict)
83 return
84 }
85 if err := update.WriteRequest(s.StateDir, ref); err != nil {
86 http.Error(w, "unavailable\n", http.StatusServiceUnavailable)
87 return
88 }
89 start := s.UpdateStarter
90 if start == nil {
91 start = func(ctx context.Context, _ string) error { return update.StartSystemd(ctx) }
92 }
93 if err := start(r.Context(), ref); err != nil {
94 _ = update.WriteStatus(s.StateDir, update.Status{
95 Time: time.Now().UTC().Format(time.RFC3339), SHA: ref, Result: "failed", Error: "start",
96 })
97 http.Error(w, "start failed\n", http.StatusBadGateway)
98 return
99 }
100 if s.Log != nil {
101 s.Log.Info("self-update gestart", "ref", ref)
102 }
103 w.Header().Set("Content-Type", "application/json; charset=utf-8")
104 w.WriteHeader(http.StatusAccepted)
105 _ = json.NewEncoder(w).Encode(map[string]string{"status": "accepted", "ref": ref})
106 }
107
108 func (s *Server) selfUpdateStatus(w http.ResponseWriter, r *http.Request) {
109 if !update.Enabled() {
110 http.NotFound(w, r)
111 return
112 }
113 if !update.Equal(update.Token(), bearer(r)) {
114 http.Error(w, "unauthorized\n", http.StatusUnauthorized)
115 return
116 }
117 running := 0
118 if s.Store != nil {
119 n, err := s.Store.CountRunningJobs(r.Context())
120 if err != nil {
121 http.Error(w, "unavailable\n", http.StatusServiceUnavailable)
122 return
123 }
124 running = n
125 }
126 st, err := update.ReadStatus(s.StateDir)
127 if err != nil {
128 http.Error(w, "unavailable\n", http.StatusServiceUnavailable)
129 return
130 }
131 w.Header().Set("Content-Type", "application/json; charset=utf-8")
132 w.Header().Set("Cache-Control", "no-store")
133 var upd any
134 if st.Result != "" {
135 upd = st
136 }
137 _ = json.NewEncoder(w).Encode(map[string]any{"running": running, "update": upd})
138 }
139
140 func updateRef(r *http.Request) (string, error) {
141 raw, err := io.ReadAll(io.LimitReader(r.Body, 4096))
142 if err != nil {
143 return "", err
144 }
145 if strings.TrimSpace(string(raw)) == "" {
146 return "", nil
147 }
148 var body struct {
149 Ref string `json:"ref"`
150 SHA string `json:"sha"`
151 }
152 if err := json.Unmarshal(raw, &body); err != nil {
153 return "", err
154 }
155 ref := strings.TrimSpace(body.Ref)
156 sha := strings.TrimSpace(body.SHA)
157 if ref != "" && sha != "" && ref != sha {
158 return "", errMismatch
159 }
160 if ref == "" {
161 ref = sha
162 }
163 return ref, nil
164 }
165
166 var errMismatch = errString("ref")
167
168 type errString string
169
170 func (e errString) Error() string { return string(e) }
171
172 func clientIP(r *http.Request) string {
173 host, _, err := net.SplitHostPort(r.RemoteAddr)
174 if err != nil {
175 return r.RemoteAddr
176 }
177 return host
178 }
179
180 func (s *Server) attachUpdate(v *View, lang i18n.Lang) {
181 if v.User == nil || !v.User.InstanceAdmin {
182 return
183 }
184 v.ShowUpdate = true
185 st, err := update.ReadStatus(s.StateDir)
186 if err != nil || st.Result == "" {
187 return
188 }
189 label := i18n.T(lang, "update.result."+st.Result)
190 if label == "update.result."+st.Result {
191 label = st.Result
192 }
193 v.Update = &UpdateView{
194 When: st.Time, SHA: st.SHA, Result: st.Result, ResultLabel: label, Error: st.Error, Has: true,
195 }
196 }
@@ -0,0 +1,196 @@
1package server
2
3import (
4 "context"
5 "encoding/json"
6 "io"
7 "net"
8 "net/http"
9 "strings"
10 "sync"
11 "time"
12
13 "gitlab.com/Timfa/bluegit/internal/i18n"
14 "gitlab.com/Timfa/bluegit/internal/update"
15)
16
17const (
18 updateLimit = 5
19 updateWindow = time.Minute
20 updateRunning = 30 * time.Minute
21)
22
23// UpdateView is de laatste self-update op de Info- en setup-pagina.
24type UpdateView struct {
25 When, SHA, Result, ResultLabel, Error string
26 Has bool
27}
28
29// UpdateStarter start de unit. Tests zetten een stub. Nil gebruikt systemctl.
30type UpdateStarter func(ctx context.Context, ref string) error
31
32type updateLimiter struct {
33 mu sync.Mutex
34 at map[string][]time.Time
35}
36
37func (l *updateLimiter) allow(ip string, now time.Time) bool {
38 l.mu.Lock()
39 defer l.mu.Unlock()
40 if l.at == nil {
41 l.at = map[string][]time.Time{}
42 }
43 cut := now.Add(-updateWindow)
44 keep := l.at[ip][:0]
45 for _, ts := range l.at[ip] {
46 if ts.After(cut) {
47 keep = append(keep, ts)
48 }
49 }
50 if len(keep) >= updateLimit {
51 l.at[ip] = keep
52 return false
53 }
54 l.at[ip] = append(keep, now)
55 return true
56}
57
58func (s *Server) selfUpdate(w http.ResponseWriter, r *http.Request) {
59 if !update.Enabled() {
60 http.NotFound(w, r)
61 return
62 }
63 if !s.updateHits.allow(clientIP(r), time.Now()) {
64 http.Error(w, "too many requests\n", http.StatusTooManyRequests)
65 return
66 }
67 if !update.Equal(update.Token(), bearer(r)) {
68 http.Error(w, "unauthorized\n", http.StatusUnauthorized)
69 return
70 }
71 ref, err := updateRef(r)
72 if err != nil {
73 http.Error(w, "bad request\n", http.StatusBadRequest)
74 return
75 }
76 if !update.ValidRef(ref) {
77 http.Error(w, "bad request\n", http.StatusBadRequest)
78 return
79 }
80 st, _ := update.ReadStatus(s.StateDir)
81 if update.FreshRunning(st, time.Now(), updateRunning) {
82 http.Error(w, "update already running\n", http.StatusConflict)
83 return
84 }
85 if err := update.WriteRequest(s.StateDir, ref); err != nil {
86 http.Error(w, "unavailable\n", http.StatusServiceUnavailable)
87 return
88 }
89 start := s.UpdateStarter
90 if start == nil {
91 start = func(ctx context.Context, _ string) error { return update.StartSystemd(ctx) }
92 }
93 if err := start(r.Context(), ref); err != nil {
94 _ = update.WriteStatus(s.StateDir, update.Status{
95 Time: time.Now().UTC().Format(time.RFC3339), SHA: ref, Result: "failed", Error: "start",
96 })
97 http.Error(w, "start failed\n", http.StatusBadGateway)
98 return
99 }
100 if s.Log != nil {
101 s.Log.Info("self-update gestart", "ref", ref)
102 }
103 w.Header().Set("Content-Type", "application/json; charset=utf-8")
104 w.WriteHeader(http.StatusAccepted)
105 _ = json.NewEncoder(w).Encode(map[string]string{"status": "accepted", "ref": ref})
106}
107
108func (s *Server) selfUpdateStatus(w http.ResponseWriter, r *http.Request) {
109 if !update.Enabled() {
110 http.NotFound(w, r)
111 return
112 }
113 if !update.Equal(update.Token(), bearer(r)) {
114 http.Error(w, "unauthorized\n", http.StatusUnauthorized)
115 return
116 }
117 running := 0
118 if s.Store != nil {
119 n, err := s.Store.CountRunningJobs(r.Context())
120 if err != nil {
121 http.Error(w, "unavailable\n", http.StatusServiceUnavailable)
122 return
123 }
124 running = n
125 }
126 st, err := update.ReadStatus(s.StateDir)
127 if err != nil {
128 http.Error(w, "unavailable\n", http.StatusServiceUnavailable)
129 return
130 }
131 w.Header().Set("Content-Type", "application/json; charset=utf-8")
132 w.Header().Set("Cache-Control", "no-store")
133 var upd any
134 if st.Result != "" {
135 upd = st
136 }
137 _ = json.NewEncoder(w).Encode(map[string]any{"running": running, "update": upd})
138}
139
140func updateRef(r *http.Request) (string, error) {
141 raw, err := io.ReadAll(io.LimitReader(r.Body, 4096))
142 if err != nil {
143 return "", err
144 }
145 if strings.TrimSpace(string(raw)) == "" {
146 return "", nil
147 }
148 var body struct {
149 Ref string `json:"ref"`
150 SHA string `json:"sha"`
151 }
152 if err := json.Unmarshal(raw, &body); err != nil {
153 return "", err
154 }
155 ref := strings.TrimSpace(body.Ref)
156 sha := strings.TrimSpace(body.SHA)
157 if ref != "" && sha != "" && ref != sha {
158 return "", errMismatch
159 }
160 if ref == "" {
161 ref = sha
162 }
163 return ref, nil
164}
165
166var errMismatch = errString("ref")
167
168type errString string
169
170func (e errString) Error() string { return string(e) }
171
172func clientIP(r *http.Request) string {
173 host, _, err := net.SplitHostPort(r.RemoteAddr)
174 if err != nil {
175 return r.RemoteAddr
176 }
177 return host
178}
179
180func (s *Server) attachUpdate(v *View, lang i18n.Lang) {
181 if v.User == nil || !v.User.InstanceAdmin {
182 return
183 }
184 v.ShowUpdate = true
185 st, err := update.ReadStatus(s.StateDir)
186 if err != nil || st.Result == "" {
187 return
188 }
189 label := i18n.T(lang, "update.result."+st.Result)
190 if label == "update.result."+st.Result {
191 label = st.Result
192 }
193 v.Update = &UpdateView{
194 When: st.Time, SHA: st.SHA, Result: st.Result, ResultLabel: label, Error: st.Error, Has: true,
195 }
196}
internal/server/selfupdate_test.go added +205 −0
@@ -0,0 +1,205 @@
1 package server
2
3 import (
4 "bytes"
5 "context"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "os"
10 "path/filepath"
11 "strings"
12 "testing"
13 "time"
14
15 "gitlab.com/Timfa/bluegit/internal/auth"
16 "gitlab.com/Timfa/bluegit/internal/config"
17 "gitlab.com/Timfa/bluegit/internal/store"
18 "gitlab.com/Timfa/bluegit/internal/update"
19 )
20
21 func newUpdateServer(t *testing.T) (*Server, *httptest.Server, string) {
22 t.Helper()
23 dir := t.TempDir()
24 st, err := store.Open(filepath.Join(dir, "bluegit.db"), bytes32())
25 if err != nil {
26 t.Fatal(err)
27 }
28 t.Cleanup(func() { _ = st.Close() })
29 cfg := config.Config{
30 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: dir,
31 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1},
32 Git: config.Git{Binary: "git", DefaultBranch: "master"},
33 CI: config.CI{Enabled: false},
34 }
35 srv := &Server{
36 Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true,
37 Git: "git", StateDir: dir,
38 }
39 ts := httptest.NewServer(srv.Handler())
40 t.Cleanup(ts.Close)
41 return srv, ts, dir
42 }
43
44 func TestSelfUpdateDisabledWithoutToken(t *testing.T) {
45 t.Setenv(update.TokenEnv, "")
46 _, ts, _ := newUpdateServer(t)
47 res, err := http.Post(ts.URL+"/api/v1/admin/self-update", "application/json", strings.NewReader(`{"ref":"master"}`))
48 if err != nil {
49 t.Fatal(err)
50 }
51 body := read(t, res)
52 if res.StatusCode != http.StatusNotFound {
53 t.Fatalf("uit hoort 404, kreeg %d %s", res.StatusCode, body)
54 }
55 res, err = http.Get(ts.URL + "/api/v1/admin/self-update")
56 if err != nil {
57 t.Fatal(err)
58 }
59 if res.StatusCode != http.StatusNotFound {
60 t.Fatalf("status uit hoort 404, kreeg %d", res.StatusCode)
61 }
62 _ = read(t, res)
63 }
64
65 func TestSelfUpdateAuthAndStart(t *testing.T) {
66 t.Setenv(update.TokenEnv, "sleutel-voor-de-test")
67 srv, ts, dir := newUpdateServer(t)
68 var started string
69 srv.UpdateStarter = func(_ context.Context, ref string) error {
70 started = ref
71 return nil
72 }
73 post := func(token, body string) *http.Response {
74 t.Helper()
75 req, err := http.NewRequest(http.MethodPost, ts.URL+"/api/v1/admin/self-update", strings.NewReader(body))
76 if err != nil {
77 t.Fatal(err)
78 }
79 if token != "" {
80 req.Header.Set("Authorization", "Bearer "+token)
81 }
82 res, err := http.DefaultClient.Do(req)
83 if err != nil {
84 t.Fatal(err)
85 }
86 return res
87 }
88
89 res := post("fout", `{"ref":"master"}`)
90 if res.StatusCode != http.StatusUnauthorized {
91 t.Fatalf("foute sleutel %d %s", res.StatusCode, read(t, res))
92 }
93 _ = read(t, res)
94
95 res = post("sleutel-voor-de-test", `{"ref":"../etc"}`)
96 if res.StatusCode != http.StatusBadRequest {
97 t.Fatalf("slechte ref %d %s", res.StatusCode, read(t, res))
98 }
99 _ = read(t, res)
100 if started != "" {
101 t.Fatal("ongeldige ref startte de unit")
102 }
103
104 sha := "0123456789abcdef0123456789abcdef01234567"
105 res = post("sleutel-voor-de-test", `{"sha":"`+sha+`"}`)
106 body := read(t, res)
107 if res.StatusCode != http.StatusAccepted || !strings.Contains(body, `"accepted"`) {
108 t.Fatalf("start %d %s", res.StatusCode, body)
109 }
110 if started != sha {
111 t.Fatalf("unit kreeg %q", started)
112 }
113 raw, err := os.ReadFile(filepath.Join(dir, update.RequestFile))
114 if err != nil || string(raw) != sha+"\n" {
115 t.Fatalf("verzoek %q %v", raw, err)
116 }
117
118 req, err := http.NewRequest(http.MethodGet, ts.URL+"/api/v1/admin/self-update", nil)
119 if err != nil {
120 t.Fatal(err)
121 }
122 req.Header.Set("Authorization", "Bearer sleutel-voor-de-test")
123 res, err = http.DefaultClient.Do(req)
124 if err != nil {
125 t.Fatal(err)
126 }
127 body = read(t, res)
128 if res.StatusCode != 200 || !strings.Contains(body, `"running":0`) {
129 t.Fatalf("status %d %s", res.StatusCode, body)
130 }
131
132 if err := update.WriteStatus(dir, update.Status{Time: time.Now().UTC().Format(time.RFC3339), SHA: sha, Result: "running"}); err != nil {
133 t.Fatal(err)
134 }
135 started = ""
136 res = post("sleutel-voor-de-test", "")
137 if res.StatusCode != http.StatusConflict {
138 t.Fatalf("bezig %d %s", res.StatusCode, read(t, res))
139 }
140 _ = read(t, res)
141 if started != "" {
142 t.Fatal("een lopende update startte opnieuw")
143 }
144 }
145
146 func TestSelfUpdateRateLimit(t *testing.T) {
147 t.Setenv(update.TokenEnv, "sleutel-voor-de-test")
148 _, ts, _ := newUpdateServer(t)
149 var last int
150 for i := 0; i < updateLimit+1; i++ {
151 req, err := http.NewRequest(http.MethodPost, ts.URL+"/api/v1/admin/self-update", bytes.NewReader(nil))
152 if err != nil {
153 t.Fatal(err)
154 }
155 req.Header.Set("Authorization", "Bearer fout")
156 res, err := http.DefaultClient.Do(req)
157 if err != nil {
158 t.Fatal(err)
159 }
160 last = res.StatusCode
161 _ = read(t, res)
162 }
163 if last != http.StatusTooManyRequests {
164 t.Fatalf("rate limit %d", last)
165 }
166 }
167
168 func TestUpdateStatusOnAdminPages(t *testing.T) {
169 dirSetup := func(t *testing.T) (*httptest.Server, string) {
170 t.Helper()
171 _, ts, dir := newUpdateServer(t)
172 sha := "abcdef1234567890abcdef1234567890abcdef12"
173 if err := update.WriteStatus(dir, update.Status{Time: "2026-10-22T12:00:00Z", SHA: sha, Result: "ok"}); err != nil {
174 t.Fatal(err)
175 }
176 return ts, sha
177 }
178 ts, sha := dirSetup(t)
179 anon, err := http.Get(ts.URL + "/-/info")
180 if err != nil {
181 t.Fatal(err)
182 }
183 anonBody := read(t, anon)
184 if strings.Contains(anonBody, sha) || strings.Contains(anonBody, "data-update") {
185 t.Fatal("anonieme infopagina toont de update")
186 }
187
188 jar, _ := cookiejar.New(nil)
189 client := &http.Client{Jar: jar}
190 res, err := client.Get(ts.URL + "/login")
191 if err != nil {
192 t.Fatal(err)
193 }
194 _ = read(t, res)
195 for _, path := range []string{"/-/info", "/setup"} {
196 res, err = client.Get(ts.URL + path)
197 if err != nil {
198 t.Fatal(err)
199 }
200 body := read(t, res)
201 if res.StatusCode != 200 || !strings.Contains(body, "data-update") || !strings.Contains(body, sha) || !strings.Contains(body, "succeeded") {
202 t.Fatalf("%s mist de update (%d):\n%s", path, res.StatusCode, body)
203 }
204 }
205 }
@@ -0,0 +1,205 @@
1package server
2
3import (
4 "bytes"
5 "context"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "os"
10 "path/filepath"
11 "strings"
12 "testing"
13 "time"
14
15 "gitlab.com/Timfa/bluegit/internal/auth"
16 "gitlab.com/Timfa/bluegit/internal/config"
17 "gitlab.com/Timfa/bluegit/internal/store"
18 "gitlab.com/Timfa/bluegit/internal/update"
19)
20
21func newUpdateServer(t *testing.T) (*Server, *httptest.Server, string) {
22 t.Helper()
23 dir := t.TempDir()
24 st, err := store.Open(filepath.Join(dir, "bluegit.db"), bytes32())
25 if err != nil {
26 t.Fatal(err)
27 }
28 t.Cleanup(func() { _ = st.Close() })
29 cfg := config.Config{
30 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: dir,
31 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1},
32 Git: config.Git{Binary: "git", DefaultBranch: "master"},
33 CI: config.CI{Enabled: false},
34 }
35 srv := &Server{
36 Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true,
37 Git: "git", StateDir: dir,
38 }
39 ts := httptest.NewServer(srv.Handler())
40 t.Cleanup(ts.Close)
41 return srv, ts, dir
42}
43
44func TestSelfUpdateDisabledWithoutToken(t *testing.T) {
45 t.Setenv(update.TokenEnv, "")
46 _, ts, _ := newUpdateServer(t)
47 res, err := http.Post(ts.URL+"/api/v1/admin/self-update", "application/json", strings.NewReader(`{"ref":"master"}`))
48 if err != nil {
49 t.Fatal(err)
50 }
51 body := read(t, res)
52 if res.StatusCode != http.StatusNotFound {
53 t.Fatalf("uit hoort 404, kreeg %d %s", res.StatusCode, body)
54 }
55 res, err = http.Get(ts.URL + "/api/v1/admin/self-update")
56 if err != nil {
57 t.Fatal(err)
58 }
59 if res.StatusCode != http.StatusNotFound {
60 t.Fatalf("status uit hoort 404, kreeg %d", res.StatusCode)
61 }
62 _ = read(t, res)
63}
64
65func TestSelfUpdateAuthAndStart(t *testing.T) {
66 t.Setenv(update.TokenEnv, "sleutel-voor-de-test")
67 srv, ts, dir := newUpdateServer(t)
68 var started string
69 srv.UpdateStarter = func(_ context.Context, ref string) error {
70 started = ref
71 return nil
72 }
73 post := func(token, body string) *http.Response {
74 t.Helper()
75 req, err := http.NewRequest(http.MethodPost, ts.URL+"/api/v1/admin/self-update", strings.NewReader(body))
76 if err != nil {
77 t.Fatal(err)
78 }
79 if token != "" {
80 req.Header.Set("Authorization", "Bearer "+token)
81 }
82 res, err := http.DefaultClient.Do(req)
83 if err != nil {
84 t.Fatal(err)
85 }
86 return res
87 }
88
89 res := post("fout", `{"ref":"master"}`)
90 if res.StatusCode != http.StatusUnauthorized {
91 t.Fatalf("foute sleutel %d %s", res.StatusCode, read(t, res))
92 }
93 _ = read(t, res)
94
95 res = post("sleutel-voor-de-test", `{"ref":"../etc"}`)
96 if res.StatusCode != http.StatusBadRequest {
97 t.Fatalf("slechte ref %d %s", res.StatusCode, read(t, res))
98 }
99 _ = read(t, res)
100 if started != "" {
101 t.Fatal("ongeldige ref startte de unit")
102 }
103
104 sha := "0123456789abcdef0123456789abcdef01234567"
105 res = post("sleutel-voor-de-test", `{"sha":"`+sha+`"}`)
106 body := read(t, res)
107 if res.StatusCode != http.StatusAccepted || !strings.Contains(body, `"accepted"`) {
108 t.Fatalf("start %d %s", res.StatusCode, body)
109 }
110 if started != sha {
111 t.Fatalf("unit kreeg %q", started)
112 }
113 raw, err := os.ReadFile(filepath.Join(dir, update.RequestFile))
114 if err != nil || string(raw) != sha+"\n" {
115 t.Fatalf("verzoek %q %v", raw, err)
116 }
117
118 req, err := http.NewRequest(http.MethodGet, ts.URL+"/api/v1/admin/self-update", nil)
119 if err != nil {
120 t.Fatal(err)
121 }
122 req.Header.Set("Authorization", "Bearer sleutel-voor-de-test")
123 res, err = http.DefaultClient.Do(req)
124 if err != nil {
125 t.Fatal(err)
126 }
127 body = read(t, res)
128 if res.StatusCode != 200 || !strings.Contains(body, `"running":0`) {
129 t.Fatalf("status %d %s", res.StatusCode, body)
130 }
131
132 if err := update.WriteStatus(dir, update.Status{Time: time.Now().UTC().Format(time.RFC3339), SHA: sha, Result: "running"}); err != nil {
133 t.Fatal(err)
134 }
135 started = ""
136 res = post("sleutel-voor-de-test", "")
137 if res.StatusCode != http.StatusConflict {
138 t.Fatalf("bezig %d %s", res.StatusCode, read(t, res))
139 }
140 _ = read(t, res)
141 if started != "" {
142 t.Fatal("een lopende update startte opnieuw")
143 }
144}
145
146func TestSelfUpdateRateLimit(t *testing.T) {
147 t.Setenv(update.TokenEnv, "sleutel-voor-de-test")
148 _, ts, _ := newUpdateServer(t)
149 var last int
150 for i := 0; i < updateLimit+1; i++ {
151 req, err := http.NewRequest(http.MethodPost, ts.URL+"/api/v1/admin/self-update", bytes.NewReader(nil))
152 if err != nil {
153 t.Fatal(err)
154 }
155 req.Header.Set("Authorization", "Bearer fout")
156 res, err := http.DefaultClient.Do(req)
157 if err != nil {
158 t.Fatal(err)
159 }
160 last = res.StatusCode
161 _ = read(t, res)
162 }
163 if last != http.StatusTooManyRequests {
164 t.Fatalf("rate limit %d", last)
165 }
166}
167
168func TestUpdateStatusOnAdminPages(t *testing.T) {
169 dirSetup := func(t *testing.T) (*httptest.Server, string) {
170 t.Helper()
171 _, ts, dir := newUpdateServer(t)
172 sha := "abcdef1234567890abcdef1234567890abcdef12"
173 if err := update.WriteStatus(dir, update.Status{Time: "2026-10-22T12:00:00Z", SHA: sha, Result: "ok"}); err != nil {
174 t.Fatal(err)
175 }
176 return ts, sha
177 }
178 ts, sha := dirSetup(t)
179 anon, err := http.Get(ts.URL + "/-/info")
180 if err != nil {
181 t.Fatal(err)
182 }
183 anonBody := read(t, anon)
184 if strings.Contains(anonBody, sha) || strings.Contains(anonBody, "data-update") {
185 t.Fatal("anonieme infopagina toont de update")
186 }
187
188 jar, _ := cookiejar.New(nil)
189 client := &http.Client{Jar: jar}
190 res, err := client.Get(ts.URL + "/login")
191 if err != nil {
192 t.Fatal(err)
193 }
194 _ = read(t, res)
195 for _, path := range []string{"/-/info", "/setup"} {
196 res, err = client.Get(ts.URL + path)
197 if err != nil {
198 t.Fatal(err)
199 }
200 body := read(t, res)
201 if res.StatusCode != 200 || !strings.Contains(body, "data-update") || !strings.Contains(body, sha) || !strings.Contains(body, "succeeded") {
202 t.Fatalf("%s mist de update (%d):\n%s", path, res.StatusCode, body)
203 }
204 }
205}
internal/server/server.go +9 −2
@@ -45,8 +45,11 @@ type Server struct {
45 45 StateDir string
46 46 // AfterStorage krijgt het nieuwe datadisk-pad, voor runner en SSH.
47 47 AfterStorage func(path string)
48 tmpl *template.Template
49 byLang map[string]*template.Template
48 // UpdateStarter start bluegit-update.service. Nil gebruikt systemctl.
49 UpdateStarter UpdateStarter
50 updateHits updateLimiter
51 tmpl *template.Template
52 byLang map[string]*template.Template
50 53
51 54 storageMu sync.RWMutex
52 55 storage string
@@ -68,6 +71,8 @@ func (s *Server) Handler() http.Handler {
68 71 mux.HandleFunc("GET /assets/{file}", s.asset)
69 72 mux.HandleFunc("GET /-/info", s.infoPage)
70 73 mux.HandleFunc("GET /api/v1/ci/spec", s.ciSpec)
74 mux.HandleFunc("GET /api/v1/admin/self-update", s.selfUpdateStatus)
75 mux.HandleFunc("POST /api/v1/admin/self-update", s.selfUpdate)
71 76 mux.HandleFunc("GET /healthz", func(w http.ResponseWriter, r *http.Request) {
72 77 w.WriteHeader(http.StatusOK)
73 78 _, _ = w.Write([]byte("ok\n"))
@@ -511,6 +516,8 @@ type View struct {
511 516 MinFree string
512 517 Wide bool
513 518 Info bool
519 ShowUpdate bool
520 Update *UpdateView
514 521 Spec cispec.Doc
515 522 SpecJSON template.JS
516 523 Page string
@@ -45,8 +45,11 @@ type Server struct {
45 StateDir string
45 StateDir string
46 // AfterStorage krijgt het nieuwe datadisk-pad, voor runner en SSH.
46 // AfterStorage krijgt het nieuwe datadisk-pad, voor runner en SSH.
47 AfterStorage func(path string)
47 AfterStorage func(path string)
48 tmpl *template.Template
48 // UpdateStarter start bluegit-update.service. Nil gebruikt systemctl.
49 byLang map[string]*template.Template
49 UpdateStarter UpdateStarter
50 updateHits updateLimiter
51 tmpl *template.Template
52 byLang map[string]*template.Template
50
53
51 storageMu sync.RWMutex
54 storageMu sync.RWMutex
52 storage string
55 storage string
@@ -68,6 +71,8 @@ func (s *Server) Handler() http.Handler {
68 mux.HandleFunc("GET /assets/{file}", s.asset)
71 mux.HandleFunc("GET /assets/{file}", s.asset)
69 mux.HandleFunc("GET /-/info", s.infoPage)
72 mux.HandleFunc("GET /-/info", s.infoPage)
70 mux.HandleFunc("GET /api/v1/ci/spec", s.ciSpec)
73 mux.HandleFunc("GET /api/v1/ci/spec", s.ciSpec)
74 mux.HandleFunc("GET /api/v1/admin/self-update", s.selfUpdateStatus)
75 mux.HandleFunc("POST /api/v1/admin/self-update", s.selfUpdate)
71 mux.HandleFunc("GET /healthz", func(w http.ResponseWriter, r *http.Request) {
76 mux.HandleFunc("GET /healthz", func(w http.ResponseWriter, r *http.Request) {
72 w.WriteHeader(http.StatusOK)
77 w.WriteHeader(http.StatusOK)
73 _, _ = w.Write([]byte("ok\n"))
78 _, _ = w.Write([]byte("ok\n"))
@@ -511,6 +516,8 @@ type View struct {
511 MinFree string
516 MinFree string
512 Wide bool
517 Wide bool
513 Info bool
518 Info bool
519 ShowUpdate bool
520 Update *UpdateView
514 Spec cispec.Doc
521 Spec cispec.Doc
515 SpecJSON template.JS
522 SpecJSON template.JS
516 Page string
523 Page string
internal/server/setup.go +2 −1
@@ -16,7 +16,7 @@ func (s *Server) noStorageText(r *http.Request) string {
16 16
17 17 func allowsWithoutStorage(r *http.Request) bool {
18 18 switch r.URL.Path {
19 case "/healthz", "/login", "/auth/callback", "/logout", "/setup", "/-/info", "/api/v1/ci/spec":
19 case "/healthz", "/login", "/auth/callback", "/logout", "/setup", "/-/info", "/api/v1/ci/spec", "/api/v1/admin/self-update":
20 20 return true
21 21 }
22 22 return strings.HasPrefix(r.URL.Path, "/assets/")
@@ -160,6 +160,7 @@ func (s *Server) renderSetup(w http.ResponseWriter, r *http.Request, problem, pr
160 160 v.Err = s.trErr(r, err)
161 161 }
162 162 }
163 s.attachUpdate(&v, s.langOf(r))
163 164 s.render(w, "setup", v)
164 165 }
165 166
@@ -16,7 +16,7 @@ func (s *Server) noStorageText(r *http.Request) string {
16
16
17func allowsWithoutStorage(r *http.Request) bool {
17func allowsWithoutStorage(r *http.Request) bool {
18 switch r.URL.Path {
18 switch r.URL.Path {
19 case "/healthz", "/login", "/auth/callback", "/logout", "/setup", "/-/info", "/api/v1/ci/spec":
19 case "/healthz", "/login", "/auth/callback", "/logout", "/setup", "/-/info", "/api/v1/ci/spec", "/api/v1/admin/self-update":
20 return true
20 return true
21 }
21 }
22 return strings.HasPrefix(r.URL.Path, "/assets/")
22 return strings.HasPrefix(r.URL.Path, "/assets/")
@@ -160,6 +160,7 @@ func (s *Server) renderSetup(w http.ResponseWriter, r *http.Request, problem, pr
160 v.Err = s.trErr(r, err)
160 v.Err = s.trErr(r, err)
161 }
161 }
162 }
162 }
163 s.attachUpdate(&v, s.langOf(r))
163 s.render(w, "setup", v)
164 s.render(w, "setup", v)
164}
165}
165
166
internal/server/templates/info.html +15 −0
@@ -1,3 +1,17 @@
1 {{define "updatestatus"}}
2 <section class="panel" data-update>
3 <h2>{{t "update.title"}}</h2>
4 {{if .Update}}
5 <p>{{t "update.when"}} <time>{{.Update.When}}</time></p>
6 <p>{{t "update.sha"}} <code>{{.Update.SHA}}</code></p>
7 <p>{{t "update.result"}} {{.Update.ResultLabel}}</p>
8 {{if .Update.Error}}<p class="muted">{{.Update.Error}}</p>{{end}}
9 {{else}}
10 <p class="muted">{{t "update.none"}}</p>
11 {{end}}
12 </section>
13 {{end}}
14
1 15 {{define "info"}}
2 16 {{template "layout-start" .}}
3 17 <article class="spec">
@@ -38,6 +52,7 @@
38 52 </table>
39 53 {{end}}
40 54 {{end}}
55 {{if .ShowUpdate}}{{template "updatestatus" .}}{{end}}
41 56 <script type="application/json" id="bluegit-ci-spec">{{.SpecJSON}}</script>
42 57 </article>
43 58 {{template "layout-end" .}}
@@ -1,3 +1,17 @@
1{{define "updatestatus"}}
2<section class="panel" data-update>
3 <h2>{{t "update.title"}}</h2>
4 {{if .Update}}
5 <p>{{t "update.when"}} <time>{{.Update.When}}</time></p>
6 <p>{{t "update.sha"}} <code>{{.Update.SHA}}</code></p>
7 <p>{{t "update.result"}} {{.Update.ResultLabel}}</p>
8 {{if .Update.Error}}<p class="muted">{{.Update.Error}}</p>{{end}}
9 {{else}}
10 <p class="muted">{{t "update.none"}}</p>
11 {{end}}
12</section>
13{{end}}
14
1{{define "info"}}
15{{define "info"}}
2{{template "layout-start" .}}
16{{template "layout-start" .}}
3<article class="spec">
17<article class="spec">
@@ -38,6 +52,7 @@
38 </table>
52 </table>
39 {{end}}
53 {{end}}
40 {{end}}
54 {{end}}
55 {{if .ShowUpdate}}{{template "updatestatus" .}}{{end}}
41 <script type="application/json" id="bluegit-ci-spec">{{.SpecJSON}}</script>
56 <script type="application/json" id="bluegit-ci-spec">{{.SpecJSON}}</script>
42</article>
57</article>
43{{template "layout-end" .}}
58{{template "layout-end" .}}
internal/server/templates/pages.html +1 −0
@@ -15,6 +15,7 @@
15 15 </form>
16 16 <p class="muted">{{t "setup.rules" .MinFree}}</p>
17 17 </section>
18 {{if .ShowUpdate}}{{template "updatestatus" .}}{{end}}
18 19 {{template "layout-end" .}}
19 20 {{end}}
20 21
@@ -15,6 +15,7 @@
15 </form>
15 </form>
16 <p class="muted">{{t "setup.rules" .MinFree}}</p>
16 <p class="muted">{{t "setup.rules" .MinFree}}</p>
17</section>
17</section>
18{{if .ShowUpdate}}{{template "updatestatus" .}}{{end}}
18{{template "layout-end" .}}
19{{template "layout-end" .}}
19{{end}}
20{{end}}
20
21
internal/store/flow.go +7 −0
@@ -618,6 +618,13 @@ func (s *Store) MarkJobRunning(ctx context.Context, id int64) (bool, error) {
618 618 return n == 1, nil
619 619 }
620 620
621 // CountRunningJobs telt jobs die Steve nu uitvoert.
622 func (s *Store) CountRunningJobs(ctx context.Context) (int, error) {
623 var n int
624 err := s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM jobs WHERE status = 'running'`).Scan(&n)
625 return n, err
626 }
627
621 628 // FinishJob schrijft het eindresultaat en het log.
622 629 func (s *Store) FinishJob(ctx context.Context, id int64, status, extra string) error {
623 630 _, err := s.db.ExecContext(ctx, `UPDATE jobs SET status = ?, log = log || ?, finished_at = ? WHERE id = ?`, status, extra, now(), id)
@@ -618,6 +618,13 @@ func (s *Store) MarkJobRunning(ctx context.Context, id int64) (bool, error) {
618 return n == 1, nil
618 return n == 1, nil
619}
619}
620
620
621// CountRunningJobs telt jobs die Steve nu uitvoert.
622func (s *Store) CountRunningJobs(ctx context.Context) (int, error) {
623 var n int
624 err := s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM jobs WHERE status = 'running'`).Scan(&n)
625 return n, err
626}
627
621// FinishJob schrijft het eindresultaat en het log.
628// FinishJob schrijft het eindresultaat en het log.
622func (s *Store) FinishJob(ctx context.Context, id int64, status, extra string) error {
629func (s *Store) FinishJob(ctx context.Context, id int64, status, extra string) error {
623 _, err := s.db.ExecContext(ctx, `UPDATE jobs SET status = ?, log = log || ?, finished_at = ? WHERE id = ?`, status, extra, now(), id)
630 _, err := s.db.ExecContext(ctx, `UPDATE jobs SET status = ?, log = log || ?, finished_at = ? WHERE id = ?`, status, extra, now(), id)
internal/update/packaging_test.go added +187 −0
@@ -0,0 +1,187 @@
1 package update
2
3 import (
4 "os"
5 "os/exec"
6 "path/filepath"
7 "strings"
8 "testing"
9 )
10
11 func root(t *testing.T) string {
12 t.Helper()
13 return filepath.Join("..", "..")
14 }
15
16 func TestPackagingFiles(t *testing.T) {
17 base := root(t)
18 unit, err := os.ReadFile(filepath.Join(base, "packaging", "bluegit-update.service"))
19 if err != nil {
20 t.Fatal(err)
21 }
22 text := string(unit)
23 for _, want := range []string{
24 "Type=oneshot",
25 "User=root",
26 "ExecStart=/usr/lib/bluegit/update",
27 "EnvironmentFile=-/etc/bluegit/env",
28 "TimeoutStartSec=3h",
29 } {
30 if !strings.Contains(text, want) {
31 t.Fatalf("unit mist %q", want)
32 }
33 }
34 if strings.Contains(text, "User=bluegit") {
35 t.Fatal("de update-unit hoort niet als bluegit te draaien")
36 }
37 rules, err := os.ReadFile(filepath.Join(base, "packaging", "bluegit-update.rules"))
38 if err != nil {
39 t.Fatal(err)
40 }
41 ruleText := string(rules)
42 for _, want := range []string{
43 `subject.user != "bluegit"`,
44 `action.lookup("verb") == "start"`,
45 `action.lookup("unit") == "bluegit-update.service"`,
46 "polkit.Result.YES",
47 "org.freedesktop.systemd1.manage-units",
48 } {
49 if !strings.Contains(ruleText, want) {
50 t.Fatalf("polkit mist %q", want)
51 }
52 }
53 for _, banned := range []string{"stop", "restart", "isolate"} {
54 if strings.Contains(ruleText, banned) {
55 t.Fatalf("polkit noemt %s", banned)
56 }
57 }
58 service, err := os.ReadFile(filepath.Join(base, "packaging", "bluegit.service"))
59 if err != nil {
60 t.Fatal(err)
61 }
62 if !strings.Contains(string(service), "EnvironmentFile=-/etc/bluegit/env") {
63 t.Fatal("bluegit.service leest /etc/bluegit/env niet")
64 }
65 sysusers, err := os.ReadFile(filepath.Join(base, "packaging", "sysusers.conf"))
66 if err != nil {
67 t.Fatal(err)
68 }
69 if !strings.Contains(string(sysusers), "u bluegit-build ") {
70 t.Fatal("sysusers mist bluegit-build")
71 }
72 hook, err := os.ReadFile(filepath.Join(base, "packaging", "aur", "bluegit.install"))
73 if err != nil {
74 t.Fatal(err)
75 }
76 if !strings.Contains(string(hook), "bluegit-build") || !strings.Contains(string(hook), "systemd-sysusers bluegit.conf") {
77 t.Fatal("install-hook maakt de bouwgebruiker niet")
78 }
79 if !strings.Contains(string(hook), "try-restart bluegit.service") {
80 t.Fatal("upgrade hoort de service te herstarten")
81 }
82 pkg, err := os.ReadFile(filepath.Join(base, "packaging", "aur", "PKGBUILD"))
83 if err != nil {
84 t.Fatal(err)
85 }
86 pkgText := string(pkg)
87 for _, want := range []string{
88 "packaging/bluegit-update.sh",
89 "/usr/lib/bluegit/update",
90 "bluegit-update.service",
91 "49-bluegit-update.rules",
92 } {
93 if !strings.Contains(pkgText, want) {
94 t.Fatalf("PKGBUILD installeert %s niet", want)
95 }
96 }
97 }
98
99 func TestUpdateScriptBehavior(t *testing.T) {
100 if _, err := exec.LookPath("bash"); err != nil {
101 t.Skip("bash ontbreekt")
102 }
103 if _, err := exec.LookPath("git"); err != nil {
104 t.Skip("git ontbreekt")
105 }
106 base := root(t)
107 script := filepath.Join(base, "packaging", "bluegit-update.sh")
108 if out, err := exec.Command("bash", "-n", script).CombinedOutput(); err != nil {
109 t.Fatalf("syntax: %v %s", err, out)
110 }
111 body, err := os.ReadFile(script)
112 if err != nil {
113 t.Fatal(err)
114 }
115 text := string(body)
116 for _, want := range []string{
117 "makepkg --noconfirm --nosign",
118 "pacman -U --noconfirm",
119 "runuser -u",
120 "TZ=UTC git -C",
121 "--date=format-local:%Y%m%d%H%M%S",
122 "flock -n",
123 "wait_until_idle",
124 } {
125 if !strings.Contains(text, want) {
126 t.Fatalf("script mist %q", want)
127 }
128 }
129 if strings.Contains(text, "gitlab.com") {
130 t.Fatal("de updater hoort de lokale bare repo te gebruiken")
131 }
132
133 repo := t.TempDir()
134 git := func(args ...string) {
135 t.Helper()
136 cmd := exec.Command("git", args...)
137 cmd.Dir = repo
138 cmd.Env = append(os.Environ(),
139 "GIT_AUTHOR_DATE=2026-01-02T03:04:05Z",
140 "GIT_COMMITTER_DATE=2026-01-02T03:04:05Z",
141 )
142 if out, err := cmd.CombinedOutput(); err != nil {
143 t.Fatalf("git %s: %v %s", args, err, out)
144 }
145 }
146 git("init", "-b", "master")
147 git("config", "user.email", "tim@users.git.timfalken.com")
148 git("config", "user.name", "tim")
149 if err := os.WriteFile(filepath.Join(repo, "README"), []byte("x\n"), 0o644); err != nil {
150 t.Fatal(err)
151 }
152 git("add", "README")
153 git("commit", "-m", "een")
154 shaOut, err := exec.Command("git", "-C", repo, "rev-parse", "HEAD").Output()
155 if err != nil {
156 t.Fatal(err)
157 }
158 sha := strings.TrimSpace(string(shaOut))
159
160 bin := t.TempDir()
161 count := filepath.Join(bin, "count")
162 if err := os.WriteFile(count, []byte("2\n"), 0o644); err != nil {
163 t.Fatal(err)
164 }
165 curl := filepath.Join(bin, "curl")
166 curlBody := "#!/bin/bash\nn=$(tr -d '[:space:]' < " + shellQuote(count) + ")\nprintf '{\"running\":%s}\\n' \"$n\"\nif [[ \"$n\" != 0 ]]; then echo $((n-1)) > " + shellQuote(count) + "; fi\n"
167 if err := os.WriteFile(curl, []byte(curlBody), 0o755); err != nil {
168 t.Fatal(err)
169 }
170 probe := "source " + shellQuote(script) + "\n" +
171 "valid_ref '' && valid_ref 'master' && valid_ref " + shellQuote(sha) + " || exit 1\n" +
172 "valid_ref '../x' && exit 1\n" +
173 "valid_ref 'master;rm' && exit 1\n" +
174 "ver=$(pkgver_of " + shellQuote(repo) + " " + shellQuote(sha) + ")\n" +
175 "[[ \"$ver\" == 20260102030405 ]] || { echo \"pkgver $ver\"; exit 1; }\n" +
176 "export PATH=" + shellQuote(bin) + ":$PATH\n" +
177 "export BLUEGIT_UPDATE_TOKEN=test BLUEGIT_UPDATE_URL=http://127.0.0.1:9 BLUEGIT_UPDATE_POLL=0 BLUEGIT_UPDATE_TIMEOUT=5\n" +
178 "wait_until_idle\n"
179 cmd := exec.Command("bash", "-c", probe)
180 if out, err := cmd.CombinedOutput(); err != nil {
181 t.Fatalf("gedrag: %v %s", err, out)
182 }
183 }
184
185 func shellQuote(s string) string {
186 return "'" + strings.ReplaceAll(s, "'", "'\\''") + "'"
187 }
@@ -0,0 +1,187 @@
1package update
2
3import (
4 "os"
5 "os/exec"
6 "path/filepath"
7 "strings"
8 "testing"
9)
10
11func root(t *testing.T) string {
12 t.Helper()
13 return filepath.Join("..", "..")
14}
15
16func TestPackagingFiles(t *testing.T) {
17 base := root(t)
18 unit, err := os.ReadFile(filepath.Join(base, "packaging", "bluegit-update.service"))
19 if err != nil {
20 t.Fatal(err)
21 }
22 text := string(unit)
23 for _, want := range []string{
24 "Type=oneshot",
25 "User=root",
26 "ExecStart=/usr/lib/bluegit/update",
27 "EnvironmentFile=-/etc/bluegit/env",
28 "TimeoutStartSec=3h",
29 } {
30 if !strings.Contains(text, want) {
31 t.Fatalf("unit mist %q", want)
32 }
33 }
34 if strings.Contains(text, "User=bluegit") {
35 t.Fatal("de update-unit hoort niet als bluegit te draaien")
36 }
37 rules, err := os.ReadFile(filepath.Join(base, "packaging", "bluegit-update.rules"))
38 if err != nil {
39 t.Fatal(err)
40 }
41 ruleText := string(rules)
42 for _, want := range []string{
43 `subject.user != "bluegit"`,
44 `action.lookup("verb") == "start"`,
45 `action.lookup("unit") == "bluegit-update.service"`,
46 "polkit.Result.YES",
47 "org.freedesktop.systemd1.manage-units",
48 } {
49 if !strings.Contains(ruleText, want) {
50 t.Fatalf("polkit mist %q", want)
51 }
52 }
53 for _, banned := range []string{"stop", "restart", "isolate"} {
54 if strings.Contains(ruleText, banned) {
55 t.Fatalf("polkit noemt %s", banned)
56 }
57 }
58 service, err := os.ReadFile(filepath.Join(base, "packaging", "bluegit.service"))
59 if err != nil {
60 t.Fatal(err)
61 }
62 if !strings.Contains(string(service), "EnvironmentFile=-/etc/bluegit/env") {
63 t.Fatal("bluegit.service leest /etc/bluegit/env niet")
64 }
65 sysusers, err := os.ReadFile(filepath.Join(base, "packaging", "sysusers.conf"))
66 if err != nil {
67 t.Fatal(err)
68 }
69 if !strings.Contains(string(sysusers), "u bluegit-build ") {
70 t.Fatal("sysusers mist bluegit-build")
71 }
72 hook, err := os.ReadFile(filepath.Join(base, "packaging", "aur", "bluegit.install"))
73 if err != nil {
74 t.Fatal(err)
75 }
76 if !strings.Contains(string(hook), "bluegit-build") || !strings.Contains(string(hook), "systemd-sysusers bluegit.conf") {
77 t.Fatal("install-hook maakt de bouwgebruiker niet")
78 }
79 if !strings.Contains(string(hook), "try-restart bluegit.service") {
80 t.Fatal("upgrade hoort de service te herstarten")
81 }
82 pkg, err := os.ReadFile(filepath.Join(base, "packaging", "aur", "PKGBUILD"))
83 if err != nil {
84 t.Fatal(err)
85 }
86 pkgText := string(pkg)
87 for _, want := range []string{
88 "packaging/bluegit-update.sh",
89 "/usr/lib/bluegit/update",
90 "bluegit-update.service",
91 "49-bluegit-update.rules",
92 } {
93 if !strings.Contains(pkgText, want) {
94 t.Fatalf("PKGBUILD installeert %s niet", want)
95 }
96 }
97}
98
99func TestUpdateScriptBehavior(t *testing.T) {
100 if _, err := exec.LookPath("bash"); err != nil {
101 t.Skip("bash ontbreekt")
102 }
103 if _, err := exec.LookPath("git"); err != nil {
104 t.Skip("git ontbreekt")
105 }
106 base := root(t)
107 script := filepath.Join(base, "packaging", "bluegit-update.sh")
108 if out, err := exec.Command("bash", "-n", script).CombinedOutput(); err != nil {
109 t.Fatalf("syntax: %v %s", err, out)
110 }
111 body, err := os.ReadFile(script)
112 if err != nil {
113 t.Fatal(err)
114 }
115 text := string(body)
116 for _, want := range []string{
117 "makepkg --noconfirm --nosign",
118 "pacman -U --noconfirm",
119 "runuser -u",
120 "TZ=UTC git -C",
121 "--date=format-local:%Y%m%d%H%M%S",
122 "flock -n",
123 "wait_until_idle",
124 } {
125 if !strings.Contains(text, want) {
126 t.Fatalf("script mist %q", want)
127 }
128 }
129 if strings.Contains(text, "gitlab.com") {
130 t.Fatal("de updater hoort de lokale bare repo te gebruiken")
131 }
132
133 repo := t.TempDir()
134 git := func(args ...string) {
135 t.Helper()
136 cmd := exec.Command("git", args...)
137 cmd.Dir = repo
138 cmd.Env = append(os.Environ(),
139 "GIT_AUTHOR_DATE=2026-01-02T03:04:05Z",
140 "GIT_COMMITTER_DATE=2026-01-02T03:04:05Z",
141 )
142 if out, err := cmd.CombinedOutput(); err != nil {
143 t.Fatalf("git %s: %v %s", args, err, out)
144 }
145 }
146 git("init", "-b", "master")
147 git("config", "user.email", "tim@users.git.timfalken.com")
148 git("config", "user.name", "tim")
149 if err := os.WriteFile(filepath.Join(repo, "README"), []byte("x\n"), 0o644); err != nil {
150 t.Fatal(err)
151 }
152 git("add", "README")
153 git("commit", "-m", "een")
154 shaOut, err := exec.Command("git", "-C", repo, "rev-parse", "HEAD").Output()
155 if err != nil {
156 t.Fatal(err)
157 }
158 sha := strings.TrimSpace(string(shaOut))
159
160 bin := t.TempDir()
161 count := filepath.Join(bin, "count")
162 if err := os.WriteFile(count, []byte("2\n"), 0o644); err != nil {
163 t.Fatal(err)
164 }
165 curl := filepath.Join(bin, "curl")
166 curlBody := "#!/bin/bash\nn=$(tr -d '[:space:]' < " + shellQuote(count) + ")\nprintf '{\"running\":%s}\\n' \"$n\"\nif [[ \"$n\" != 0 ]]; then echo $((n-1)) > " + shellQuote(count) + "; fi\n"
167 if err := os.WriteFile(curl, []byte(curlBody), 0o755); err != nil {
168 t.Fatal(err)
169 }
170 probe := "source " + shellQuote(script) + "\n" +
171 "valid_ref '' && valid_ref 'master' && valid_ref " + shellQuote(sha) + " || exit 1\n" +
172 "valid_ref '../x' && exit 1\n" +
173 "valid_ref 'master;rm' && exit 1\n" +
174 "ver=$(pkgver_of " + shellQuote(repo) + " " + shellQuote(sha) + ")\n" +
175 "[[ \"$ver\" == 20260102030405 ]] || { echo \"pkgver $ver\"; exit 1; }\n" +
176 "export PATH=" + shellQuote(bin) + ":$PATH\n" +
177 "export BLUEGIT_UPDATE_TOKEN=test BLUEGIT_UPDATE_URL=http://127.0.0.1:9 BLUEGIT_UPDATE_POLL=0 BLUEGIT_UPDATE_TIMEOUT=5\n" +
178 "wait_until_idle\n"
179 cmd := exec.Command("bash", "-c", probe)
180 if out, err := cmd.CombinedOutput(); err != nil {
181 t.Fatalf("gedrag: %v %s", err, out)
182 }
183}
184
185func shellQuote(s string) string {
186 return "'" + strings.ReplaceAll(s, "'", "'\\''") + "'"
187}
internal/update/update.go added +204 −0
@@ -0,0 +1,204 @@
1 // Package update is de self-update van een geïnstalleerde BlueGit.
2 // Het HTTP-endpoint schrijft alleen een verzoek weg en start de unit.
3 // Het script in packaging doet de bouw en de installatie.
4 package update
5
6 import (
7 "context"
8 "crypto/sha256"
9 "crypto/subtle"
10 "encoding/json"
11 "errors"
12 "fmt"
13 "os"
14 "os/exec"
15 "path/filepath"
16 "regexp"
17 "strings"
18 "time"
19 )
20
21 const (
22 // Unit is de enige systemd-unit die de bluegit-gebruiker mag starten.
23 Unit = "bluegit-update.service"
24 // TokenEnv is de sleutel. Zonder waarde is het endpoint uit.
25 TokenEnv = "BLUEGIT_UPDATE_TOKEN"
26 // RequestFile is één regel: leeg betekent HEAD, anders een sha of ref.
27 RequestFile = "update-request"
28 // StatusFile is de laatste poging, gelezen door de Info- en setup-pagina.
29 StatusFile = "update-status.json"
30 )
31
32 // Status is het resultaat dat het update-script en de webpagina delen.
33 type Status struct {
34 Time string `json:"time"`
35 SHA string `json:"sha"`
36 Result string `json:"result"`
37 Error string `json:"error,omitempty"`
38 }
39
40 // Token is de geconfigureerde sleutel. Leeg betekent dat self-update uit staat.
41 func Token() string {
42 return strings.TrimSpace(os.Getenv(TokenEnv))
43 }
44
45 // Enabled is false zolang er geen sleutel in de omgeving staat.
46 func Enabled() bool { return Token() != "" }
47
48 // Equal vergelijkt twee sleutels zonder de lengte of de inhoud te lekken
49 // via een vroege return. Een lege verwachte sleutel past nooit.
50 func Equal(secret, got string) bool {
51 if secret == "" || got == "" {
52 return false
53 }
54 sumS := sha256.Sum256([]byte(secret))
55 sumG := sha256.Sum256([]byte(got))
56 return subtle.ConstantTimeCompare(sumS[:], sumG[:]) == 1
57 }
58
59 var refPattern = regexp.MustCompile(`^[0-9A-Za-z][0-9A-Za-z._/-]{0,199}$`)
60
61 // ValidRef staat een lege ref toe (HEAD van de bare repo), een sha, of een
62 // branchnaam. Punt-punt en @{ zijn geen git-ref die we aan het script geven.
63 func ValidRef(ref string) bool {
64 if ref == "" {
65 return true
66 }
67 if strings.Contains(ref, "..") || strings.Contains(ref, "@{") {
68 return false
69 }
70 return refPattern.MatchString(ref)
71 }
72
73 // WriteRequest zet de gevraagde ref klaar voor de unit.
74 func WriteRequest(dir, ref string) error {
75 if dir == "" {
76 return errors.New("state-map ontbreekt")
77 }
78 if err := os.MkdirAll(dir, 0o750); err != nil {
79 return err
80 }
81 target := filepath.Join(dir, RequestFile)
82 tmp, err := os.CreateTemp(dir, RequestFile+".*")
83 if err != nil {
84 return err
85 }
86 tmpName := tmp.Name()
87 cleanup := true
88 defer func() {
89 if cleanup {
90 _ = os.Remove(tmpName)
91 }
92 }()
93 if _, err := tmp.WriteString(ref + "\n"); err != nil {
94 _ = tmp.Close()
95 return err
96 }
97 if err := tmp.Chmod(0o640); err != nil {
98 _ = tmp.Close()
99 return err
100 }
101 if err := tmp.Close(); err != nil {
102 return err
103 }
104 if err := os.Rename(tmpName, target); err != nil {
105 return err
106 }
107 cleanup = false
108 return nil
109 }
110
111 // ReadStatus leest de laatste update. Een ontbrekend bestand is geen fout.
112 func ReadStatus(dir string) (Status, error) {
113 if dir == "" {
114 return Status{}, nil
115 }
116 raw, err := os.ReadFile(filepath.Join(dir, StatusFile))
117 if err != nil {
118 if errors.Is(err, os.ErrNotExist) {
119 return Status{}, nil
120 }
121 return Status{}, err
122 }
123 var st Status
124 if err := json.Unmarshal(raw, &st); err != nil {
125 return Status{}, nil
126 }
127 return st, nil
128 }
129
130 // WriteStatus is voor tests en voor een mislukte start vanuit het proces.
131 func WriteStatus(dir string, st Status) error {
132 if dir == "" {
133 return errors.New("state-map ontbreekt")
134 }
135 if st.Time == "" {
136 st.Time = time.Now().UTC().Format(time.RFC3339)
137 }
138 raw, err := json.Marshal(st)
139 if err != nil {
140 return err
141 }
142 raw = append(raw, '\n')
143 if err := os.MkdirAll(dir, 0o750); err != nil {
144 return err
145 }
146 target := filepath.Join(dir, StatusFile)
147 tmp, err := os.CreateTemp(dir, StatusFile+".*")
148 if err != nil {
149 return err
150 }
151 tmpName := tmp.Name()
152 cleanup := true
153 defer func() {
154 if cleanup {
155 _ = os.Remove(tmpName)
156 }
157 }()
158 if _, err := tmp.Write(raw); err != nil {
159 _ = tmp.Close()
160 return err
161 }
162 if err := tmp.Chmod(0o644); err != nil {
163 _ = tmp.Close()
164 return err
165 }
166 if err := tmp.Close(); err != nil {
167 return err
168 }
169 if err := os.Rename(tmpName, target); err != nil {
170 return err
171 }
172 cleanup = false
173 return nil
174 }
175
176 // FreshRunning is waar als een update nog bezig hoort te zijn.
177 func FreshRunning(st Status, now time.Time, window time.Duration) bool {
178 if st.Result != "running" || st.Time == "" {
179 return false
180 }
181 t, err := time.Parse(time.RFC3339, st.Time)
182 if err != nil {
183 return false
184 }
185 return now.Sub(t) < window && now.Sub(t) > -time.Minute
186 }
187
188 // StartSystemd start de oneshot zonder erop te wachten. De aanroepende
189 // CI-job moet kunnen eindigen, anders wacht de updater eeuwig op zichzelf.
190 func StartSystemd(ctx context.Context) error {
191 cmd := exec.CommandContext(ctx, "systemctl", "start", "--no-block", Unit)
192 out, err := cmd.CombinedOutput()
193 if err != nil {
194 msg := strings.TrimSpace(string(out))
195 if len(msg) > 200 {
196 msg = msg[:200]
197 }
198 if msg == "" {
199 return err
200 }
201 return fmt.Errorf("systemctl: %s", msg)
202 }
203 return nil
204 }
@@ -0,0 +1,204 @@
1// Package update is de self-update van een geïnstalleerde BlueGit.
2// Het HTTP-endpoint schrijft alleen een verzoek weg en start de unit.
3// Het script in packaging doet de bouw en de installatie.
4package update
5
6import (
7 "context"
8 "crypto/sha256"
9 "crypto/subtle"
10 "encoding/json"
11 "errors"
12 "fmt"
13 "os"
14 "os/exec"
15 "path/filepath"
16 "regexp"
17 "strings"
18 "time"
19)
20
21const (
22 // Unit is de enige systemd-unit die de bluegit-gebruiker mag starten.
23 Unit = "bluegit-update.service"
24 // TokenEnv is de sleutel. Zonder waarde is het endpoint uit.
25 TokenEnv = "BLUEGIT_UPDATE_TOKEN"
26 // RequestFile is één regel: leeg betekent HEAD, anders een sha of ref.
27 RequestFile = "update-request"
28 // StatusFile is de laatste poging, gelezen door de Info- en setup-pagina.
29 StatusFile = "update-status.json"
30)
31
32// Status is het resultaat dat het update-script en de webpagina delen.
33type Status struct {
34 Time string `json:"time"`
35 SHA string `json:"sha"`
36 Result string `json:"result"`
37 Error string `json:"error,omitempty"`
38}
39
40// Token is de geconfigureerde sleutel. Leeg betekent dat self-update uit staat.
41func Token() string {
42 return strings.TrimSpace(os.Getenv(TokenEnv))
43}
44
45// Enabled is false zolang er geen sleutel in de omgeving staat.
46func Enabled() bool { return Token() != "" }
47
48// Equal vergelijkt twee sleutels zonder de lengte of de inhoud te lekken
49// via een vroege return. Een lege verwachte sleutel past nooit.
50func Equal(secret, got string) bool {
51 if secret == "" || got == "" {
52 return false
53 }
54 sumS := sha256.Sum256([]byte(secret))
55 sumG := sha256.Sum256([]byte(got))
56 return subtle.ConstantTimeCompare(sumS[:], sumG[:]) == 1
57}
58
59var refPattern = regexp.MustCompile(`^[0-9A-Za-z][0-9A-Za-z._/-]{0,199}$`)
60
61// ValidRef staat een lege ref toe (HEAD van de bare repo), een sha, of een
62// branchnaam. Punt-punt en @{ zijn geen git-ref die we aan het script geven.
63func ValidRef(ref string) bool {
64 if ref == "" {
65 return true
66 }
67 if strings.Contains(ref, "..") || strings.Contains(ref, "@{") {
68 return false
69 }
70 return refPattern.MatchString(ref)
71}
72
73// WriteRequest zet de gevraagde ref klaar voor de unit.
74func WriteRequest(dir, ref string) error {
75 if dir == "" {
76 return errors.New("state-map ontbreekt")
77 }
78 if err := os.MkdirAll(dir, 0o750); err != nil {
79 return err
80 }
81 target := filepath.Join(dir, RequestFile)
82 tmp, err := os.CreateTemp(dir, RequestFile+".*")
83 if err != nil {
84 return err
85 }
86 tmpName := tmp.Name()
87 cleanup := true
88 defer func() {
89 if cleanup {
90 _ = os.Remove(tmpName)
91 }
92 }()
93 if _, err := tmp.WriteString(ref + "\n"); err != nil {
94 _ = tmp.Close()
95 return err
96 }
97 if err := tmp.Chmod(0o640); err != nil {
98 _ = tmp.Close()
99 return err
100 }
101 if err := tmp.Close(); err != nil {
102 return err
103 }
104 if err := os.Rename(tmpName, target); err != nil {
105 return err
106 }
107 cleanup = false
108 return nil
109}
110
111// ReadStatus leest de laatste update. Een ontbrekend bestand is geen fout.
112func ReadStatus(dir string) (Status, error) {
113 if dir == "" {
114 return Status{}, nil
115 }
116 raw, err := os.ReadFile(filepath.Join(dir, StatusFile))
117 if err != nil {
118 if errors.Is(err, os.ErrNotExist) {
119 return Status{}, nil
120 }
121 return Status{}, err
122 }
123 var st Status
124 if err := json.Unmarshal(raw, &st); err != nil {
125 return Status{}, nil
126 }
127 return st, nil
128}
129
130// WriteStatus is voor tests en voor een mislukte start vanuit het proces.
131func WriteStatus(dir string, st Status) error {
132 if dir == "" {
133 return errors.New("state-map ontbreekt")
134 }
135 if st.Time == "" {
136 st.Time = time.Now().UTC().Format(time.RFC3339)
137 }
138 raw, err := json.Marshal(st)
139 if err != nil {
140 return err
141 }
142 raw = append(raw, '\n')
143 if err := os.MkdirAll(dir, 0o750); err != nil {
144 return err
145 }
146 target := filepath.Join(dir, StatusFile)
147 tmp, err := os.CreateTemp(dir, StatusFile+".*")
148 if err != nil {
149 return err
150 }
151 tmpName := tmp.Name()
152 cleanup := true
153 defer func() {
154 if cleanup {
155 _ = os.Remove(tmpName)
156 }
157 }()
158 if _, err := tmp.Write(raw); err != nil {
159 _ = tmp.Close()
160 return err
161 }
162 if err := tmp.Chmod(0o644); err != nil {
163 _ = tmp.Close()
164 return err
165 }
166 if err := tmp.Close(); err != nil {
167 return err
168 }
169 if err := os.Rename(tmpName, target); err != nil {
170 return err
171 }
172 cleanup = false
173 return nil
174}
175
176// FreshRunning is waar als een update nog bezig hoort te zijn.
177func FreshRunning(st Status, now time.Time, window time.Duration) bool {
178 if st.Result != "running" || st.Time == "" {
179 return false
180 }
181 t, err := time.Parse(time.RFC3339, st.Time)
182 if err != nil {
183 return false
184 }
185 return now.Sub(t) < window && now.Sub(t) > -time.Minute
186}
187
188// StartSystemd start de oneshot zonder erop te wachten. De aanroepende
189// CI-job moet kunnen eindigen, anders wacht de updater eeuwig op zichzelf.
190func StartSystemd(ctx context.Context) error {
191 cmd := exec.CommandContext(ctx, "systemctl", "start", "--no-block", Unit)
192 out, err := cmd.CombinedOutput()
193 if err != nil {
194 msg := strings.TrimSpace(string(out))
195 if len(msg) > 200 {
196 msg = msg[:200]
197 }
198 if msg == "" {
199 return err
200 }
201 return fmt.Errorf("systemctl: %s", msg)
202 }
203 return nil
204}
internal/update/update_test.go added +76 −0
@@ -0,0 +1,76 @@
1 package update
2
3 import (
4 "os"
5 "path/filepath"
6 "testing"
7 "time"
8 )
9
10 func TestEqualIsConstantShape(t *testing.T) {
11 if !Equal("geheim-token", "geheim-token") {
12 t.Fatal("gelijke sleutels")
13 }
14 if Equal("geheim-token", "ander-token") || Equal("geheim-token", "geheim-token-extra") {
15 t.Fatal("ongelijke sleutels horen te falen")
16 }
17 if Equal("", "geheim-token") || Equal("geheim-token", "") {
18 t.Fatal("lege sleutel past nooit")
19 }
20 }
21
22 func TestValidRef(t *testing.T) {
23 ok := []string{"", "master", "refs/heads/master", "0123456789abcdef0123456789abcdef01234567"}
24 bad := []string{"../etc", "master;rm", "-master", "a b", "refs/heads/@{upstream}"}
25 for _, ref := range ok {
26 if !ValidRef(ref) {
27 t.Fatalf("hoort geldig: %q", ref)
28 }
29 }
30 for _, ref := range bad {
31 if ValidRef(ref) {
32 t.Fatalf("hoort ongeldig: %q", ref)
33 }
34 }
35 }
36
37 func TestStatusRoundTrip(t *testing.T) {
38 dir := t.TempDir()
39 if err := WriteRequest(dir, "master"); err != nil {
40 t.Fatal(err)
41 }
42 raw, err := os.ReadFile(filepath.Join(dir, RequestFile))
43 if err != nil {
44 t.Fatal(err)
45 }
46 if string(raw) != "master\n" {
47 t.Fatalf("verzoek %q", raw)
48 }
49 st := Status{Time: "2026-10-22T12:00:00Z", SHA: "abc", Result: "ok"}
50 if err := WriteStatus(dir, st); err != nil {
51 t.Fatal(err)
52 }
53 got, err := ReadStatus(dir)
54 if err != nil || got.SHA != "abc" || got.Result != "ok" {
55 t.Fatalf("%+v %v", got, err)
56 }
57 missing, err := ReadStatus(t.TempDir())
58 if err != nil || missing.Result != "" {
59 t.Fatalf("leeg: %+v %v", missing, err)
60 }
61 }
62
63 func TestFreshRunning(t *testing.T) {
64 now := time.Date(2026, 10, 22, 12, 0, 0, 0, time.UTC)
65 fresh := Status{Time: now.Add(-time.Minute).Format(time.RFC3339), Result: "running"}
66 if !FreshRunning(fresh, now, 30*time.Minute) {
67 t.Fatal("verse running hoort te blokkeren")
68 }
69 old := Status{Time: now.Add(-time.Hour).Format(time.RFC3339), Result: "running"}
70 if FreshRunning(old, now, 30*time.Minute) {
71 t.Fatal("oude running hoort niet te blokkeren")
72 }
73 if FreshRunning(Status{Time: now.Format(time.RFC3339), Result: "failed"}, now, time.Hour) {
74 t.Fatal("failed blokkeert niet")
75 }
76 }
@@ -0,0 +1,76 @@
1package update
2
3import (
4 "os"
5 "path/filepath"
6 "testing"
7 "time"
8)
9
10func TestEqualIsConstantShape(t *testing.T) {
11 if !Equal("geheim-token", "geheim-token") {
12 t.Fatal("gelijke sleutels")
13 }
14 if Equal("geheim-token", "ander-token") || Equal("geheim-token", "geheim-token-extra") {
15 t.Fatal("ongelijke sleutels horen te falen")
16 }
17 if Equal("", "geheim-token") || Equal("geheim-token", "") {
18 t.Fatal("lege sleutel past nooit")
19 }
20}
21
22func TestValidRef(t *testing.T) {
23 ok := []string{"", "master", "refs/heads/master", "0123456789abcdef0123456789abcdef01234567"}
24 bad := []string{"../etc", "master;rm", "-master", "a b", "refs/heads/@{upstream}"}
25 for _, ref := range ok {
26 if !ValidRef(ref) {
27 t.Fatalf("hoort geldig: %q", ref)
28 }
29 }
30 for _, ref := range bad {
31 if ValidRef(ref) {
32 t.Fatalf("hoort ongeldig: %q", ref)
33 }
34 }
35}
36
37func TestStatusRoundTrip(t *testing.T) {
38 dir := t.TempDir()
39 if err := WriteRequest(dir, "master"); err != nil {
40 t.Fatal(err)
41 }
42 raw, err := os.ReadFile(filepath.Join(dir, RequestFile))
43 if err != nil {
44 t.Fatal(err)
45 }
46 if string(raw) != "master\n" {
47 t.Fatalf("verzoek %q", raw)
48 }
49 st := Status{Time: "2026-10-22T12:00:00Z", SHA: "abc", Result: "ok"}
50 if err := WriteStatus(dir, st); err != nil {
51 t.Fatal(err)
52 }
53 got, err := ReadStatus(dir)
54 if err != nil || got.SHA != "abc" || got.Result != "ok" {
55 t.Fatalf("%+v %v", got, err)
56 }
57 missing, err := ReadStatus(t.TempDir())
58 if err != nil || missing.Result != "" {
59 t.Fatalf("leeg: %+v %v", missing, err)
60 }
61}
62
63func TestFreshRunning(t *testing.T) {
64 now := time.Date(2026, 10, 22, 12, 0, 0, 0, time.UTC)
65 fresh := Status{Time: now.Add(-time.Minute).Format(time.RFC3339), Result: "running"}
66 if !FreshRunning(fresh, now, 30*time.Minute) {
67 t.Fatal("verse running hoort te blokkeren")
68 }
69 old := Status{Time: now.Add(-time.Hour).Format(time.RFC3339), Result: "running"}
70 if FreshRunning(old, now, 30*time.Minute) {
71 t.Fatal("oude running hoort niet te blokkeren")
72 }
73 if FreshRunning(Status{Time: now.Format(time.RFC3339), Result: "failed"}, now, time.Hour) {
74 t.Fatal("failed blokkeert niet")
75 }
76}
packaging/arch/PKGBUILD +3 −0
@@ -29,4 +29,7 @@ package() {
29 29 install -Dm644 "$root/packaging/storage.conf" "$pkgdir/usr/share/bluegit/storage.conf.example"
30 30 install -Dm644 "$root/packaging/sysusers.conf" "$pkgdir/usr/lib/sysusers.d/bluegit.conf"
31 31 install -Dm644 "$root/packaging/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/bluegit.conf"
32 install -Dm755 "$root/packaging/bluegit-update.sh" "$pkgdir/usr/lib/bluegit/update"
33 install -Dm644 "$root/packaging/bluegit-update.service" "$pkgdir/usr/lib/systemd/system/bluegit-update.service"
34 install -Dm644 "$root/packaging/bluegit-update.rules" "$pkgdir/usr/share/polkit-1/rules.d/49-bluegit-update.rules"
32 35 }
@@ -29,4 +29,7 @@ package() {
29 install -Dm644 "$root/packaging/storage.conf" "$pkgdir/usr/share/bluegit/storage.conf.example"
29 install -Dm644 "$root/packaging/storage.conf" "$pkgdir/usr/share/bluegit/storage.conf.example"
30 install -Dm644 "$root/packaging/sysusers.conf" "$pkgdir/usr/lib/sysusers.d/bluegit.conf"
30 install -Dm644 "$root/packaging/sysusers.conf" "$pkgdir/usr/lib/sysusers.d/bluegit.conf"
31 install -Dm644 "$root/packaging/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/bluegit.conf"
31 install -Dm644 "$root/packaging/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/bluegit.conf"
32 install -Dm755 "$root/packaging/bluegit-update.sh" "$pkgdir/usr/lib/bluegit/update"
33 install -Dm644 "$root/packaging/bluegit-update.service" "$pkgdir/usr/lib/systemd/system/bluegit-update.service"
34 install -Dm644 "$root/packaging/bluegit-update.rules" "$pkgdir/usr/share/polkit-1/rules.d/49-bluegit-update.rules"
32}
35}
packaging/aur/PKGBUILD +3 −0
@@ -30,5 +30,8 @@ package() {
30 30 install -Dm644 packaging/storage.conf "$pkgdir/usr/share/bluegit/storage.conf.example"
31 31 install -Dm644 packaging/sysusers.conf "$pkgdir/usr/lib/sysusers.d/bluegit.conf"
32 32 install -Dm644 packaging/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/bluegit.conf"
33 install -Dm755 packaging/bluegit-update.sh "$pkgdir/usr/lib/bluegit/update"
34 install -Dm644 packaging/bluegit-update.service "$pkgdir/usr/lib/systemd/system/bluegit-update.service"
35 install -Dm644 packaging/bluegit-update.rules "$pkgdir/usr/share/polkit-1/rules.d/49-bluegit-update.rules"
33 36 install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
34 37 }
@@ -30,5 +30,8 @@ package() {
30 install -Dm644 packaging/storage.conf "$pkgdir/usr/share/bluegit/storage.conf.example"
30 install -Dm644 packaging/storage.conf "$pkgdir/usr/share/bluegit/storage.conf.example"
31 install -Dm644 packaging/sysusers.conf "$pkgdir/usr/lib/sysusers.d/bluegit.conf"
31 install -Dm644 packaging/sysusers.conf "$pkgdir/usr/lib/sysusers.d/bluegit.conf"
32 install -Dm644 packaging/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/bluegit.conf"
32 install -Dm644 packaging/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/bluegit.conf"
33 install -Dm755 packaging/bluegit-update.sh "$pkgdir/usr/lib/bluegit/update"
34 install -Dm644 packaging/bluegit-update.service "$pkgdir/usr/lib/systemd/system/bluegit-update.service"
35 install -Dm644 packaging/bluegit-update.rules "$pkgdir/usr/share/polkit-1/rules.d/49-bluegit-update.rules"
33 install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
36 install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
34}
37}
packaging/aur/bluegit.install +2 −0
@@ -1,5 +1,7 @@
1 1 # System-unit met User=bluegit, config in /etc/bluegit/config.yml en
2 2 # state in /var/lib/bluegit. Dit is geen systemd --user-unit.
3 # systemd-sysusers maakt ook bluegit-build, de onbevoegde bouwgebruiker
4 # van bluegit-update.service. post_upgrade herstart bluegit.service.
3 5 # backup= in de PKGBUILD laat een bestaande config.yml staan.
4 6 # Zonder draaiende systemd (chroot of container) faalt de transactie niet.
5 7
@@ -1,5 +1,7 @@
1# System-unit met User=bluegit, config in /etc/bluegit/config.yml en
1# System-unit met User=bluegit, config in /etc/bluegit/config.yml en
2# state in /var/lib/bluegit. Dit is geen systemd --user-unit.
2# state in /var/lib/bluegit. Dit is geen systemd --user-unit.
3# systemd-sysusers maakt ook bluegit-build, de onbevoegde bouwgebruiker
4# van bluegit-update.service. post_upgrade herstart bluegit.service.
3# backup= in de PKGBUILD laat een bestaande config.yml staan.
5# backup= in de PKGBUILD laat een bestaande config.yml staan.
4# Zonder draaiende systemd (chroot of container) faalt de transactie niet.
6# Zonder draaiende systemd (chroot of container) faalt de transactie niet.
5
7
packaging/bluegit-update.rules added +12 −0
@@ -0,0 +1,12 @@
1 // Alleen gebruiker bluegit mag deze ene unit starten.
2 polkit.addRule(function(action, subject) {
3 if (action.id != "org.freedesktop.systemd1.manage-units") {
4 return;
5 }
6 if (subject.user != "bluegit") {
7 return;
8 }
9 if (action.lookup("verb") == "start" && action.lookup("unit") == "bluegit-update.service") {
10 return polkit.Result.YES;
11 }
12 });
@@ -0,0 +1,12 @@
1// Alleen gebruiker bluegit mag deze ene unit starten.
2polkit.addRule(function(action, subject) {
3 if (action.id != "org.freedesktop.systemd1.manage-units") {
4 return;
5 }
6 if (subject.user != "bluegit") {
7 return;
8 }
9 if (action.lookup("verb") == "start" && action.lookup("unit") == "bluegit-update.service") {
10 return polkit.Result.YES;
11 }
12});
packaging/bluegit-update.service added +21 −0
@@ -0,0 +1,21 @@
1 [Unit]
2 Description=BlueGit self-update
3 After=network-online.target
4 Wants=network-online.target
5
6 [Service]
7 Type=oneshot
8 # Root installeert het pakket. De bluegit-gebruiker mag alleen deze unit starten.
9 User=root
10 Environment=BLUEGIT_STATE_DIR=/var/lib/bluegit
11 Environment=BLUEGIT_BUILD_USER=bluegit-build
12 Environment=BLUEGIT_UPDATE_URL=http://127.0.0.1:8080
13 # BLUEGIT_UPDATE_TOKEN en BLUEGIT_UPDATE_REPO staan in dit bestand, als het er is.
14 EnvironmentFile=-/etc/bluegit/env
15 ExecStart=/usr/lib/bluegit/update
16 TimeoutStartSec=3h
17 StandardOutput=journal
18 StandardError=journal
19
20 [Install]
21 # Niet enable'en. Het endpoint start de unit.
@@ -0,0 +1,21 @@
1[Unit]
2Description=BlueGit self-update
3After=network-online.target
4Wants=network-online.target
5
6[Service]
7Type=oneshot
8# Root installeert het pakket. De bluegit-gebruiker mag alleen deze unit starten.
9User=root
10Environment=BLUEGIT_STATE_DIR=/var/lib/bluegit
11Environment=BLUEGIT_BUILD_USER=bluegit-build
12Environment=BLUEGIT_UPDATE_URL=http://127.0.0.1:8080
13# BLUEGIT_UPDATE_TOKEN en BLUEGIT_UPDATE_REPO staan in dit bestand, als het er is.
14EnvironmentFile=-/etc/bluegit/env
15ExecStart=/usr/lib/bluegit/update
16TimeoutStartSec=3h
17StandardOutput=journal
18StandardError=journal
19
20[Install]
21# Niet enable'en. Het endpoint start de unit.
packaging/bluegit-update.sh added +170 −0
@@ -0,0 +1,170 @@
1 #!/usr/bin/env bash
2 # Bouwt BlueGit uit de lokale bare repo en installeert dat pakket.
3 # Draait als root via bluegit-update.service. De bouw zelf doet bluegit-build.
4 # Bij een fout blijft het geïnstalleerde pakket staan. Journal houdt de uitvoer.
5 set -euo pipefail
6
7 : "${BLUEGIT_STATE_DIR:=/var/lib/bluegit}"
8 : "${BLUEGIT_UPDATE_URL:=http://127.0.0.1:8080}"
9 : "${BLUEGIT_BUILD_USER:=bluegit-build}"
10 : "${BLUEGIT_UPDATE_POLL:=2}"
11 : "${BLUEGIT_UPDATE_TIMEOUT:=1800}"
12
13 REQUEST="${BLUEGIT_STATE_DIR}/update-request"
14 STATUS="${BLUEGIT_STATE_DIR}/update-status.json"
15 sha=""
16
17 valid_ref() {
18 local ref="$1"
19 if [[ -z "$ref" ]]; then
20 return 0
21 fi
22 [[ "$ref" != *..* && "$ref" != *'@{'* ]] || return 1
23 [[ "$ref" =~ ^[0-9A-Za-z][0-9A-Za-z._/-]{0,199}$ ]]
24 }
25
26 # Zelfde tijdstempel als scripts/aur-publish-local.sh: UTC-committertijd.
27 pkgver_of() {
28 local repo="$1" commit="$2"
29 TZ=UTC git -C "$repo" show -s --date=format-local:%Y%m%d%H%M%S --format=%cd "$commit"
30 }
31
32 resolve_sha() {
33 local repo="$1" ref="$2"
34 if [[ -z "$ref" ]]; then
35 ref="HEAD"
36 fi
37 git -C "$repo" rev-parse --verify "${ref}^{commit}"
38 }
39
40 write_status() {
41 local result="$1" commit="$2" err="${3:-}"
42 local now tmp
43 now="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
44 err="${err//$'\n'/ }"
45 err="${err//\"/}"
46 mkdir -p "$BLUEGIT_STATE_DIR"
47 tmp="$(mktemp "${BLUEGIT_STATE_DIR}/.update-status.XXXXXX")"
48 printf '{"time":"%s","sha":"%s","result":"%s","error":"%s"}\n' "$now" "$commit" "$result" "$err" > "$tmp"
49 chmod 644 "$tmp"
50 mv -f "$tmp" "$STATUS"
51 }
52
53 wait_until_idle() {
54 local deadline body n poll
55 poll="$BLUEGIT_UPDATE_POLL"
56 deadline=$((SECONDS + BLUEGIT_UPDATE_TIMEOUT))
57 while (( SECONDS < deadline )); do
58 body="$(curl -fsS -H "Authorization: Bearer ${BLUEGIT_UPDATE_TOKEN}" "${BLUEGIT_UPDATE_URL}/api/v1/admin/self-update" || true)"
59 n="$(printf '%s' "$body" | sed -n 's/.*"running":[[:space:]]*\([0-9][0-9]*\).*/\1/p' | head -n 1)"
60 if [[ "$n" == "0" ]]; then
61 return 0
62 fi
63 echo "Steve heeft nog ${n:-onbekend} lopende jobs."
64 sleep "$poll"
65 done
66 echo "Timeout: Steve heeft nog lopende jobs." >&2
67 return 1
68 }
69
70 prepare_build() {
71 local repo="$1" commit="$2" dest="$3" version sum
72 version="$(pkgver_of "$repo" "$commit")"
73 [[ "$version" =~ ^[0-9]{14}$ ]] || { echo "pkgver is geen tijdstempel: $version" >&2; return 1; }
74 mkdir -p "$dest"
75 git -C "$repo" archive --format=tar.gz --prefix="bluegit-${commit}/" -o "$dest/bluegit-${commit}.tar.gz" "$commit"
76 git -C "$repo" show "${commit}:packaging/aur/PKGBUILD" > "$dest/PKGBUILD"
77 git -C "$repo" show "${commit}:packaging/aur/bluegit.install" > "$dest/bluegit.install"
78 sum="$(sha256sum "$dest/bluegit-${commit}.tar.gz" | awk '{print $1}')"
79 sed -i "s/^pkgver=.*/pkgver=${version}/" "$dest/PKGBUILD"
80 sed -i "s/^pkgrel=.*/pkgrel=1/" "$dest/PKGBUILD"
81 sed -i "s/^_commit=.*/_commit=${commit}/" "$dest/PKGBUILD"
82 sed -i "s|^sha256sums=.*|sha256sums=('${sum}')|" "$dest/PKGBUILD"
83 sed -i "s|^source=.*|source=('bluegit-${commit}.tar.gz')|" "$dest/PKGBUILD"
84 printf '%s\n' "$version"
85 }
86
87 main() {
88 local ref repo work version built
89 : "${BLUEGIT_UPDATE_TOKEN:?BLUEGIT_UPDATE_TOKEN ontbreekt}"
90 : "${BLUEGIT_UPDATE_REPO:?BLUEGIT_UPDATE_REPO ontbreekt}"
91 repo="$BLUEGIT_UPDATE_REPO"
92 [[ -d "$repo" ]] || { echo "Bare repo niet gevonden: $repo" >&2; exit 1; }
93 command -v git >/dev/null
94 command -v curl >/dev/null
95 command -v makepkg >/dev/null
96 command -v pacman >/dev/null
97 command -v runuser >/dev/null
98 id "$BLUEGIT_BUILD_USER" >/dev/null 2>&1 || { echo "Bouwgebruiker $BLUEGIT_BUILD_USER ontbreekt." >&2; exit 1; }
99
100 mkdir -p "$BLUEGIT_STATE_DIR"
101 exec 9>"${BLUEGIT_STATE_DIR}/update.lock"
102 if ! flock -n 9; then
103 echo "Er loopt al een self-update." >&2
104 exit 1
105 fi
106 trap on_exit EXIT
107
108 ref=""
109 if [[ -f "$REQUEST" ]]; then
110 ref="$(tr -d '[:space:]' < "$REQUEST")"
111 fi
112 valid_ref "$ref" || { echo "Ongeldige ref." >&2; exit 1; }
113 sha="$(resolve_sha "$repo" "$ref")"
114 echo "Self-update naar $sha"
115 write_status running "$sha" ""
116
117 if ! wait_until_idle; then
118 write_status failed "$sha" "jobs still running"
119 exit 1
120 fi
121
122 work="$(mktemp -d /var/tmp/bluegit-update.XXXXXX)"
123 chmod 755 "$work"
124 version="$(prepare_build "$repo" "$sha" "$work")"
125 echo "pkgver $version"
126 mkdir -p "$work/pkg"
127 chown -R "$BLUEGIT_BUILD_USER:$BLUEGIT_BUILD_USER" "$work"
128 runuser -u "$BLUEGIT_BUILD_USER" -- env \
129 HOME="/var/lib/${BLUEGIT_BUILD_USER}" \
130 BUILDDIR="$work/build" \
131 SRCDEST="$work" \
132 PKGDEST="$work/pkg" \
133 makepkg --noconfirm --nosign
134 chown -R root:root "$work/pkg"
135
136 if ! wait_until_idle; then
137 write_status failed "$sha" "jobs still running"
138 exit 1
139 fi
140
141 shopt -s nullglob
142 built=("$work"/pkg/bluegit-*.pkg.tar.*)
143 shopt -u nullglob
144 if [[ ${#built[@]} -ne 1 ]]; then
145 echo "Geen uniek pakket in $work/pkg" >&2
146 write_status failed "$sha" "package missing"
147 exit 1
148 fi
149 pacman -U --noconfirm "${built[0]}"
150 write_status ok "$sha" ""
151 trap - EXIT
152 rm -rf "$work" || true
153 work=""
154 echo "Self-update geïnstalleerd: $sha ($version)"
155 }
156
157 on_exit() {
158 local rc=$?
159 if [[ "$rc" -ne 0 ]]; then
160 write_status failed "${sha:-}" "exit ${rc}" || true
161 fi
162 if [[ -n "${work:-}" && -d "${work:-}" ]]; then
163 rm -rf "$work" || true
164 fi
165 exit "$rc"
166 }
167
168 if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
169 main "$@"
170 fi
@@ -0,0 +1,170 @@
1#!/usr/bin/env bash
2# Bouwt BlueGit uit de lokale bare repo en installeert dat pakket.
3# Draait als root via bluegit-update.service. De bouw zelf doet bluegit-build.
4# Bij een fout blijft het geïnstalleerde pakket staan. Journal houdt de uitvoer.
5set -euo pipefail
6
7: "${BLUEGIT_STATE_DIR:=/var/lib/bluegit}"
8: "${BLUEGIT_UPDATE_URL:=http://127.0.0.1:8080}"
9: "${BLUEGIT_BUILD_USER:=bluegit-build}"
10: "${BLUEGIT_UPDATE_POLL:=2}"
11: "${BLUEGIT_UPDATE_TIMEOUT:=1800}"
12
13REQUEST="${BLUEGIT_STATE_DIR}/update-request"
14STATUS="${BLUEGIT_STATE_DIR}/update-status.json"
15sha=""
16
17valid_ref() {
18 local ref="$1"
19 if [[ -z "$ref" ]]; then
20 return 0
21 fi
22 [[ "$ref" != *..* && "$ref" != *'@{'* ]] || return 1
23 [[ "$ref" =~ ^[0-9A-Za-z][0-9A-Za-z._/-]{0,199}$ ]]
24}
25
26# Zelfde tijdstempel als scripts/aur-publish-local.sh: UTC-committertijd.
27pkgver_of() {
28 local repo="$1" commit="$2"
29 TZ=UTC git -C "$repo" show -s --date=format-local:%Y%m%d%H%M%S --format=%cd "$commit"
30}
31
32resolve_sha() {
33 local repo="$1" ref="$2"
34 if [[ -z "$ref" ]]; then
35 ref="HEAD"
36 fi
37 git -C "$repo" rev-parse --verify "${ref}^{commit}"
38}
39
40write_status() {
41 local result="$1" commit="$2" err="${3:-}"
42 local now tmp
43 now="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
44 err="${err//$'\n'/ }"
45 err="${err//\"/}"
46 mkdir -p "$BLUEGIT_STATE_DIR"
47 tmp="$(mktemp "${BLUEGIT_STATE_DIR}/.update-status.XXXXXX")"
48 printf '{"time":"%s","sha":"%s","result":"%s","error":"%s"}\n' "$now" "$commit" "$result" "$err" > "$tmp"
49 chmod 644 "$tmp"
50 mv -f "$tmp" "$STATUS"
51}
52
53wait_until_idle() {
54 local deadline body n poll
55 poll="$BLUEGIT_UPDATE_POLL"
56 deadline=$((SECONDS + BLUEGIT_UPDATE_TIMEOUT))
57 while (( SECONDS < deadline )); do
58 body="$(curl -fsS -H "Authorization: Bearer ${BLUEGIT_UPDATE_TOKEN}" "${BLUEGIT_UPDATE_URL}/api/v1/admin/self-update" || true)"
59 n="$(printf '%s' "$body" | sed -n 's/.*"running":[[:space:]]*\([0-9][0-9]*\).*/\1/p' | head -n 1)"
60 if [[ "$n" == "0" ]]; then
61 return 0
62 fi
63 echo "Steve heeft nog ${n:-onbekend} lopende jobs."
64 sleep "$poll"
65 done
66 echo "Timeout: Steve heeft nog lopende jobs." >&2
67 return 1
68}
69
70prepare_build() {
71 local repo="$1" commit="$2" dest="$3" version sum
72 version="$(pkgver_of "$repo" "$commit")"
73 [[ "$version" =~ ^[0-9]{14}$ ]] || { echo "pkgver is geen tijdstempel: $version" >&2; return 1; }
74 mkdir -p "$dest"
75 git -C "$repo" archive --format=tar.gz --prefix="bluegit-${commit}/" -o "$dest/bluegit-${commit}.tar.gz" "$commit"
76 git -C "$repo" show "${commit}:packaging/aur/PKGBUILD" > "$dest/PKGBUILD"
77 git -C "$repo" show "${commit}:packaging/aur/bluegit.install" > "$dest/bluegit.install"
78 sum="$(sha256sum "$dest/bluegit-${commit}.tar.gz" | awk '{print $1}')"
79 sed -i "s/^pkgver=.*/pkgver=${version}/" "$dest/PKGBUILD"
80 sed -i "s/^pkgrel=.*/pkgrel=1/" "$dest/PKGBUILD"
81 sed -i "s/^_commit=.*/_commit=${commit}/" "$dest/PKGBUILD"
82 sed -i "s|^sha256sums=.*|sha256sums=('${sum}')|" "$dest/PKGBUILD"
83 sed -i "s|^source=.*|source=('bluegit-${commit}.tar.gz')|" "$dest/PKGBUILD"
84 printf '%s\n' "$version"
85}
86
87main() {
88 local ref repo work version built
89 : "${BLUEGIT_UPDATE_TOKEN:?BLUEGIT_UPDATE_TOKEN ontbreekt}"
90 : "${BLUEGIT_UPDATE_REPO:?BLUEGIT_UPDATE_REPO ontbreekt}"
91 repo="$BLUEGIT_UPDATE_REPO"
92 [[ -d "$repo" ]] || { echo "Bare repo niet gevonden: $repo" >&2; exit 1; }
93 command -v git >/dev/null
94 command -v curl >/dev/null
95 command -v makepkg >/dev/null
96 command -v pacman >/dev/null
97 command -v runuser >/dev/null
98 id "$BLUEGIT_BUILD_USER" >/dev/null 2>&1 || { echo "Bouwgebruiker $BLUEGIT_BUILD_USER ontbreekt." >&2; exit 1; }
99
100 mkdir -p "$BLUEGIT_STATE_DIR"
101 exec 9>"${BLUEGIT_STATE_DIR}/update.lock"
102 if ! flock -n 9; then
103 echo "Er loopt al een self-update." >&2
104 exit 1
105 fi
106 trap on_exit EXIT
107
108 ref=""
109 if [[ -f "$REQUEST" ]]; then
110 ref="$(tr -d '[:space:]' < "$REQUEST")"
111 fi
112 valid_ref "$ref" || { echo "Ongeldige ref." >&2; exit 1; }
113 sha="$(resolve_sha "$repo" "$ref")"
114 echo "Self-update naar $sha"
115 write_status running "$sha" ""
116
117 if ! wait_until_idle; then
118 write_status failed "$sha" "jobs still running"
119 exit 1
120 fi
121
122 work="$(mktemp -d /var/tmp/bluegit-update.XXXXXX)"
123 chmod 755 "$work"
124 version="$(prepare_build "$repo" "$sha" "$work")"
125 echo "pkgver $version"
126 mkdir -p "$work/pkg"
127 chown -R "$BLUEGIT_BUILD_USER:$BLUEGIT_BUILD_USER" "$work"
128 runuser -u "$BLUEGIT_BUILD_USER" -- env \
129 HOME="/var/lib/${BLUEGIT_BUILD_USER}" \
130 BUILDDIR="$work/build" \
131 SRCDEST="$work" \
132 PKGDEST="$work/pkg" \
133 makepkg --noconfirm --nosign
134 chown -R root:root "$work/pkg"
135
136 if ! wait_until_idle; then
137 write_status failed "$sha" "jobs still running"
138 exit 1
139 fi
140
141 shopt -s nullglob
142 built=("$work"/pkg/bluegit-*.pkg.tar.*)
143 shopt -u nullglob
144 if [[ ${#built[@]} -ne 1 ]]; then
145 echo "Geen uniek pakket in $work/pkg" >&2
146 write_status failed "$sha" "package missing"
147 exit 1
148 fi
149 pacman -U --noconfirm "${built[0]}"
150 write_status ok "$sha" ""
151 trap - EXIT
152 rm -rf "$work" || true
153 work=""
154 echo "Self-update geïnstalleerd: $sha ($version)"
155}
156
157on_exit() {
158 local rc=$?
159 if [[ "$rc" -ne 0 ]]; then
160 write_status failed "${sha:-}" "exit ${rc}" || true
161 fi
162 if [[ -n "${work:-}" && -d "${work:-}" ]]; then
163 rm -rf "$work" || true
164 fi
165 exit "$rc"
166}
167
168if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
169 main "$@"
170fi
packaging/bluegit.service +2 −0
@@ -10,6 +10,8 @@ Group=bluegit
10 10 # Steve praat met de Docker-socket (root:docker). Zonder deze groep start geen job.
11 11 SupplementaryGroups=docker
12 12 EnvironmentFile=-/etc/bluegit/secret.env
13 # Optioneel. BLUEGIT_UPDATE_TOKEN zet POST /api/v1/admin/self-update aan.
14 EnvironmentFile=-/etc/bluegit/env
13 15 ExecStart=/usr/bin/bluegit serve --config /etc/bluegit/config.yml
14 16 Restart=on-failure
15 17 NoNewPrivileges=true
@@ -10,6 +10,8 @@ Group=bluegit
10# Steve praat met de Docker-socket (root:docker). Zonder deze groep start geen job.
10# Steve praat met de Docker-socket (root:docker). Zonder deze groep start geen job.
11SupplementaryGroups=docker
11SupplementaryGroups=docker
12EnvironmentFile=-/etc/bluegit/secret.env
12EnvironmentFile=-/etc/bluegit/secret.env
13# Optioneel. BLUEGIT_UPDATE_TOKEN zet POST /api/v1/admin/self-update aan.
14EnvironmentFile=-/etc/bluegit/env
13ExecStart=/usr/bin/bluegit serve --config /etc/bluegit/config.yml
15ExecStart=/usr/bin/bluegit serve --config /etc/bluegit/config.yml
14Restart=on-failure
16Restart=on-failure
15NoNewPrivileges=true
17NoNewPrivileges=true
packaging/install.sh +3 −0
@@ -10,6 +10,9 @@ install -Dm755 bluegit /usr/bin/bluegit
10 10 install -Dm644 packaging/bluegit.service /usr/lib/systemd/system/bluegit.service
11 11 install -Dm644 packaging/sysusers.conf /usr/lib/sysusers.d/bluegit.conf
12 12 install -Dm644 packaging/tmpfiles.conf /usr/lib/tmpfiles.d/bluegit.conf
13 install -Dm755 packaging/bluegit-update.sh /usr/lib/bluegit/update
14 install -Dm644 packaging/bluegit-update.service /usr/lib/systemd/system/bluegit-update.service
15 install -Dm644 packaging/bluegit-update.rules /usr/share/polkit-1/rules.d/49-bluegit-update.rules
13 16 install -Dm644 packaging/storage.conf /usr/share/bluegit/storage.conf.example
14 17 if [ ! -f /etc/bluegit/config.yml ]; then
15 18 install -Dm640 packaging/bluegit.yml /etc/bluegit/config.yml
@@ -10,6 +10,9 @@ install -Dm755 bluegit /usr/bin/bluegit
10install -Dm644 packaging/bluegit.service /usr/lib/systemd/system/bluegit.service
10install -Dm644 packaging/bluegit.service /usr/lib/systemd/system/bluegit.service
11install -Dm644 packaging/sysusers.conf /usr/lib/sysusers.d/bluegit.conf
11install -Dm644 packaging/sysusers.conf /usr/lib/sysusers.d/bluegit.conf
12install -Dm644 packaging/tmpfiles.conf /usr/lib/tmpfiles.d/bluegit.conf
12install -Dm644 packaging/tmpfiles.conf /usr/lib/tmpfiles.d/bluegit.conf
13install -Dm755 packaging/bluegit-update.sh /usr/lib/bluegit/update
14install -Dm644 packaging/bluegit-update.service /usr/lib/systemd/system/bluegit-update.service
15install -Dm644 packaging/bluegit-update.rules /usr/share/polkit-1/rules.d/49-bluegit-update.rules
13install -Dm644 packaging/storage.conf /usr/share/bluegit/storage.conf.example
16install -Dm644 packaging/storage.conf /usr/share/bluegit/storage.conf.example
14if [ ! -f /etc/bluegit/config.yml ]; then
17if [ ! -f /etc/bluegit/config.yml ]; then
15 install -Dm640 packaging/bluegit.yml /etc/bluegit/config.yml
18 install -Dm640 packaging/bluegit.yml /etc/bluegit/config.yml
packaging/sysusers.conf +1 −0
@@ -1 +1,2 @@
1 1 u bluegit - "BlueGit" /var/lib/bluegit /usr/sbin/nologin
2 u bluegit-build - "BlueGit package build" /var/lib/bluegit-build /usr/bin/nologin
@@ -1 +1,2 @@
1u bluegit - "BlueGit" /var/lib/bluegit /usr/sbin/nologin
1u bluegit - "BlueGit" /var/lib/bluegit /usr/sbin/nologin
2u bluegit-build - "BlueGit package build" /var/lib/bluegit-build /usr/bin/nologin