BlueGit

timfa bluegit

Merge branch 'feature/webui-config-bluegit-runner'

timfa Grok Bot · pushed by timfa

Authored 2026-11-18 · 1 hour ago

Hash
fb34353e826311a1722689f726e18a0d1e996adf
Pipeline
Passed
35 files changed +2954 −116
README.md +4 −4
@@ -40,9 +40,9 @@ De installatiebeheerder is geen beheerder van andermans repository. Een onbesche
40 40
41 41 ## Installeren
42 42
43 Op Arch installeer je het AUR-pakket `bluegit`. De configuratie staat in `/etc/bluegit/config.yml`. De systemd-service heet `bluegit.service`.
43 Op Arch installeer je het AUR-pakket `bluegit`. Een eerste `config.yml` kan in `/etc/bluegit/config.yml` staan; na de eerste start beheer je listen, base_url, auth en de rest onder Beheer → Instellingen (`settings.yml` in de state-map). `config.yml` blijft als terugval en wordt niet herschreven. De systemd-service heet `bluegit.service`.
44 44
45 `bluegit example-config` print een voorbeeld. Het clientgeheim hoort in `/etc/bluegit/client_secret` (mode `0600`) of als `BLUEGIT_AUTH_CLIENT_SECRET` in `/etc/bluegit/secret.env`. Zonder configuratie én geheim start de service niet. De eerste aangemelde gebruiker wordt installatiebeheerder en kiest in `/setup` de schijf voor de repositories.
45 `bluegit example-config` print een voorbeeld voor die eerste `config.yml`. Het clientgeheim hoort in `/etc/bluegit/client_secret` (mode `0600`), als `BLUEGIT_AUTH_CLIENT_SECRET` in `/etc/bluegit/secret.env`, of na de eerste start (eenmalig, nooit teruggetoond) onder Beheer → Instellingen. Zonder configuratie én geheim start een verse instantie niet. De eerste aangemelde gebruiker wordt installatiebeheerder en kiest in `/setup` de schijf voor de repositories. Toegangstokens maak je in Instellingen of onder Beheer → Gebruikers (`bluegit token create` blijft een alternatief).
46 46
47 47 Op andere distro's gebruik je de pakketten van de [releasepagina](https://git.timfalken.com/timfa/bluegit/-/releases). Elke release (tag `v*`) heeft voor `bluegit`, `bluegit-runner` en `bluegit-backup`:
48 48
@@ -53,7 +53,7 @@ Op andere distro's gebruik je de pakketten van de [releasepagina](https://git.ti
53 53 - `.pkg.tar.zst` voor Arch (`pacman -U bluegit-x86_64.pkg.tar.zst`);
54 54 - `SHA256SUMS` over alle bestanden.
55 55
56 De pakketten installeren de systemd-unit en de gebruiker (`bluegit`, `bluegit-runner`, `bluegit-backup`), net als de AUR-pakketten. `bluegit` en `bluegit-runner` plaatsen hun config onder `/etc/<naam>/`. `bluegit-backup` heeft geen `config.yml` meer: je start hem met `--data-dir` (de unit gebruikt `/var/lib/bluegit-backup`) en regelt de rest in de webinterface. Ze zetten de service niet aan. De self-update (bluegit-update) zit alleen in het AUR-pakket. `<programma> --version` toont de tag. De CI test elk pakket in ubuntu:24.04, debian:12, rockylinux:9, fedora en archlinux voordat er een release komt.
56 De pakketten installeren de systemd-unit en de gebruiker (`bluegit`, `bluegit-runner`, `bluegit-backup`), net als de AUR-pakketten. `bluegit` levert nog een voorbeeld-`config.yml` onder `/etc/bluegit/` (terugval en eerste start). `bluegit-runner` start zonder config.yml; koppelen en instellingen gaan in de webinterface (`connection.yml` in de werkmap). `bluegit-backup` heeft geen `config.yml` meer: je start hem met `--data-dir` (de unit gebruikt `/var/lib/bluegit-backup`) en regelt de rest in de webinterface. Ze zetten de service niet aan. De self-update (bluegit-update) zit alleen in het AUR-pakket. `<programma> --version` toont de tag. De CI test elk pakket in ubuntu:24.04, debian:12, rockylinux:9, fedora en archlinux voordat er een release komt.
57 57
58 58 Hoe het AUR-pakket gepubliceerd wordt en hoe de self-update via pacman werkt, staat in [docs/AUR.md](docs/AUR.md). De stappen voor de installatie op git.timfalken.com staan in [docs/BEHEER.md](docs/BEHEER.md).
59 59
@@ -107,7 +107,7 @@ Details en de OIDC-controles staan in [docs/AUTH.md](docs/AUTH.md). Kort, stap v
107 107 5. BlueGit vraagt de scopes `openid`, `profile`, `email` en `User.Read`. De eerste drie horen bij OpenID Connect. `User.Read` is nodig om bij het aanmelden de profielfoto op te halen bij Microsoft Graph (`GET https://graph.microsoft.com/v1.0/me/photo/$value`). Voeg *Microsoft Graph → User.Read* (gedelegeerd) toe onder API-machtigingen van de app-registratie en geef desnoods admin-toestemming. Zonder foto (404) toont BlueGit initialen; een handmatig geüploade avatar wordt niet overschreven.
108 108 6. Op het overzicht van de app-registratie staan de **Directory (tenant) ID** (`auth.tenant_id`) en de **Application (client) ID** (`auth.client_id`).
109 109
110 Zet in `/etc/bluegit/config.yml` (geen echte geheimen in dit bestand of in deze docs):
110 Zet dit bij de eerste start in `/etc/bluegit/config.yml`, of na de eerste start onder Beheer → Instellingen (geen echte geheimen in dit bestand of in deze docs):
111 111
112 112 ```yaml
113 113 auth:
@@ -40,9 +40,9 @@ De installatiebeheerder is geen beheerder van andermans repository. Een onbesche
40
40
41## Installeren
41## Installeren
42
42
43Op Arch installeer je het AUR-pakket `bluegit`. De configuratie staat in `/etc/bluegit/config.yml`. De systemd-service heet `bluegit.service`.
43Op Arch installeer je het AUR-pakket `bluegit`. Een eerste `config.yml` kan in `/etc/bluegit/config.yml` staan; na de eerste start beheer je listen, base_url, auth en de rest onder Beheer → Instellingen (`settings.yml` in de state-map). `config.yml` blijft als terugval en wordt niet herschreven. De systemd-service heet `bluegit.service`.
44
44
45`bluegit example-config` print een voorbeeld. Het clientgeheim hoort in `/etc/bluegit/client_secret` (mode `0600`) of als `BLUEGIT_AUTH_CLIENT_SECRET` in `/etc/bluegit/secret.env`. Zonder configuratie én geheim start de service niet. De eerste aangemelde gebruiker wordt installatiebeheerder en kiest in `/setup` de schijf voor de repositories.
45`bluegit example-config` print een voorbeeld voor die eerste `config.yml`. Het clientgeheim hoort in `/etc/bluegit/client_secret` (mode `0600`), als `BLUEGIT_AUTH_CLIENT_SECRET` in `/etc/bluegit/secret.env`, of na de eerste start (eenmalig, nooit teruggetoond) onder Beheer → Instellingen. Zonder configuratie én geheim start een verse instantie niet. De eerste aangemelde gebruiker wordt installatiebeheerder en kiest in `/setup` de schijf voor de repositories. Toegangstokens maak je in Instellingen of onder Beheer → Gebruikers (`bluegit token create` blijft een alternatief).
46
46
47Op andere distro's gebruik je de pakketten van de [releasepagina](https://git.timfalken.com/timfa/bluegit/-/releases). Elke release (tag `v*`) heeft voor `bluegit`, `bluegit-runner` en `bluegit-backup`:
47Op andere distro's gebruik je de pakketten van de [releasepagina](https://git.timfalken.com/timfa/bluegit/-/releases). Elke release (tag `v*`) heeft voor `bluegit`, `bluegit-runner` en `bluegit-backup`:
48
48
@@ -53,7 +53,7 @@ Op andere distro's gebruik je de pakketten van de [releasepagina](https://git.ti
53- `.pkg.tar.zst` voor Arch (`pacman -U bluegit-x86_64.pkg.tar.zst`);
53- `.pkg.tar.zst` voor Arch (`pacman -U bluegit-x86_64.pkg.tar.zst`);
54- `SHA256SUMS` over alle bestanden.
54- `SHA256SUMS` over alle bestanden.
55
55
56De pakketten installeren de systemd-unit en de gebruiker (`bluegit`, `bluegit-runner`, `bluegit-backup`), net als de AUR-pakketten. `bluegit` en `bluegit-runner` plaatsen hun config onder `/etc/<naam>/`. `bluegit-backup` heeft geen `config.yml` meer: je start hem met `--data-dir` (de unit gebruikt `/var/lib/bluegit-backup`) en regelt de rest in de webinterface. Ze zetten de service niet aan. De self-update (bluegit-update) zit alleen in het AUR-pakket. `<programma> --version` toont de tag. De CI test elk pakket in ubuntu:24.04, debian:12, rockylinux:9, fedora en archlinux voordat er een release komt.
56De pakketten installeren de systemd-unit en de gebruiker (`bluegit`, `bluegit-runner`, `bluegit-backup`), net als de AUR-pakketten. `bluegit` levert nog een voorbeeld-`config.yml` onder `/etc/bluegit/` (terugval en eerste start). `bluegit-runner` start zonder config.yml; koppelen en instellingen gaan in de webinterface (`connection.yml` in de werkmap). `bluegit-backup` heeft geen `config.yml` meer: je start hem met `--data-dir` (de unit gebruikt `/var/lib/bluegit-backup`) en regelt de rest in de webinterface. Ze zetten de service niet aan. De self-update (bluegit-update) zit alleen in het AUR-pakket. `<programma> --version` toont de tag. De CI test elk pakket in ubuntu:24.04, debian:12, rockylinux:9, fedora en archlinux voordat er een release komt.
57
57
58Hoe het AUR-pakket gepubliceerd wordt en hoe de self-update via pacman werkt, staat in [docs/AUR.md](docs/AUR.md). De stappen voor de installatie op git.timfalken.com staan in [docs/BEHEER.md](docs/BEHEER.md).
58Hoe het AUR-pakket gepubliceerd wordt en hoe de self-update via pacman werkt, staat in [docs/AUR.md](docs/AUR.md). De stappen voor de installatie op git.timfalken.com staan in [docs/BEHEER.md](docs/BEHEER.md).
59
59
@@ -107,7 +107,7 @@ Details en de OIDC-controles staan in [docs/AUTH.md](docs/AUTH.md). Kort, stap v
1075. BlueGit vraagt de scopes `openid`, `profile`, `email` en `User.Read`. De eerste drie horen bij OpenID Connect. `User.Read` is nodig om bij het aanmelden de profielfoto op te halen bij Microsoft Graph (`GET https://graph.microsoft.com/v1.0/me/photo/$value`). Voeg *Microsoft Graph → User.Read* (gedelegeerd) toe onder API-machtigingen van de app-registratie en geef desnoods admin-toestemming. Zonder foto (404) toont BlueGit initialen; een handmatig geüploade avatar wordt niet overschreven.
1075. BlueGit vraagt de scopes `openid`, `profile`, `email` en `User.Read`. De eerste drie horen bij OpenID Connect. `User.Read` is nodig om bij het aanmelden de profielfoto op te halen bij Microsoft Graph (`GET https://graph.microsoft.com/v1.0/me/photo/$value`). Voeg *Microsoft Graph → User.Read* (gedelegeerd) toe onder API-machtigingen van de app-registratie en geef desnoods admin-toestemming. Zonder foto (404) toont BlueGit initialen; een handmatig geüploade avatar wordt niet overschreven.
1086. Op het overzicht van de app-registratie staan de **Directory (tenant) ID** (`auth.tenant_id`) en de **Application (client) ID** (`auth.client_id`).
1086. Op het overzicht van de app-registratie staan de **Directory (tenant) ID** (`auth.tenant_id`) en de **Application (client) ID** (`auth.client_id`).
109
109
110Zet in `/etc/bluegit/config.yml` (geen echte geheimen in dit bestand of in deze docs):
110Zet dit bij de eerste start in `/etc/bluegit/config.yml`, of na de eerste start onder Beheer → Instellingen (geen echte geheimen in dit bestand of in deze docs):
111
111
112```yaml
112```yaml
113auth:
113auth:
cmd/bluegit-runner/connect.go added +260 −0
@@ -0,0 +1,260 @@
1 package main
2
3 import (
4 "bytes"
5 "crypto/hmac"
6 "encoding/json"
7 "html/template"
8 "net/http"
9 "os"
10 "strings"
11
12 "gitlab.com/Timfa/bluegit/internal/i18n"
13 )
14
15 func mountConnect(u *webUI, c *client, relisten func(string) error) {
16 h := u.h
17 h.ExtraTop = func(r *http.Request) template.HTML { return u.connectHTML(r, c) }
18 u.mux.HandleFunc("POST /connect", u.guardWrite(func(w http.ResponseWriter, r *http.Request) {
19 _ = r.ParseForm()
20 cur := c.snapshot()
21 m := machineFrom(cur)
22 if v := strings.TrimSpace(r.FormValue("url")); v != "" {
23 m.URL = strings.TrimRight(v, "/")
24 }
25 if v := strings.TrimSpace(r.FormValue("name")); v != "" {
26 m.Name = v
27 }
28 if v := strings.TrimSpace(r.FormValue("docker")); v != "" {
29 m.Docker = v
30 }
31 if v := strings.TrimSpace(r.FormValue("git")); v != "" {
32 m.Git = v
33 }
34 if v := strings.TrimSpace(r.FormValue("network")); v != "" {
35 m.Network = v
36 }
37 if v := strings.TrimSpace(r.FormValue("ui_listen")); v != "" {
38 m.UIListen = v
39 }
40 if v := strings.TrimSpace(r.FormValue("language")); v != "" {
41 m.Language = v
42 }
43 oldListen := cur.UIListen
44 if err := c.setMachine(m); err != nil {
45 http.Redirect(w, r, "/?err=rui.connect.err.save", http.StatusSeeOther)
46 return
47 }
48 if m.UIListen != "" && m.UIListen != oldListen && m.UIListen != "off" && relisten != nil {
49 if err := relisten(m.UIListen); err != nil {
50 http.Redirect(w, r, "/?err=rui.connect.err.listen", http.StatusSeeOther)
51 return
52 }
53 }
54 http.Redirect(w, r, "/?ok=rui.connect.ok", http.StatusSeeOther)
55 }))
56 u.mux.HandleFunc("POST /register", u.guardWrite(func(w http.ResponseWriter, r *http.Request) {
57 _ = r.ParseForm()
58 url := strings.TrimRight(strings.TrimSpace(r.FormValue("url")), "/")
59 tok := strings.TrimSpace(r.FormValue("registration_token"))
60 name := strings.TrimSpace(r.FormValue("name"))
61 if url == "" || tok == "" {
62 http.Redirect(w, r, "/?err=rui.connect.err.register", http.StatusSeeOther)
63 return
64 }
65 if err := registerAndSave(c, url, tok, name); err != nil {
66 http.Redirect(w, r, "/?err=rui.connect.err.register", http.StatusSeeOther)
67 return
68 }
69 http.Redirect(w, r, "/?ok=rui.connect.registered", http.StatusSeeOther)
70 }))
71 u.mux.HandleFunc("GET /api/connection", func(w http.ResponseWriter, r *http.Request) {
72 if !u.authed(r) {
73 http.Error(w, `{"error":"unauthorized"}`, http.StatusUnauthorized)
74 return
75 }
76 writeConnJSON(w, c.snapshot())
77 })
78 u.mux.HandleFunc("PUT /api/connection", func(w http.ResponseWriter, r *http.Request) {
79 if !u.authed(r) {
80 http.Error(w, `{"error":"unauthorized"}`, http.StatusUnauthorized)
81 return
82 }
83 var in machineSettings
84 if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
85 http.Error(w, `{"error":"bad json"}`, http.StatusBadRequest)
86 return
87 }
88 // Leeg token = ongewijzigd.
89 if strings.TrimSpace(in.Token) == "" {
90 in.Token = c.snapshot().Token
91 }
92 old := c.snapshot().UIListen
93 if err := c.setMachine(in); err != nil {
94 http.Error(w, `{"error":"save"}`, http.StatusInternalServerError)
95 return
96 }
97 if in.UIListen != "" && in.UIListen != old && in.UIListen != "off" && relisten != nil {
98 if err := relisten(in.UIListen); err != nil {
99 http.Error(w, `{"error":"listen"}`, http.StatusBadRequest)
100 return
101 }
102 }
103 writeConnJSON(w, c.snapshot())
104 })
105 u.mux.HandleFunc("POST /api/register", func(w http.ResponseWriter, r *http.Request) {
106 if !u.authed(r) {
107 http.Error(w, `{"error":"unauthorized"}`, http.StatusUnauthorized)
108 return
109 }
110 var in struct {
111 URL string `json:"url"`
112 Token string `json:"token"`
113 Name string `json:"name"`
114 }
115 if err := json.NewDecoder(r.Body).Decode(&in); err != nil || strings.TrimSpace(in.URL) == "" || strings.TrimSpace(in.Token) == "" {
116 http.Error(w, `{"error":"url and token are required"}`, http.StatusBadRequest)
117 return
118 }
119 if err := registerAndSave(c, strings.TrimRight(strings.TrimSpace(in.URL), "/"), strings.TrimSpace(in.Token), strings.TrimSpace(in.Name)); err != nil {
120 w.Header().Set("Content-Type", "application/json")
121 w.WriteHeader(http.StatusBadRequest)
122 _ = json.NewEncoder(w).Encode(map[string]string{"error": err.Error()})
123 return
124 }
125 writeConnJSON(w, c.snapshot())
126 })
127 }
128
129 func writeConnJSON(w http.ResponseWriter, cfg Config) {
130 w.Header().Set("Content-Type", "application/json")
131 _ = json.NewEncoder(w).Encode(map[string]any{
132 "url": cfg.URL, "name": cfg.Name, "docker": cfg.Docker, "git": cfg.Git,
133 "network": cfg.Network, "concurrency": cfg.Concurrency, "ui_listen": cfg.UIListen,
134 "language": cfg.Language, "work_dir": cfg.WorkDir, "token_set": strings.TrimSpace(cfg.Token) != "",
135 "registered": registered(cfg),
136 })
137 }
138
139 func (u *webUI) guardWrite(fn http.HandlerFunc) http.HandlerFunc {
140 return func(w http.ResponseWriter, r *http.Request) {
141 if !u.authed(r) {
142 http.Redirect(w, r, "/login", http.StatusSeeOther)
143 return
144 }
145 if !u.csrfOK(r) {
146 http.Error(w, "csrf", http.StatusForbidden)
147 return
148 }
149 fn(w, r)
150 }
151 }
152
153 func (u *webUI) csrfOK(r *http.Request) bool {
154 if strings.HasPrefix(r.Header.Get("Authorization"), "Bearer ") {
155 return true
156 }
157 _ = r.ParseForm()
158 return hmac.Equal([]byte(r.FormValue("csrf")), []byte(u.mac("csrf")))
159 }
160
161 func (u *webUI) connectHTML(r *http.Request, c *client) template.HTML {
162 lang := u.lang(r)
163 cfg := c.snapshot()
164 csrf := u.mac("csrf")
165 var b bytes.Buffer
166 _ = connectTmpl.Execute(&b, map[string]any{
167 "T": func(k string, a ...any) string { return i18n.T(lang, k, a...) },
168 "CSRF": csrf,
169 "URL": cfg.URL,
170 "Name": cfg.Name,
171 "Docker": cfg.Docker,
172 "Git": cfg.Git,
173 "Network": cfg.Network,
174 "UIListen": cfg.UIListen,
175 "Language": cfg.Language,
176 "WorkDir": cfg.WorkDir,
177 "Registered": registered(cfg),
178 })
179 return template.HTML(b.String())
180 }
181
182 var connectTmpl = template.Must(template.New("connect").Parse(`
183 <section class="panel" id="connect">
184 <h2>{{call .T "rui.connect.title"}}</h2>
185 <p class="muted">{{call .T "rui.connect.lead"}}</p>
186 {{if not .Registered}}
187 <form method="post" action="/register" class="rui-form">
188 <input type="hidden" name="csrf" value="{{.CSRF}}">
189 <label><span class="rui-lbl">{{call .T "rui.connect.url"}}</span><input name="url" value="{{.URL}}" placeholder="https://git.example.com" required></label>
190 <label><span class="rui-lbl">{{call .T "rui.connect.regToken"}}</span><input name="registration_token" type="password" autocomplete="off" required></label>
191 <label><span class="rui-lbl">{{call .T "rui.connect.name"}}</span><input name="name" value="{{.Name}}"></label>
192 <button type="submit">{{call .T "rui.connect.register"}}</button>
193 </form>
194 {{else}}
195 <p class="rui-safe ok">✓ {{call .T "rui.connect.linked"}}</p>
196 {{end}}
197 <form method="post" action="/connect" class="rui-form">
198 <input type="hidden" name="csrf" value="{{.CSRF}}">
199 <label><span class="rui-lbl">{{call .T "rui.connect.url"}}</span><input name="url" value="{{.URL}}" placeholder="https://git.example.com"></label>
200 <label><span class="rui-lbl">{{call .T "rui.connect.name"}}</span><input name="name" value="{{.Name}}"></label>
201 <label><span class="rui-lbl">{{call .T "rui.connect.docker"}}</span><input name="docker" value="{{.Docker}}"></label>
202 <label><span class="rui-lbl">{{call .T "rui.connect.git"}}</span><input name="git" value="{{.Git}}"></label>
203 <label><span class="rui-lbl">{{call .T "rui.connect.network"}}</span><input name="network" value="{{.Network}}"></label>
204 <label><span class="rui-lbl">{{call .T "rui.connect.uiListen"}}</span><input name="ui_listen" value="{{.UIListen}}"></label>
205 <label><span class="rui-lbl">{{call .T "rui.connect.language"}}</span><input name="language" value="{{.Language}}" placeholder="en"></label>
206 <label><span class="rui-lbl">{{call .T "rui.connect.workDir"}}</span><input value="{{.WorkDir}}" readonly></label>
207 <p class="muted">{{call .T "rui.connect.workDirWhy"}}</p>
208 <button type="submit">{{call .T "action.save"}}</button>
209 </form>
210 </section>
211 `))
212
213 func registerAndSave(c *client, url, token, name string) error {
214 cur := c.snapshot()
215 id, outName, runnerTok, err := postRegister(url, token, name, version)
216 if err != nil {
217 return err
218 }
219 _ = id
220 m := machineFrom(cur)
221 m.URL, m.Token, m.Name = url, runnerTok, outName
222 return c.setMachine(m)
223 }
224
225 func postRegister(baseURL, token, name, ver string) (id int64, outName, runnerTok string, err error) {
226 if name == "" {
227 name, _ = os.Hostname()
228 }
229 body, _ := json.Marshal(map[string]string{"token": token, "name": name, "version": ver})
230 resp, err := http.Post(strings.TrimRight(baseURL, "/")+"/api/v1/runners/register", "application/json", bytes.NewReader(body))
231 if err != nil {
232 return 0, "", "", err
233 }
234 defer resp.Body.Close()
235 var out struct {
236 ID int64 `json:"id"`
237 Name string `json:"name"`
238 Token string `json:"token"`
239 Message string `json:"message"`
240 }
241 _ = json.NewDecoder(resp.Body).Decode(&out)
242 if resp.StatusCode != http.StatusCreated || out.Token == "" {
243 return 0, "", "", fmtRegister(resp.StatusCode, out.Message)
244 }
245 return out.ID, out.Name, out.Token, nil
246 }
247
248 func fmtRegister(code int, msg string) error {
249 if msg == "" {
250 msg = http.StatusText(code)
251 }
252 return &regError{code: code, msg: msg}
253 }
254
255 type regError struct {
256 code int
257 msg string
258 }
259
260 func (e *regError) Error() string { return e.msg }
@@ -0,0 +1,260 @@
1package main
2
3import (
4 "bytes"
5 "crypto/hmac"
6 "encoding/json"
7 "html/template"
8 "net/http"
9 "os"
10 "strings"
11
12 "gitlab.com/Timfa/bluegit/internal/i18n"
13)
14
15func mountConnect(u *webUI, c *client, relisten func(string) error) {
16 h := u.h
17 h.ExtraTop = func(r *http.Request) template.HTML { return u.connectHTML(r, c) }
18 u.mux.HandleFunc("POST /connect", u.guardWrite(func(w http.ResponseWriter, r *http.Request) {
19 _ = r.ParseForm()
20 cur := c.snapshot()
21 m := machineFrom(cur)
22 if v := strings.TrimSpace(r.FormValue("url")); v != "" {
23 m.URL = strings.TrimRight(v, "/")
24 }
25 if v := strings.TrimSpace(r.FormValue("name")); v != "" {
26 m.Name = v
27 }
28 if v := strings.TrimSpace(r.FormValue("docker")); v != "" {
29 m.Docker = v
30 }
31 if v := strings.TrimSpace(r.FormValue("git")); v != "" {
32 m.Git = v
33 }
34 if v := strings.TrimSpace(r.FormValue("network")); v != "" {
35 m.Network = v
36 }
37 if v := strings.TrimSpace(r.FormValue("ui_listen")); v != "" {
38 m.UIListen = v
39 }
40 if v := strings.TrimSpace(r.FormValue("language")); v != "" {
41 m.Language = v
42 }
43 oldListen := cur.UIListen
44 if err := c.setMachine(m); err != nil {
45 http.Redirect(w, r, "/?err=rui.connect.err.save", http.StatusSeeOther)
46 return
47 }
48 if m.UIListen != "" && m.UIListen != oldListen && m.UIListen != "off" && relisten != nil {
49 if err := relisten(m.UIListen); err != nil {
50 http.Redirect(w, r, "/?err=rui.connect.err.listen", http.StatusSeeOther)
51 return
52 }
53 }
54 http.Redirect(w, r, "/?ok=rui.connect.ok", http.StatusSeeOther)
55 }))
56 u.mux.HandleFunc("POST /register", u.guardWrite(func(w http.ResponseWriter, r *http.Request) {
57 _ = r.ParseForm()
58 url := strings.TrimRight(strings.TrimSpace(r.FormValue("url")), "/")
59 tok := strings.TrimSpace(r.FormValue("registration_token"))
60 name := strings.TrimSpace(r.FormValue("name"))
61 if url == "" || tok == "" {
62 http.Redirect(w, r, "/?err=rui.connect.err.register", http.StatusSeeOther)
63 return
64 }
65 if err := registerAndSave(c, url, tok, name); err != nil {
66 http.Redirect(w, r, "/?err=rui.connect.err.register", http.StatusSeeOther)
67 return
68 }
69 http.Redirect(w, r, "/?ok=rui.connect.registered", http.StatusSeeOther)
70 }))
71 u.mux.HandleFunc("GET /api/connection", func(w http.ResponseWriter, r *http.Request) {
72 if !u.authed(r) {
73 http.Error(w, `{"error":"unauthorized"}`, http.StatusUnauthorized)
74 return
75 }
76 writeConnJSON(w, c.snapshot())
77 })
78 u.mux.HandleFunc("PUT /api/connection", func(w http.ResponseWriter, r *http.Request) {
79 if !u.authed(r) {
80 http.Error(w, `{"error":"unauthorized"}`, http.StatusUnauthorized)
81 return
82 }
83 var in machineSettings
84 if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
85 http.Error(w, `{"error":"bad json"}`, http.StatusBadRequest)
86 return
87 }
88 // Leeg token = ongewijzigd.
89 if strings.TrimSpace(in.Token) == "" {
90 in.Token = c.snapshot().Token
91 }
92 old := c.snapshot().UIListen
93 if err := c.setMachine(in); err != nil {
94 http.Error(w, `{"error":"save"}`, http.StatusInternalServerError)
95 return
96 }
97 if in.UIListen != "" && in.UIListen != old && in.UIListen != "off" && relisten != nil {
98 if err := relisten(in.UIListen); err != nil {
99 http.Error(w, `{"error":"listen"}`, http.StatusBadRequest)
100 return
101 }
102 }
103 writeConnJSON(w, c.snapshot())
104 })
105 u.mux.HandleFunc("POST /api/register", func(w http.ResponseWriter, r *http.Request) {
106 if !u.authed(r) {
107 http.Error(w, `{"error":"unauthorized"}`, http.StatusUnauthorized)
108 return
109 }
110 var in struct {
111 URL string `json:"url"`
112 Token string `json:"token"`
113 Name string `json:"name"`
114 }
115 if err := json.NewDecoder(r.Body).Decode(&in); err != nil || strings.TrimSpace(in.URL) == "" || strings.TrimSpace(in.Token) == "" {
116 http.Error(w, `{"error":"url and token are required"}`, http.StatusBadRequest)
117 return
118 }
119 if err := registerAndSave(c, strings.TrimRight(strings.TrimSpace(in.URL), "/"), strings.TrimSpace(in.Token), strings.TrimSpace(in.Name)); err != nil {
120 w.Header().Set("Content-Type", "application/json")
121 w.WriteHeader(http.StatusBadRequest)
122 _ = json.NewEncoder(w).Encode(map[string]string{"error": err.Error()})
123 return
124 }
125 writeConnJSON(w, c.snapshot())
126 })
127}
128
129func writeConnJSON(w http.ResponseWriter, cfg Config) {
130 w.Header().Set("Content-Type", "application/json")
131 _ = json.NewEncoder(w).Encode(map[string]any{
132 "url": cfg.URL, "name": cfg.Name, "docker": cfg.Docker, "git": cfg.Git,
133 "network": cfg.Network, "concurrency": cfg.Concurrency, "ui_listen": cfg.UIListen,
134 "language": cfg.Language, "work_dir": cfg.WorkDir, "token_set": strings.TrimSpace(cfg.Token) != "",
135 "registered": registered(cfg),
136 })
137}
138
139func (u *webUI) guardWrite(fn http.HandlerFunc) http.HandlerFunc {
140 return func(w http.ResponseWriter, r *http.Request) {
141 if !u.authed(r) {
142 http.Redirect(w, r, "/login", http.StatusSeeOther)
143 return
144 }
145 if !u.csrfOK(r) {
146 http.Error(w, "csrf", http.StatusForbidden)
147 return
148 }
149 fn(w, r)
150 }
151}
152
153func (u *webUI) csrfOK(r *http.Request) bool {
154 if strings.HasPrefix(r.Header.Get("Authorization"), "Bearer ") {
155 return true
156 }
157 _ = r.ParseForm()
158 return hmac.Equal([]byte(r.FormValue("csrf")), []byte(u.mac("csrf")))
159}
160
161func (u *webUI) connectHTML(r *http.Request, c *client) template.HTML {
162 lang := u.lang(r)
163 cfg := c.snapshot()
164 csrf := u.mac("csrf")
165 var b bytes.Buffer
166 _ = connectTmpl.Execute(&b, map[string]any{
167 "T": func(k string, a ...any) string { return i18n.T(lang, k, a...) },
168 "CSRF": csrf,
169 "URL": cfg.URL,
170 "Name": cfg.Name,
171 "Docker": cfg.Docker,
172 "Git": cfg.Git,
173 "Network": cfg.Network,
174 "UIListen": cfg.UIListen,
175 "Language": cfg.Language,
176 "WorkDir": cfg.WorkDir,
177 "Registered": registered(cfg),
178 })
179 return template.HTML(b.String())
180}
181
182var connectTmpl = template.Must(template.New("connect").Parse(`
183<section class="panel" id="connect">
184 <h2>{{call .T "rui.connect.title"}}</h2>
185 <p class="muted">{{call .T "rui.connect.lead"}}</p>
186 {{if not .Registered}}
187 <form method="post" action="/register" class="rui-form">
188 <input type="hidden" name="csrf" value="{{.CSRF}}">
189 <label><span class="rui-lbl">{{call .T "rui.connect.url"}}</span><input name="url" value="{{.URL}}" placeholder="https://git.example.com" required></label>
190 <label><span class="rui-lbl">{{call .T "rui.connect.regToken"}}</span><input name="registration_token" type="password" autocomplete="off" required></label>
191 <label><span class="rui-lbl">{{call .T "rui.connect.name"}}</span><input name="name" value="{{.Name}}"></label>
192 <button type="submit">{{call .T "rui.connect.register"}}</button>
193 </form>
194 {{else}}
195 <p class="rui-safe ok">✓ {{call .T "rui.connect.linked"}}</p>
196 {{end}}
197 <form method="post" action="/connect" class="rui-form">
198 <input type="hidden" name="csrf" value="{{.CSRF}}">
199 <label><span class="rui-lbl">{{call .T "rui.connect.url"}}</span><input name="url" value="{{.URL}}" placeholder="https://git.example.com"></label>
200 <label><span class="rui-lbl">{{call .T "rui.connect.name"}}</span><input name="name" value="{{.Name}}"></label>
201 <label><span class="rui-lbl">{{call .T "rui.connect.docker"}}</span><input name="docker" value="{{.Docker}}"></label>
202 <label><span class="rui-lbl">{{call .T "rui.connect.git"}}</span><input name="git" value="{{.Git}}"></label>
203 <label><span class="rui-lbl">{{call .T "rui.connect.network"}}</span><input name="network" value="{{.Network}}"></label>
204 <label><span class="rui-lbl">{{call .T "rui.connect.uiListen"}}</span><input name="ui_listen" value="{{.UIListen}}"></label>
205 <label><span class="rui-lbl">{{call .T "rui.connect.language"}}</span><input name="language" value="{{.Language}}" placeholder="en"></label>
206 <label><span class="rui-lbl">{{call .T "rui.connect.workDir"}}</span><input value="{{.WorkDir}}" readonly></label>
207 <p class="muted">{{call .T "rui.connect.workDirWhy"}}</p>
208 <button type="submit">{{call .T "action.save"}}</button>
209 </form>
210</section>
211`))
212
213func registerAndSave(c *client, url, token, name string) error {
214 cur := c.snapshot()
215 id, outName, runnerTok, err := postRegister(url, token, name, version)
216 if err != nil {
217 return err
218 }
219 _ = id
220 m := machineFrom(cur)
221 m.URL, m.Token, m.Name = url, runnerTok, outName
222 return c.setMachine(m)
223}
224
225func postRegister(baseURL, token, name, ver string) (id int64, outName, runnerTok string, err error) {
226 if name == "" {
227 name, _ = os.Hostname()
228 }
229 body, _ := json.Marshal(map[string]string{"token": token, "name": name, "version": ver})
230 resp, err := http.Post(strings.TrimRight(baseURL, "/")+"/api/v1/runners/register", "application/json", bytes.NewReader(body))
231 if err != nil {
232 return 0, "", "", err
233 }
234 defer resp.Body.Close()
235 var out struct {
236 ID int64 `json:"id"`
237 Name string `json:"name"`
238 Token string `json:"token"`
239 Message string `json:"message"`
240 }
241 _ = json.NewDecoder(resp.Body).Decode(&out)
242 if resp.StatusCode != http.StatusCreated || out.Token == "" {
243 return 0, "", "", fmtRegister(resp.StatusCode, out.Message)
244 }
245 return out.ID, out.Name, out.Token, nil
246}
247
248func fmtRegister(code int, msg string) error {
249 if msg == "" {
250 msg = http.StatusText(code)
251 }
252 return &regError{code: code, msg: msg}
253}
254
255type regError struct {
256 code int
257 msg string
258}
259
260func (e *regError) Error() string { return e.msg }
cmd/bluegit-runner/main.go +60 −18
@@ -104,10 +104,16 @@ func main() {
104 104
105 105 func usage() {
106 106 fmt.Fprintln(os.Stderr, `usage:
107 bluegit-runner register --url https://git.example.com --token bgrr_... [--name NAME] [--config PATH]
108 bluegit-runner run [--config PATH]
109 bluegit-runner ui-token [--config PATH] (shows the web UI admin token)
110 bluegit-runner version`)
107 bluegit-runner run [--work-dir DIR] [--config PATH]
108 bluegit-runner register --url https://git.example.com --token bgrr_... [--name NAME] [--work-dir DIR] [--config PATH]
109 bluegit-runner ui-token [--work-dir DIR] [--config PATH]
110 bluegit-runner version
111
112 Koppelen en instellingen gaan via de webinterface: open http://127.0.0.1:8765
113 (of ui_listen), meld je aan met het beheertoken uit "bluegit-runner ui-token",
114 en vul onder Koppeling de BlueGit-URL en het registratietoken in.
115 De CLI-register is een alternatief. work_dir (standaard /var/lib/bluegit-runner)
116 en het eerste beheertoken blijven buiten de UI.`)
111 117 }
112 118
113 119 func loadConfig(path string) (Config, error) {
@@ -132,6 +138,7 @@ func cmdRegister(args []string) error {
132 138 token := fs.String("token", "", "registration token from the BlueGit UI")
133 139 name := fs.String("name", "", "runner name (default: hostname)")
134 140 cfgPath := fs.String("config", defaultConfig, "config file")
141 workDir := fs.String("work-dir", "", "work directory (default: /var/lib/bluegit-runner)")
135 142 _ = fs.Parse(args)
136 143 // Niet-interactief (agents): alles mag ook via de omgeving.
137 144 if *token == "" {
@@ -180,6 +187,12 @@ func cmdRegister(args []string) error {
180 187 if err := os.WriteFile(*cfgPath, b, 0o600); err != nil {
181 188 return err
182 189 }
190 work := resolveWorkDir(*workDir, *cfgPath, existing)
191 existing.defaults()
192 existing.WorkDir = work
193 if err := saveConnection(work, machineFrom(existing)); err != nil {
194 return err
195 }
183 196 if os.Geteuid() == 0 {
184 197 if u, err := user.Lookup("bluegit-runner"); err == nil {
185 198 uid, _ := strconv.Atoi(u.Uid)
@@ -211,11 +224,28 @@ type client struct {
211 224 file *runnercfg.File
212 225 jobs *runnercfg.Tracker
213 226 stMu sync.Mutex
227 cfgMu sync.Mutex
214 228 seen time.Time
215 229 srvName string
216 230 srvPause bool
217 231 }
218 232
233 func (c *client) snapshot() Config {
234 c.cfgMu.Lock()
235 defer c.cfgMu.Unlock()
236 return c.cfg
237 }
238
239 func (c *client) setMachine(m machineSettings) error {
240 c.cfgMu.Lock()
241 applyMachine(&c.cfg, m)
242 c.cfg.defaults()
243 work := c.cfg.WorkDir
244 snap := machineFrom(c.cfg)
245 c.cfgMu.Unlock()
246 return saveConnection(work, snap)
247 }
248
219 249 func (c *client) settings() runnercfg.Settings {
220 250 s, err := c.file.Load(c.defaults())
221 251 if err != nil {
@@ -265,16 +295,12 @@ func (c *client) heartbeat(ctx context.Context) error {
265 295 func cmdUIToken(args []string) error {
266 296 fs := flag.NewFlagSet("ui-token", flag.ExitOnError)
267 297 cfgPath := fs.String("config", defaultConfig, "config file")
298 workDir := fs.String("work-dir", "", "work directory (default: /var/lib/bluegit-runner)")
268 299 _ = fs.Parse(args)
269 b, err := os.ReadFile(*cfgPath)
300 cfg, err := loadRuntime(*cfgPath, *workDir, nil)
270 301 if err != nil {
271 302 return err
272 303 }
273 var cfg Config
274 if err := yaml.Unmarshal(b, &cfg); err != nil {
275 return err
276 }
277 cfg.defaults()
278 304 tok, _, err := ensureUIToken(cfg)
279 305 if err != nil {
280 306 return fmt.Errorf("%w (run as root or as bluegit-runner)", err)
@@ -284,11 +310,12 @@ func cmdUIToken(args []string) error {
284 310 }
285 311
286 312 func (c *client) do(ctx context.Context, method, path string, body io.Reader, ctype string) (*http.Response, error) {
287 req, err := http.NewRequestWithContext(ctx, method, c.cfg.URL+path, body)
313 cfg := c.snapshot()
314 req, err := http.NewRequestWithContext(ctx, method, cfg.URL+path, body)
288 315 if err != nil {
289 316 return nil, err
290 317 }
291 req.Header.Set("Authorization", "Bearer "+c.cfg.Token)
318 req.Header.Set("Authorization", "Bearer "+cfg.Token)
292 319 req.Header.Set("X-Runner-Version", version)
293 320 if ctype != "" {
294 321 req.Header.Set("Content-Type", ctype)
@@ -316,22 +343,27 @@ func (c *client) postJSON(ctx context.Context, path string, in, out any) error {
316 343 func cmdRun(args []string) error {
317 344 fs := flag.NewFlagSet("run", flag.ExitOnError)
318 345 cfgPath := fs.String("config", defaultConfig, "config file")
346 workDir := fs.String("work-dir", "", "work directory (default: /var/lib/bluegit-runner)")
319 347 once := fs.Bool("once", false, "run at most one job, then exit (for tests)")
320 348 _ = fs.Parse(args)
321 cfg, err := loadConfig(*cfgPath)
349 log := slog.New(slog.NewTextHandler(os.Stderr, nil))
350 cfg, err := loadRuntime(*cfgPath, *workDir, log)
322 351 if err != nil {
323 352 return err
324 353 }
325 log := slog.New(slog.NewTextHandler(os.Stderr, nil))
326 354 ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
327 355 defer stop()
328 356 c := &client{cfg: cfg, http: &http.Client{Timeout: 0}, log: log,
329 357 file: &runnercfg.File{Path: filepath.Join(cfg.WorkDir, "settings.json")}, jobs: &runnercfg.Tracker{}}
330 358 c.jobs.SetPaused(c.settings().Paused)
331 if err := c.heartbeat(ctx); err != nil {
332 return fmt.Errorf("cannot reach BlueGit: %w", err)
359 if registered(cfg) {
360 if err := c.heartbeat(ctx); err != nil {
361 log.Warn("cannot reach BlueGit yet", "err", err)
362 }
363 log.Info("bluegit-runner started", "url", cfg.URL, "name", c.status().Name, "version", version, "concurrency", c.settings().Concurrency)
364 } else {
365 log.Info("bluegit-runner started zonder koppeling; registreer in de webinterface", "work_dir", cfg.WorkDir)
333 366 }
334 log.Info("bluegit-runner started", "url", cfg.URL, "name", c.status().Name, "version", version, "concurrency", c.settings().Concurrency)
335 367 if cfg.UIListen != "off" {
336 368 tok, created, err := ensureUIToken(cfg)
337 369 if err != nil {
@@ -344,7 +376,10 @@ func cmdRun(args []string) error {
344 376 _ = c.heartbeat(hctx) // naam en pauze meteen naar de server
345 377 return nil
346 378 }}
347 if err := serveUI(ctx, newWebUI(cfg, tok, h), cfg.UIListen, log.Warn); err != nil {
379 ui := newWebUI(cfg, tok, h)
380 relisten := func(addr string) error { return relistenUI(ui, addr, log.Warn) }
381 mountConnect(ui, c, relisten)
382 if err := serveUI(ctx, ui, cfg.UIListen, log.Warn); err != nil {
348 383 log.Warn("web UI", "listen", cfg.UIListen, "err", err)
349 384 } else {
350 385 log.Info("web UI", "url", "http://"+cfg.UIListen, "first_start", created, "token", "see: bluegit-runner ui-token")
@@ -380,6 +415,13 @@ func cmdRun(args []string) error {
380 415 }
381 416 continue
382 417 }
418 if !registered(c.snapshot()) {
419 select {
420 case <-ctx.Done():
421 case <-time.After(2 * time.Second):
422 }
423 continue
424 }
383 425 ran, err := c.poll(ctx)
384 426 if err != nil && ctx.Err() == nil {
385 427 log.Warn("poll", "err", err)
@@ -104,10 +104,16 @@ func main() {
104
104
105func usage() {
105func usage() {
106 fmt.Fprintln(os.Stderr, `usage:
106 fmt.Fprintln(os.Stderr, `usage:
107 bluegit-runner register --url https://git.example.com --token bgrr_... [--name NAME] [--config PATH]
107 bluegit-runner run [--work-dir DIR] [--config PATH]
108 bluegit-runner run [--config PATH]
108 bluegit-runner register --url https://git.example.com --token bgrr_... [--name NAME] [--work-dir DIR] [--config PATH]
109 bluegit-runner ui-token [--config PATH] (shows the web UI admin token)
109 bluegit-runner ui-token [--work-dir DIR] [--config PATH]
110 bluegit-runner version`)
110 bluegit-runner version
111
112Koppelen en instellingen gaan via de webinterface: open http://127.0.0.1:8765
113(of ui_listen), meld je aan met het beheertoken uit "bluegit-runner ui-token",
114en vul onder Koppeling de BlueGit-URL en het registratietoken in.
115De CLI-register is een alternatief. work_dir (standaard /var/lib/bluegit-runner)
116en het eerste beheertoken blijven buiten de UI.`)
111}
117}
112
118
113func loadConfig(path string) (Config, error) {
119func loadConfig(path string) (Config, error) {
@@ -132,6 +138,7 @@ func cmdRegister(args []string) error {
132 token := fs.String("token", "", "registration token from the BlueGit UI")
138 token := fs.String("token", "", "registration token from the BlueGit UI")
133 name := fs.String("name", "", "runner name (default: hostname)")
139 name := fs.String("name", "", "runner name (default: hostname)")
134 cfgPath := fs.String("config", defaultConfig, "config file")
140 cfgPath := fs.String("config", defaultConfig, "config file")
141 workDir := fs.String("work-dir", "", "work directory (default: /var/lib/bluegit-runner)")
135 _ = fs.Parse(args)
142 _ = fs.Parse(args)
136 // Niet-interactief (agents): alles mag ook via de omgeving.
143 // Niet-interactief (agents): alles mag ook via de omgeving.
137 if *token == "" {
144 if *token == "" {
@@ -180,6 +187,12 @@ func cmdRegister(args []string) error {
180 if err := os.WriteFile(*cfgPath, b, 0o600); err != nil {
187 if err := os.WriteFile(*cfgPath, b, 0o600); err != nil {
181 return err
188 return err
182 }
189 }
190 work := resolveWorkDir(*workDir, *cfgPath, existing)
191 existing.defaults()
192 existing.WorkDir = work
193 if err := saveConnection(work, machineFrom(existing)); err != nil {
194 return err
195 }
183 if os.Geteuid() == 0 {
196 if os.Geteuid() == 0 {
184 if u, err := user.Lookup("bluegit-runner"); err == nil {
197 if u, err := user.Lookup("bluegit-runner"); err == nil {
185 uid, _ := strconv.Atoi(u.Uid)
198 uid, _ := strconv.Atoi(u.Uid)
@@ -211,11 +224,28 @@ type client struct {
211 file *runnercfg.File
224 file *runnercfg.File
212 jobs *runnercfg.Tracker
225 jobs *runnercfg.Tracker
213 stMu sync.Mutex
226 stMu sync.Mutex
227 cfgMu sync.Mutex
214 seen time.Time
228 seen time.Time
215 srvName string
229 srvName string
216 srvPause bool
230 srvPause bool
217}
231}
218
232
233func (c *client) snapshot() Config {
234 c.cfgMu.Lock()
235 defer c.cfgMu.Unlock()
236 return c.cfg
237}
238
239func (c *client) setMachine(m machineSettings) error {
240 c.cfgMu.Lock()
241 applyMachine(&c.cfg, m)
242 c.cfg.defaults()
243 work := c.cfg.WorkDir
244 snap := machineFrom(c.cfg)
245 c.cfgMu.Unlock()
246 return saveConnection(work, snap)
247}
248
219func (c *client) settings() runnercfg.Settings {
249func (c *client) settings() runnercfg.Settings {
220 s, err := c.file.Load(c.defaults())
250 s, err := c.file.Load(c.defaults())
221 if err != nil {
251 if err != nil {
@@ -265,16 +295,12 @@ func (c *client) heartbeat(ctx context.Context) error {
265func cmdUIToken(args []string) error {
295func cmdUIToken(args []string) error {
266 fs := flag.NewFlagSet("ui-token", flag.ExitOnError)
296 fs := flag.NewFlagSet("ui-token", flag.ExitOnError)
267 cfgPath := fs.String("config", defaultConfig, "config file")
297 cfgPath := fs.String("config", defaultConfig, "config file")
298 workDir := fs.String("work-dir", "", "work directory (default: /var/lib/bluegit-runner)")
268 _ = fs.Parse(args)
299 _ = fs.Parse(args)
269 b, err := os.ReadFile(*cfgPath)
300 cfg, err := loadRuntime(*cfgPath, *workDir, nil)
270 if err != nil {
301 if err != nil {
271 return err
302 return err
272 }
303 }
273 var cfg Config
274 if err := yaml.Unmarshal(b, &cfg); err != nil {
275 return err
276 }
277 cfg.defaults()
278 tok, _, err := ensureUIToken(cfg)
304 tok, _, err := ensureUIToken(cfg)
279 if err != nil {
305 if err != nil {
280 return fmt.Errorf("%w (run as root or as bluegit-runner)", err)
306 return fmt.Errorf("%w (run as root or as bluegit-runner)", err)
@@ -284,11 +310,12 @@ func cmdUIToken(args []string) error {
284}
310}
285
311
286func (c *client) do(ctx context.Context, method, path string, body io.Reader, ctype string) (*http.Response, error) {
312func (c *client) do(ctx context.Context, method, path string, body io.Reader, ctype string) (*http.Response, error) {
287 req, err := http.NewRequestWithContext(ctx, method, c.cfg.URL+path, body)
313 cfg := c.snapshot()
314 req, err := http.NewRequestWithContext(ctx, method, cfg.URL+path, body)
288 if err != nil {
315 if err != nil {
289 return nil, err
316 return nil, err
290 }
317 }
291 req.Header.Set("Authorization", "Bearer "+c.cfg.Token)
318 req.Header.Set("Authorization", "Bearer "+cfg.Token)
292 req.Header.Set("X-Runner-Version", version)
319 req.Header.Set("X-Runner-Version", version)
293 if ctype != "" {
320 if ctype != "" {
294 req.Header.Set("Content-Type", ctype)
321 req.Header.Set("Content-Type", ctype)
@@ -316,22 +343,27 @@ func (c *client) postJSON(ctx context.Context, path string, in, out any) error {
316func cmdRun(args []string) error {
343func cmdRun(args []string) error {
317 fs := flag.NewFlagSet("run", flag.ExitOnError)
344 fs := flag.NewFlagSet("run", flag.ExitOnError)
318 cfgPath := fs.String("config", defaultConfig, "config file")
345 cfgPath := fs.String("config", defaultConfig, "config file")
346 workDir := fs.String("work-dir", "", "work directory (default: /var/lib/bluegit-runner)")
319 once := fs.Bool("once", false, "run at most one job, then exit (for tests)")
347 once := fs.Bool("once", false, "run at most one job, then exit (for tests)")
320 _ = fs.Parse(args)
348 _ = fs.Parse(args)
321 cfg, err := loadConfig(*cfgPath)
349 log := slog.New(slog.NewTextHandler(os.Stderr, nil))
350 cfg, err := loadRuntime(*cfgPath, *workDir, log)
322 if err != nil {
351 if err != nil {
323 return err
352 return err
324 }
353 }
325 log := slog.New(slog.NewTextHandler(os.Stderr, nil))
326 ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
354 ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
327 defer stop()
355 defer stop()
328 c := &client{cfg: cfg, http: &http.Client{Timeout: 0}, log: log,
356 c := &client{cfg: cfg, http: &http.Client{Timeout: 0}, log: log,
329 file: &runnercfg.File{Path: filepath.Join(cfg.WorkDir, "settings.json")}, jobs: &runnercfg.Tracker{}}
357 file: &runnercfg.File{Path: filepath.Join(cfg.WorkDir, "settings.json")}, jobs: &runnercfg.Tracker{}}
330 c.jobs.SetPaused(c.settings().Paused)
358 c.jobs.SetPaused(c.settings().Paused)
331 if err := c.heartbeat(ctx); err != nil {
359 if registered(cfg) {
332 return fmt.Errorf("cannot reach BlueGit: %w", err)
360 if err := c.heartbeat(ctx); err != nil {
361 log.Warn("cannot reach BlueGit yet", "err", err)
362 }
363 log.Info("bluegit-runner started", "url", cfg.URL, "name", c.status().Name, "version", version, "concurrency", c.settings().Concurrency)
364 } else {
365 log.Info("bluegit-runner started zonder koppeling; registreer in de webinterface", "work_dir", cfg.WorkDir)
333 }
366 }
334 log.Info("bluegit-runner started", "url", cfg.URL, "name", c.status().Name, "version", version, "concurrency", c.settings().Concurrency)
335 if cfg.UIListen != "off" {
367 if cfg.UIListen != "off" {
336 tok, created, err := ensureUIToken(cfg)
368 tok, created, err := ensureUIToken(cfg)
337 if err != nil {
369 if err != nil {
@@ -344,7 +376,10 @@ func cmdRun(args []string) error {
344 _ = c.heartbeat(hctx) // naam en pauze meteen naar de server
376 _ = c.heartbeat(hctx) // naam en pauze meteen naar de server
345 return nil
377 return nil
346 }}
378 }}
347 if err := serveUI(ctx, newWebUI(cfg, tok, h), cfg.UIListen, log.Warn); err != nil {
379 ui := newWebUI(cfg, tok, h)
380 relisten := func(addr string) error { return relistenUI(ui, addr, log.Warn) }
381 mountConnect(ui, c, relisten)
382 if err := serveUI(ctx, ui, cfg.UIListen, log.Warn); err != nil {
348 log.Warn("web UI", "listen", cfg.UIListen, "err", err)
383 log.Warn("web UI", "listen", cfg.UIListen, "err", err)
349 } else {
384 } else {
350 log.Info("web UI", "url", "http://"+cfg.UIListen, "first_start", created, "token", "see: bluegit-runner ui-token")
385 log.Info("web UI", "url", "http://"+cfg.UIListen, "first_start", created, "token", "see: bluegit-runner ui-token")
@@ -380,6 +415,13 @@ func cmdRun(args []string) error {
380 }
415 }
381 continue
416 continue
382 }
417 }
418 if !registered(c.snapshot()) {
419 select {
420 case <-ctx.Done():
421 case <-time.After(2 * time.Second):
422 }
423 continue
424 }
383 ran, err := c.poll(ctx)
425 ran, err := c.poll(ctx)
384 if err != nil && ctx.Err() == nil {
426 if err != nil && ctx.Err() == nil {
385 log.Warn("poll", "err", err)
427 log.Warn("poll", "err", err)
cmd/bluegit-runner/runtime.go added +192 −0
@@ -0,0 +1,192 @@
1 package main
2
3 import (
4 "fmt"
5 "io"
6 "log/slog"
7 "os"
8 "path/filepath"
9 "strings"
10
11 "gopkg.in/yaml.v3"
12
13 "gitlab.com/Timfa/bluegit/internal/apppaths"
14 )
15
16 const (
17 connectionFile = "connection.yml"
18 connectionMark = "config.yml.imported"
19 defaultWorkDir = "/var/lib/bluegit-runner"
20 defaultWindows = "BlueGit-runner"
21 )
22
23 // machineSettings is het deel van de runnerconfig dat in de webinterface hoort.
24 type machineSettings struct {
25 URL string `yaml:"url,omitempty"`
26 Token string `yaml:"token,omitempty"`
27 Name string `yaml:"name,omitempty"`
28 Docker string `yaml:"docker,omitempty"`
29 Git string `yaml:"git,omitempty"`
30 Network string `yaml:"network,omitempty"`
31 Concurrency int `yaml:"concurrency,omitempty"`
32 UIListen string `yaml:"ui_listen,omitempty"`
33 Language string `yaml:"language,omitempty"`
34 }
35
36 func defaultWorkDirPath() string {
37 return apppaths.DataDir(defaultWorkDir, defaultWindows)
38 }
39
40 func resolveWorkDir(flagDir, cfgPath string, file Config) string {
41 if d := strings.TrimSpace(flagDir); d != "" {
42 return d
43 }
44 if d := strings.TrimSpace(os.Getenv("BLUEGIT_RUNNER_WORK_DIR")); d != "" {
45 return d
46 }
47 if d := strings.TrimSpace(file.WorkDir); d != "" {
48 return d
49 }
50 return defaultWorkDirPath()
51 }
52
53 func loadFileConfig(path string) (Config, error) {
54 var c Config
55 b, err := os.ReadFile(path)
56 if err != nil {
57 if os.IsNotExist(err) {
58 return c, nil
59 }
60 return c, err
61 }
62 if err := yaml.Unmarshal(b, &c); err != nil {
63 return c, err
64 }
65 return c, nil
66 }
67
68 func loadConnection(workDir string) (machineSettings, error) {
69 var m machineSettings
70 b, err := os.ReadFile(filepath.Join(workDir, connectionFile))
71 if err != nil {
72 if os.IsNotExist(err) {
73 return m, nil
74 }
75 return m, err
76 }
77 err = yaml.Unmarshal(b, &m)
78 return m, err
79 }
80
81 func saveConnection(workDir string, m machineSettings) error {
82 if err := os.MkdirAll(workDir, 0o750); err != nil {
83 return err
84 }
85 b, err := yaml.Marshal(m)
86 if err != nil {
87 return err
88 }
89 path := filepath.Join(workDir, connectionFile)
90 tmp := path + ".tmp"
91 if err := os.WriteFile(tmp, b, 0o600); err != nil {
92 return err
93 }
94 return os.Rename(tmp, path)
95 }
96
97 func applyMachine(c *Config, m machineSettings) {
98 if m.URL != "" {
99 c.URL = strings.TrimRight(m.URL, "/")
100 }
101 if m.Token != "" {
102 c.Token = m.Token
103 }
104 if m.Name != "" {
105 c.Name = m.Name
106 }
107 if m.Docker != "" {
108 c.Docker = m.Docker
109 }
110 if m.Git != "" {
111 c.Git = m.Git
112 }
113 if m.Network != "" {
114 c.Network = m.Network
115 }
116 if m.Concurrency > 0 {
117 c.Concurrency = m.Concurrency
118 }
119 if m.UIListen != "" {
120 c.UIListen = m.UIListen
121 }
122 if m.Language != "" {
123 c.Language = m.Language
124 }
125 }
126
127 func machineFrom(c Config) machineSettings {
128 return machineSettings{
129 URL: c.URL, Token: c.Token, Name: c.Name, Docker: c.Docker, Git: c.Git,
130 Network: c.Network, Concurrency: c.Concurrency, UIListen: c.UIListen, Language: c.Language,
131 }
132 }
133
134 func importRunnerLegacy(workDir, cfgPath string, file Config, log *slog.Logger) {
135 if workDir == "" {
136 return
137 }
138 _ = os.MkdirAll(workDir, 0o750)
139 set := filepath.Join(workDir, connectionFile)
140 mark := filepath.Join(workDir, connectionMark)
141 if _, err := os.Stat(set); err == nil {
142 _ = os.WriteFile(mark, nil, 0o640)
143 return
144 }
145 if _, err := os.Stat(mark); err == nil {
146 return
147 }
148 if cfgPath == "" {
149 return
150 }
151 if _, err := os.Stat(cfgPath); err != nil {
152 return
153 }
154 if err := saveConnection(workDir, machineFrom(file)); err != nil {
155 if log != nil {
156 log.Error("config.yml-import naar connection.yml mislukt; bestaande config blijft gelden", "err", err)
157 }
158 return
159 }
160 _ = os.WriteFile(mark, nil, 0o640)
161 if log != nil {
162 log.Info("config.yml eenmalig overgenomen in connection.yml; daarna wint de webinterface", "config", cfgPath, "settings", set)
163 }
164 }
165
166 // loadRuntime leest optioneel config.yml, importeert eenmaal, en overlays
167 // connection.yml. url en token mogen leeg zijn (registratie via de UI).
168 func loadRuntime(cfgPath, workDirFlag string, log *slog.Logger) (Config, error) {
169 if log == nil {
170 log = slog.New(slog.NewTextHandler(io.Discard, nil))
171 }
172 file, err := loadFileConfig(cfgPath)
173 if err != nil {
174 return Config{}, fmt.Errorf("config: %w", err)
175 }
176 work := resolveWorkDir(workDirFlag, cfgPath, file)
177 importRunnerLegacy(work, cfgPath, file, log)
178 c := file
179 c.WorkDir = work
180 if m, err := loadConnection(work); err != nil {
181 log.Error("connection.yml onleesbaar; val terug op config.yml", "err", err)
182 } else {
183 applyMachine(&c, m)
184 }
185 c.WorkDir = work
186 c.defaults()
187 return c, nil
188 }
189
190 func registered(c Config) bool {
191 return strings.TrimSpace(c.URL) != "" && strings.TrimSpace(c.Token) != ""
192 }
@@ -0,0 +1,192 @@
1package main
2
3import (
4 "fmt"
5 "io"
6 "log/slog"
7 "os"
8 "path/filepath"
9 "strings"
10
11 "gopkg.in/yaml.v3"
12
13 "gitlab.com/Timfa/bluegit/internal/apppaths"
14)
15
16const (
17 connectionFile = "connection.yml"
18 connectionMark = "config.yml.imported"
19 defaultWorkDir = "/var/lib/bluegit-runner"
20 defaultWindows = "BlueGit-runner"
21)
22
23// machineSettings is het deel van de runnerconfig dat in de webinterface hoort.
24type machineSettings struct {
25 URL string `yaml:"url,omitempty"`
26 Token string `yaml:"token,omitempty"`
27 Name string `yaml:"name,omitempty"`
28 Docker string `yaml:"docker,omitempty"`
29 Git string `yaml:"git,omitempty"`
30 Network string `yaml:"network,omitempty"`
31 Concurrency int `yaml:"concurrency,omitempty"`
32 UIListen string `yaml:"ui_listen,omitempty"`
33 Language string `yaml:"language,omitempty"`
34}
35
36func defaultWorkDirPath() string {
37 return apppaths.DataDir(defaultWorkDir, defaultWindows)
38}
39
40func resolveWorkDir(flagDir, cfgPath string, file Config) string {
41 if d := strings.TrimSpace(flagDir); d != "" {
42 return d
43 }
44 if d := strings.TrimSpace(os.Getenv("BLUEGIT_RUNNER_WORK_DIR")); d != "" {
45 return d
46 }
47 if d := strings.TrimSpace(file.WorkDir); d != "" {
48 return d
49 }
50 return defaultWorkDirPath()
51}
52
53func loadFileConfig(path string) (Config, error) {
54 var c Config
55 b, err := os.ReadFile(path)
56 if err != nil {
57 if os.IsNotExist(err) {
58 return c, nil
59 }
60 return c, err
61 }
62 if err := yaml.Unmarshal(b, &c); err != nil {
63 return c, err
64 }
65 return c, nil
66}
67
68func loadConnection(workDir string) (machineSettings, error) {
69 var m machineSettings
70 b, err := os.ReadFile(filepath.Join(workDir, connectionFile))
71 if err != nil {
72 if os.IsNotExist(err) {
73 return m, nil
74 }
75 return m, err
76 }
77 err = yaml.Unmarshal(b, &m)
78 return m, err
79}
80
81func saveConnection(workDir string, m machineSettings) error {
82 if err := os.MkdirAll(workDir, 0o750); err != nil {
83 return err
84 }
85 b, err := yaml.Marshal(m)
86 if err != nil {
87 return err
88 }
89 path := filepath.Join(workDir, connectionFile)
90 tmp := path + ".tmp"
91 if err := os.WriteFile(tmp, b, 0o600); err != nil {
92 return err
93 }
94 return os.Rename(tmp, path)
95}
96
97func applyMachine(c *Config, m machineSettings) {
98 if m.URL != "" {
99 c.URL = strings.TrimRight(m.URL, "/")
100 }
101 if m.Token != "" {
102 c.Token = m.Token
103 }
104 if m.Name != "" {
105 c.Name = m.Name
106 }
107 if m.Docker != "" {
108 c.Docker = m.Docker
109 }
110 if m.Git != "" {
111 c.Git = m.Git
112 }
113 if m.Network != "" {
114 c.Network = m.Network
115 }
116 if m.Concurrency > 0 {
117 c.Concurrency = m.Concurrency
118 }
119 if m.UIListen != "" {
120 c.UIListen = m.UIListen
121 }
122 if m.Language != "" {
123 c.Language = m.Language
124 }
125}
126
127func machineFrom(c Config) machineSettings {
128 return machineSettings{
129 URL: c.URL, Token: c.Token, Name: c.Name, Docker: c.Docker, Git: c.Git,
130 Network: c.Network, Concurrency: c.Concurrency, UIListen: c.UIListen, Language: c.Language,
131 }
132}
133
134func importRunnerLegacy(workDir, cfgPath string, file Config, log *slog.Logger) {
135 if workDir == "" {
136 return
137 }
138 _ = os.MkdirAll(workDir, 0o750)
139 set := filepath.Join(workDir, connectionFile)
140 mark := filepath.Join(workDir, connectionMark)
141 if _, err := os.Stat(set); err == nil {
142 _ = os.WriteFile(mark, nil, 0o640)
143 return
144 }
145 if _, err := os.Stat(mark); err == nil {
146 return
147 }
148 if cfgPath == "" {
149 return
150 }
151 if _, err := os.Stat(cfgPath); err != nil {
152 return
153 }
154 if err := saveConnection(workDir, machineFrom(file)); err != nil {
155 if log != nil {
156 log.Error("config.yml-import naar connection.yml mislukt; bestaande config blijft gelden", "err", err)
157 }
158 return
159 }
160 _ = os.WriteFile(mark, nil, 0o640)
161 if log != nil {
162 log.Info("config.yml eenmalig overgenomen in connection.yml; daarna wint de webinterface", "config", cfgPath, "settings", set)
163 }
164}
165
166// loadRuntime leest optioneel config.yml, importeert eenmaal, en overlays
167// connection.yml. url en token mogen leeg zijn (registratie via de UI).
168func loadRuntime(cfgPath, workDirFlag string, log *slog.Logger) (Config, error) {
169 if log == nil {
170 log = slog.New(slog.NewTextHandler(io.Discard, nil))
171 }
172 file, err := loadFileConfig(cfgPath)
173 if err != nil {
174 return Config{}, fmt.Errorf("config: %w", err)
175 }
176 work := resolveWorkDir(workDirFlag, cfgPath, file)
177 importRunnerLegacy(work, cfgPath, file, log)
178 c := file
179 c.WorkDir = work
180 if m, err := loadConnection(work); err != nil {
181 log.Error("connection.yml onleesbaar; val terug op config.yml", "err", err)
182 } else {
183 applyMachine(&c, m)
184 }
185 c.WorkDir = work
186 c.defaults()
187 return c, nil
188}
189
190func registered(c Config) bool {
191 return strings.TrimSpace(c.URL) != "" && strings.TrimSpace(c.Token) != ""
192}
cmd/bluegit-runner/runtime_test.go added +76 −0
@@ -0,0 +1,76 @@
1 package main
2
3 import (
4 "bytes"
5 "io"
6 "log/slog"
7 "os"
8 "path/filepath"
9 "testing"
10 )
11
12 func TestRunnerUpgradePathLeavesConfigUnchanged(t *testing.T) {
13 root := t.TempDir()
14 work := filepath.Join(root, "work")
15 cfgPath := filepath.Join(root, "config.yml")
16 raw := []byte("url: https://git.example.test\ntoken: bgr_secret\nname: nas\ndocker: docker\nwork_dir: " + work + "\nui_listen: 127.0.0.1:8765\n")
17 if err := os.WriteFile(cfgPath, raw, 0o600); err != nil {
18 t.Fatal(err)
19 }
20 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
21 cfg, err := loadRuntime(cfgPath, "", silent)
22 if err != nil {
23 t.Fatal(err)
24 }
25 if cfg.URL != "https://git.example.test" || cfg.Token != "bgr_secret" || cfg.Name != "nas" {
26 t.Fatalf("%+v", cfg)
27 }
28 if cfg.WorkDir != work {
29 t.Fatalf("work_dir %s", cfg.WorkDir)
30 }
31 after, _ := os.ReadFile(cfgPath)
32 if !bytes.Equal(after, raw) {
33 t.Fatalf("config.yml gewijzigd: %s", after)
34 }
35 if _, err := os.Stat(filepath.Join(work, connectionFile)); err != nil {
36 t.Fatal("connection.yml ontbreekt")
37 }
38 // Tweede start, gewijzigde config.yml: connection wint, bestand blijft.
39 if err := os.WriteFile(cfgPath, bytes.Replace(raw, []byte("nas"), []byte("ander"), 1), 0o600); err != nil {
40 t.Fatal(err)
41 }
42 cfg2, err := loadRuntime(cfgPath, "", silent)
43 if err != nil {
44 t.Fatal(err)
45 }
46 if cfg2.Name != "nas" {
47 t.Fatalf("connection hoort te winnen: %s", cfg2.Name)
48 }
49 onDisk, _ := os.ReadFile(cfgPath)
50 if !bytes.Contains(onDisk, []byte("ander")) {
51 t.Fatal("tweede start mocht config.yml niet terugschrijven")
52 }
53 }
54
55 func TestRunnerStartsWithoutRegistration(t *testing.T) {
56 work := t.TempDir()
57 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
58 cfg, err := loadRuntime(filepath.Join(work, "ontbreekt.yml"), work, silent)
59 if err != nil {
60 t.Fatal(err)
61 }
62 if registered(cfg) {
63 t.Fatal("zonder url/token geen koppeling")
64 }
65 if cfg.WorkDir != work || cfg.UIListen == "" {
66 t.Fatalf("%+v", cfg)
67 }
68 }
69
70 func TestConnectionJSONOmitsToken(t *testing.T) {
71 cfg := Config{URL: "https://git.example.test", Token: "bgr_secret", Name: "n", WorkDir: t.TempDir()}
72 cfg.defaults()
73 if !registered(cfg) {
74 t.Fatal("hoort gekoppeld")
75 }
76 }
@@ -0,0 +1,76 @@
1package main
2
3import (
4 "bytes"
5 "io"
6 "log/slog"
7 "os"
8 "path/filepath"
9 "testing"
10)
11
12func TestRunnerUpgradePathLeavesConfigUnchanged(t *testing.T) {
13 root := t.TempDir()
14 work := filepath.Join(root, "work")
15 cfgPath := filepath.Join(root, "config.yml")
16 raw := []byte("url: https://git.example.test\ntoken: bgr_secret\nname: nas\ndocker: docker\nwork_dir: " + work + "\nui_listen: 127.0.0.1:8765\n")
17 if err := os.WriteFile(cfgPath, raw, 0o600); err != nil {
18 t.Fatal(err)
19 }
20 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
21 cfg, err := loadRuntime(cfgPath, "", silent)
22 if err != nil {
23 t.Fatal(err)
24 }
25 if cfg.URL != "https://git.example.test" || cfg.Token != "bgr_secret" || cfg.Name != "nas" {
26 t.Fatalf("%+v", cfg)
27 }
28 if cfg.WorkDir != work {
29 t.Fatalf("work_dir %s", cfg.WorkDir)
30 }
31 after, _ := os.ReadFile(cfgPath)
32 if !bytes.Equal(after, raw) {
33 t.Fatalf("config.yml gewijzigd: %s", after)
34 }
35 if _, err := os.Stat(filepath.Join(work, connectionFile)); err != nil {
36 t.Fatal("connection.yml ontbreekt")
37 }
38 // Tweede start, gewijzigde config.yml: connection wint, bestand blijft.
39 if err := os.WriteFile(cfgPath, bytes.Replace(raw, []byte("nas"), []byte("ander"), 1), 0o600); err != nil {
40 t.Fatal(err)
41 }
42 cfg2, err := loadRuntime(cfgPath, "", silent)
43 if err != nil {
44 t.Fatal(err)
45 }
46 if cfg2.Name != "nas" {
47 t.Fatalf("connection hoort te winnen: %s", cfg2.Name)
48 }
49 onDisk, _ := os.ReadFile(cfgPath)
50 if !bytes.Contains(onDisk, []byte("ander")) {
51 t.Fatal("tweede start mocht config.yml niet terugschrijven")
52 }
53}
54
55func TestRunnerStartsWithoutRegistration(t *testing.T) {
56 work := t.TempDir()
57 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
58 cfg, err := loadRuntime(filepath.Join(work, "ontbreekt.yml"), work, silent)
59 if err != nil {
60 t.Fatal(err)
61 }
62 if registered(cfg) {
63 t.Fatal("zonder url/token geen koppeling")
64 }
65 if cfg.WorkDir != work || cfg.UIListen == "" {
66 t.Fatalf("%+v", cfg)
67 }
68}
69
70func TestConnectionJSONOmitsToken(t *testing.T) {
71 cfg := Config{URL: "https://git.example.test", Token: "bgr_secret", Name: "n", WorkDir: t.TempDir()}
72 cfg.defaults()
73 if !registered(cfg) {
74 t.Fatal("hoort gekoppeld")
75 }
76}
cmd/bluegit-runner/ui.go +31 −0
@@ -15,6 +15,7 @@ import (
15 15 "os"
16 16 "path/filepath"
17 17 "strings"
18 "sync"
18 19 "time"
19 20
20 21 "gitlab.com/Timfa/bluegit/internal/i18n"
@@ -57,6 +58,10 @@ type webUI struct {
57 58 token string
58 59 h *runnercfg.Handler
59 60 mux *http.ServeMux
61
62 listenMu sync.Mutex
63 hs *http.Server
64 ln net.Listener
60 65 }
61 66
62 67 func (u *webUI) mac(purpose string) string {
@@ -221,6 +226,9 @@ func serveUI(ctx context.Context, u *webUI, listen string, logf func(string, ...
221 226 return err
222 227 }
223 228 srv := &http.Server{Handler: u, ReadHeaderTimeout: 10 * time.Second}
229 u.listenMu.Lock()
230 u.hs, u.ln = srv, ln
231 u.listenMu.Unlock()
224 232 go func() {
225 233 <-ctx.Done()
226 234 sc, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@@ -235,6 +243,29 @@ func serveUI(ctx context.Context, u *webUI, listen string, logf func(string, ...
235 243 return nil
236 244 }
237 245
246 func relistenUI(u *webUI, addr string, logf func(string, ...any)) error {
247 ln, err := net.Listen("tcp", addr)
248 if err != nil {
249 return err
250 }
251 newHS := &http.Server{Handler: u, ReadHeaderTimeout: 10 * time.Second}
252 u.listenMu.Lock()
253 old := u.hs
254 u.hs, u.ln = newHS, ln
255 u.listenMu.Unlock()
256 go func() {
257 if err := newHS.Serve(ln); err != nil && !errors.Is(err, http.ErrServerClosed) {
258 logf("web UI", "err", err)
259 }
260 }()
261 if old != nil {
262 ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
263 defer cancel()
264 _ = old.Shutdown(ctx)
265 }
266 return nil
267 }
268
238 269 var layoutTmpl = template.Must(template.New("layout").Parse(`<!DOCTYPE html>
239 270 <html lang="{{.Lang}}">
240 271 <head>
@@ -15,6 +15,7 @@ import (
15 "os"
15 "os"
16 "path/filepath"
16 "path/filepath"
17 "strings"
17 "strings"
18 "sync"
18 "time"
19 "time"
19
20
20 "gitlab.com/Timfa/bluegit/internal/i18n"
21 "gitlab.com/Timfa/bluegit/internal/i18n"
@@ -57,6 +58,10 @@ type webUI struct {
57 token string
58 token string
58 h *runnercfg.Handler
59 h *runnercfg.Handler
59 mux *http.ServeMux
60 mux *http.ServeMux
61
62 listenMu sync.Mutex
63 hs *http.Server
64 ln net.Listener
60}
65}
61
66
62func (u *webUI) mac(purpose string) string {
67func (u *webUI) mac(purpose string) string {
@@ -221,6 +226,9 @@ func serveUI(ctx context.Context, u *webUI, listen string, logf func(string, ...
221 return err
226 return err
222 }
227 }
223 srv := &http.Server{Handler: u, ReadHeaderTimeout: 10 * time.Second}
228 srv := &http.Server{Handler: u, ReadHeaderTimeout: 10 * time.Second}
229 u.listenMu.Lock()
230 u.hs, u.ln = srv, ln
231 u.listenMu.Unlock()
224 go func() {
232 go func() {
225 <-ctx.Done()
233 <-ctx.Done()
226 sc, cancel := context.WithTimeout(context.Background(), 5*time.Second)
234 sc, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@@ -235,6 +243,29 @@ func serveUI(ctx context.Context, u *webUI, listen string, logf func(string, ...
235 return nil
243 return nil
236}
244}
237
245
246func relistenUI(u *webUI, addr string, logf func(string, ...any)) error {
247 ln, err := net.Listen("tcp", addr)
248 if err != nil {
249 return err
250 }
251 newHS := &http.Server{Handler: u, ReadHeaderTimeout: 10 * time.Second}
252 u.listenMu.Lock()
253 old := u.hs
254 u.hs, u.ln = newHS, ln
255 u.listenMu.Unlock()
256 go func() {
257 if err := newHS.Serve(ln); err != nil && !errors.Is(err, http.ErrServerClosed) {
258 logf("web UI", "err", err)
259 }
260 }()
261 if old != nil {
262 ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
263 defer cancel()
264 _ = old.Shutdown(ctx)
265 }
266 return nil
267}
268
238var layoutTmpl = template.Must(template.New("layout").Parse(`<!DOCTYPE html>
269var layoutTmpl = template.Must(template.New("layout").Parse(`<!DOCTYPE html>
239<html lang="{{.Lang}}">
270<html lang="{{.Lang}}">
240<head>
271<head>
cmd/bluegit/main.go +54 −31
@@ -64,23 +64,30 @@ func main() {
64 64 func usage() {
65 65 fmt.Fprintf(os.Stderr, `BlueGit
66 66
67 bluegit serve --config /etc/bluegit/config.yml
67 bluegit serve [--config /etc/bluegit/config.yml]
68 68 bluegit hook pre-receive
69 bluegit token create --config /etc/bluegit/config.yml --user tim --name laptop
69 bluegit token create [--config /etc/bluegit/config.yml] --user tim --name laptop
70 70 bluegit example-config
71 71 bluegit version
72
73 Machine-instellingen (listen, base_url, auth, ssh, git, ci) regel je in
74 Beheer → Instellingen. Een bestaande config.yml wordt eenmalig overgenomen
75 en daarna alleen nog als terugval gelezen. Een toegangstoken maak je in
76 Instellingen of onder Beheer → Gebruikers.
72 77 `)
73 78 }
74 79
75 80 func serve(args []string) error {
76 81 fs := flag.NewFlagSet("serve", flag.ExitOnError)
77 configPath := fs.String("config", "", "pad naar config.yml")
82 configPath := fs.String("config", "", "pad naar config.yml (terugval; instellingen staan in de webinterface)")
78 83 _ = fs.Parse(args)
79 cfg, err := loadConfig(*configPath)
84 log := slog.New(slog.NewTextHandler(os.Stdout, nil))
85 path := apppaths.ConfigFile(*configPath, "BLUEGIT_CONFIG", "bluegit.yml", "/etc/bluegit/config.yml", "BlueGit")
86 rt, err := config.LoadRuntime(path, log)
80 87 if err != nil {
81 88 return err
82 89 }
83 log := slog.New(slog.NewTextHandler(os.Stdout, nil))
90 cfg := rt.Config
84 91 if err := os.MkdirAll(cfg.StatePath, 0o750); err != nil {
85 92 return err
86 93 }
@@ -124,7 +131,7 @@ func serve(args []string) error {
124 131 var restart atomic.Bool
125 132 srv := &server.Server{
126 133 Cfg: cfg, Store: st, Auth: provider, Dev: dev, Git: cfg.Git.Binary, HookBin: exe, Log: log,
127 StateDir: cfg.StatePath,
134 StateDir: cfg.StatePath, ConfigPath: rt.ConfigPath, SettingsPath: rt.SettingsPath,
128 135 RequestRestart: func() {
129 136 restart.Store(true)
130 137 stop()
@@ -160,19 +167,6 @@ func serve(args []string) error {
160 167 go srv.StaleManualSweeper(ctx)
161 168 go srv.GitMaintenanceSweeper(ctx)
162 169 var sh *sshd.Server
163 if cfg.SSH.Enabled {
164 sh = &sshd.Server{
165 Listen: cfg.SSH.Listen, Store: st, GitBin: cfg.Git.Binary, Storage: dataPath,
166 HostKey: filepath.Join(cfg.StatePath, "ssh", "host_ed25519"), Log: log,
167 OnPush: srv.AfterPush,
168 API: srv.CallAPI,
169 }
170 go func() {
171 if err := sh.Run(ctx); err != nil {
172 log.Error("ssh", "err", err)
173 }
174 }()
175 }
176 170 srv.AfterStorage = func(path string) {
177 171 if rn != nil {
178 172 rn.SetStorage(path)
@@ -183,7 +177,39 @@ func serve(args []string) error {
183 177 }
184 178 srv.AdoptStorage(dataPath)
185 179 srv.RefreshHooks()
186 httpSrv := &http.Server{Addr: cfg.Listen, Handler: srv.Handler(), ReadHeaderTimeout: 10 * time.Second}
180 var sshCancel context.CancelFunc
181 srv.ApplySSH = func(enabled bool, listen string) error {
182 if !enabled {
183 if sshCancel != nil {
184 sshCancel()
185 sshCancel = nil
186 }
187 sh = nil
188 return nil
189 }
190 if sh != nil {
191 return sh.Relisten(listen)
192 }
193 sh = &sshd.Server{
194 Listen: listen, Store: st, GitBin: cfg.Git.Binary, Storage: srv.StoragePath(),
195 HostKey: filepath.Join(cfg.StatePath, "ssh", "host_ed25519"), Log: log,
196 OnPush: srv.AfterPush, API: srv.CallAPI,
197 }
198 var sshCtx context.Context
199 sshCtx, sshCancel = context.WithCancel(ctx)
200 go func() {
201 if err := sh.Run(sshCtx); err != nil {
202 log.Error("ssh", "err", err)
203 }
204 }()
205 return nil
206 }
207 if cfg.SSH.Enabled {
208 if err := srv.ApplySSH(true, cfg.SSH.Listen); err != nil {
209 return err
210 }
211 }
212
187 213 shutDone := make(chan struct{})
188 214 go func() {
189 215 defer close(shutDone)
@@ -192,12 +218,12 @@ func serve(args []string) error {
192 218 // doNotInterrupt-jobs lopen uit; de website blijft zo lang bereikbaar.
193 219 rn.WaitProtected(func(n int64) { log.Info("wacht op doNotInterrupt-jobs voor afsluiten", "count", n) })
194 220 }
195 shut, cancel := context.WithTimeout(context.Background(), 10*time.Second)
196 defer cancel()
197 _ = httpSrv.Shutdown(shut)
221 if sshCancel != nil {
222 sshCancel()
223 }
224 srv.StopHTTP()
198 225 }()
199 log.Info("BlueGit luistert", "addr", cfg.Listen, "base", cfg.BaseURL)
200 if err := httpSrv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
226 if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
201 227 return err
202 228 }
203 229 if restart.Load() {
@@ -243,10 +269,12 @@ func tokenCmd(args []string) error {
243 269 return fmt.Errorf("gebruik: bluegit token create --config … --user … --name …")
244 270 }
245 271 _ = fs.Parse(args[1:])
246 cfg, err := loadConfig(*configPath)
272 path := apppaths.ConfigFile(*configPath, "BLUEGIT_CONFIG", "bluegit.yml", "/etc/bluegit/config.yml", "BlueGit")
273 rt, err := config.LoadRuntime(path, nil)
247 274 if err != nil {
248 275 return err
249 276 }
277 cfg := rt.Config
250 278 if err := os.MkdirAll(cfg.StatePath, 0o750); err != nil {
251 279 return err
252 280 }
@@ -296,11 +324,6 @@ func resolveStorage(cfg config.Config, log *slog.Logger) string {
296 324 return path
297 325 }
298 326
299 func loadConfig(path string) (config.Config, error) {
300 path = apppaths.ConfigFile(path, "BLUEGIT_CONFIG", "bluegit.yml", "/etc/bluegit/config.yml", "BlueGit")
301 return config.Load(path)
302 }
303
304 327 func loadKey(path string) ([]byte, error) {
305 328 if b, err := os.ReadFile(path); err == nil {
306 329 if len(b) != 32 {
@@ -64,23 +64,30 @@ func main() {
64func usage() {
64func usage() {
65 fmt.Fprintf(os.Stderr, `BlueGit
65 fmt.Fprintf(os.Stderr, `BlueGit
66
66
67 bluegit serve --config /etc/bluegit/config.yml
67 bluegit serve [--config /etc/bluegit/config.yml]
68 bluegit hook pre-receive
68 bluegit hook pre-receive
69 bluegit token create --config /etc/bluegit/config.yml --user tim --name laptop
69 bluegit token create [--config /etc/bluegit/config.yml] --user tim --name laptop
70 bluegit example-config
70 bluegit example-config
71 bluegit version
71 bluegit version
72
73Machine-instellingen (listen, base_url, auth, ssh, git, ci) regel je in
74Beheer → Instellingen. Een bestaande config.yml wordt eenmalig overgenomen
75en daarna alleen nog als terugval gelezen. Een toegangstoken maak je in
76Instellingen of onder Beheer → Gebruikers.
72`)
77`)
73}
78}
74
79
75func serve(args []string) error {
80func serve(args []string) error {
76 fs := flag.NewFlagSet("serve", flag.ExitOnError)
81 fs := flag.NewFlagSet("serve", flag.ExitOnError)
77 configPath := fs.String("config", "", "pad naar config.yml")
82 configPath := fs.String("config", "", "pad naar config.yml (terugval; instellingen staan in de webinterface)")
78 _ = fs.Parse(args)
83 _ = fs.Parse(args)
79 cfg, err := loadConfig(*configPath)
84 log := slog.New(slog.NewTextHandler(os.Stdout, nil))
85 path := apppaths.ConfigFile(*configPath, "BLUEGIT_CONFIG", "bluegit.yml", "/etc/bluegit/config.yml", "BlueGit")
86 rt, err := config.LoadRuntime(path, log)
80 if err != nil {
87 if err != nil {
81 return err
88 return err
82 }
89 }
83 log := slog.New(slog.NewTextHandler(os.Stdout, nil))
90 cfg := rt.Config
84 if err := os.MkdirAll(cfg.StatePath, 0o750); err != nil {
91 if err := os.MkdirAll(cfg.StatePath, 0o750); err != nil {
85 return err
92 return err
86 }
93 }
@@ -124,7 +131,7 @@ func serve(args []string) error {
124 var restart atomic.Bool
131 var restart atomic.Bool
125 srv := &server.Server{
132 srv := &server.Server{
126 Cfg: cfg, Store: st, Auth: provider, Dev: dev, Git: cfg.Git.Binary, HookBin: exe, Log: log,
133 Cfg: cfg, Store: st, Auth: provider, Dev: dev, Git: cfg.Git.Binary, HookBin: exe, Log: log,
127 StateDir: cfg.StatePath,
134 StateDir: cfg.StatePath, ConfigPath: rt.ConfigPath, SettingsPath: rt.SettingsPath,
128 RequestRestart: func() {
135 RequestRestart: func() {
129 restart.Store(true)
136 restart.Store(true)
130 stop()
137 stop()
@@ -160,19 +167,6 @@ func serve(args []string) error {
160 go srv.StaleManualSweeper(ctx)
167 go srv.StaleManualSweeper(ctx)
161 go srv.GitMaintenanceSweeper(ctx)
168 go srv.GitMaintenanceSweeper(ctx)
162 var sh *sshd.Server
169 var sh *sshd.Server
163 if cfg.SSH.Enabled {
164 sh = &sshd.Server{
165 Listen: cfg.SSH.Listen, Store: st, GitBin: cfg.Git.Binary, Storage: dataPath,
166 HostKey: filepath.Join(cfg.StatePath, "ssh", "host_ed25519"), Log: log,
167 OnPush: srv.AfterPush,
168 API: srv.CallAPI,
169 }
170 go func() {
171 if err := sh.Run(ctx); err != nil {
172 log.Error("ssh", "err", err)
173 }
174 }()
175 }
176 srv.AfterStorage = func(path string) {
170 srv.AfterStorage = func(path string) {
177 if rn != nil {
171 if rn != nil {
178 rn.SetStorage(path)
172 rn.SetStorage(path)
@@ -183,7 +177,39 @@ func serve(args []string) error {
183 }
177 }
184 srv.AdoptStorage(dataPath)
178 srv.AdoptStorage(dataPath)
185 srv.RefreshHooks()
179 srv.RefreshHooks()
186 httpSrv := &http.Server{Addr: cfg.Listen, Handler: srv.Handler(), ReadHeaderTimeout: 10 * time.Second}
180 var sshCancel context.CancelFunc
181 srv.ApplySSH = func(enabled bool, listen string) error {
182 if !enabled {
183 if sshCancel != nil {
184 sshCancel()
185 sshCancel = nil
186 }
187 sh = nil
188 return nil
189 }
190 if sh != nil {
191 return sh.Relisten(listen)
192 }
193 sh = &sshd.Server{
194 Listen: listen, Store: st, GitBin: cfg.Git.Binary, Storage: srv.StoragePath(),
195 HostKey: filepath.Join(cfg.StatePath, "ssh", "host_ed25519"), Log: log,
196 OnPush: srv.AfterPush, API: srv.CallAPI,
197 }
198 var sshCtx context.Context
199 sshCtx, sshCancel = context.WithCancel(ctx)
200 go func() {
201 if err := sh.Run(sshCtx); err != nil {
202 log.Error("ssh", "err", err)
203 }
204 }()
205 return nil
206 }
207 if cfg.SSH.Enabled {
208 if err := srv.ApplySSH(true, cfg.SSH.Listen); err != nil {
209 return err
210 }
211 }
212
187 shutDone := make(chan struct{})
213 shutDone := make(chan struct{})
188 go func() {
214 go func() {
189 defer close(shutDone)
215 defer close(shutDone)
@@ -192,12 +218,12 @@ func serve(args []string) error {
192 // doNotInterrupt-jobs lopen uit; de website blijft zo lang bereikbaar.
218 // doNotInterrupt-jobs lopen uit; de website blijft zo lang bereikbaar.
193 rn.WaitProtected(func(n int64) { log.Info("wacht op doNotInterrupt-jobs voor afsluiten", "count", n) })
219 rn.WaitProtected(func(n int64) { log.Info("wacht op doNotInterrupt-jobs voor afsluiten", "count", n) })
194 }
220 }
195 shut, cancel := context.WithTimeout(context.Background(), 10*time.Second)
221 if sshCancel != nil {
196 defer cancel()
222 sshCancel()
197 _ = httpSrv.Shutdown(shut)
223 }
224 srv.StopHTTP()
198 }()
225 }()
199 log.Info("BlueGit luistert", "addr", cfg.Listen, "base", cfg.BaseURL)
226 if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
200 if err := httpSrv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
201 return err
227 return err
202 }
228 }
203 if restart.Load() {
229 if restart.Load() {
@@ -243,10 +269,12 @@ func tokenCmd(args []string) error {
243 return fmt.Errorf("gebruik: bluegit token create --config … --user … --name …")
269 return fmt.Errorf("gebruik: bluegit token create --config … --user … --name …")
244 }
270 }
245 _ = fs.Parse(args[1:])
271 _ = fs.Parse(args[1:])
246 cfg, err := loadConfig(*configPath)
272 path := apppaths.ConfigFile(*configPath, "BLUEGIT_CONFIG", "bluegit.yml", "/etc/bluegit/config.yml", "BlueGit")
273 rt, err := config.LoadRuntime(path, nil)
247 if err != nil {
274 if err != nil {
248 return err
275 return err
249 }
276 }
277 cfg := rt.Config
250 if err := os.MkdirAll(cfg.StatePath, 0o750); err != nil {
278 if err := os.MkdirAll(cfg.StatePath, 0o750); err != nil {
251 return err
279 return err
252 }
280 }
@@ -296,11 +324,6 @@ func resolveStorage(cfg config.Config, log *slog.Logger) string {
296 return path
324 return path
297}
325}
298
326
299func loadConfig(path string) (config.Config, error) {
300 path = apppaths.ConfigFile(path, "BLUEGIT_CONFIG", "bluegit.yml", "/etc/bluegit/config.yml", "BlueGit")
301 return config.Load(path)
302}
303
304func loadKey(path string) ([]byte, error) {
327func loadKey(path string) ([]byte, error) {
305 if b, err := os.ReadFile(path); err == nil {
328 if b, err := os.ReadFile(path); err == nil {
306 if len(b) != 32 {
329 if len(b) != 32 {
docs/ASSUMPTIONS.md +25 −0
@@ -171,3 +171,28 @@ Tot 16-11-2026, toen dit nog een aparte repository was. Wat er sindsdien geldt,
171 171 - De integratietests bouwen BlueGit van de ref in `.bluegit-ref` (`master`; tijdens de compatibiliteitswijziging tijdelijk `feature/backup-compat`, tot die in BlueGit gemerged is).
172 172 - De integratietests draaien nooit tegen een echte BlueGit-installatie. Elke test start een eigen BlueGit in een tijdelijke map, met de dev-login en zonder SSH of CI-runner.
173 173 - Het AUR-pakket `bluegit-backup` haalt de broncode uit het archief van `timfa/bluegit` (dezelfde repository), net als `bluegit` en `bluegit-runner`.
174
175 ## Machine-instellingen in de webinterface (18-11-2026, t1283u)
176
177 BlueGit en de losse runner volgen dezelfde regel als de backup server: alles wat in een webinterface kan, hoort daar (met API-pariteit), tenzij het technisch niet anders kan.
178
179 ### BlueGit
180
181 - Machine-instellingen uit `/etc/bluegit/config.yml` (listen, base_url, trusted_proxies, auth/OIDC inclusief clientgeheim, git, ssh, ci, runner.name) staan onder **Beheer → Instellingen** en `GET`/`PUT /api/v1/admin/settings`. Ze worden opgeslagen in `state_path/settings.yml` (mode 0600). Geheimen zijn in de UI en de API alleen schrijven: het clientgeheim wordt nooit teruggegeven, alleen `client_secret_set`.
182 - Een bestaande `config.yml` wordt **eenmalig** naar `settings.yml` gekopieerd (marker `config.yml.imported`). De import is idempotent. **`config.yml` zelf wordt nooit herschreven of verwijderd**, zodat een self-update van git.timfalken.com met de bestaande config start. Zonder `settings.yml` is het gedrag gelijk aan `Load(config.yml)`. Is `settings.yml` onleesbaar of ongeldig, dan valt de server terug op `config.yml` en start gewoon. Omgevingsvariabelen (`BLUEGIT_LISTEN`, `BLUEGIT_AUTH_CLIENT_SECRET`, `BLUEGIT_STATE_PATH`, …) winnen altijd, als laatste redmiddel.
183 - `listen` en `ssh.listen` worden live omgezet: eerst binden op het nieuwe adres, bij falen blijft de oude listener. Auth-wijzigingen gaan meteen in voor de volgende login. `ci.presets` en de live runnerlimieten blijven onder Beheer → Runner (`runner-settings.json`), om geen tweede bron te maken.
184 - **Buiten de UI, met reden:**
185 - `state_path` (standaard `/var/lib/bluegit`, of `BLUEGIT_STATE_PATH` / `state_path` in config.yml): hier staan de database, `secret.key` en `settings.yml`, dus het pad kan niet in dat bestand zelf wonen. De UI toont het alleen-lezen.
186 - Processtart (`bluegit serve`) en de eerste bootstrap van een verse instantie (voorbeeld-`config.yml` + clientgeheim), omdat Validate zonder geheim niet kan starten.
187 - `storage_path` en de leescache blijven op de bestaande pagina `/setup` (Beheer → Opslag).
188 - Persoonlijke toegangstokens stonden al onder Instellingen (`/settings/tokens` en `/api/v1/user/tokens`). `bluegit token create` maakt hetzelfde soort token; dat kan nu ook onder Beheer → Gebruikers (en `POST /api/v1/admin/users/{username}/tokens`). Het nieuwe token wordt één keer getoond.
189 - CSRF en instance-admin zijn verplicht voor wijzigingen.
190
191 ### Runner
192
193 - `url`, runner-token, naam, docker, git, network, ui_listen en language staan in de runner-webinterface (Koppeling) en in de API `/api/connection` en `/api/register`. Registratie kan in de UI: BlueGit-URL + registratietoken. Opgeslagen in `work_dir/connection.yml` (0600). Het runner-token is schrijven-only (`token_set`). Een bestaande `/etc/bluegit-runner/config.yml` wordt eenmaal geïmporteerd en blijft als terugval ongewijzigd. De service start ook zonder die config.yml, zodat je eerst de UI kunt openen.
194 - Joblimieten, presets en pauze bleven al in `work_dir/settings.json`.
195 - **Buiten de UI, met reden:**
196 - `work_dir` (standaard `/var/lib/bluegit-runner`, of `--work-dir` / `BLUEGIT_RUNNER_WORK_DIR`): hier staan `connection.yml`, `settings.json` en het UI-beheertoken.
197 - Het eerste UI-beheertoken (`bluegit-runner ui-token`, bestand `work_dir/ui-token`, mode 0600): bootstrap om überhaupt in te loggen. Na het inloggen blijft dat de manier om het token te zien; het komt niet in de logs.
198 - Processtart (`bluegit-runner run`) en lidmaatschap van de docker-groep (systeem, geen applicatie-instelling).
@@ -171,3 +171,28 @@ Tot 16-11-2026, toen dit nog een aparte repository was. Wat er sindsdien geldt,
171- De integratietests bouwen BlueGit van de ref in `.bluegit-ref` (`master`; tijdens de compatibiliteitswijziging tijdelijk `feature/backup-compat`, tot die in BlueGit gemerged is).
171- De integratietests bouwen BlueGit van de ref in `.bluegit-ref` (`master`; tijdens de compatibiliteitswijziging tijdelijk `feature/backup-compat`, tot die in BlueGit gemerged is).
172- De integratietests draaien nooit tegen een echte BlueGit-installatie. Elke test start een eigen BlueGit in een tijdelijke map, met de dev-login en zonder SSH of CI-runner.
172- De integratietests draaien nooit tegen een echte BlueGit-installatie. Elke test start een eigen BlueGit in een tijdelijke map, met de dev-login en zonder SSH of CI-runner.
173- Het AUR-pakket `bluegit-backup` haalt de broncode uit het archief van `timfa/bluegit` (dezelfde repository), net als `bluegit` en `bluegit-runner`.
173- Het AUR-pakket `bluegit-backup` haalt de broncode uit het archief van `timfa/bluegit` (dezelfde repository), net als `bluegit` en `bluegit-runner`.
174
175## Machine-instellingen in de webinterface (18-11-2026, t1283u)
176
177BlueGit en de losse runner volgen dezelfde regel als de backup server: alles wat in een webinterface kan, hoort daar (met API-pariteit), tenzij het technisch niet anders kan.
178
179### BlueGit
180
181- Machine-instellingen uit `/etc/bluegit/config.yml` (listen, base_url, trusted_proxies, auth/OIDC inclusief clientgeheim, git, ssh, ci, runner.name) staan onder **Beheer → Instellingen** en `GET`/`PUT /api/v1/admin/settings`. Ze worden opgeslagen in `state_path/settings.yml` (mode 0600). Geheimen zijn in de UI en de API alleen schrijven: het clientgeheim wordt nooit teruggegeven, alleen `client_secret_set`.
182- Een bestaande `config.yml` wordt **eenmalig** naar `settings.yml` gekopieerd (marker `config.yml.imported`). De import is idempotent. **`config.yml` zelf wordt nooit herschreven of verwijderd**, zodat een self-update van git.timfalken.com met de bestaande config start. Zonder `settings.yml` is het gedrag gelijk aan `Load(config.yml)`. Is `settings.yml` onleesbaar of ongeldig, dan valt de server terug op `config.yml` en start gewoon. Omgevingsvariabelen (`BLUEGIT_LISTEN`, `BLUEGIT_AUTH_CLIENT_SECRET`, `BLUEGIT_STATE_PATH`, …) winnen altijd, als laatste redmiddel.
183- `listen` en `ssh.listen` worden live omgezet: eerst binden op het nieuwe adres, bij falen blijft de oude listener. Auth-wijzigingen gaan meteen in voor de volgende login. `ci.presets` en de live runnerlimieten blijven onder Beheer → Runner (`runner-settings.json`), om geen tweede bron te maken.
184- **Buiten de UI, met reden:**
185 - `state_path` (standaard `/var/lib/bluegit`, of `BLUEGIT_STATE_PATH` / `state_path` in config.yml): hier staan de database, `secret.key` en `settings.yml`, dus het pad kan niet in dat bestand zelf wonen. De UI toont het alleen-lezen.
186 - Processtart (`bluegit serve`) en de eerste bootstrap van een verse instantie (voorbeeld-`config.yml` + clientgeheim), omdat Validate zonder geheim niet kan starten.
187 - `storage_path` en de leescache blijven op de bestaande pagina `/setup` (Beheer → Opslag).
188- Persoonlijke toegangstokens stonden al onder Instellingen (`/settings/tokens` en `/api/v1/user/tokens`). `bluegit token create` maakt hetzelfde soort token; dat kan nu ook onder Beheer → Gebruikers (en `POST /api/v1/admin/users/{username}/tokens`). Het nieuwe token wordt één keer getoond.
189- CSRF en instance-admin zijn verplicht voor wijzigingen.
190
191### Runner
192
193- `url`, runner-token, naam, docker, git, network, ui_listen en language staan in de runner-webinterface (Koppeling) en in de API `/api/connection` en `/api/register`. Registratie kan in de UI: BlueGit-URL + registratietoken. Opgeslagen in `work_dir/connection.yml` (0600). Het runner-token is schrijven-only (`token_set`). Een bestaande `/etc/bluegit-runner/config.yml` wordt eenmaal geïmporteerd en blijft als terugval ongewijzigd. De service start ook zonder die config.yml, zodat je eerst de UI kunt openen.
194- Joblimieten, presets en pauze bleven al in `work_dir/settings.json`.
195- **Buiten de UI, met reden:**
196 - `work_dir` (standaard `/var/lib/bluegit-runner`, of `--work-dir` / `BLUEGIT_RUNNER_WORK_DIR`): hier staan `connection.yml`, `settings.json` en het UI-beheertoken.
197 - Het eerste UI-beheertoken (`bluegit-runner ui-token`, bestand `work_dir/ui-token`, mode 0600): bootstrap om überhaupt in te loggen. Na het inloggen blijft dat de manier om het token te zien; het komt niet in de logs.
198 - Processtart (`bluegit-runner run`) en lidmaatschap van de docker-groep (systeem, geen applicatie-instelling).
docs/runner.en.md +35 −10
@@ -21,8 +21,8 @@ yay -S bluegit-runner
21 21 ```
22 22
23 23 The package creates the system user `bluegit-runner` (member of `docker`),
24 installs and enables `bluegit-runner.service`. The service starts once
25 `/etc/bluegit-runner/config.yml` exists; an upgrade restarts it.
24 installs and enables `bluegit-runner.service`. The service starts
25 immediately; you register it in the web interface. An upgrade restarts it.
26 26
27 27 ## Install elsewhere (binary + systemd)
28 28
@@ -38,20 +38,45 @@ sudo usermod -aG docker bluegit-runner
38 38 sudo systemctl daemon-reload && sudo systemctl enable bluegit-runner
39 39 ```
40 40
41 Without systemd: `bluegit-runner run --config path/to/config.yml` as a user that may use Docker.
41 Without systemd: `bluegit-runner run --work-dir /var/lib/bluegit-runner` as a user that may use Docker.
42 42
43 43 ## Register
44 44
45 45 - **1.** In BlueGit: **Settings → Runners → New registration token** (account runner) or **Group → Settings → Runners** (group runner, maintainers). The token (`bgrr_…`) is valid 24 hours, single use, shown once.
46 - **2.** On the machine: `sudo bluegit-runner register --url https://git.example.com --token bgrr_... [--name my-pc]`. The runner gets its own token (`bgr_…`); the server stores only its hash. `register` starts the service and prints how to open the web interface.
46 - **2.** On the machine, through the web interface (recommended):
47
48 ```sh
49 sudo -u bluegit-runner bluegit-runner ui-token --work-dir /var/lib/bluegit-runner
50 ```
51
52 Open http://127.0.0.1:8765 (or the address in `ui_listen`), sign in with
53 that admin token, and under **Connection** enter the BlueGit URL, the
54 registration token and an optional name. The runner token (`bgr_…`) is
55 stored in `work_dir/connection.yml` (mode 0600) and never shown again.
56 The server stores only its hash.
57
58 Alternative via the CLI:
59
60 ```sh
61 sudo bluegit-runner register --url https://git.example.com --token bgrr_... [--name my-pc]
62 ```
47 63
48 64 ## Config
49 65
50 `/etc/bluegit-runner/config.yml`: `url`, `token`, `name`, `docker`, `git`,
51 `work_dir` (`/var/lib/bluegit-runner`), `network` (`bridge`), `concurrency`
52 (start value), `ui_listen` (`127.0.0.1:8765`, `off` disables the UI) and
53 `language` (`en`, `nl`, `de`, `fr`). Settings changed in the web interface
54 are stored in `work_dir/settings.json`.
66 Settings (url, name, docker, git, `ui_listen`, …) are managed in the web
67 interface. They live in `work_dir/connection.yml` (default
68 `/var/lib/bluegit-runner/connection.yml`). An existing
69 `/etc/bluegit-runner/config.yml` is imported once and then only read as a
70 fallback; the file itself is left unchanged. Job limits, presets and pause
71 stay in `work_dir/settings.json`, as before.
72
73 `work_dir` itself and the first admin token (`bluegit-runner ui-token`) stay
74 outside the UI, because the settings and the token live there.
75
76 Legacy `/etc/bluegit-runner/config.yml` (fallback): `url`, `token`, `name`,
77 `docker`, `git`, `work_dir` (`/var/lib/bluegit-runner`), `network`
78 (`bridge`), `concurrency` (start value), `ui_listen` (`127.0.0.1:8765`,
79 `off` disables the UI) and `language` (`en`, `nl`, `de`, `fr`).
55 80
56 81 ## Web interface
57 82
@@ -126,7 +151,7 @@ Instance admins register runners under **Admin → Runner → Global runners** (
126 151
127 152 - Every job runs in its own Docker container with the checkout on `/workspace`; services get a network per job. Per-job limits are set in the web interface.
128 153 - Docker access is root-equivalent on that machine; account runners only get jobs of their owner's repositories, group runners only of their group.
129 - The runner token is only in `config.yml` (0600); the server keeps a hash. It may only clone the repository of a job the runner is running right now.
154 - The runner token is only in `work_dir/connection.yml` (0600; or the legacy `config.yml` as fallback); the server keeps a hash. It may only clone the repository of a job the runner is running right now.
130 155 - Job secrets are masked in logs. The service runs with `NoNewPrivileges`, `ProtectSystem=strict`, `ProtectHome` and `PrivateTmp`.
131 156
132 157 ## Online, offline and lost runners
@@ -21,8 +21,8 @@ yay -S bluegit-runner
21```
21```
22
22
23The package creates the system user `bluegit-runner` (member of `docker`),
23The package creates the system user `bluegit-runner` (member of `docker`),
24installs and enables `bluegit-runner.service`. The service starts once
24installs and enables `bluegit-runner.service`. The service starts
25`/etc/bluegit-runner/config.yml` exists; an upgrade restarts it.
25immediately; you register it in the web interface. An upgrade restarts it.
26
26
27## Install elsewhere (binary + systemd)
27## Install elsewhere (binary + systemd)
28
28
@@ -38,20 +38,45 @@ sudo usermod -aG docker bluegit-runner
38sudo systemctl daemon-reload && sudo systemctl enable bluegit-runner
38sudo systemctl daemon-reload && sudo systemctl enable bluegit-runner
39```
39```
40
40
41Without systemd: `bluegit-runner run --config path/to/config.yml` as a user that may use Docker.
41Without systemd: `bluegit-runner run --work-dir /var/lib/bluegit-runner` as a user that may use Docker.
42
42
43## Register
43## Register
44
44
45- **1.** In BlueGit: **Settings → Runners → New registration token** (account runner) or **Group → Settings → Runners** (group runner, maintainers). The token (`bgrr_…`) is valid 24 hours, single use, shown once.
45- **1.** In BlueGit: **Settings → Runners → New registration token** (account runner) or **Group → Settings → Runners** (group runner, maintainers). The token (`bgrr_…`) is valid 24 hours, single use, shown once.
46- **2.** On the machine: `sudo bluegit-runner register --url https://git.example.com --token bgrr_... [--name my-pc]`. The runner gets its own token (`bgr_…`); the server stores only its hash. `register` starts the service and prints how to open the web interface.
46- **2.** On the machine, through the web interface (recommended):
47
48 ```sh
49 sudo -u bluegit-runner bluegit-runner ui-token --work-dir /var/lib/bluegit-runner
50 ```
51
52 Open http://127.0.0.1:8765 (or the address in `ui_listen`), sign in with
53 that admin token, and under **Connection** enter the BlueGit URL, the
54 registration token and an optional name. The runner token (`bgr_…`) is
55 stored in `work_dir/connection.yml` (mode 0600) and never shown again.
56 The server stores only its hash.
57
58 Alternative via the CLI:
59
60 ```sh
61 sudo bluegit-runner register --url https://git.example.com --token bgrr_... [--name my-pc]
62 ```
47
63
48## Config
64## Config
49
65
50`/etc/bluegit-runner/config.yml`: `url`, `token`, `name`, `docker`, `git`,
66Settings (url, name, docker, git, `ui_listen`, …) are managed in the web
51`work_dir` (`/var/lib/bluegit-runner`), `network` (`bridge`), `concurrency`
67interface. They live in `work_dir/connection.yml` (default
52(start value), `ui_listen` (`127.0.0.1:8765`, `off` disables the UI) and
68`/var/lib/bluegit-runner/connection.yml`). An existing
53`language` (`en`, `nl`, `de`, `fr`). Settings changed in the web interface
69`/etc/bluegit-runner/config.yml` is imported once and then only read as a
54are stored in `work_dir/settings.json`.
70fallback; the file itself is left unchanged. Job limits, presets and pause
71stay in `work_dir/settings.json`, as before.
72
73`work_dir` itself and the first admin token (`bluegit-runner ui-token`) stay
74outside the UI, because the settings and the token live there.
75
76Legacy `/etc/bluegit-runner/config.yml` (fallback): `url`, `token`, `name`,
77`docker`, `git`, `work_dir` (`/var/lib/bluegit-runner`), `network`
78(`bridge`), `concurrency` (start value), `ui_listen` (`127.0.0.1:8765`,
79`off` disables the UI) and `language` (`en`, `nl`, `de`, `fr`).
55
80
56## Web interface
81## Web interface
57
82
@@ -126,7 +151,7 @@ Instance admins register runners under **Admin → Runner → Global runners** (
126
151
127- Every job runs in its own Docker container with the checkout on `/workspace`; services get a network per job. Per-job limits are set in the web interface.
152- Every job runs in its own Docker container with the checkout on `/workspace`; services get a network per job. Per-job limits are set in the web interface.
128- Docker access is root-equivalent on that machine; account runners only get jobs of their owner's repositories, group runners only of their group.
153- Docker access is root-equivalent on that machine; account runners only get jobs of their owner's repositories, group runners only of their group.
129- The runner token is only in `config.yml` (0600); the server keeps a hash. It may only clone the repository of a job the runner is running right now.
154- The runner token is only in `work_dir/connection.yml` (0600; or the legacy `config.yml` as fallback); the server keeps a hash. It may only clone the repository of a job the runner is running right now.
130- Job secrets are masked in logs. The service runs with `NoNewPrivileges`, `ProtectSystem=strict`, `ProtectHome` and `PrivateTmp`.
155- Job secrets are masked in logs. The service runs with `NoNewPrivileges`, `ProtectSystem=strict`, `ProtectHome` and `PrivateTmp`.
131
156
132## Online, offline and lost runners
157## Online, offline and lost runners
docs/runner.md +29 −9
@@ -25,7 +25,7 @@ yay -S bluegit-runner # of: git clone https://aur.archlinux.org/bluegit-r
25 25
26 26 Het pakket maakt de systeemgebruiker `bluegit-runner` (lid van `docker`),
27 27 installeert `bluegit-runner.service` en zet die aan. De service start
28 zodra `/etc/bluegit-runner/config.yml` bestaat; een upgrade herstart hem.
28 meteen; koppelen doe je in de webinterface. Een upgrade herstart hem.
29 29
30 30 ## Installeren buiten Arch (binary + systemd)
31 31
@@ -43,28 +43,48 @@ sudo usermod -aG docker bluegit-runner
43 43 sudo systemctl daemon-reload && sudo systemctl enable bluegit-runner
44 44 ```
45 45
46 Daarna [registreren](#registreren). Zonder systemd: `bluegit-runner run --config pad/naar/config.yml`
46 Daarna [registreren](#registreren). Zonder systemd: `bluegit-runner run --work-dir /var/lib/bluegit-runner`
47 47 als een gebruiker die Docker mag gebruiken.
48 48
49 49 ## Registreren
50 50
51 51 - **1.** In BlueGit: **Instellingen → Runners → Nieuw registratietoken** voor een account-runner, of **Groep → Instellingen → Runners** voor een groepsrunner (maintainer). Het token (`bgrr_…`) is 24 uur geldig, eenmalig, en je ziet het één keer.
52 - **2.** Op de machine:
52 - **2.** Op de machine, via de webinterface (aanbevolen):
53
54 ```sh
55 sudo -u bluegit-runner bluegit-runner ui-token --work-dir /var/lib/bluegit-runner
56 ```
57
58 Open http://127.0.0.1:8765 (of het adres in ui_listen), meld je aan met
59 dat beheertoken, en vul onder **Koppeling** de BlueGit-URL, het
60 registratietoken en eventueel een naam in. Het runner-token (`bgr_…`)
61 wordt opgeslagen in `work_dir/connection.yml` (mode 0600) en nooit
62 teruggetoond. De server bewaart alleen de hash.
63
64 Alternatief via de CLI:
53 65
54 66 ```sh
55 67 sudo bluegit-runner register --url https://git.timfalken.com --token bgrr_... [--name mijn-pc]
56 68 ```
57 69
58 De runner krijgt een eigen runner-token (`bgr_…`); de server bewaart
59 alleen de hash. Het token staat in `/etc/bluegit-runner/config.yml`
60 (mode 0600, eigenaar `bluegit-runner`). `register` start de service.
61 - **3.** In de UI staat de runner nu als **online**. Intrekken kan daar ook; het token werkt dan meteen niet meer.
70 - **3.** In de BlueGit-UI staat de runner nu als **online**. Intrekken kan daar ook; het token werkt dan meteen niet meer.
62 71
63 72 Het registratietoken mag ook via `BLUEGIT_RUNNER_REGISTRATION_TOKEN`.
64 73
65 74 ## Config
66 75
67 `/etc/bluegit-runner/config.yml`:
76 Instellingen (url, naam, docker, git, ui_listen, …) regel je in de
77 webinterface. Ze staan in `work_dir/connection.yml` (standaard
78 `/var/lib/bluegit-runner/connection.yml`). Een bestaande
79 `/etc/bluegit-runner/config.yml` wordt eenmalig overgenomen en daarna
80 alleen nog als terugval gelezen; het bestand zelf blijft ongewijzigd.
81 Joblimieten, presets en pauze staan in `work_dir/settings.json`, zoals
82 voorheen.
83
84 `work_dir` zelf en het eerste beheertoken (`bluegit-runner ui-token`)
85 blijven buiten de UI, omdat de instellingen en het token daar wonen.
86
87 Oude `/etc/bluegit-runner/config.yml` (terugval):
68 88
69 89 | sleutel | standaard | |
70 90 |---|---|---|
@@ -320,7 +340,7 @@ runner) en starten na het hervatten. Na een herstart blijft de pauze staan.
320 340
321 341 - Elke job draait in een **eigen Docker-container** (`docker run --rm`) met de checkout op `/workspace`; services in een eigen netwerk per job. Limieten per job (CPU, geheugen, processen) zet je in de webinterface.
322 342 - Docker-toegang is root-equivalent op die machine: geef een runner alleen jobs uit repo's die je vertrouwt (account-runners krijgen alleen jobs van repo's van hun eigenaar, groepsrunners alleen van hun groep).
323 - Het **runner-token** (`bgr_…`) staat alleen in `config.yml` (0600); de server bewaart alleen de **hash**. Het mag alleen de repo clonen van een job die die runner op dat moment draait, en gaat via de omgeving naar git (niet in de proceslijst). Het registratietoken (`bgrr_…`) is eenmalig en 24 uur geldig.
343 - Het **runner-token** (`bgr_…`) staat in `connection.yml` in de werkmap (0600; een oude `config.yml` is terugval); de server bewaart alleen de **hash**. Het mag alleen de repo clonen van een job die die runner op dat moment draait, en gaat via de omgeving naar git (niet in de proceslijst). Het registratietoken (`bgrr_…`) is eenmalig en 24 uur geldig.
324 344 - Geheimen uit de job worden in de log gemaskeerd, ook op de runner.
325 345 - De service draait met `NoNewPrivileges`, `ProtectSystem=strict`, `ProtectHome` en `PrivateTmp`; schrijven kan alleen in `/var/lib/bluegit-runner`.
326 346 - De webinterface luistert standaard op localhost, vraagt het beheertoken, gebruikt een `HttpOnly`/`SameSite=Strict`-cookie en CSRF-velden.
@@ -25,7 +25,7 @@ yay -S bluegit-runner # of: git clone https://aur.archlinux.org/bluegit-r
25
25
26Het pakket maakt de systeemgebruiker `bluegit-runner` (lid van `docker`),
26Het pakket maakt de systeemgebruiker `bluegit-runner` (lid van `docker`),
27installeert `bluegit-runner.service` en zet die aan. De service start
27installeert `bluegit-runner.service` en zet die aan. De service start
28zodra `/etc/bluegit-runner/config.yml` bestaat; een upgrade herstart hem.
28meteen; koppelen doe je in de webinterface. Een upgrade herstart hem.
29
29
30## Installeren buiten Arch (binary + systemd)
30## Installeren buiten Arch (binary + systemd)
31
31
@@ -43,28 +43,48 @@ sudo usermod -aG docker bluegit-runner
43sudo systemctl daemon-reload && sudo systemctl enable bluegit-runner
43sudo systemctl daemon-reload && sudo systemctl enable bluegit-runner
44```
44```
45
45
46Daarna [registreren](#registreren). Zonder systemd: `bluegit-runner run --config pad/naar/config.yml`
46Daarna [registreren](#registreren). Zonder systemd: `bluegit-runner run --work-dir /var/lib/bluegit-runner`
47als een gebruiker die Docker mag gebruiken.
47als een gebruiker die Docker mag gebruiken.
48
48
49## Registreren
49## Registreren
50
50
51- **1.** In BlueGit: **Instellingen → Runners → Nieuw registratietoken** voor een account-runner, of **Groep → Instellingen → Runners** voor een groepsrunner (maintainer). Het token (`bgrr_…`) is 24 uur geldig, eenmalig, en je ziet het één keer.
51- **1.** In BlueGit: **Instellingen → Runners → Nieuw registratietoken** voor een account-runner, of **Groep → Instellingen → Runners** voor een groepsrunner (maintainer). Het token (`bgrr_…`) is 24 uur geldig, eenmalig, en je ziet het één keer.
52- **2.** Op de machine:
52- **2.** Op de machine, via de webinterface (aanbevolen):
53
54 ```sh
55 sudo -u bluegit-runner bluegit-runner ui-token --work-dir /var/lib/bluegit-runner
56 ```
57
58 Open http://127.0.0.1:8765 (of het adres in ui_listen), meld je aan met
59 dat beheertoken, en vul onder **Koppeling** de BlueGit-URL, het
60 registratietoken en eventueel een naam in. Het runner-token (`bgr_…`)
61 wordt opgeslagen in `work_dir/connection.yml` (mode 0600) en nooit
62 teruggetoond. De server bewaart alleen de hash.
63
64 Alternatief via de CLI:
53
65
54 ```sh
66 ```sh
55 sudo bluegit-runner register --url https://git.timfalken.com --token bgrr_... [--name mijn-pc]
67 sudo bluegit-runner register --url https://git.timfalken.com --token bgrr_... [--name mijn-pc]
56 ```
68 ```
57
69
58 De runner krijgt een eigen runner-token (`bgr_…`); de server bewaart
70- **3.** In de BlueGit-UI staat de runner nu als **online**. Intrekken kan daar ook; het token werkt dan meteen niet meer.
59 alleen de hash. Het token staat in `/etc/bluegit-runner/config.yml`
60 (mode 0600, eigenaar `bluegit-runner`). `register` start de service.
61- **3.** In de UI staat de runner nu als **online**. Intrekken kan daar ook; het token werkt dan meteen niet meer.
62
71
63Het registratietoken mag ook via `BLUEGIT_RUNNER_REGISTRATION_TOKEN`.
72Het registratietoken mag ook via `BLUEGIT_RUNNER_REGISTRATION_TOKEN`.
64
73
65## Config
74## Config
66
75
67`/etc/bluegit-runner/config.yml`:
76Instellingen (url, naam, docker, git, ui_listen, …) regel je in de
77webinterface. Ze staan in `work_dir/connection.yml` (standaard
78`/var/lib/bluegit-runner/connection.yml`). Een bestaande
79`/etc/bluegit-runner/config.yml` wordt eenmalig overgenomen en daarna
80alleen nog als terugval gelezen; het bestand zelf blijft ongewijzigd.
81Joblimieten, presets en pauze staan in `work_dir/settings.json`, zoals
82voorheen.
83
84`work_dir` zelf en het eerste beheertoken (`bluegit-runner ui-token`)
85blijven buiten de UI, omdat de instellingen en het token daar wonen.
86
87Oude `/etc/bluegit-runner/config.yml` (terugval):
68
88
69| sleutel | standaard | |
89| sleutel | standaard | |
70|---|---|---|
90|---|---|---|
@@ -320,7 +340,7 @@ runner) en starten na het hervatten. Na een herstart blijft de pauze staan.
320
340
321- Elke job draait in een **eigen Docker-container** (`docker run --rm`) met de checkout op `/workspace`; services in een eigen netwerk per job. Limieten per job (CPU, geheugen, processen) zet je in de webinterface.
341- Elke job draait in een **eigen Docker-container** (`docker run --rm`) met de checkout op `/workspace`; services in een eigen netwerk per job. Limieten per job (CPU, geheugen, processen) zet je in de webinterface.
322- Docker-toegang is root-equivalent op die machine: geef een runner alleen jobs uit repo's die je vertrouwt (account-runners krijgen alleen jobs van repo's van hun eigenaar, groepsrunners alleen van hun groep).
342- Docker-toegang is root-equivalent op die machine: geef een runner alleen jobs uit repo's die je vertrouwt (account-runners krijgen alleen jobs van repo's van hun eigenaar, groepsrunners alleen van hun groep).
323- Het **runner-token** (`bgr_…`) staat alleen in `config.yml` (0600); de server bewaart alleen de **hash**. Het mag alleen de repo clonen van een job die die runner op dat moment draait, en gaat via de omgeving naar git (niet in de proceslijst). Het registratietoken (`bgrr_…`) is eenmalig en 24 uur geldig.
343- Het **runner-token** (`bgr_…`) staat in `connection.yml` in de werkmap (0600; een oude `config.yml` is terugval); de server bewaart alleen de **hash**. Het mag alleen de repo clonen van een job die die runner op dat moment draait, en gaat via de omgeving naar git (niet in de proceslijst). Het registratietoken (`bgrr_…`) is eenmalig en 24 uur geldig.
324- Geheimen uit de job worden in de log gemaskeerd, ook op de runner.
344- Geheimen uit de job worden in de log gemaskeerd, ook op de runner.
325- De service draait met `NoNewPrivileges`, `ProtectSystem=strict`, `ProtectHome` en `PrivateTmp`; schrijven kan alleen in `/var/lib/bluegit-runner`.
345- De service draait met `NoNewPrivileges`, `ProtectSystem=strict`, `ProtectHome` en `PrivateTmp`; schrijven kan alleen in `/var/lib/bluegit-runner`.
326- De webinterface luistert standaard op localhost, vraagt het beheertoken, gebruikt een `HttpOnly`/`SameSite=Strict`-cookie en CSRF-velden.
346- De webinterface luistert standaard op localhost, vraagt het beheertoken, gebruikt een `HttpOnly`/`SameSite=Strict`-cookie en CSRF-velden.
internal/backupserver/integration/harness_test.go +14 −0
@@ -29,6 +29,7 @@ import (
29 29
30 30 "gitlab.com/Timfa/bluegit/internal/backupserver/config"
31 31 "gitlab.com/Timfa/bluegit/internal/backupserver/server"
32 bgconfig "gitlab.com/Timfa/bluegit/internal/config"
32 33 )
33 34
34 35 // FutureProtocol is het protocol van de test-build bluegit-future.
@@ -247,6 +248,19 @@ func (g *BlueGit) RestartAs(user string, authID int) {
247 248 if err := os.WriteFile(g.Config, []byte(strings.Join(out, "\n")), 0o600); err != nil {
248 249 g.t.Fatal(err)
249 250 }
251 // settings.yml wint na de eenmalige import; die moet mee.
252 if st, err := bgconfig.LoadSettings(g.State); err == nil && st != nil {
253 if st.Auth == nil {
254 st.Auth = &bgconfig.PersistedAuth{}
255 }
256 u := user
257 st.Auth.DevUser = &u
258 id := int64(authID)
259 st.Auth.DevAuthID = &id
260 if err := bgconfig.SaveSettings(g.State, *st); err != nil {
261 g.t.Fatal(err)
262 }
263 }
250 264 g.cmd = exec.Command(g.Bin, "serve", "--config", g.Config)
251 265 g.cmd.Stdout, g.cmd.Stderr = g.log, g.log
252 266 if err := g.cmd.Start(); err != nil {
@@ -29,6 +29,7 @@ import (
29
29
30 "gitlab.com/Timfa/bluegit/internal/backupserver/config"
30 "gitlab.com/Timfa/bluegit/internal/backupserver/config"
31 "gitlab.com/Timfa/bluegit/internal/backupserver/server"
31 "gitlab.com/Timfa/bluegit/internal/backupserver/server"
32 bgconfig "gitlab.com/Timfa/bluegit/internal/config"
32)
33)
33
34
34// FutureProtocol is het protocol van de test-build bluegit-future.
35// FutureProtocol is het protocol van de test-build bluegit-future.
@@ -247,6 +248,19 @@ func (g *BlueGit) RestartAs(user string, authID int) {
247 if err := os.WriteFile(g.Config, []byte(strings.Join(out, "\n")), 0o600); err != nil {
248 if err := os.WriteFile(g.Config, []byte(strings.Join(out, "\n")), 0o600); err != nil {
248 g.t.Fatal(err)
249 g.t.Fatal(err)
249 }
250 }
251 // settings.yml wint na de eenmalige import; die moet mee.
252 if st, err := bgconfig.LoadSettings(g.State); err == nil && st != nil {
253 if st.Auth == nil {
254 st.Auth = &bgconfig.PersistedAuth{}
255 }
256 u := user
257 st.Auth.DevUser = &u
258 id := int64(authID)
259 st.Auth.DevAuthID = &id
260 if err := bgconfig.SaveSettings(g.State, *st); err != nil {
261 g.t.Fatal(err)
262 }
263 }
250 g.cmd = exec.Command(g.Bin, "serve", "--config", g.Config)
264 g.cmd = exec.Command(g.Bin, "serve", "--config", g.Config)
251 g.cmd.Stdout, g.cmd.Stderr = g.log, g.log
265 g.cmd.Stdout, g.cmd.Stderr = g.log, g.log
252 if err := g.cmd.Start(); err != nil {
266 if err := g.cmd.Start(); err != nil {
internal/config/config.go +26 −11
@@ -169,6 +169,19 @@ func Load(path string) (Config, error) {
169 169 return Config{}, fmt.Errorf("config: %w", err)
170 170 }
171 171 c.applyDefaults()
172 applyEnv(&c)
173 if err := fillSecretFromFile(&c); err != nil {
174 return Config{}, err
175 }
176 c.resolvePresetPaths(path)
177 if err := c.Validate(); err != nil {
178 return Config{}, err
179 }
180 return c, nil
181 }
182
183 // applyEnv laat omgevingsvariabelen winnen van bestandswaarden.
184 func applyEnv(c *Config) {
172 185 if v := os.Getenv("BLUEGIT_STATE_PATH"); v != "" {
173 186 c.StatePath = v
174 187 }
@@ -184,18 +197,19 @@ func Load(path string) (Config, error) {
184 197 if v := os.Getenv("BLUEGIT_AUTH_CLIENT_SECRET"); v != "" {
185 198 c.Auth.ClientSecret = v
186 199 }
187 if c.Auth.ClientSecret == "" && c.Auth.ClientSecretFile != "" {
188 b, err := os.ReadFile(c.Auth.ClientSecretFile)
189 if err != nil {
190 return Config{}, fmt.Errorf("clientgeheim: %w", err)
191 }
192 c.Auth.ClientSecret = strings.TrimSpace(string(b))
200 }
201
202 // fillSecretFromFile vult een leeg clientgeheim uit auth.client_secret_file.
203 func fillSecretFromFile(c *Config) error {
204 if c.Auth.ClientSecret != "" || strings.TrimSpace(c.Auth.ClientSecretFile) == "" {
205 return nil
193 206 }
194 c.resolvePresetPaths(path)
195 if err := c.Validate(); err != nil {
196 return Config{}, err
207 b, err := os.ReadFile(c.Auth.ClientSecretFile)
208 if err != nil {
209 return fmt.Errorf("clientgeheim: %w", err)
197 210 }
198 return c, nil
211 c.Auth.ClientSecret = strings.TrimSpace(string(b))
212 return nil
199 213 }
200 214
201 215 func (c *Config) resolvePresetPaths(configFile string) {
@@ -425,7 +439,8 @@ func (c Config) EntraIssuer() string {
425 439
426 440 // Example is een startconfiguratie voor de mini-PC.
427 441 func Example() string {
428 return `# BlueGit op de mini-PC. Kopieer naar /etc/bluegit/config.yml.
442 return `# BlueGit op de mini-PC. Kopieer naar /etc/bluegit/config.yml voor de eerste start.
443 # Daarna: Beheer → Instellingen. Dit bestand blijft ongewijzigd als terugval.
429 444 # Plain HTTP. TLS en de publieke SSH-poort doet de ingress, zie docs/INGRESS.md.
430 445 base_url: https://git.timfalken.com
431 446 listen: 0.0.0.0:8080
@@ -169,6 +169,19 @@ func Load(path string) (Config, error) {
169 return Config{}, fmt.Errorf("config: %w", err)
169 return Config{}, fmt.Errorf("config: %w", err)
170 }
170 }
171 c.applyDefaults()
171 c.applyDefaults()
172 applyEnv(&c)
173 if err := fillSecretFromFile(&c); err != nil {
174 return Config{}, err
175 }
176 c.resolvePresetPaths(path)
177 if err := c.Validate(); err != nil {
178 return Config{}, err
179 }
180 return c, nil
181}
182
183// applyEnv laat omgevingsvariabelen winnen van bestandswaarden.
184func applyEnv(c *Config) {
172 if v := os.Getenv("BLUEGIT_STATE_PATH"); v != "" {
185 if v := os.Getenv("BLUEGIT_STATE_PATH"); v != "" {
173 c.StatePath = v
186 c.StatePath = v
174 }
187 }
@@ -184,18 +197,19 @@ func Load(path string) (Config, error) {
184 if v := os.Getenv("BLUEGIT_AUTH_CLIENT_SECRET"); v != "" {
197 if v := os.Getenv("BLUEGIT_AUTH_CLIENT_SECRET"); v != "" {
185 c.Auth.ClientSecret = v
198 c.Auth.ClientSecret = v
186 }
199 }
187 if c.Auth.ClientSecret == "" && c.Auth.ClientSecretFile != "" {
200}
188 b, err := os.ReadFile(c.Auth.ClientSecretFile)
201
189 if err != nil {
202// fillSecretFromFile vult een leeg clientgeheim uit auth.client_secret_file.
190 return Config{}, fmt.Errorf("clientgeheim: %w", err)
203func fillSecretFromFile(c *Config) error {
191 }
204 if c.Auth.ClientSecret != "" || strings.TrimSpace(c.Auth.ClientSecretFile) == "" {
192 c.Auth.ClientSecret = strings.TrimSpace(string(b))
205 return nil
193 }
206 }
194 c.resolvePresetPaths(path)
207 b, err := os.ReadFile(c.Auth.ClientSecretFile)
195 if err := c.Validate(); err != nil {
208 if err != nil {
196 return Config{}, err
209 return fmt.Errorf("clientgeheim: %w", err)
197 }
210 }
198 return c, nil
211 c.Auth.ClientSecret = strings.TrimSpace(string(b))
212 return nil
199}
213}
200
214
201func (c *Config) resolvePresetPaths(configFile string) {
215func (c *Config) resolvePresetPaths(configFile string) {
@@ -425,7 +439,8 @@ func (c Config) EntraIssuer() string {
425
439
426// Example is een startconfiguratie voor de mini-PC.
440// Example is een startconfiguratie voor de mini-PC.
427func Example() string {
441func Example() string {
428 return `# BlueGit op de mini-PC. Kopieer naar /etc/bluegit/config.yml.
442 return `# BlueGit op de mini-PC. Kopieer naar /etc/bluegit/config.yml voor de eerste start.
443# Daarna: Beheer → Instellingen. Dit bestand blijft ongewijzigd als terugval.
429# Plain HTTP. TLS en de publieke SSH-poort doet de ingress, zie docs/INGRESS.md.
444# Plain HTTP. TLS en de publieke SSH-poort doet de ingress, zie docs/INGRESS.md.
430base_url: https://git.timfalken.com
445base_url: https://git.timfalken.com
431listen: 0.0.0.0:8080
446listen: 0.0.0.0:8080
internal/config/runtime.go added +187 −0
@@ -0,0 +1,187 @@
1 package config
2
3 import (
4 "fmt"
5 "io"
6 "log/slog"
7 "os"
8 "path/filepath"
9 "strings"
10 )
11
12 // SettingsFile is de web-instellingen onder state_path.
13 const SettingsFile = "settings.yml"
14
15 // ImportMarker wordt gezet na een eenmalige import van config.yml.
16 const ImportMarker = "config.yml.imported"
17
18 // Runtime is de geladen machineconfiguratie plus herkomst.
19 type Runtime struct {
20 Config Config
21 ConfigPath string
22 SettingsPath string
23 Imported bool
24 }
25
26 // LoadRuntime leest config.yml (als die er is) en overlays settings.yml.
27 //
28 // Veiligheid bij een self-update:
29 // - config.yml wordt nooit herschreven of verwijderd.
30 // - Zonder settings.yml start de server precies zoals Load(config.yml).
31 // - Een bestaande config.yml wordt één keer naar settings.yml gekopieerd
32 // (idempotent via de marker of het bestaan van settings.yml).
33 // - Is settings.yml onleesbaar of ongeldig, dan valt de server terug op
34 // config.yml en start gewoon.
35 // - Omgevingsvariabelen (BLUEGIT_LISTEN, BLUEGIT_AUTH_CLIENT_SECRET, …)
36 // winnen altijd, als laatste redmiddel voor beheer.
37 func LoadRuntime(configPath string, log *slog.Logger) (Runtime, error) {
38 if log == nil {
39 log = slog.New(slog.NewTextHandler(io.Discard, nil))
40 }
41 rt := Runtime{ConfigPath: configPath}
42 baseline, haveFile, fileErr := loadBaseline(configPath)
43 if !haveFile {
44 baseline.applyDefaults()
45 applyEnv(&baseline)
46 _ = fillSecretFromFile(&baseline)
47 }
48
49 if imported, err := ImportLegacy(configPath, baseline, log); err != nil {
50 log.Error("config.yml-import naar settings.yml mislukt; bestaande config blijft gelden", "err", err)
51 } else {
52 rt.Imported = imported
53 }
54
55 rt.SettingsPath = filepath.Join(baseline.StatePath, SettingsFile)
56 result := baseline
57 if set, err := LoadSettings(baseline.StatePath); err != nil {
58 log.Error("settings.yml onleesbaar; val terug op config.yml", "path", rt.SettingsPath, "err", err)
59 } else if set != nil {
60 over := baseline
61 applyPersisted(&over, set)
62 applyEnv(&over)
63 if err := fillSecretFromFile(&over); err != nil && over.Auth.ClientSecret == "" {
64 log.Warn("client_secret_file niet leesbaar; er is mogelijk een geheim in settings.yml of de omgeving", "err", err)
65 }
66 if err := over.Validate(); err != nil {
67 log.Error("settings.yml ongeldig; val terug op config.yml", "err", err)
68 } else {
69 result = over
70 }
71 }
72
73 if err := result.Validate(); err != nil {
74 if fileErr != nil {
75 return Runtime{}, fileErr
76 }
77 return Runtime{}, err
78 }
79 rt.Config = result
80 return rt, nil
81 }
82
83 func loadBaseline(configPath string) (Config, bool, error) {
84 if strings.TrimSpace(configPath) == "" {
85 return Config{}, false, nil
86 }
87 st, err := os.Stat(configPath)
88 if err != nil {
89 if os.IsNotExist(err) {
90 return Config{}, false, nil
91 }
92 return Config{}, false, err
93 }
94 if st.IsDir() {
95 return Config{}, false, fmt.Errorf("config: %s is een map", configPath)
96 }
97 c, err := Load(configPath)
98 if err != nil {
99 return Config{}, false, err
100 }
101 return c, true, nil
102 }
103
104 // ImportLegacy kopieert één keer een bestaande config.yml naar settings.yml.
105 // config.yml zelf blijft ongewijzigd. Idempotent: bestaat settings.yml of
106 // de marker al, dan gebeurt er niets.
107 func ImportLegacy(configPath string, src Config, log *slog.Logger) (bool, error) {
108 if strings.TrimSpace(src.StatePath) == "" {
109 return false, nil
110 }
111 if err := os.MkdirAll(src.StatePath, 0o750); err != nil {
112 return false, err
113 }
114 setPath := filepath.Join(src.StatePath, SettingsFile)
115 markPath := filepath.Join(src.StatePath, ImportMarker)
116 if _, err := os.Stat(setPath); err == nil {
117 _ = touchMarker(markPath)
118 return false, nil
119 }
120 if _, err := os.Stat(markPath); err == nil {
121 return false, nil
122 }
123 if strings.TrimSpace(configPath) == "" {
124 return false, nil
125 }
126 if _, err := os.Stat(configPath); err != nil {
127 return false, nil
128 }
129 if err := SaveSettings(src.StatePath, persistFrom(src)); err != nil {
130 return false, err
131 }
132 if err := touchMarker(markPath); err != nil {
133 return false, err
134 }
135 if log != nil {
136 log.Info("config.yml eenmalig overgenomen in settings.yml; daarna wint de webinterface, config.yml blijft als terugval en is niet meer nodig om te wijzigen",
137 "config", configPath, "settings", setPath)
138 }
139 return true, nil
140 }
141
142 func touchMarker(path string) error {
143 f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0o640)
144 if err != nil {
145 return err
146 }
147 return f.Close()
148 }
149
150 // atomicWrite schrijft path via een tijdelijk bestand in dezelfde map.
151 func atomicWrite(path string, data []byte, mode os.FileMode) error {
152 dir := filepath.Dir(path)
153 if err := os.MkdirAll(dir, 0o750); err != nil {
154 return err
155 }
156 f, err := os.CreateTemp(dir, ".settings-*.tmp")
157 if err != nil {
158 return err
159 }
160 tmp := f.Name()
161 ok := false
162 defer func() {
163 if !ok {
164 _ = os.Remove(tmp)
165 }
166 }()
167 if _, err := f.Write(data); err != nil {
168 _ = f.Close()
169 return err
170 }
171 if err := f.Chmod(mode); err != nil {
172 _ = f.Close()
173 return err
174 }
175 if err := f.Sync(); err != nil {
176 _ = f.Close()
177 return err
178 }
179 if err := f.Close(); err != nil {
180 return err
181 }
182 if err := os.Rename(tmp, path); err != nil {
183 return err
184 }
185 ok = true
186 return nil
187 }
@@ -0,0 +1,187 @@
1package config
2
3import (
4 "fmt"
5 "io"
6 "log/slog"
7 "os"
8 "path/filepath"
9 "strings"
10)
11
12// SettingsFile is de web-instellingen onder state_path.
13const SettingsFile = "settings.yml"
14
15// ImportMarker wordt gezet na een eenmalige import van config.yml.
16const ImportMarker = "config.yml.imported"
17
18// Runtime is de geladen machineconfiguratie plus herkomst.
19type Runtime struct {
20 Config Config
21 ConfigPath string
22 SettingsPath string
23 Imported bool
24}
25
26// LoadRuntime leest config.yml (als die er is) en overlays settings.yml.
27//
28// Veiligheid bij een self-update:
29// - config.yml wordt nooit herschreven of verwijderd.
30// - Zonder settings.yml start de server precies zoals Load(config.yml).
31// - Een bestaande config.yml wordt één keer naar settings.yml gekopieerd
32// (idempotent via de marker of het bestaan van settings.yml).
33// - Is settings.yml onleesbaar of ongeldig, dan valt de server terug op
34// config.yml en start gewoon.
35// - Omgevingsvariabelen (BLUEGIT_LISTEN, BLUEGIT_AUTH_CLIENT_SECRET, …)
36// winnen altijd, als laatste redmiddel voor beheer.
37func LoadRuntime(configPath string, log *slog.Logger) (Runtime, error) {
38 if log == nil {
39 log = slog.New(slog.NewTextHandler(io.Discard, nil))
40 }
41 rt := Runtime{ConfigPath: configPath}
42 baseline, haveFile, fileErr := loadBaseline(configPath)
43 if !haveFile {
44 baseline.applyDefaults()
45 applyEnv(&baseline)
46 _ = fillSecretFromFile(&baseline)
47 }
48
49 if imported, err := ImportLegacy(configPath, baseline, log); err != nil {
50 log.Error("config.yml-import naar settings.yml mislukt; bestaande config blijft gelden", "err", err)
51 } else {
52 rt.Imported = imported
53 }
54
55 rt.SettingsPath = filepath.Join(baseline.StatePath, SettingsFile)
56 result := baseline
57 if set, err := LoadSettings(baseline.StatePath); err != nil {
58 log.Error("settings.yml onleesbaar; val terug op config.yml", "path", rt.SettingsPath, "err", err)
59 } else if set != nil {
60 over := baseline
61 applyPersisted(&over, set)
62 applyEnv(&over)
63 if err := fillSecretFromFile(&over); err != nil && over.Auth.ClientSecret == "" {
64 log.Warn("client_secret_file niet leesbaar; er is mogelijk een geheim in settings.yml of de omgeving", "err", err)
65 }
66 if err := over.Validate(); err != nil {
67 log.Error("settings.yml ongeldig; val terug op config.yml", "err", err)
68 } else {
69 result = over
70 }
71 }
72
73 if err := result.Validate(); err != nil {
74 if fileErr != nil {
75 return Runtime{}, fileErr
76 }
77 return Runtime{}, err
78 }
79 rt.Config = result
80 return rt, nil
81}
82
83func loadBaseline(configPath string) (Config, bool, error) {
84 if strings.TrimSpace(configPath) == "" {
85 return Config{}, false, nil
86 }
87 st, err := os.Stat(configPath)
88 if err != nil {
89 if os.IsNotExist(err) {
90 return Config{}, false, nil
91 }
92 return Config{}, false, err
93 }
94 if st.IsDir() {
95 return Config{}, false, fmt.Errorf("config: %s is een map", configPath)
96 }
97 c, err := Load(configPath)
98 if err != nil {
99 return Config{}, false, err
100 }
101 return c, true, nil
102}
103
104// ImportLegacy kopieert één keer een bestaande config.yml naar settings.yml.
105// config.yml zelf blijft ongewijzigd. Idempotent: bestaat settings.yml of
106// de marker al, dan gebeurt er niets.
107func ImportLegacy(configPath string, src Config, log *slog.Logger) (bool, error) {
108 if strings.TrimSpace(src.StatePath) == "" {
109 return false, nil
110 }
111 if err := os.MkdirAll(src.StatePath, 0o750); err != nil {
112 return false, err
113 }
114 setPath := filepath.Join(src.StatePath, SettingsFile)
115 markPath := filepath.Join(src.StatePath, ImportMarker)
116 if _, err := os.Stat(setPath); err == nil {
117 _ = touchMarker(markPath)
118 return false, nil
119 }
120 if _, err := os.Stat(markPath); err == nil {
121 return false, nil
122 }
123 if strings.TrimSpace(configPath) == "" {
124 return false, nil
125 }
126 if _, err := os.Stat(configPath); err != nil {
127 return false, nil
128 }
129 if err := SaveSettings(src.StatePath, persistFrom(src)); err != nil {
130 return false, err
131 }
132 if err := touchMarker(markPath); err != nil {
133 return false, err
134 }
135 if log != nil {
136 log.Info("config.yml eenmalig overgenomen in settings.yml; daarna wint de webinterface, config.yml blijft als terugval en is niet meer nodig om te wijzigen",
137 "config", configPath, "settings", setPath)
138 }
139 return true, nil
140}
141
142func touchMarker(path string) error {
143 f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0o640)
144 if err != nil {
145 return err
146 }
147 return f.Close()
148}
149
150// atomicWrite schrijft path via een tijdelijk bestand in dezelfde map.
151func atomicWrite(path string, data []byte, mode os.FileMode) error {
152 dir := filepath.Dir(path)
153 if err := os.MkdirAll(dir, 0o750); err != nil {
154 return err
155 }
156 f, err := os.CreateTemp(dir, ".settings-*.tmp")
157 if err != nil {
158 return err
159 }
160 tmp := f.Name()
161 ok := false
162 defer func() {
163 if !ok {
164 _ = os.Remove(tmp)
165 }
166 }()
167 if _, err := f.Write(data); err != nil {
168 _ = f.Close()
169 return err
170 }
171 if err := f.Chmod(mode); err != nil {
172 _ = f.Close()
173 return err
174 }
175 if err := f.Sync(); err != nil {
176 _ = f.Close()
177 return err
178 }
179 if err := f.Close(); err != nil {
180 return err
181 }
182 if err := os.Rename(tmp, path); err != nil {
183 return err
184 }
185 ok = true
186 return nil
187}
internal/config/runtime_test.go added +267 −0
@@ -0,0 +1,267 @@
1 package config
2
3 import (
4 "bytes"
5 "io"
6 "log/slog"
7 "os"
8 "path/filepath"
9 "strings"
10 "testing"
11 )
12
13 func writeUpgradeFixture(t *testing.T) (configPath, stateDir, secretPath string, raw []byte) {
14 t.Helper()
15 root := t.TempDir()
16 stateDir = filepath.Join(root, "state")
17 if err := os.MkdirAll(stateDir, 0o750); err != nil {
18 t.Fatal(err)
19 }
20 secretPath = filepath.Join(root, "client_secret")
21 if err := os.WriteFile(secretPath, []byte("het-geheim\n"), 0o600); err != nil {
22 t.Fatal(err)
23 }
24 configPath = filepath.Join(root, "etc", "config.yml")
25 if err := os.MkdirAll(filepath.Dir(configPath), 0o755); err != nil {
26 t.Fatal(err)
27 }
28 raw = []byte(`base_url: https://git.example.test
29 listen: 127.0.0.1:9090
30 state_path: ` + stateDir + `
31 trusted_proxies:
32 - 10.0.0.2
33 auth:
34 mode: oauth
35 client_id: git.example.test
36 client_secret: ""
37 client_secret_file: ` + secretPath + `
38 ssh:
39 enabled: true
40 listen: 127.0.0.1:2222
41 public_host: git.example.test
42 public_port: 22
43 ci:
44 enabled: true
45 concurrency: 2
46 `)
47 if err := os.WriteFile(configPath, raw, 0o644); err != nil {
48 t.Fatal(err)
49 }
50 return configPath, stateDir, secretPath, raw
51 }
52
53 func TestUpgradePathLeavesConfigYmlUnchanged(t *testing.T) {
54 configPath, stateDir, _, raw := writeUpgradeFixture(t)
55 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
56
57 rt, err := LoadRuntime(configPath, silent)
58 if err != nil {
59 t.Fatal(err)
60 }
61 if !rt.Imported {
62 t.Fatal("eerste start hoort config.yml te importeren")
63 }
64 if rt.Config.Auth.ClientSecret != "het-geheim" {
65 t.Fatalf("geheim: %q", rt.Config.Auth.ClientSecret)
66 }
67 if rt.Config.Listen != "127.0.0.1:9090" || rt.Config.CI.Concurrency != 2 {
68 t.Fatalf("waarden: %+v", rt.Config)
69 }
70 after, err := os.ReadFile(configPath)
71 if err != nil {
72 t.Fatal(err)
73 }
74 if !bytes.Equal(after, raw) {
75 t.Fatalf("config.yml is gewijzigd:\n%s", after)
76 }
77 if _, err := os.Stat(filepath.Join(stateDir, SettingsFile)); err != nil {
78 t.Fatal("settings.yml ontbreekt")
79 }
80 if _, err := os.Stat(filepath.Join(stateDir, ImportMarker)); err != nil {
81 t.Fatal("marker ontbreekt")
82 }
83
84 // Tweede start: geen tweede import, ook niet als config.yml verandert.
85 changed := bytes.Replace(raw, []byte("127.0.0.1:9090"), []byte("127.0.0.1:9191"), 1)
86 if err := os.WriteFile(configPath, changed, 0o644); err != nil {
87 t.Fatal(err)
88 }
89 rt2, err := LoadRuntime(configPath, silent)
90 if err != nil {
91 t.Fatal(err)
92 }
93 if rt2.Imported {
94 t.Fatal("tweede start mag niet opnieuw importeren")
95 }
96 if rt2.Config.Listen != "127.0.0.1:9090" {
97 t.Fatalf("settings moeten winnen, got %s", rt2.Config.Listen)
98 }
99 after, _ = os.ReadFile(configPath)
100 if !bytes.Equal(after, changed) {
101 t.Fatal("tweede start mag config.yml niet terugschrijven")
102 }
103 }
104
105 func TestSettingsOverlayWinsAndEnvWinsLast(t *testing.T) {
106 configPath, stateDir, _, _ := writeUpgradeFixture(t)
107 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
108 if _, err := LoadRuntime(configPath, silent); err != nil {
109 t.Fatal(err)
110 }
111 st, err := LoadSettings(stateDir)
112 if err != nil || st == nil {
113 t.Fatal(err)
114 }
115 st.Listen = ptr("127.0.0.1:9400")
116 st.BaseURL = ptr("https://over.example.test")
117 if err := SaveSettings(stateDir, *st); err != nil {
118 t.Fatal(err)
119 }
120 t.Setenv("BLUEGIT_LISTEN", "127.0.0.1:9500")
121 rt, err := LoadRuntime(configPath, silent)
122 if err != nil {
123 t.Fatal(err)
124 }
125 if rt.Config.BaseURL != "https://over.example.test" {
126 t.Fatalf("overlay base_url: %s", rt.Config.BaseURL)
127 }
128 if rt.Config.Listen != "127.0.0.1:9500" {
129 t.Fatalf("env moet winnen: %s", rt.Config.Listen)
130 }
131 }
132
133 func TestCorruptSettingsFallBackToConfigYml(t *testing.T) {
134 configPath, stateDir, _, _ := writeUpgradeFixture(t)
135 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
136 if _, err := LoadRuntime(configPath, silent); err != nil {
137 t.Fatal(err)
138 }
139 bad := filepath.Join(stateDir, SettingsFile)
140 if err := os.WriteFile(bad, []byte(":::: geen yaml"), 0o600); err != nil {
141 t.Fatal(err)
142 }
143 rt, err := LoadRuntime(configPath, silent)
144 if err != nil {
145 t.Fatalf("moet starten op config.yml: %v", err)
146 }
147 if rt.Config.Listen != "127.0.0.1:9090" || rt.Config.Auth.ClientSecret != "het-geheim" {
148 t.Fatalf("terugval mislukt: %+v", rt.Config)
149 }
150 }
151
152 func TestInvalidSettingsValuesFallBack(t *testing.T) {
153 configPath, stateDir, _, _ := writeUpgradeFixture(t)
154 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
155 if _, err := LoadRuntime(configPath, silent); err != nil {
156 t.Fatal(err)
157 }
158 st, err := LoadSettings(stateDir)
159 if err != nil {
160 t.Fatal(err)
161 }
162 st.BaseURL = ptr("niet-een-url")
163 if err := SaveSettings(stateDir, *st); err != nil {
164 t.Fatal(err)
165 }
166 rt, err := LoadRuntime(configPath, silent)
167 if err != nil {
168 t.Fatalf("ongeldige settings mogen de start niet breken: %v", err)
169 }
170 if rt.Config.BaseURL != "https://git.example.test" {
171 t.Fatalf("terugval base_url: %s", rt.Config.BaseURL)
172 }
173 }
174
175 func TestSecretFileFallbackWhenSettingsHaveNoSecret(t *testing.T) {
176 configPath, stateDir, secretPath, _ := writeUpgradeFixture(t)
177 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
178 if _, err := LoadRuntime(configPath, silent); err != nil {
179 t.Fatal(err)
180 }
181 st, err := LoadSettings(stateDir)
182 if err != nil {
183 t.Fatal(err)
184 }
185 st.Auth.ClientSecret = nil
186 if err := SaveSettings(stateDir, *st); err != nil {
187 t.Fatal(err)
188 }
189 if err := os.WriteFile(secretPath, []byte("nieuw-geheim\n"), 0o600); err != nil {
190 t.Fatal(err)
191 }
192 rt, err := LoadRuntime(configPath, silent)
193 if err != nil {
194 t.Fatal(err)
195 }
196 if rt.Config.Auth.ClientSecret != "nieuw-geheim" {
197 t.Fatalf("bestand als terugval: %q", rt.Config.Auth.ClientSecret)
198 }
199 }
200
201 func TestLoadRuntimeSameAsLoadWhenNoSettingsYet(t *testing.T) {
202 // Als settings.yml niet geschreven kan worden, moet LoadRuntime
203 // nog steeds hetzelfde resultaat geven als Load (ook als root
204 // draait, waar chmod op een map niet tegenhoudt).
205 configPath, stateDir, _, _ := writeUpgradeFixture(t)
206 if err := os.RemoveAll(stateDir); err != nil {
207 t.Fatal(err)
208 }
209 if err := os.WriteFile(stateDir, []byte("geen map"), 0o600); err != nil {
210 t.Fatal(err)
211 }
212 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
213 want, err := Load(configPath)
214 if err != nil {
215 t.Fatal(err)
216 }
217 rt, err := LoadRuntime(configPath, silent)
218 if err != nil {
219 t.Fatal(err)
220 }
221 if rt.Imported {
222 t.Fatal("import hoort te falen als state_path geen schrijfbare map is")
223 }
224 if rt.Config.Listen != want.Listen || rt.Config.Auth.ClientSecret != want.Auth.ClientSecret || rt.Config.BaseURL != want.BaseURL {
225 t.Fatalf("LoadRuntime != Load: %+v vs %+v", rt.Config, want)
226 }
227 }
228
229 func TestMergeUpdateKeepsSecretWhenLeftBlank(t *testing.T) {
230 cur := Config{BaseURL: "https://git.example.test", Listen: "127.0.0.1:8080", StatePath: t.TempDir()}
231 cur.Auth = Auth{Mode: "oauth", ClientID: "id", ClientSecret: "old-secret", BaseURL: "https://auth.example"}
232 cur.applyDefaults()
233 next, saved := MergeUpdate(cur, Persisted{
234 Listen: ptr("127.0.0.1:8081"),
235 Auth: &PersistedAuth{ClientSecret: ptr("")},
236 })
237 if next.Listen != "127.0.0.1:8081" {
238 t.Fatal(next.Listen)
239 }
240 if next.Auth.ClientSecret != "old-secret" {
241 t.Fatalf("geheim gewist: %q", next.Auth.ClientSecret)
242 }
243 if saved.Auth == nil || saved.Auth.ClientSecret == nil || *saved.Auth.ClientSecret != "old-secret" {
244 t.Fatal("opgeslagen geheim ontbreekt")
245 }
246 }
247
248 func TestImportIsIdempotentWithMarkerOnly(t *testing.T) {
249 configPath, stateDir, _, _ := writeUpgradeFixture(t)
250 if err := os.WriteFile(filepath.Join(stateDir, ImportMarker), nil, 0o640); err != nil {
251 t.Fatal(err)
252 }
253 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
254 rt, err := LoadRuntime(configPath, silent)
255 if err != nil {
256 t.Fatal(err)
257 }
258 if rt.Imported {
259 t.Fatal("marker zonder settings.yml: niet opnieuw importeren")
260 }
261 if _, err := os.Stat(filepath.Join(stateDir, SettingsFile)); err == nil {
262 t.Fatal("er had geen settings.yml mogen ontstaan")
263 }
264 if !strings.HasPrefix(rt.Config.Listen, "127.0.0.1:9090") {
265 t.Fatalf("config.yml als terugval: %s", rt.Config.Listen)
266 }
267 }
@@ -0,0 +1,267 @@
1package config
2
3import (
4 "bytes"
5 "io"
6 "log/slog"
7 "os"
8 "path/filepath"
9 "strings"
10 "testing"
11)
12
13func writeUpgradeFixture(t *testing.T) (configPath, stateDir, secretPath string, raw []byte) {
14 t.Helper()
15 root := t.TempDir()
16 stateDir = filepath.Join(root, "state")
17 if err := os.MkdirAll(stateDir, 0o750); err != nil {
18 t.Fatal(err)
19 }
20 secretPath = filepath.Join(root, "client_secret")
21 if err := os.WriteFile(secretPath, []byte("het-geheim\n"), 0o600); err != nil {
22 t.Fatal(err)
23 }
24 configPath = filepath.Join(root, "etc", "config.yml")
25 if err := os.MkdirAll(filepath.Dir(configPath), 0o755); err != nil {
26 t.Fatal(err)
27 }
28 raw = []byte(`base_url: https://git.example.test
29listen: 127.0.0.1:9090
30state_path: ` + stateDir + `
31trusted_proxies:
32 - 10.0.0.2
33auth:
34 mode: oauth
35 client_id: git.example.test
36 client_secret: ""
37 client_secret_file: ` + secretPath + `
38ssh:
39 enabled: true
40 listen: 127.0.0.1:2222
41 public_host: git.example.test
42 public_port: 22
43ci:
44 enabled: true
45 concurrency: 2
46`)
47 if err := os.WriteFile(configPath, raw, 0o644); err != nil {
48 t.Fatal(err)
49 }
50 return configPath, stateDir, secretPath, raw
51}
52
53func TestUpgradePathLeavesConfigYmlUnchanged(t *testing.T) {
54 configPath, stateDir, _, raw := writeUpgradeFixture(t)
55 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
56
57 rt, err := LoadRuntime(configPath, silent)
58 if err != nil {
59 t.Fatal(err)
60 }
61 if !rt.Imported {
62 t.Fatal("eerste start hoort config.yml te importeren")
63 }
64 if rt.Config.Auth.ClientSecret != "het-geheim" {
65 t.Fatalf("geheim: %q", rt.Config.Auth.ClientSecret)
66 }
67 if rt.Config.Listen != "127.0.0.1:9090" || rt.Config.CI.Concurrency != 2 {
68 t.Fatalf("waarden: %+v", rt.Config)
69 }
70 after, err := os.ReadFile(configPath)
71 if err != nil {
72 t.Fatal(err)
73 }
74 if !bytes.Equal(after, raw) {
75 t.Fatalf("config.yml is gewijzigd:\n%s", after)
76 }
77 if _, err := os.Stat(filepath.Join(stateDir, SettingsFile)); err != nil {
78 t.Fatal("settings.yml ontbreekt")
79 }
80 if _, err := os.Stat(filepath.Join(stateDir, ImportMarker)); err != nil {
81 t.Fatal("marker ontbreekt")
82 }
83
84 // Tweede start: geen tweede import, ook niet als config.yml verandert.
85 changed := bytes.Replace(raw, []byte("127.0.0.1:9090"), []byte("127.0.0.1:9191"), 1)
86 if err := os.WriteFile(configPath, changed, 0o644); err != nil {
87 t.Fatal(err)
88 }
89 rt2, err := LoadRuntime(configPath, silent)
90 if err != nil {
91 t.Fatal(err)
92 }
93 if rt2.Imported {
94 t.Fatal("tweede start mag niet opnieuw importeren")
95 }
96 if rt2.Config.Listen != "127.0.0.1:9090" {
97 t.Fatalf("settings moeten winnen, got %s", rt2.Config.Listen)
98 }
99 after, _ = os.ReadFile(configPath)
100 if !bytes.Equal(after, changed) {
101 t.Fatal("tweede start mag config.yml niet terugschrijven")
102 }
103}
104
105func TestSettingsOverlayWinsAndEnvWinsLast(t *testing.T) {
106 configPath, stateDir, _, _ := writeUpgradeFixture(t)
107 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
108 if _, err := LoadRuntime(configPath, silent); err != nil {
109 t.Fatal(err)
110 }
111 st, err := LoadSettings(stateDir)
112 if err != nil || st == nil {
113 t.Fatal(err)
114 }
115 st.Listen = ptr("127.0.0.1:9400")
116 st.BaseURL = ptr("https://over.example.test")
117 if err := SaveSettings(stateDir, *st); err != nil {
118 t.Fatal(err)
119 }
120 t.Setenv("BLUEGIT_LISTEN", "127.0.0.1:9500")
121 rt, err := LoadRuntime(configPath, silent)
122 if err != nil {
123 t.Fatal(err)
124 }
125 if rt.Config.BaseURL != "https://over.example.test" {
126 t.Fatalf("overlay base_url: %s", rt.Config.BaseURL)
127 }
128 if rt.Config.Listen != "127.0.0.1:9500" {
129 t.Fatalf("env moet winnen: %s", rt.Config.Listen)
130 }
131}
132
133func TestCorruptSettingsFallBackToConfigYml(t *testing.T) {
134 configPath, stateDir, _, _ := writeUpgradeFixture(t)
135 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
136 if _, err := LoadRuntime(configPath, silent); err != nil {
137 t.Fatal(err)
138 }
139 bad := filepath.Join(stateDir, SettingsFile)
140 if err := os.WriteFile(bad, []byte(":::: geen yaml"), 0o600); err != nil {
141 t.Fatal(err)
142 }
143 rt, err := LoadRuntime(configPath, silent)
144 if err != nil {
145 t.Fatalf("moet starten op config.yml: %v", err)
146 }
147 if rt.Config.Listen != "127.0.0.1:9090" || rt.Config.Auth.ClientSecret != "het-geheim" {
148 t.Fatalf("terugval mislukt: %+v", rt.Config)
149 }
150}
151
152func TestInvalidSettingsValuesFallBack(t *testing.T) {
153 configPath, stateDir, _, _ := writeUpgradeFixture(t)
154 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
155 if _, err := LoadRuntime(configPath, silent); err != nil {
156 t.Fatal(err)
157 }
158 st, err := LoadSettings(stateDir)
159 if err != nil {
160 t.Fatal(err)
161 }
162 st.BaseURL = ptr("niet-een-url")
163 if err := SaveSettings(stateDir, *st); err != nil {
164 t.Fatal(err)
165 }
166 rt, err := LoadRuntime(configPath, silent)
167 if err != nil {
168 t.Fatalf("ongeldige settings mogen de start niet breken: %v", err)
169 }
170 if rt.Config.BaseURL != "https://git.example.test" {
171 t.Fatalf("terugval base_url: %s", rt.Config.BaseURL)
172 }
173}
174
175func TestSecretFileFallbackWhenSettingsHaveNoSecret(t *testing.T) {
176 configPath, stateDir, secretPath, _ := writeUpgradeFixture(t)
177 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
178 if _, err := LoadRuntime(configPath, silent); err != nil {
179 t.Fatal(err)
180 }
181 st, err := LoadSettings(stateDir)
182 if err != nil {
183 t.Fatal(err)
184 }
185 st.Auth.ClientSecret = nil
186 if err := SaveSettings(stateDir, *st); err != nil {
187 t.Fatal(err)
188 }
189 if err := os.WriteFile(secretPath, []byte("nieuw-geheim\n"), 0o600); err != nil {
190 t.Fatal(err)
191 }
192 rt, err := LoadRuntime(configPath, silent)
193 if err != nil {
194 t.Fatal(err)
195 }
196 if rt.Config.Auth.ClientSecret != "nieuw-geheim" {
197 t.Fatalf("bestand als terugval: %q", rt.Config.Auth.ClientSecret)
198 }
199}
200
201func TestLoadRuntimeSameAsLoadWhenNoSettingsYet(t *testing.T) {
202 // Als settings.yml niet geschreven kan worden, moet LoadRuntime
203 // nog steeds hetzelfde resultaat geven als Load (ook als root
204 // draait, waar chmod op een map niet tegenhoudt).
205 configPath, stateDir, _, _ := writeUpgradeFixture(t)
206 if err := os.RemoveAll(stateDir); err != nil {
207 t.Fatal(err)
208 }
209 if err := os.WriteFile(stateDir, []byte("geen map"), 0o600); err != nil {
210 t.Fatal(err)
211 }
212 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
213 want, err := Load(configPath)
214 if err != nil {
215 t.Fatal(err)
216 }
217 rt, err := LoadRuntime(configPath, silent)
218 if err != nil {
219 t.Fatal(err)
220 }
221 if rt.Imported {
222 t.Fatal("import hoort te falen als state_path geen schrijfbare map is")
223 }
224 if rt.Config.Listen != want.Listen || rt.Config.Auth.ClientSecret != want.Auth.ClientSecret || rt.Config.BaseURL != want.BaseURL {
225 t.Fatalf("LoadRuntime != Load: %+v vs %+v", rt.Config, want)
226 }
227}
228
229func TestMergeUpdateKeepsSecretWhenLeftBlank(t *testing.T) {
230 cur := Config{BaseURL: "https://git.example.test", Listen: "127.0.0.1:8080", StatePath: t.TempDir()}
231 cur.Auth = Auth{Mode: "oauth", ClientID: "id", ClientSecret: "old-secret", BaseURL: "https://auth.example"}
232 cur.applyDefaults()
233 next, saved := MergeUpdate(cur, Persisted{
234 Listen: ptr("127.0.0.1:8081"),
235 Auth: &PersistedAuth{ClientSecret: ptr("")},
236 })
237 if next.Listen != "127.0.0.1:8081" {
238 t.Fatal(next.Listen)
239 }
240 if next.Auth.ClientSecret != "old-secret" {
241 t.Fatalf("geheim gewist: %q", next.Auth.ClientSecret)
242 }
243 if saved.Auth == nil || saved.Auth.ClientSecret == nil || *saved.Auth.ClientSecret != "old-secret" {
244 t.Fatal("opgeslagen geheim ontbreekt")
245 }
246}
247
248func TestImportIsIdempotentWithMarkerOnly(t *testing.T) {
249 configPath, stateDir, _, _ := writeUpgradeFixture(t)
250 if err := os.WriteFile(filepath.Join(stateDir, ImportMarker), nil, 0o640); err != nil {
251 t.Fatal(err)
252 }
253 silent := slog.New(slog.NewTextHandler(io.Discard, nil))
254 rt, err := LoadRuntime(configPath, silent)
255 if err != nil {
256 t.Fatal(err)
257 }
258 if rt.Imported {
259 t.Fatal("marker zonder settings.yml: niet opnieuw importeren")
260 }
261 if _, err := os.Stat(filepath.Join(stateDir, SettingsFile)); err == nil {
262 t.Fatal("er had geen settings.yml mogen ontstaan")
263 }
264 if !strings.HasPrefix(rt.Config.Listen, "127.0.0.1:9090") {
265 t.Fatalf("config.yml als terugval: %s", rt.Config.Listen)
266 }
267}
internal/config/settings.go added +267 −0
@@ -0,0 +1,267 @@
1 package config
2
3 import (
4 "fmt"
5 "os"
6 "path/filepath"
7 "strings"
8
9 "gopkg.in/yaml.v3"
10 )
11
12 // Persisted is het deel van de machineconfiguratie dat in settings.yml
13 // staat. Pointers onderscheiden "niet gezet" (terugval op config.yml) van
14 // een expliciete waarde, inclusief een lege lijst of false.
15 // state_path hoort hier niet in: die bepaalt waar dit bestand ligt.
16 type Persisted struct {
17 BaseURL *string `yaml:"base_url,omitempty"`
18 Listen *string `yaml:"listen,omitempty"`
19 TrustedProxies *[]string `yaml:"trusted_proxies,omitempty"`
20 Auth *PersistedAuth `yaml:"auth,omitempty"`
21 Git *PersistedGit `yaml:"git,omitempty"`
22 SSH *PersistedSSH `yaml:"ssh,omitempty"`
23 Runner *PersistedRunner `yaml:"runner,omitempty"`
24 CI *PersistedCI `yaml:"ci,omitempty"`
25 }
26
27 // PersistedAuth is het auth-blok in settings.yml.
28 type PersistedAuth struct {
29 Mode *string `yaml:"mode,omitempty"`
30 BaseURL *string `yaml:"base_url,omitempty"`
31 ClientID *string `yaml:"client_id,omitempty"`
32 ClientSecret *string `yaml:"client_secret,omitempty"`
33 ClientSecretFile *string `yaml:"client_secret_file,omitempty"`
34 RedirectPath *string `yaml:"redirect_path,omitempty"`
35 UserAgent *string `yaml:"user_agent,omitempty"`
36 DevUser *string `yaml:"dev_user,omitempty"`
37 DevAuthID *int64 `yaml:"dev_auth_id,omitempty"`
38 TenantID *string `yaml:"tenant_id,omitempty"`
39 Issuer *string `yaml:"issuer,omitempty"`
40 }
41
42 // PersistedGit is het git-blok in settings.yml.
43 type PersistedGit struct {
44 Binary *string `yaml:"binary,omitempty"`
45 DefaultBranch *string `yaml:"default_branch,omitempty"`
46 HookBinary *string `yaml:"hook_binary,omitempty"`
47 MaintenanceInterval *string `yaml:"maintenance_interval,omitempty"`
48 }
49
50 // PersistedSSH is het ssh-blok in settings.yml.
51 type PersistedSSH struct {
52 Enabled *bool `yaml:"enabled,omitempty"`
53 Listen *string `yaml:"listen,omitempty"`
54 PublicHost *string `yaml:"public_host,omitempty"`
55 PublicPort *int `yaml:"public_port,omitempty"`
56 }
57
58 // PersistedRunner is het runner-blok in settings.yml.
59 type PersistedRunner struct {
60 Name *string `yaml:"name,omitempty"`
61 }
62
63 // PersistedCI is het ci-blok in settings.yml. Presets blijven in
64 // config.yml / de runner-UI (runner-settings.json); die zitten hier
65 // expres niet, om geen tweede bron te maken.
66 type PersistedCI struct {
67 Enabled *bool `yaml:"enabled,omitempty"`
68 Docker *string `yaml:"docker_binary,omitempty"`
69 Concurrency *int `yaml:"concurrency,omitempty"`
70 Network *string `yaml:"network,omitempty"`
71 TimeoutSec *int `yaml:"timeout_seconds,omitempty"`
72 UpdateMaxWaitMin *int `yaml:"update_max_wait_minutes,omitempty"`
73 }
74
75 // LoadSettings leest settings.yml. (nil, nil) als het bestand er niet is.
76 func LoadSettings(statePath string) (*Persisted, error) {
77 path := filepath.Join(statePath, SettingsFile)
78 b, err := os.ReadFile(path)
79 if err != nil {
80 if os.IsNotExist(err) {
81 return nil, nil
82 }
83 return nil, err
84 }
85 var p Persisted
86 if err := yaml.Unmarshal(b, &p); err != nil {
87 return nil, fmt.Errorf("%s: %w", path, err)
88 }
89 return &p, nil
90 }
91
92 // SaveSettings schrijft settings.yml atomair met mode 0600.
93 func SaveSettings(statePath string, p Persisted) error {
94 b, err := yaml.Marshal(p)
95 if err != nil {
96 return err
97 }
98 return atomicWrite(filepath.Join(statePath, SettingsFile), b, 0o600)
99 }
100
101 func ptr[T any](v T) *T { return &v }
102
103 // SettingsFrom maakt de opgeslagen vorm van de huidige configuratie.
104 func SettingsFrom(c Config) Persisted {
105 return persistFrom(c)
106 }
107
108 func persistFrom(c Config) Persisted {
109 proxies := append([]string(nil), c.TrustedProxies...)
110 auth := PersistedAuth{
111 Mode: ptr(c.Auth.Mode),
112 BaseURL: ptr(c.Auth.BaseURL),
113 ClientID: ptr(c.Auth.ClientID),
114 RedirectPath: ptr(c.Auth.RedirectPath),
115 UserAgent: ptr(c.Auth.UserAgent),
116 DevUser: ptr(c.Auth.DevUser),
117 DevAuthID: ptr(c.Auth.DevAuthID),
118 TenantID: ptr(c.Auth.TenantID),
119 Issuer: ptr(c.Auth.Issuer),
120 ClientSecretFile: ptr(c.Auth.ClientSecretFile),
121 }
122 if strings.TrimSpace(c.Auth.ClientSecret) != "" {
123 auth.ClientSecret = ptr(c.Auth.ClientSecret)
124 }
125 return Persisted{
126 BaseURL: ptr(c.BaseURL),
127 Listen: ptr(c.Listen),
128 TrustedProxies: &proxies,
129 Auth: &auth,
130 Git: &PersistedGit{
131 Binary: ptr(c.Git.Binary),
132 DefaultBranch: ptr(c.Git.DefaultBranch),
133 HookBinary: ptr(c.Git.HookBinary),
134 MaintenanceInterval: ptr(c.Git.MaintenanceInterval),
135 },
136 SSH: &PersistedSSH{
137 Enabled: ptr(c.SSH.Enabled),
138 Listen: ptr(c.SSH.Listen),
139 PublicHost: ptr(c.SSH.PublicHost),
140 PublicPort: ptr(c.SSH.PublicPort),
141 },
142 Runner: &PersistedRunner{Name: ptr(c.Runner.Name)},
143 CI: &PersistedCI{
144 Enabled: ptr(c.CI.Enabled),
145 Docker: ptr(c.CI.Docker),
146 Concurrency: ptr(c.CI.Concurrency),
147 Network: ptr(c.CI.Network),
148 TimeoutSec: ptr(c.CI.TimeoutSec),
149 UpdateMaxWaitMin: ptr(c.CI.UpdateMaxWaitMin),
150 },
151 }
152 }
153
154 func applyPersisted(c *Config, p *Persisted) {
155 if p == nil {
156 return
157 }
158 if p.BaseURL != nil {
159 c.BaseURL = strings.TrimRight(*p.BaseURL, "/")
160 }
161 if p.Listen != nil {
162 c.Listen = *p.Listen
163 }
164 if p.TrustedProxies != nil {
165 c.TrustedProxies = append([]string(nil), *p.TrustedProxies...)
166 }
167 if a := p.Auth; a != nil {
168 if a.Mode != nil {
169 c.Auth.Mode = *a.Mode
170 }
171 if a.BaseURL != nil {
172 c.Auth.BaseURL = strings.TrimRight(*a.BaseURL, "/")
173 }
174 if a.ClientID != nil {
175 c.Auth.ClientID = *a.ClientID
176 }
177 if a.ClientSecret != nil && strings.TrimSpace(*a.ClientSecret) != "" {
178 c.Auth.ClientSecret = *a.ClientSecret
179 }
180 if a.ClientSecretFile != nil {
181 c.Auth.ClientSecretFile = *a.ClientSecretFile
182 }
183 if a.RedirectPath != nil {
184 c.Auth.RedirectPath = *a.RedirectPath
185 }
186 if a.UserAgent != nil {
187 c.Auth.UserAgent = *a.UserAgent
188 }
189 if a.DevUser != nil {
190 c.Auth.DevUser = *a.DevUser
191 }
192 if a.DevAuthID != nil {
193 c.Auth.DevAuthID = *a.DevAuthID
194 }
195 if a.TenantID != nil {
196 c.Auth.TenantID = strings.TrimSpace(*a.TenantID)
197 }
198 if a.Issuer != nil {
199 c.Auth.Issuer = strings.TrimRight(strings.TrimSpace(*a.Issuer), "/")
200 }
201 }
202 if g := p.Git; g != nil {
203 if g.Binary != nil {
204 c.Git.Binary = *g.Binary
205 }
206 if g.DefaultBranch != nil {
207 c.Git.DefaultBranch = *g.DefaultBranch
208 }
209 if g.HookBinary != nil {
210 c.Git.HookBinary = *g.HookBinary
211 }
212 if g.MaintenanceInterval != nil {
213 c.Git.MaintenanceInterval = *g.MaintenanceInterval
214 }
215 }
216 if s := p.SSH; s != nil {
217 if s.Enabled != nil {
218 c.SSH.Enabled = *s.Enabled
219 }
220 if s.Listen != nil {
221 c.SSH.Listen = *s.Listen
222 }
223 if s.PublicHost != nil {
224 c.SSH.PublicHost = *s.PublicHost
225 }
226 if s.PublicPort != nil {
227 c.SSH.PublicPort = *s.PublicPort
228 }
229 }
230 if r := p.Runner; r != nil && r.Name != nil {
231 c.Runner.Name = strings.TrimSpace(*r.Name)
232 }
233 if ci := p.CI; ci != nil {
234 if ci.Enabled != nil {
235 c.CI.Enabled = *ci.Enabled
236 }
237 if ci.Docker != nil {
238 c.CI.Docker = *ci.Docker
239 }
240 if ci.Concurrency != nil {
241 c.CI.Concurrency = *ci.Concurrency
242 }
243 if ci.Network != nil {
244 c.CI.Network = *ci.Network
245 }
246 if ci.TimeoutSec != nil {
247 c.CI.TimeoutSec = *ci.TimeoutSec
248 }
249 if ci.UpdateMaxWaitMin != nil {
250 c.CI.UpdateMaxWaitMin = *ci.UpdateMaxWaitMin
251 }
252 }
253 }
254
255 // MergeUpdate past een wijziging uit de UI/API toe op de huidige config
256 // en bouwt de nieuwe Persisted-staat (leeg gelaten geheim blijft behouden).
257 func MergeUpdate(cur Config, patch Persisted) (Config, Persisted) {
258 next := cur
259 // Een leeg nieuw geheim betekent "ongewijzigd".
260 if patch.Auth != nil && patch.Auth.ClientSecret != nil && strings.TrimSpace(*patch.Auth.ClientSecret) == "" {
261 patch.Auth.ClientSecret = nil
262 }
263 applyPersisted(&next, &patch)
264 next.applyDefaults()
265 saved := persistFrom(next)
266 return next, saved
267 }
@@ -0,0 +1,267 @@
1package config
2
3import (
4 "fmt"
5 "os"
6 "path/filepath"
7 "strings"
8
9 "gopkg.in/yaml.v3"
10)
11
12// Persisted is het deel van de machineconfiguratie dat in settings.yml
13// staat. Pointers onderscheiden "niet gezet" (terugval op config.yml) van
14// een expliciete waarde, inclusief een lege lijst of false.
15// state_path hoort hier niet in: die bepaalt waar dit bestand ligt.
16type Persisted struct {
17 BaseURL *string `yaml:"base_url,omitempty"`
18 Listen *string `yaml:"listen,omitempty"`
19 TrustedProxies *[]string `yaml:"trusted_proxies,omitempty"`
20 Auth *PersistedAuth `yaml:"auth,omitempty"`
21 Git *PersistedGit `yaml:"git,omitempty"`
22 SSH *PersistedSSH `yaml:"ssh,omitempty"`
23 Runner *PersistedRunner `yaml:"runner,omitempty"`
24 CI *PersistedCI `yaml:"ci,omitempty"`
25}
26
27// PersistedAuth is het auth-blok in settings.yml.
28type PersistedAuth struct {
29 Mode *string `yaml:"mode,omitempty"`
30 BaseURL *string `yaml:"base_url,omitempty"`
31 ClientID *string `yaml:"client_id,omitempty"`
32 ClientSecret *string `yaml:"client_secret,omitempty"`
33 ClientSecretFile *string `yaml:"client_secret_file,omitempty"`
34 RedirectPath *string `yaml:"redirect_path,omitempty"`
35 UserAgent *string `yaml:"user_agent,omitempty"`
36 DevUser *string `yaml:"dev_user,omitempty"`
37 DevAuthID *int64 `yaml:"dev_auth_id,omitempty"`
38 TenantID *string `yaml:"tenant_id,omitempty"`
39 Issuer *string `yaml:"issuer,omitempty"`
40}
41
42// PersistedGit is het git-blok in settings.yml.
43type PersistedGit struct {
44 Binary *string `yaml:"binary,omitempty"`
45 DefaultBranch *string `yaml:"default_branch,omitempty"`
46 HookBinary *string `yaml:"hook_binary,omitempty"`
47 MaintenanceInterval *string `yaml:"maintenance_interval,omitempty"`
48}
49
50// PersistedSSH is het ssh-blok in settings.yml.
51type PersistedSSH struct {
52 Enabled *bool `yaml:"enabled,omitempty"`
53 Listen *string `yaml:"listen,omitempty"`
54 PublicHost *string `yaml:"public_host,omitempty"`
55 PublicPort *int `yaml:"public_port,omitempty"`
56}
57
58// PersistedRunner is het runner-blok in settings.yml.
59type PersistedRunner struct {
60 Name *string `yaml:"name,omitempty"`
61}
62
63// PersistedCI is het ci-blok in settings.yml. Presets blijven in
64// config.yml / de runner-UI (runner-settings.json); die zitten hier
65// expres niet, om geen tweede bron te maken.
66type PersistedCI struct {
67 Enabled *bool `yaml:"enabled,omitempty"`
68 Docker *string `yaml:"docker_binary,omitempty"`
69 Concurrency *int `yaml:"concurrency,omitempty"`
70 Network *string `yaml:"network,omitempty"`
71 TimeoutSec *int `yaml:"timeout_seconds,omitempty"`
72 UpdateMaxWaitMin *int `yaml:"update_max_wait_minutes,omitempty"`
73}
74
75// LoadSettings leest settings.yml. (nil, nil) als het bestand er niet is.
76func LoadSettings(statePath string) (*Persisted, error) {
77 path := filepath.Join(statePath, SettingsFile)
78 b, err := os.ReadFile(path)
79 if err != nil {
80 if os.IsNotExist(err) {
81 return nil, nil
82 }
83 return nil, err
84 }
85 var p Persisted
86 if err := yaml.Unmarshal(b, &p); err != nil {
87 return nil, fmt.Errorf("%s: %w", path, err)
88 }
89 return &p, nil
90}
91
92// SaveSettings schrijft settings.yml atomair met mode 0600.
93func SaveSettings(statePath string, p Persisted) error {
94 b, err := yaml.Marshal(p)
95 if err != nil {
96 return err
97 }
98 return atomicWrite(filepath.Join(statePath, SettingsFile), b, 0o600)
99}
100
101func ptr[T any](v T) *T { return &v }
102
103// SettingsFrom maakt de opgeslagen vorm van de huidige configuratie.
104func SettingsFrom(c Config) Persisted {
105 return persistFrom(c)
106}
107
108func persistFrom(c Config) Persisted {
109 proxies := append([]string(nil), c.TrustedProxies...)
110 auth := PersistedAuth{
111 Mode: ptr(c.Auth.Mode),
112 BaseURL: ptr(c.Auth.BaseURL),
113 ClientID: ptr(c.Auth.ClientID),
114 RedirectPath: ptr(c.Auth.RedirectPath),
115 UserAgent: ptr(c.Auth.UserAgent),
116 DevUser: ptr(c.Auth.DevUser),
117 DevAuthID: ptr(c.Auth.DevAuthID),
118 TenantID: ptr(c.Auth.TenantID),
119 Issuer: ptr(c.Auth.Issuer),
120 ClientSecretFile: ptr(c.Auth.ClientSecretFile),
121 }
122 if strings.TrimSpace(c.Auth.ClientSecret) != "" {
123 auth.ClientSecret = ptr(c.Auth.ClientSecret)
124 }
125 return Persisted{
126 BaseURL: ptr(c.BaseURL),
127 Listen: ptr(c.Listen),
128 TrustedProxies: &proxies,
129 Auth: &auth,
130 Git: &PersistedGit{
131 Binary: ptr(c.Git.Binary),
132 DefaultBranch: ptr(c.Git.DefaultBranch),
133 HookBinary: ptr(c.Git.HookBinary),
134 MaintenanceInterval: ptr(c.Git.MaintenanceInterval),
135 },
136 SSH: &PersistedSSH{
137 Enabled: ptr(c.SSH.Enabled),
138 Listen: ptr(c.SSH.Listen),
139 PublicHost: ptr(c.SSH.PublicHost),
140 PublicPort: ptr(c.SSH.PublicPort),
141 },
142 Runner: &PersistedRunner{Name: ptr(c.Runner.Name)},
143 CI: &PersistedCI{
144 Enabled: ptr(c.CI.Enabled),
145 Docker: ptr(c.CI.Docker),
146 Concurrency: ptr(c.CI.Concurrency),
147 Network: ptr(c.CI.Network),
148 TimeoutSec: ptr(c.CI.TimeoutSec),
149 UpdateMaxWaitMin: ptr(c.CI.UpdateMaxWaitMin),
150 },
151 }
152}
153
154func applyPersisted(c *Config, p *Persisted) {
155 if p == nil {
156 return
157 }
158 if p.BaseURL != nil {
159 c.BaseURL = strings.TrimRight(*p.BaseURL, "/")
160 }
161 if p.Listen != nil {
162 c.Listen = *p.Listen
163 }
164 if p.TrustedProxies != nil {
165 c.TrustedProxies = append([]string(nil), *p.TrustedProxies...)
166 }
167 if a := p.Auth; a != nil {
168 if a.Mode != nil {
169 c.Auth.Mode = *a.Mode
170 }
171 if a.BaseURL != nil {
172 c.Auth.BaseURL = strings.TrimRight(*a.BaseURL, "/")
173 }
174 if a.ClientID != nil {
175 c.Auth.ClientID = *a.ClientID
176 }
177 if a.ClientSecret != nil && strings.TrimSpace(*a.ClientSecret) != "" {
178 c.Auth.ClientSecret = *a.ClientSecret
179 }
180 if a.ClientSecretFile != nil {
181 c.Auth.ClientSecretFile = *a.ClientSecretFile
182 }
183 if a.RedirectPath != nil {
184 c.Auth.RedirectPath = *a.RedirectPath
185 }
186 if a.UserAgent != nil {
187 c.Auth.UserAgent = *a.UserAgent
188 }
189 if a.DevUser != nil {
190 c.Auth.DevUser = *a.DevUser
191 }
192 if a.DevAuthID != nil {
193 c.Auth.DevAuthID = *a.DevAuthID
194 }
195 if a.TenantID != nil {
196 c.Auth.TenantID = strings.TrimSpace(*a.TenantID)
197 }
198 if a.Issuer != nil {
199 c.Auth.Issuer = strings.TrimRight(strings.TrimSpace(*a.Issuer), "/")
200 }
201 }
202 if g := p.Git; g != nil {
203 if g.Binary != nil {
204 c.Git.Binary = *g.Binary
205 }
206 if g.DefaultBranch != nil {
207 c.Git.DefaultBranch = *g.DefaultBranch
208 }
209 if g.HookBinary != nil {
210 c.Git.HookBinary = *g.HookBinary
211 }
212 if g.MaintenanceInterval != nil {
213 c.Git.MaintenanceInterval = *g.MaintenanceInterval
214 }
215 }
216 if s := p.SSH; s != nil {
217 if s.Enabled != nil {
218 c.SSH.Enabled = *s.Enabled
219 }
220 if s.Listen != nil {
221 c.SSH.Listen = *s.Listen
222 }
223 if s.PublicHost != nil {
224 c.SSH.PublicHost = *s.PublicHost
225 }
226 if s.PublicPort != nil {
227 c.SSH.PublicPort = *s.PublicPort
228 }
229 }
230 if r := p.Runner; r != nil && r.Name != nil {
231 c.Runner.Name = strings.TrimSpace(*r.Name)
232 }
233 if ci := p.CI; ci != nil {
234 if ci.Enabled != nil {
235 c.CI.Enabled = *ci.Enabled
236 }
237 if ci.Docker != nil {
238 c.CI.Docker = *ci.Docker
239 }
240 if ci.Concurrency != nil {
241 c.CI.Concurrency = *ci.Concurrency
242 }
243 if ci.Network != nil {
244 c.CI.Network = *ci.Network
245 }
246 if ci.TimeoutSec != nil {
247 c.CI.TimeoutSec = *ci.TimeoutSec
248 }
249 if ci.UpdateMaxWaitMin != nil {
250 c.CI.UpdateMaxWaitMin = *ci.UpdateMaxWaitMin
251 }
252 }
253}
254
255// MergeUpdate past een wijziging uit de UI/API toe op de huidige config
256// en bouwt de nieuwe Persisted-staat (leeg gelaten geheim blijft behouden).
257func MergeUpdate(cur Config, patch Persisted) (Config, Persisted) {
258 next := cur
259 // Een leeg nieuw geheim betekent "ongewijzigd".
260 if patch.Auth != nil && patch.Auth.ClientSecret != nil && strings.TrimSpace(*patch.Auth.ClientSecret) == "" {
261 patch.Auth.ClientSecret = nil
262 }
263 applyPersisted(&next, &patch)
264 next.applyDefaults()
265 saved := persistFrom(next)
266 return next, saved
267}
internal/i18n/catalog_instance.go added +240 −0
@@ -0,0 +1,240 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, instanceEN)
5 addCatalog(nl, instanceNL)
6 addCatalog(de, instanceDE)
7 addCatalog(fr, instanceFR)
8 }
9
10 var instanceEN = map[string]string{
11 "title.adminSettings": "Settings",
12 "admin.tab.settings": "Settings",
13 "admin.settings.lead": "These are the machine settings of this instance. Changes are saved in settings.yml under the state directory and applied immediately where that is safe. The original config.yml is left unchanged and is only a fallback.",
14 "admin.settings.saved": "Settings saved.",
15 "admin.settings.listenNow": "Listening on %s. Update any reverse proxy if needed.",
16 "admin.settings.machine": "Machine",
17 "admin.settings.baseURL": "Public URL",
18 "admin.settings.listen": "Listen address",
19 "admin.settings.listening": "Currently listening on %s.",
20 "admin.settings.statePath": "State directory",
21 "admin.settings.stateWhy": "The database, secret key and settings.yml live here, so this path cannot be changed in the web interface. Set it with state_path in config.yml, BLUEGIT_STATE_PATH, or the default /var/lib/bluegit.",
22 "admin.settings.configPath": "config.yml",
23 "admin.settings.configWhy": "Still read at startup as a fallback. The web interface does not rewrite this file.",
24 "admin.settings.settingsPath": "settings.yml",
25 "admin.settings.storagePath": "Data disk",
26 "admin.settings.trustedProxies": "Trusted proxies",
27 "admin.settings.trustedWhy": "One IP or CIDR per line. Only these addresses may set X-Forwarded-For and X-Real-IP.",
28 "admin.settings.auth": "Sign-in",
29 "admin.settings.authMode": "Mode",
30 "admin.settings.authModeWhy": "oauth uses auth.timfalken.com, entra uses Microsoft Entra ID (one tenant), dev is only for local use and is refused for git.timfalken.com.",
31 "admin.settings.authBase": "Auth server URL",
32 "admin.settings.clientID": "Client ID",
33 "admin.settings.clientSecret": "Client secret",
34 "admin.settings.secretSet": "A secret is already stored. Leave this blank to keep it.",
35 "admin.settings.secretKeep": "Leave blank to keep the current secret.",
36 "admin.settings.secretFile": "Client secret file",
37 "admin.settings.redirect": "Redirect path",
38 "admin.settings.userAgent": "User agent",
39 "admin.settings.tenant": "Tenant ID",
40 "admin.settings.issuer": "Issuer (optional)",
41 "admin.settings.devUser": "Dev username",
42 "admin.settings.git": "Git",
43 "admin.settings.gitBinary": "Git binary",
44 "admin.settings.defaultBranch": "Default branch",
45 "admin.settings.hookBinary": "Hook binary",
46 "admin.settings.maintenance": "Maintenance interval",
47 "admin.settings.ssh": "SSH",
48 "admin.settings.sshEnabled": "Enable git over SSH",
49 "admin.settings.sshListen": "SSH listen address",
50 "admin.settings.publicHost": "Public host",
51 "admin.settings.publicPort": "Public port",
52 "admin.settings.ci": "Built-in runner",
53 "admin.settings.ciEnabled": "Enable the built-in runner",
54 "admin.settings.docker": "Docker binary",
55 "admin.settings.concurrency": "Concurrency (startup default)",
56 "admin.settings.network": "Docker network",
57 "admin.settings.timeout": "Job timeout (seconds)",
58 "admin.settings.updateWait": "Self-update wait (minutes)",
59 "admin.settings.ciPresets": "Image presets and live runner limits are under Admin → Runner.",
60 "admin.settings.runnerName": "Built-in runner name",
61 "admin.token.create": "Create token",
62 "admin.token.name": "Token name",
63 "admin.token.created": "A new access token for %s. It is shown only once.",
64 "admin.token.once": "Copy this token now. It will not be shown again.",
65 "admin.token.showOnce": "New token for %s:",
66 }
67
68 var instanceNL = map[string]string{
69 "title.adminSettings": "Instellingen",
70 "admin.tab.settings": "Instellingen",
71 "admin.settings.lead": "Dit zijn de machine-instellingen van deze instantie. Wijzigingen landen in settings.yml in de state-map en gaan waar dat veilig is meteen in. De oorspronkelijke config.yml blijft ongewijzigd en dient alleen als terugval.",
72 "admin.settings.saved": "Instellingen opgeslagen.",
73 "admin.settings.listenNow": "Luistert nu op %s. Pas zo nodig de reverse proxy aan.",
74 "admin.settings.machine": "Machine",
75 "admin.settings.baseURL": "Publieke URL",
76 "admin.settings.listen": "Luisteradres",
77 "admin.settings.listening": "Luistert nu op %s.",
78 "admin.settings.statePath": "State-map",
79 "admin.settings.stateWhy": "Hier staan de database, de sleutel en settings.yml, dus dit pad kun je niet in de webinterface wijzigen. Zet het met state_path in config.yml, BLUEGIT_STATE_PATH, of de standaard /var/lib/bluegit.",
80 "admin.settings.configPath": "config.yml",
81 "admin.settings.configWhy": "Wordt bij het starten nog gelezen als terugval. De webinterface schrijft dit bestand niet bij.",
82 "admin.settings.settingsPath": "settings.yml",
83 "admin.settings.storagePath": "Datadisk",
84 "admin.settings.trustedProxies": "Vertrouwde proxies",
85 "admin.settings.trustedWhy": "Eén IP of CIDR per regel. Alleen deze adressen mogen X-Forwarded-For en X-Real-IP zetten.",
86 "admin.settings.auth": "Aanmelden",
87 "admin.settings.authMode": "Modus",
88 "admin.settings.authModeWhy": "oauth gebruikt auth.timfalken.com, entra gebruikt Microsoft Entra ID (één tenant), dev is alleen lokaal en is geweigerd voor git.timfalken.com.",
89 "admin.settings.authBase": "URL van de auth-server",
90 "admin.settings.clientID": "Client-ID",
91 "admin.settings.clientSecret": "Clientgeheim",
92 "admin.settings.secretSet": "Er is al een geheim opgeslagen. Laat dit veld leeg om het te houden.",
93 "admin.settings.secretKeep": "Laat leeg om het huidige geheim te houden.",
94 "admin.settings.secretFile": "Bestand met clientgeheim",
95 "admin.settings.redirect": "Redirect-pad",
96 "admin.settings.userAgent": "User agent",
97 "admin.settings.tenant": "Tenant-ID",
98 "admin.settings.issuer": "Issuer (optioneel)",
99 "admin.settings.devUser": "Dev-gebruikersnaam",
100 "admin.settings.git": "Git",
101 "admin.settings.gitBinary": "Git-binary",
102 "admin.settings.defaultBranch": "Standaardbranch",
103 "admin.settings.hookBinary": "Hook-binary",
104 "admin.settings.maintenance": "Onderhoudsinterval",
105 "admin.settings.ssh": "SSH",
106 "admin.settings.sshEnabled": "Git over SSH aanzetten",
107 "admin.settings.sshListen": "SSH-luisteradres",
108 "admin.settings.publicHost": "Publieke host",
109 "admin.settings.publicPort": "Publieke poort",
110 "admin.settings.ci": "Ingebouwde runner",
111 "admin.settings.ciEnabled": "Ingebouwde runner aanzetten",
112 "admin.settings.docker": "Docker-binary",
113 "admin.settings.concurrency": "Gelijktijdigheid (opstartwaarde)",
114 "admin.settings.network": "Docker-netwerk",
115 "admin.settings.timeout": "Job-timeout (seconden)",
116 "admin.settings.updateWait": "Wachttijd self-update (minuten)",
117 "admin.settings.ciPresets": "Image-presets en live limieten staan onder Beheer → Runner.",
118 "admin.settings.runnerName": "Naam van de ingebouwde runner",
119 "admin.token.create": "Token maken",
120 "admin.token.name": "Tokennaam",
121 "admin.token.created": "Een nieuw toegangstoken voor %s. Het wordt maar één keer getoond.",
122 "admin.token.once": "Kopieer dit token nu. Het wordt niet opnieuw getoond.",
123 "admin.token.showOnce": "Nieuw token voor %s:",
124 }
125
126 var instanceDE = map[string]string{
127 "title.adminSettings": "Einstellungen",
128 "admin.tab.settings": "Einstellungen",
129 "admin.settings.lead": "Das sind die Maschineneinstellungen dieser Instanz. Änderungen landen in settings.yml im State-Verzeichnis und gelten, soweit es sicher ist, sofort. Die ursprüngliche config.yml bleibt unverändert und dient nur als Rückfall.",
130 "admin.settings.saved": "Einstellungen gespeichert.",
131 "admin.settings.listenNow": "Lauscht jetzt auf %s. Passe bei Bedarf den Reverse-Proxy an.",
132 "admin.settings.machine": "Maschine",
133 "admin.settings.baseURL": "Öffentliche URL",
134 "admin.settings.listen": "Listen-Adresse",
135 "admin.settings.listening": "Lauscht jetzt auf %s.",
136 "admin.settings.statePath": "State-Verzeichnis",
137 "admin.settings.stateWhy": "Hier liegen Datenbank, Schlüssel und settings.yml, deshalb lässt sich dieser Pfad nicht in der Weboberfläche ändern. Setze ihn mit state_path in der config.yml, BLUEGIT_STATE_PATH oder dem Standard /var/lib/bluegit.",
138 "admin.settings.configPath": "config.yml",
139 "admin.settings.configWhy": "Wird beim Start weiter als Rückfall gelesen. Die Weboberfläche schreibt diese Datei nicht um.",
140 "admin.settings.settingsPath": "settings.yml",
141 "admin.settings.storagePath": "Datenträger",
142 "admin.settings.trustedProxies": "Vertrauenswürdige Proxys",
143 "admin.settings.trustedWhy": "Eine IP oder CIDR je Zeile. Nur diese Adressen dürfen X-Forwarded-For und X-Real-IP setzen.",
144 "admin.settings.auth": "Anmeldung",
145 "admin.settings.authMode": "Modus",
146 "admin.settings.authModeWhy": "oauth nutzt auth.timfalken.com, entra Microsoft Entra ID (eine Tenant), dev ist nur lokal und für git.timfalken.com verboten.",
147 "admin.settings.authBase": "URL des Auth-Servers",
148 "admin.settings.clientID": "Client-ID",
149 "admin.settings.clientSecret": "Client-Geheimnis",
150 "admin.settings.secretSet": "Es ist bereits ein Geheimnis gespeichert. Lass das Feld leer, um es zu behalten.",
151 "admin.settings.secretKeep": "Leer lassen, um das aktuelle Geheimnis zu behalten.",
152 "admin.settings.secretFile": "Datei mit dem Client-Geheimnis",
153 "admin.settings.redirect": "Redirect-Pfad",
154 "admin.settings.userAgent": "User-Agent",
155 "admin.settings.tenant": "Tenant-ID",
156 "admin.settings.issuer": "Issuer (optional)",
157 "admin.settings.devUser": "Dev-Benutzername",
158 "admin.settings.git": "Git",
159 "admin.settings.gitBinary": "Git-Binary",
160 "admin.settings.defaultBranch": "Standardbranch",
161 "admin.settings.hookBinary": "Hook-Binary",
162 "admin.settings.maintenance": "Wartungsintervall",
163 "admin.settings.ssh": "SSH",
164 "admin.settings.sshEnabled": "Git über SSH einschalten",
165 "admin.settings.sshListen": "SSH-Listen-Adresse",
166 "admin.settings.publicHost": "Öffentlicher Host",
167 "admin.settings.publicPort": "Öffentlicher Port",
168 "admin.settings.ci": "Eingebauter Runner",
169 "admin.settings.ciEnabled": "Eingebauten Runner einschalten",
170 "admin.settings.docker": "Docker-Binary",
171 "admin.settings.concurrency": "Parallelität (Startwert)",
172 "admin.settings.network": "Docker-Netzwerk",
173 "admin.settings.timeout": "Job-Timeout (Sekunden)",
174 "admin.settings.updateWait": "Wartezeit für Self-Update (Minuten)",
175 "admin.settings.ciPresets": "Image-Presets und Live-Limits stehen unter Verwaltung → Runner.",
176 "admin.settings.runnerName": "Name des eingebauten Runners",
177 "admin.token.create": "Token erstellen",
178 "admin.token.name": "Tokenname",
179 "admin.token.created": "Ein neues Zugriffstoken für %s. Es wird nur einmal angezeigt.",
180 "admin.token.once": "Kopiere dieses Token jetzt. Es wird nicht erneut angezeigt.",
181 "admin.token.showOnce": "Neues Token für %s:",
182 }
183
184 var instanceFR = map[string]string{
185 "title.adminSettings": "Paramètres",
186 "admin.tab.settings": "Paramètres",
187 "admin.settings.lead": "Voici les paramètres machine de cette instance. Les modifications sont enregistrées dans settings.yml du répertoire d’état et s’appliquent tout de suite lorsque c’est sûr. Le fichier config.yml d’origine n’est pas modifié et sert seulement de secours.",
188 "admin.settings.saved": "Paramètres enregistrés.",
189 "admin.settings.listenNow": "Écoute maintenant sur %s. Adapte le reverse proxy si besoin.",
190 "admin.settings.machine": "Machine",
191 "admin.settings.baseURL": "URL publique",
192 "admin.settings.listen": "Adresse d’écoute",
193 "admin.settings.listening": "Écoute actuellement sur %s.",
194 "admin.settings.statePath": "Répertoire d’état",
195 "admin.settings.stateWhy": "La base, la clé et settings.yml s’y trouvent, donc ce chemin ne peut pas être changé dans l’interface. Définis-le avec state_path dans config.yml, BLUEGIT_STATE_PATH, ou le défaut /var/lib/bluegit.",
196 "admin.settings.configPath": "config.yml",
197 "admin.settings.configWhy": "Toujours lu au démarrage comme secours. L’interface n’écrit pas dans ce fichier.",
198 "admin.settings.settingsPath": "settings.yml",
199 "admin.settings.storagePath": "Disque de données",
200 "admin.settings.trustedProxies": "Proxys de confiance",
201 "admin.settings.trustedWhy": "Une IP ou un CIDR par ligne. Seules ces adresses peuvent poser X-Forwarded-For et X-Real-IP.",
202 "admin.settings.auth": "Connexion",
203 "admin.settings.authMode": "Mode",
204 "admin.settings.authModeWhy": "oauth utilise auth.timfalken.com, entra utilise Microsoft Entra ID (un locataire), dev est réservé au local et refusé pour git.timfalken.com.",
205 "admin.settings.authBase": "URL du serveur d’auth",
206 "admin.settings.clientID": "ID client",
207 "admin.settings.clientSecret": "Secret client",
208 "admin.settings.secretSet": "Un secret est déjà enregistré. Laisse vide pour le conserver.",
209 "admin.settings.secretKeep": "Laisse vide pour garder le secret actuel.",
210 "admin.settings.secretFile": "Fichier du secret client",
211 "admin.settings.redirect": "Chemin de redirection",
212 "admin.settings.userAgent": "User agent",
213 "admin.settings.tenant": "ID de locataire",
214 "admin.settings.issuer": "Issuer (facultatif)",
215 "admin.settings.devUser": "Nom d’utilisateur dev",
216 "admin.settings.git": "Git",
217 "admin.settings.gitBinary": "Binaire git",
218 "admin.settings.defaultBranch": "Branche par défaut",
219 "admin.settings.hookBinary": "Binaire des hooks",
220 "admin.settings.maintenance": "Intervalle de maintenance",
221 "admin.settings.ssh": "SSH",
222 "admin.settings.sshEnabled": "Activer git via SSH",
223 "admin.settings.sshListen": "Adresse d’écoute SSH",
224 "admin.settings.publicHost": "Hôte public",
225 "admin.settings.publicPort": "Port public",
226 "admin.settings.ci": "Runner intégré",
227 "admin.settings.ciEnabled": "Activer le runner intégré",
228 "admin.settings.docker": "Binaire Docker",
229 "admin.settings.concurrency": "Parallélisme (valeur de démarrage)",
230 "admin.settings.network": "Réseau Docker",
231 "admin.settings.timeout": "Délai des jobs (secondes)",
232 "admin.settings.updateWait": "Attente de self-update (minutes)",
233 "admin.settings.ciPresets": "Les préréglages d’images et les limites en direct sont sous Administration → Runner.",
234 "admin.settings.runnerName": "Nom du runner intégré",
235 "admin.token.create": "Créer un jeton",
236 "admin.token.name": "Nom du jeton",
237 "admin.token.created": "Nouveau jeton d’accès pour %s. Il n’est affiché qu’une fois.",
238 "admin.token.once": "Copie ce jeton maintenant. Il ne sera plus affiché.",
239 "admin.token.showOnce": "Nouveau jeton pour %s :",
240 }
@@ -0,0 +1,240 @@
1package i18n
2
3func init() {
4 addCatalog(en, instanceEN)
5 addCatalog(nl, instanceNL)
6 addCatalog(de, instanceDE)
7 addCatalog(fr, instanceFR)
8}
9
10var instanceEN = map[string]string{
11 "title.adminSettings": "Settings",
12 "admin.tab.settings": "Settings",
13 "admin.settings.lead": "These are the machine settings of this instance. Changes are saved in settings.yml under the state directory and applied immediately where that is safe. The original config.yml is left unchanged and is only a fallback.",
14 "admin.settings.saved": "Settings saved.",
15 "admin.settings.listenNow": "Listening on %s. Update any reverse proxy if needed.",
16 "admin.settings.machine": "Machine",
17 "admin.settings.baseURL": "Public URL",
18 "admin.settings.listen": "Listen address",
19 "admin.settings.listening": "Currently listening on %s.",
20 "admin.settings.statePath": "State directory",
21 "admin.settings.stateWhy": "The database, secret key and settings.yml live here, so this path cannot be changed in the web interface. Set it with state_path in config.yml, BLUEGIT_STATE_PATH, or the default /var/lib/bluegit.",
22 "admin.settings.configPath": "config.yml",
23 "admin.settings.configWhy": "Still read at startup as a fallback. The web interface does not rewrite this file.",
24 "admin.settings.settingsPath": "settings.yml",
25 "admin.settings.storagePath": "Data disk",
26 "admin.settings.trustedProxies": "Trusted proxies",
27 "admin.settings.trustedWhy": "One IP or CIDR per line. Only these addresses may set X-Forwarded-For and X-Real-IP.",
28 "admin.settings.auth": "Sign-in",
29 "admin.settings.authMode": "Mode",
30 "admin.settings.authModeWhy": "oauth uses auth.timfalken.com, entra uses Microsoft Entra ID (one tenant), dev is only for local use and is refused for git.timfalken.com.",
31 "admin.settings.authBase": "Auth server URL",
32 "admin.settings.clientID": "Client ID",
33 "admin.settings.clientSecret": "Client secret",
34 "admin.settings.secretSet": "A secret is already stored. Leave this blank to keep it.",
35 "admin.settings.secretKeep": "Leave blank to keep the current secret.",
36 "admin.settings.secretFile": "Client secret file",
37 "admin.settings.redirect": "Redirect path",
38 "admin.settings.userAgent": "User agent",
39 "admin.settings.tenant": "Tenant ID",
40 "admin.settings.issuer": "Issuer (optional)",
41 "admin.settings.devUser": "Dev username",
42 "admin.settings.git": "Git",
43 "admin.settings.gitBinary": "Git binary",
44 "admin.settings.defaultBranch": "Default branch",
45 "admin.settings.hookBinary": "Hook binary",
46 "admin.settings.maintenance": "Maintenance interval",
47 "admin.settings.ssh": "SSH",
48 "admin.settings.sshEnabled": "Enable git over SSH",
49 "admin.settings.sshListen": "SSH listen address",
50 "admin.settings.publicHost": "Public host",
51 "admin.settings.publicPort": "Public port",
52 "admin.settings.ci": "Built-in runner",
53 "admin.settings.ciEnabled": "Enable the built-in runner",
54 "admin.settings.docker": "Docker binary",
55 "admin.settings.concurrency": "Concurrency (startup default)",
56 "admin.settings.network": "Docker network",
57 "admin.settings.timeout": "Job timeout (seconds)",
58 "admin.settings.updateWait": "Self-update wait (minutes)",
59 "admin.settings.ciPresets": "Image presets and live runner limits are under Admin → Runner.",
60 "admin.settings.runnerName": "Built-in runner name",
61 "admin.token.create": "Create token",
62 "admin.token.name": "Token name",
63 "admin.token.created": "A new access token for %s. It is shown only once.",
64 "admin.token.once": "Copy this token now. It will not be shown again.",
65 "admin.token.showOnce": "New token for %s:",
66}
67
68var instanceNL = map[string]string{
69 "title.adminSettings": "Instellingen",
70 "admin.tab.settings": "Instellingen",
71 "admin.settings.lead": "Dit zijn de machine-instellingen van deze instantie. Wijzigingen landen in settings.yml in de state-map en gaan waar dat veilig is meteen in. De oorspronkelijke config.yml blijft ongewijzigd en dient alleen als terugval.",
72 "admin.settings.saved": "Instellingen opgeslagen.",
73 "admin.settings.listenNow": "Luistert nu op %s. Pas zo nodig de reverse proxy aan.",
74 "admin.settings.machine": "Machine",
75 "admin.settings.baseURL": "Publieke URL",
76 "admin.settings.listen": "Luisteradres",
77 "admin.settings.listening": "Luistert nu op %s.",
78 "admin.settings.statePath": "State-map",
79 "admin.settings.stateWhy": "Hier staan de database, de sleutel en settings.yml, dus dit pad kun je niet in de webinterface wijzigen. Zet het met state_path in config.yml, BLUEGIT_STATE_PATH, of de standaard /var/lib/bluegit.",
80 "admin.settings.configPath": "config.yml",
81 "admin.settings.configWhy": "Wordt bij het starten nog gelezen als terugval. De webinterface schrijft dit bestand niet bij.",
82 "admin.settings.settingsPath": "settings.yml",
83 "admin.settings.storagePath": "Datadisk",
84 "admin.settings.trustedProxies": "Vertrouwde proxies",
85 "admin.settings.trustedWhy": "Eén IP of CIDR per regel. Alleen deze adressen mogen X-Forwarded-For en X-Real-IP zetten.",
86 "admin.settings.auth": "Aanmelden",
87 "admin.settings.authMode": "Modus",
88 "admin.settings.authModeWhy": "oauth gebruikt auth.timfalken.com, entra gebruikt Microsoft Entra ID (één tenant), dev is alleen lokaal en is geweigerd voor git.timfalken.com.",
89 "admin.settings.authBase": "URL van de auth-server",
90 "admin.settings.clientID": "Client-ID",
91 "admin.settings.clientSecret": "Clientgeheim",
92 "admin.settings.secretSet": "Er is al een geheim opgeslagen. Laat dit veld leeg om het te houden.",
93 "admin.settings.secretKeep": "Laat leeg om het huidige geheim te houden.",
94 "admin.settings.secretFile": "Bestand met clientgeheim",
95 "admin.settings.redirect": "Redirect-pad",
96 "admin.settings.userAgent": "User agent",
97 "admin.settings.tenant": "Tenant-ID",
98 "admin.settings.issuer": "Issuer (optioneel)",
99 "admin.settings.devUser": "Dev-gebruikersnaam",
100 "admin.settings.git": "Git",
101 "admin.settings.gitBinary": "Git-binary",
102 "admin.settings.defaultBranch": "Standaardbranch",
103 "admin.settings.hookBinary": "Hook-binary",
104 "admin.settings.maintenance": "Onderhoudsinterval",
105 "admin.settings.ssh": "SSH",
106 "admin.settings.sshEnabled": "Git over SSH aanzetten",
107 "admin.settings.sshListen": "SSH-luisteradres",
108 "admin.settings.publicHost": "Publieke host",
109 "admin.settings.publicPort": "Publieke poort",
110 "admin.settings.ci": "Ingebouwde runner",
111 "admin.settings.ciEnabled": "Ingebouwde runner aanzetten",
112 "admin.settings.docker": "Docker-binary",
113 "admin.settings.concurrency": "Gelijktijdigheid (opstartwaarde)",
114 "admin.settings.network": "Docker-netwerk",
115 "admin.settings.timeout": "Job-timeout (seconden)",
116 "admin.settings.updateWait": "Wachttijd self-update (minuten)",
117 "admin.settings.ciPresets": "Image-presets en live limieten staan onder Beheer → Runner.",
118 "admin.settings.runnerName": "Naam van de ingebouwde runner",
119 "admin.token.create": "Token maken",
120 "admin.token.name": "Tokennaam",
121 "admin.token.created": "Een nieuw toegangstoken voor %s. Het wordt maar één keer getoond.",
122 "admin.token.once": "Kopieer dit token nu. Het wordt niet opnieuw getoond.",
123 "admin.token.showOnce": "Nieuw token voor %s:",
124}
125
126var instanceDE = map[string]string{
127 "title.adminSettings": "Einstellungen",
128 "admin.tab.settings": "Einstellungen",
129 "admin.settings.lead": "Das sind die Maschineneinstellungen dieser Instanz. Änderungen landen in settings.yml im State-Verzeichnis und gelten, soweit es sicher ist, sofort. Die ursprüngliche config.yml bleibt unverändert und dient nur als Rückfall.",
130 "admin.settings.saved": "Einstellungen gespeichert.",
131 "admin.settings.listenNow": "Lauscht jetzt auf %s. Passe bei Bedarf den Reverse-Proxy an.",
132 "admin.settings.machine": "Maschine",
133 "admin.settings.baseURL": "Öffentliche URL",
134 "admin.settings.listen": "Listen-Adresse",
135 "admin.settings.listening": "Lauscht jetzt auf %s.",
136 "admin.settings.statePath": "State-Verzeichnis",
137 "admin.settings.stateWhy": "Hier liegen Datenbank, Schlüssel und settings.yml, deshalb lässt sich dieser Pfad nicht in der Weboberfläche ändern. Setze ihn mit state_path in der config.yml, BLUEGIT_STATE_PATH oder dem Standard /var/lib/bluegit.",
138 "admin.settings.configPath": "config.yml",
139 "admin.settings.configWhy": "Wird beim Start weiter als Rückfall gelesen. Die Weboberfläche schreibt diese Datei nicht um.",
140 "admin.settings.settingsPath": "settings.yml",
141 "admin.settings.storagePath": "Datenträger",
142 "admin.settings.trustedProxies": "Vertrauenswürdige Proxys",
143 "admin.settings.trustedWhy": "Eine IP oder CIDR je Zeile. Nur diese Adressen dürfen X-Forwarded-For und X-Real-IP setzen.",
144 "admin.settings.auth": "Anmeldung",
145 "admin.settings.authMode": "Modus",
146 "admin.settings.authModeWhy": "oauth nutzt auth.timfalken.com, entra Microsoft Entra ID (eine Tenant), dev ist nur lokal und für git.timfalken.com verboten.",
147 "admin.settings.authBase": "URL des Auth-Servers",
148 "admin.settings.clientID": "Client-ID",
149 "admin.settings.clientSecret": "Client-Geheimnis",
150 "admin.settings.secretSet": "Es ist bereits ein Geheimnis gespeichert. Lass das Feld leer, um es zu behalten.",
151 "admin.settings.secretKeep": "Leer lassen, um das aktuelle Geheimnis zu behalten.",
152 "admin.settings.secretFile": "Datei mit dem Client-Geheimnis",
153 "admin.settings.redirect": "Redirect-Pfad",
154 "admin.settings.userAgent": "User-Agent",
155 "admin.settings.tenant": "Tenant-ID",
156 "admin.settings.issuer": "Issuer (optional)",
157 "admin.settings.devUser": "Dev-Benutzername",
158 "admin.settings.git": "Git",
159 "admin.settings.gitBinary": "Git-Binary",
160 "admin.settings.defaultBranch": "Standardbranch",
161 "admin.settings.hookBinary": "Hook-Binary",
162 "admin.settings.maintenance": "Wartungsintervall",
163 "admin.settings.ssh": "SSH",
164 "admin.settings.sshEnabled": "Git über SSH einschalten",
165 "admin.settings.sshListen": "SSH-Listen-Adresse",
166 "admin.settings.publicHost": "Öffentlicher Host",
167 "admin.settings.publicPort": "Öffentlicher Port",
168 "admin.settings.ci": "Eingebauter Runner",
169 "admin.settings.ciEnabled": "Eingebauten Runner einschalten",
170 "admin.settings.docker": "Docker-Binary",
171 "admin.settings.concurrency": "Parallelität (Startwert)",
172 "admin.settings.network": "Docker-Netzwerk",
173 "admin.settings.timeout": "Job-Timeout (Sekunden)",
174 "admin.settings.updateWait": "Wartezeit für Self-Update (Minuten)",
175 "admin.settings.ciPresets": "Image-Presets und Live-Limits stehen unter Verwaltung → Runner.",
176 "admin.settings.runnerName": "Name des eingebauten Runners",
177 "admin.token.create": "Token erstellen",
178 "admin.token.name": "Tokenname",
179 "admin.token.created": "Ein neues Zugriffstoken für %s. Es wird nur einmal angezeigt.",
180 "admin.token.once": "Kopiere dieses Token jetzt. Es wird nicht erneut angezeigt.",
181 "admin.token.showOnce": "Neues Token für %s:",
182}
183
184var instanceFR = map[string]string{
185 "title.adminSettings": "Paramètres",
186 "admin.tab.settings": "Paramètres",
187 "admin.settings.lead": "Voici les paramètres machine de cette instance. Les modifications sont enregistrées dans settings.yml du répertoire d’état et s’appliquent tout de suite lorsque c’est sûr. Le fichier config.yml d’origine n’est pas modifié et sert seulement de secours.",
188 "admin.settings.saved": "Paramètres enregistrés.",
189 "admin.settings.listenNow": "Écoute maintenant sur %s. Adapte le reverse proxy si besoin.",
190 "admin.settings.machine": "Machine",
191 "admin.settings.baseURL": "URL publique",
192 "admin.settings.listen": "Adresse d’écoute",
193 "admin.settings.listening": "Écoute actuellement sur %s.",
194 "admin.settings.statePath": "Répertoire d’état",
195 "admin.settings.stateWhy": "La base, la clé et settings.yml s’y trouvent, donc ce chemin ne peut pas être changé dans l’interface. Définis-le avec state_path dans config.yml, BLUEGIT_STATE_PATH, ou le défaut /var/lib/bluegit.",
196 "admin.settings.configPath": "config.yml",
197 "admin.settings.configWhy": "Toujours lu au démarrage comme secours. L’interface n’écrit pas dans ce fichier.",
198 "admin.settings.settingsPath": "settings.yml",
199 "admin.settings.storagePath": "Disque de données",
200 "admin.settings.trustedProxies": "Proxys de confiance",
201 "admin.settings.trustedWhy": "Une IP ou un CIDR par ligne. Seules ces adresses peuvent poser X-Forwarded-For et X-Real-IP.",
202 "admin.settings.auth": "Connexion",
203 "admin.settings.authMode": "Mode",
204 "admin.settings.authModeWhy": "oauth utilise auth.timfalken.com, entra utilise Microsoft Entra ID (un locataire), dev est réservé au local et refusé pour git.timfalken.com.",
205 "admin.settings.authBase": "URL du serveur d’auth",
206 "admin.settings.clientID": "ID client",
207 "admin.settings.clientSecret": "Secret client",
208 "admin.settings.secretSet": "Un secret est déjà enregistré. Laisse vide pour le conserver.",
209 "admin.settings.secretKeep": "Laisse vide pour garder le secret actuel.",
210 "admin.settings.secretFile": "Fichier du secret client",
211 "admin.settings.redirect": "Chemin de redirection",
212 "admin.settings.userAgent": "User agent",
213 "admin.settings.tenant": "ID de locataire",
214 "admin.settings.issuer": "Issuer (facultatif)",
215 "admin.settings.devUser": "Nom d’utilisateur dev",
216 "admin.settings.git": "Git",
217 "admin.settings.gitBinary": "Binaire git",
218 "admin.settings.defaultBranch": "Branche par défaut",
219 "admin.settings.hookBinary": "Binaire des hooks",
220 "admin.settings.maintenance": "Intervalle de maintenance",
221 "admin.settings.ssh": "SSH",
222 "admin.settings.sshEnabled": "Activer git via SSH",
223 "admin.settings.sshListen": "Adresse d’écoute SSH",
224 "admin.settings.publicHost": "Hôte public",
225 "admin.settings.publicPort": "Port public",
226 "admin.settings.ci": "Runner intégré",
227 "admin.settings.ciEnabled": "Activer le runner intégré",
228 "admin.settings.docker": "Binaire Docker",
229 "admin.settings.concurrency": "Parallélisme (valeur de démarrage)",
230 "admin.settings.network": "Réseau Docker",
231 "admin.settings.timeout": "Délai des jobs (secondes)",
232 "admin.settings.updateWait": "Attente de self-update (minutes)",
233 "admin.settings.ciPresets": "Les préréglages d’images et les limites en direct sont sous Administration → Runner.",
234 "admin.settings.runnerName": "Nom du runner intégré",
235 "admin.token.create": "Créer un jeton",
236 "admin.token.name": "Nom du jeton",
237 "admin.token.created": "Nouveau jeton d’accès pour %s. Il n’est affiché qu’une fois.",
238 "admin.token.once": "Copie ce jeton maintenant. Il ne sera plus affiché.",
239 "admin.token.showOnce": "Nouveau jeton pour %s :",
240}
internal/i18n/catalog_runner_connect.go added +96 −0
@@ -0,0 +1,96 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, runnerConnectEN)
5 addCatalog(nl, runnerConnectNL)
6 addCatalog(de, runnerConnectDE)
7 addCatalog(fr, runnerConnectFR)
8 }
9
10 var runnerConnectEN = map[string]string{
11 "rui.connect.title": "Connection",
12 "rui.connect.lead": "Register this runner with a BlueGit site, then adjust URL, name, Docker, git and the web UI address here. The runner token is stored and never shown again. The work directory cannot be changed here because the settings and admin token live there.",
13 "rui.connect.url": "BlueGit URL",
14 "rui.connect.regToken": "Registration token",
15 "rui.connect.name": "Name",
16 "rui.connect.register": "Register",
17 "rui.connect.linked": "This runner is registered.",
18 "rui.connect.docker": "Docker binary",
19 "rui.connect.git": "Git binary",
20 "rui.connect.network": "Docker network",
21 "rui.connect.uiListen": "Web UI listen address",
22 "rui.connect.language": "Language",
23 "rui.connect.workDir": "Work directory",
24 "rui.connect.workDirWhy": "Set with --work-dir, BLUEGIT_RUNNER_WORK_DIR, work_dir in a legacy config.yml, or the default /var/lib/bluegit-runner.",
25 "rui.connect.ok": "Connection settings saved.",
26 "rui.connect.registered": "Runner registered.",
27 "rui.connect.err.save": "Could not save the connection settings.",
28 "rui.connect.err.listen": "Could not listen on the new web UI address; the previous address is still in use.",
29 "rui.connect.err.register": "Registration failed. Check the URL and the registration token.",
30 }
31
32 var runnerConnectNL = map[string]string{
33 "rui.connect.title": "Koppeling",
34 "rui.connect.lead": "Koppel deze runner aan een BlueGit-site en pas hier daarna URL, naam, Docker, git en het adres van de webinterface aan. Het runner-token wordt opgeslagen en nooit meer getoond. De werkmap kun je hier niet wijzigen, omdat daar de instellingen en het beheertoken staan.",
35 "rui.connect.url": "BlueGit-URL",
36 "rui.connect.regToken": "Registratietoken",
37 "rui.connect.name": "Naam",
38 "rui.connect.register": "Registreren",
39 "rui.connect.linked": "Deze runner is gekoppeld.",
40 "rui.connect.docker": "Docker-binary",
41 "rui.connect.git": "Git-binary",
42 "rui.connect.network": "Docker-netwerk",
43 "rui.connect.uiListen": "Luisteradres van de webinterface",
44 "rui.connect.language": "Taal",
45 "rui.connect.workDir": "Werkmap",
46 "rui.connect.workDirWhy": "Zet je met --work-dir, BLUEGIT_RUNNER_WORK_DIR, work_dir in een oude config.yml, of de standaard /var/lib/bluegit-runner.",
47 "rui.connect.ok": "Koppelingsinstellingen opgeslagen.",
48 "rui.connect.registered": "Runner gekoppeld.",
49 "rui.connect.err.save": "Kon de koppelingsinstellingen niet opslaan.",
50 "rui.connect.err.listen": "Kon niet luisteren op het nieuwe adres van de webinterface; het oude adres blijft in gebruik.",
51 "rui.connect.err.register": "Registratie mislukt. Controleer de URL en het registratietoken.",
52 }
53
54 var runnerConnectDE = map[string]string{
55 "rui.connect.title": "Kopplung",
56 "rui.connect.lead": "Melde diesen Runner bei einer BlueGit-Site an und passe hier danach URL, Name, Docker, Git und die Adresse der Weboberfläche an. Das Runner-Token wird gespeichert und nie wieder angezeigt. Das Arbeitsverzeichnis kannst du hier nicht ändern, weil dort Einstellungen und Admin-Token liegen.",
57 "rui.connect.url": "BlueGit-URL",
58 "rui.connect.regToken": "Registrierungstoken",
59 "rui.connect.name": "Name",
60 "rui.connect.register": "Registrieren",
61 "rui.connect.linked": "Dieser Runner ist gekoppelt.",
62 "rui.connect.docker": "Docker-Binary",
63 "rui.connect.git": "Git-Binary",
64 "rui.connect.network": "Docker-Netzwerk",
65 "rui.connect.uiListen": "Listen-Adresse der Weboberfläche",
66 "rui.connect.language": "Sprache",
67 "rui.connect.workDir": "Arbeitsverzeichnis",
68 "rui.connect.workDirWhy": "Setze es mit --work-dir, BLUEGIT_RUNNER_WORK_DIR, work_dir in einer alten config.yml oder dem Standard /var/lib/bluegit-runner.",
69 "rui.connect.ok": "Kopplungseinstellungen gespeichert.",
70 "rui.connect.registered": "Runner registriert.",
71 "rui.connect.err.save": "Die Kopplungseinstellungen konnten nicht gespeichert werden.",
72 "rui.connect.err.listen": "Konnte nicht auf der neuen Adresse der Weboberfläche lauschen; die alte Adresse bleibt in Verwendung.",
73 "rui.connect.err.register": "Registrierung fehlgeschlagen. Prüfe URL und Registrierungstoken.",
74 }
75
76 var runnerConnectFR = map[string]string{
77 "rui.connect.title": "Liaison",
78 "rui.connect.lead": "Enregistre ce runner auprès d’un site BlueGit, puis ajuste ici l’URL, le nom, Docker, git et l’adresse de l’interface. Le jeton du runner est enregistré et n’est plus jamais affiché. Le dossier de travail ne peut pas être changé ici, car les paramètres et le jeton d’admin s’y trouvent.",
79 "rui.connect.url": "URL BlueGit",
80 "rui.connect.regToken": "Jeton d’enregistrement",
81 "rui.connect.name": "Nom",
82 "rui.connect.register": "Enregistrer",
83 "rui.connect.linked": "Ce runner est lié.",
84 "rui.connect.docker": "Binaire Docker",
85 "rui.connect.git": "Binaire git",
86 "rui.connect.network": "Réseau Docker",
87 "rui.connect.uiListen": "Adresse d’écoute de l’interface",
88 "rui.connect.language": "Langue",
89 "rui.connect.workDir": "Dossier de travail",
90 "rui.connect.workDirWhy": "À définir avec --work-dir, BLUEGIT_RUNNER_WORK_DIR, work_dir dans un ancien config.yml, ou le défaut /var/lib/bluegit-runner.",
91 "rui.connect.ok": "Paramètres de liaison enregistrés.",
92 "rui.connect.registered": "Runner enregistré.",
93 "rui.connect.err.save": "Impossible d’enregistrer les paramètres de liaison.",
94 "rui.connect.err.listen": "Impossible d’écouter sur la nouvelle adresse de l’interface ; l’ancienne adresse reste utilisée.",
95 "rui.connect.err.register": "Échec de l’enregistrement. Vérifie l’URL et le jeton d’enregistrement.",
96 }
@@ -0,0 +1,96 @@
1package i18n
2
3func init() {
4 addCatalog(en, runnerConnectEN)
5 addCatalog(nl, runnerConnectNL)
6 addCatalog(de, runnerConnectDE)
7 addCatalog(fr, runnerConnectFR)
8}
9
10var runnerConnectEN = map[string]string{
11 "rui.connect.title": "Connection",
12 "rui.connect.lead": "Register this runner with a BlueGit site, then adjust URL, name, Docker, git and the web UI address here. The runner token is stored and never shown again. The work directory cannot be changed here because the settings and admin token live there.",
13 "rui.connect.url": "BlueGit URL",
14 "rui.connect.regToken": "Registration token",
15 "rui.connect.name": "Name",
16 "rui.connect.register": "Register",
17 "rui.connect.linked": "This runner is registered.",
18 "rui.connect.docker": "Docker binary",
19 "rui.connect.git": "Git binary",
20 "rui.connect.network": "Docker network",
21 "rui.connect.uiListen": "Web UI listen address",
22 "rui.connect.language": "Language",
23 "rui.connect.workDir": "Work directory",
24 "rui.connect.workDirWhy": "Set with --work-dir, BLUEGIT_RUNNER_WORK_DIR, work_dir in a legacy config.yml, or the default /var/lib/bluegit-runner.",
25 "rui.connect.ok": "Connection settings saved.",
26 "rui.connect.registered": "Runner registered.",
27 "rui.connect.err.save": "Could not save the connection settings.",
28 "rui.connect.err.listen": "Could not listen on the new web UI address; the previous address is still in use.",
29 "rui.connect.err.register": "Registration failed. Check the URL and the registration token.",
30}
31
32var runnerConnectNL = map[string]string{
33 "rui.connect.title": "Koppeling",
34 "rui.connect.lead": "Koppel deze runner aan een BlueGit-site en pas hier daarna URL, naam, Docker, git en het adres van de webinterface aan. Het runner-token wordt opgeslagen en nooit meer getoond. De werkmap kun je hier niet wijzigen, omdat daar de instellingen en het beheertoken staan.",
35 "rui.connect.url": "BlueGit-URL",
36 "rui.connect.regToken": "Registratietoken",
37 "rui.connect.name": "Naam",
38 "rui.connect.register": "Registreren",
39 "rui.connect.linked": "Deze runner is gekoppeld.",
40 "rui.connect.docker": "Docker-binary",
41 "rui.connect.git": "Git-binary",
42 "rui.connect.network": "Docker-netwerk",
43 "rui.connect.uiListen": "Luisteradres van de webinterface",
44 "rui.connect.language": "Taal",
45 "rui.connect.workDir": "Werkmap",
46 "rui.connect.workDirWhy": "Zet je met --work-dir, BLUEGIT_RUNNER_WORK_DIR, work_dir in een oude config.yml, of de standaard /var/lib/bluegit-runner.",
47 "rui.connect.ok": "Koppelingsinstellingen opgeslagen.",
48 "rui.connect.registered": "Runner gekoppeld.",
49 "rui.connect.err.save": "Kon de koppelingsinstellingen niet opslaan.",
50 "rui.connect.err.listen": "Kon niet luisteren op het nieuwe adres van de webinterface; het oude adres blijft in gebruik.",
51 "rui.connect.err.register": "Registratie mislukt. Controleer de URL en het registratietoken.",
52}
53
54var runnerConnectDE = map[string]string{
55 "rui.connect.title": "Kopplung",
56 "rui.connect.lead": "Melde diesen Runner bei einer BlueGit-Site an und passe hier danach URL, Name, Docker, Git und die Adresse der Weboberfläche an. Das Runner-Token wird gespeichert und nie wieder angezeigt. Das Arbeitsverzeichnis kannst du hier nicht ändern, weil dort Einstellungen und Admin-Token liegen.",
57 "rui.connect.url": "BlueGit-URL",
58 "rui.connect.regToken": "Registrierungstoken",
59 "rui.connect.name": "Name",
60 "rui.connect.register": "Registrieren",
61 "rui.connect.linked": "Dieser Runner ist gekoppelt.",
62 "rui.connect.docker": "Docker-Binary",
63 "rui.connect.git": "Git-Binary",
64 "rui.connect.network": "Docker-Netzwerk",
65 "rui.connect.uiListen": "Listen-Adresse der Weboberfläche",
66 "rui.connect.language": "Sprache",
67 "rui.connect.workDir": "Arbeitsverzeichnis",
68 "rui.connect.workDirWhy": "Setze es mit --work-dir, BLUEGIT_RUNNER_WORK_DIR, work_dir in einer alten config.yml oder dem Standard /var/lib/bluegit-runner.",
69 "rui.connect.ok": "Kopplungseinstellungen gespeichert.",
70 "rui.connect.registered": "Runner registriert.",
71 "rui.connect.err.save": "Die Kopplungseinstellungen konnten nicht gespeichert werden.",
72 "rui.connect.err.listen": "Konnte nicht auf der neuen Adresse der Weboberfläche lauschen; die alte Adresse bleibt in Verwendung.",
73 "rui.connect.err.register": "Registrierung fehlgeschlagen. Prüfe URL und Registrierungstoken.",
74}
75
76var runnerConnectFR = map[string]string{
77 "rui.connect.title": "Liaison",
78 "rui.connect.lead": "Enregistre ce runner auprès d’un site BlueGit, puis ajuste ici l’URL, le nom, Docker, git et l’adresse de l’interface. Le jeton du runner est enregistré et n’est plus jamais affiché. Le dossier de travail ne peut pas être changé ici, car les paramètres et le jeton d’admin s’y trouvent.",
79 "rui.connect.url": "URL BlueGit",
80 "rui.connect.regToken": "Jeton d’enregistrement",
81 "rui.connect.name": "Nom",
82 "rui.connect.register": "Enregistrer",
83 "rui.connect.linked": "Ce runner est lié.",
84 "rui.connect.docker": "Binaire Docker",
85 "rui.connect.git": "Binaire git",
86 "rui.connect.network": "Réseau Docker",
87 "rui.connect.uiListen": "Adresse d’écoute de l’interface",
88 "rui.connect.language": "Langue",
89 "rui.connect.workDir": "Dossier de travail",
90 "rui.connect.workDirWhy": "À définir avec --work-dir, BLUEGIT_RUNNER_WORK_DIR, work_dir dans un ancien config.yml, ou le défaut /var/lib/bluegit-runner.",
91 "rui.connect.ok": "Paramètres de liaison enregistrés.",
92 "rui.connect.registered": "Runner enregistré.",
93 "rui.connect.err.save": "Impossible d’enregistrer les paramètres de liaison.",
94 "rui.connect.err.listen": "Impossible d’écouter sur la nouvelle adresse de l’interface ; l’ancienne adresse reste utilisée.",
95 "rui.connect.err.register": "Échec de l’enregistrement. Vérifie l’URL et le jeton d’enregistrement.",
96}
internal/runnercfg/handler.go +6 −0
@@ -48,6 +48,8 @@ type Handler struct {
48 48 Layout func(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML)
49 49 DocsURL string
50 50 APIBase string
51 // ExtraTop levert optionele HTML boven de statuskaarten (alleen standalone).
52 ExtraTop func(*http.Request) template.HTML
51 53 }
52 54
53 55 // Current leest de opgeslagen instellingen.
@@ -263,11 +265,15 @@ type View struct {
263 265 Problem string
264 266 DocsURL string
265 267 APIBase string
268 ExtraTop template.HTML
266 269 }
267 270
268 271 func (h *Handler) view(r *http.Request) View {
269 272 lang := h.lang(r)
270 273 v := View{Lang: lang, Prefix: h.Prefix, S: h.Current(), DocsURL: h.DocsURL}
274 if h.ExtraTop != nil {
275 v.ExtraTop = h.ExtraTop(r)
276 }
271 277 v.APIBase = h.APIBase
272 278 if v.APIBase == "" {
273 279 v.APIBase = h.Prefix + "/api"
@@ -48,6 +48,8 @@ type Handler struct {
48 Layout func(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML)
48 Layout func(w http.ResponseWriter, r *http.Request, lang i18n.Lang, title string, body template.HTML)
49 DocsURL string
49 DocsURL string
50 APIBase string
50 APIBase string
51 // ExtraTop levert optionele HTML boven de statuskaarten (alleen standalone).
52 ExtraTop func(*http.Request) template.HTML
51}
53}
52
54
53// Current leest de opgeslagen instellingen.
55// Current leest de opgeslagen instellingen.
@@ -263,11 +265,15 @@ type View struct {
263 Problem string
265 Problem string
264 DocsURL string
266 DocsURL string
265 APIBase string
267 APIBase string
268 ExtraTop template.HTML
266}
269}
267
270
268func (h *Handler) view(r *http.Request) View {
271func (h *Handler) view(r *http.Request) View {
269 lang := h.lang(r)
272 lang := h.lang(r)
270 v := View{Lang: lang, Prefix: h.Prefix, S: h.Current(), DocsURL: h.DocsURL}
273 v := View{Lang: lang, Prefix: h.Prefix, S: h.Current(), DocsURL: h.DocsURL}
274 if h.ExtraTop != nil {
275 v.ExtraTop = h.ExtraTop(r)
276 }
271 v.APIBase = h.APIBase
277 v.APIBase = h.APIBase
272 if v.APIBase == "" {
278 if v.APIBase == "" {
273 v.APIBase = h.Prefix + "/api"
279 v.APIBase = h.Prefix + "/api"
internal/runnercfg/ui_tmpl.go +1 −1
@@ -80,7 +80,7 @@ const uiSource = `{{define "runnerui"}}
80 80 {{else}}<span class="rui-badge bad">{{t "rui.state.offline"}}</span>{{end}}
81 81 </div>
82 82 </div>
83
83 {{if .ExtraTop}}{{.ExtraTop}}{{end}}
84 84 <div class="rui-cards">
85 85 <section class="panel rui-card">
86 86 <h2>{{t "rui.status"}}</h2>
@@ -80,7 +80,7 @@ const uiSource = `{{define "runnerui"}}
80 {{else}}<span class="rui-badge bad">{{t "rui.state.offline"}}</span>{{end}}
80 {{else}}<span class="rui-badge bad">{{t "rui.state.offline"}}</span>{{end}}
81 </div>
81 </div>
82</div>
82</div>
83
83{{if .ExtraTop}}{{.ExtraTop}}{{end}}
84<div class="rui-cards">
84<div class="rui-cards">
85 <section class="panel rui-card">
85 <section class="panel rui-card">
86 <h2>{{t "rui.status"}}</h2>
86 <h2>{{t "rui.status"}}</h2>
internal/server/admin_instance.go added +417 −0
@@ -0,0 +1,417 @@
1 package server
2
3 import (
4 "net/http"
5 "path/filepath"
6 "strconv"
7 "strings"
8
9 "gitlab.com/Timfa/bluegit/internal/auth"
10 "gitlab.com/Timfa/bluegit/internal/config"
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12 )
13
14 // ApplySSH past een wijziging van de git-SSH-listener live toe.
15 // Nil: alleen opslaan; de listener verandert bij de volgende start.
16 type ApplySSHFunc func(enabled bool, listen string) error
17
18 // InstanceView is de machineconfiguratie voor de UI en API, zonder geheimen.
19 type InstanceView struct {
20 BaseURL string `json:"base_url"`
21 Listen string `json:"listen"`
22 Listening string `json:"listening,omitempty"`
23 ListenNotice string `json:"listen_notice,omitempty"`
24 StatePath string `json:"state_path"`
25 ConfigPath string `json:"config_path,omitempty"`
26 SettingsPath string `json:"settings_path,omitempty"`
27 StoragePath string `json:"storage_path,omitempty"`
28 TrustedProxies []string `json:"trusted_proxies"`
29 Auth InstanceAuthView `json:"auth"`
30 Git InstanceGitView `json:"git"`
31 SSH InstanceSSHView `json:"ssh"`
32 Runner InstanceRunnerView `json:"runner"`
33 CI InstanceCIView `json:"ci"`
34 }
35
36 // InstanceAuthView is auth zonder het clientgeheim zelf.
37 type InstanceAuthView struct {
38 Mode string `json:"mode"`
39 BaseURL string `json:"base_url"`
40 ClientID string `json:"client_id"`
41 ClientSecretSet bool `json:"client_secret_set"`
42 ClientSecretFile string `json:"client_secret_file,omitempty"`
43 RedirectPath string `json:"redirect_path"`
44 UserAgent string `json:"user_agent"`
45 TenantID string `json:"tenant_id,omitempty"`
46 Issuer string `json:"issuer,omitempty"`
47 DevUser string `json:"dev_user,omitempty"`
48 DevAuthID int64 `json:"dev_auth_id,omitempty"`
49 }
50
51 // InstanceGitView is het git-blok.
52 type InstanceGitView struct {
53 Binary string `json:"binary"`
54 DefaultBranch string `json:"default_branch"`
55 HookBinary string `json:"hook_binary,omitempty"`
56 MaintenanceInterval string `json:"maintenance_interval,omitempty"`
57 }
58
59 // InstanceSSHView is het ssh-blok.
60 type InstanceSSHView struct {
61 Enabled bool `json:"enabled"`
62 Listen string `json:"listen"`
63 PublicHost string `json:"public_host,omitempty"`
64 PublicPort int `json:"public_port"`
65 }
66
67 // InstanceRunnerView is de naam van de ingebouwde runner.
68 type InstanceRunnerView struct {
69 Name string `json:"name"`
70 }
71
72 // InstanceCIView is het ci-blok zonder presets (die staan onder Beheer → Runner).
73 type InstanceCIView struct {
74 Enabled bool `json:"enabled"`
75 Docker string `json:"docker_binary"`
76 Concurrency int `json:"concurrency"`
77 Network string `json:"network"`
78 TimeoutSec int `json:"timeout_seconds"`
79 UpdateMaxWaitMin int `json:"update_max_wait_minutes"`
80 }
81
82 func (s *Server) instanceView() InstanceView {
83 c := s.Cfg
84 return InstanceView{
85 BaseURL: c.BaseURL,
86 Listen: c.Listen,
87 Listening: s.BoundAddr(),
88 ListenNotice: s.ListenNotice,
89 StatePath: c.StatePath,
90 ConfigPath: s.ConfigPath,
91 SettingsPath: s.SettingsPath,
92 StoragePath: s.StoragePath(),
93 TrustedProxies: append([]string(nil), c.TrustedProxies...),
94 Auth: InstanceAuthView{
95 Mode: c.Auth.Mode,
96 BaseURL: c.Auth.BaseURL,
97 ClientID: c.Auth.ClientID,
98 ClientSecretSet: strings.TrimSpace(c.Auth.ClientSecret) != "",
99 ClientSecretFile: c.Auth.ClientSecretFile,
100 RedirectPath: c.Auth.RedirectPath,
101 UserAgent: c.Auth.UserAgent,
102 TenantID: c.Auth.TenantID,
103 Issuer: c.Auth.Issuer,
104 DevUser: c.Auth.DevUser,
105 DevAuthID: c.Auth.DevAuthID,
106 },
107 Git: InstanceGitView{
108 Binary: c.Git.Binary,
109 DefaultBranch: c.Git.DefaultBranch,
110 HookBinary: c.Git.HookBinary,
111 MaintenanceInterval: c.Git.MaintenanceInterval,
112 },
113 SSH: InstanceSSHView{
114 Enabled: c.SSH.Enabled,
115 Listen: c.SSH.Listen,
116 PublicHost: c.SSH.PublicHost,
117 PublicPort: c.SSH.PublicPort,
118 },
119 Runner: InstanceRunnerView{Name: c.Runner.Name},
120 CI: InstanceCIView{
121 Enabled: c.CI.Enabled,
122 Docker: c.CI.Docker,
123 Concurrency: c.CI.Concurrency,
124 Network: c.CI.Network,
125 TimeoutSec: c.CI.TimeoutSec,
126 UpdateMaxWaitMin: c.CI.UpdateMaxWaitMin,
127 },
128 }
129 }
130
131 func (s *Server) adminSettings(w http.ResponseWriter, r *http.Request) {
132 if ok, _ := s.adminOnly(w, r); !ok {
133 return
134 }
135 v := s.view(w, r, "title.adminSettings")
136 v.Page = "adminsettings"
137 iv := s.instanceView()
138 v.Instance = &iv
139 s.render(w, "adminsettings", v)
140 }
141
142 func (s *Server) adminSettingsSave(w http.ResponseWriter, r *http.Request) {
143 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
144 return
145 }
146 _ = r.ParseForm()
147 patch := patchFromForm(r)
148 bound, err := s.ApplyInstance(patch)
149 if err != nil {
150 s.redirect(w, r, "/admin/settings", "", s.trErr(r, err))
151 return
152 }
153 msg := s.tr(r, "admin.settings.saved")
154 if bound != "" {
155 msg = s.tr(r, "admin.settings.listenNow", bound)
156 }
157 s.redirect(w, r, "/admin/settings", msg, "")
158 }
159
160 func (s *Server) apiAdminSettings(w http.ResponseWriter, r *http.Request) {
161 if !apiUser(r).InstanceAdmin {
162 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
163 return
164 }
165 switch r.Method {
166 case http.MethodGet:
167 writeJSON(w, http.StatusOK, s.instanceView())
168 case http.MethodPut:
169 var in instancePatchJSON
170 if err := readJSON(r, &in); err != nil {
171 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
172 return
173 }
174 notice, err := s.ApplyInstance(in.toPatch())
175 if !s.apiOK(w, r, err) {
176 return
177 }
178 out := s.instanceView()
179 out.ListenNotice = notice
180 writeJSON(w, http.StatusOK, out)
181 default:
182 w.WriteHeader(http.StatusMethodNotAllowed)
183 }
184 }
185
186 // ApplyInstance valideert, bindt listen/SSH indien nodig, slaat settings.yml
187 // op en zet de nieuwe waarden live. config.yml blijft ongemoeid.
188 func (s *Server) ApplyInstance(patch config.Persisted) (string, error) {
189 next, saved := config.MergeUpdate(s.Cfg, patch)
190 if err := next.Validate(); err != nil {
191 return "", fail(400, err)
192 }
193 notice := ""
194 if next.Listen != s.Cfg.Listen && s.isServing() {
195 if err := s.Relisten(next.Listen); err != nil {
196 return "", fail(400, err)
197 }
198 notice = s.BoundAddr()
199 s.ListenNotice = notice
200 }
201 if s.ApplySSH != nil && (next.SSH.Enabled != s.Cfg.SSH.Enabled || next.SSH.Listen != s.Cfg.SSH.Listen) {
202 if err := s.ApplySSH(next.SSH.Enabled, next.SSH.Listen); err != nil {
203 return notice, fail(400, err)
204 }
205 }
206 if dir := s.StateDir; dir != "" {
207 if err := config.SaveSettings(dir, saved); err != nil {
208 return notice, err
209 }
210 s.SettingsPath = filepath.Join(dir, config.SettingsFile)
211 }
212 s.Cfg = next
213 if next.Git.Binary != "" {
214 s.Git = next.Git.Binary
215 }
216 if next.Git.HookBinary != "" {
217 s.HookBin = next.Git.HookBinary
218 }
219 s.applyAuth(next)
220 if s.Runner != nil {
221 s.Runner.BaseURL = next.BaseURL
222 if next.Runner.Name != "" {
223 s.Runner.Name = next.Runner.Name
224 }
225 if next.CI.Docker != "" {
226 s.Runner.Docker = next.CI.Docker
227 }
228 }
229 return notice, nil
230 }
231
232 func (s *Server) applyAuth(cfg config.Config) {
233 switch cfg.Auth.Mode {
234 case "dev":
235 s.Auth = auth.Dev{Username: cfg.Auth.DevUser, AuthID: cfg.Auth.DevAuthID}
236 s.Dev = true
237 case "entra":
238 s.Auth = auth.NewEntra(cfg.EntraIssuer(), cfg.Auth.TenantID, cfg.Auth.ClientID, cfg.Auth.ClientSecret, cfg.Auth.UserAgent)
239 s.Dev = false
240 default:
241 s.Auth = auth.NewTimFalken(cfg.Auth.BaseURL, cfg.Auth.ClientID, cfg.Auth.ClientSecret, cfg.Auth.UserAgent)
242 s.Dev = false
243 }
244 if m, ok := s.Auth.(auth.Mailer); ok && cfg.Auth.ClientSecret != "" {
245 s.Mail = m
246 } else {
247 s.Mail = nil
248 }
249 }
250
251 func formLast(r *http.Request, name string) (string, bool) {
252 vals, ok := r.Form[name]
253 if !ok || len(vals) == 0 {
254 return "", false
255 }
256 return strings.TrimSpace(vals[len(vals)-1]), true
257 }
258
259 func patchFromForm(r *http.Request) config.Persisted {
260 str := func(name string) *string {
261 v, ok := formLast(r, name)
262 if !ok {
263 return nil
264 }
265 return &v
266 }
267 boolp := func(name string) *bool {
268 v, ok := formLast(r, name)
269 if !ok {
270 return nil
271 }
272 b := v == "1" || v == "on" || v == "true"
273 return &b
274 }
275 intp := func(name string) *int {
276 v, ok := formLast(r, name)
277 if !ok {
278 return nil
279 }
280 n, err := strconv.Atoi(v)
281 if err != nil {
282 return nil
283 }
284 return &n
285 }
286 int64p := func(name string) *int64 {
287 v, ok := formLast(r, name)
288 if !ok {
289 return nil
290 }
291 n, err := strconv.ParseInt(v, 10, 64)
292 if err != nil {
293 return nil
294 }
295 return &n
296 }
297 var proxies *[]string
298 if _, ok := r.Form["trusted_proxies"]; ok {
299 var list []string
300 for _, line := range strings.Split(r.FormValue("trusted_proxies"), "\n") {
301 line = strings.TrimSpace(line)
302 if line != "" {
303 list = append(list, line)
304 }
305 }
306 if list == nil {
307 list = []string{}
308 }
309 proxies = &list
310 }
311 p := config.Persisted{
312 BaseURL: str("base_url"),
313 Listen: str("listen"),
314 TrustedProxies: proxies,
315 Auth: &config.PersistedAuth{
316 Mode: str("auth.mode"),
317 BaseURL: str("auth.base_url"),
318 ClientID: str("auth.client_id"),
319 ClientSecret: str("auth.client_secret"),
320 ClientSecretFile: str("auth.client_secret_file"),
321 RedirectPath: str("auth.redirect_path"),
322 UserAgent: str("auth.user_agent"),
323 DevUser: str("auth.dev_user"),
324 DevAuthID: int64p("auth.dev_auth_id"),
325 TenantID: str("auth.tenant_id"),
326 Issuer: str("auth.issuer"),
327 },
328 Git: &config.PersistedGit{
329 Binary: str("git.binary"),
330 DefaultBranch: str("git.default_branch"),
331 HookBinary: str("git.hook_binary"),
332 MaintenanceInterval: str("git.maintenance_interval"),
333 },
334 SSH: &config.PersistedSSH{
335 Enabled: boolp("ssh.enabled"),
336 Listen: str("ssh.listen"),
337 PublicHost: str("ssh.public_host"),
338 PublicPort: intp("ssh.public_port"),
339 },
340 Runner: &config.PersistedRunner{Name: str("runner.name")},
341 CI: &config.PersistedCI{
342 Enabled: boolp("ci.enabled"),
343 Docker: str("ci.docker_binary"),
344 Concurrency: intp("ci.concurrency"),
345 Network: str("ci.network"),
346 TimeoutSec: intp("ci.timeout_seconds"),
347 UpdateMaxWaitMin: intp("ci.update_max_wait_minutes"),
348 },
349 }
350 return p
351 }
352
353 type instancePatchJSON struct {
354 BaseURL *string `json:"base_url"`
355 Listen *string `json:"listen"`
356 TrustedProxies *[]string `json:"trusted_proxies"`
357 Auth *struct {
358 Mode *string `json:"mode"`
359 BaseURL *string `json:"base_url"`
360 ClientID *string `json:"client_id"`
361 ClientSecret *string `json:"client_secret"`
362 ClientSecretFile *string `json:"client_secret_file"`
363 RedirectPath *string `json:"redirect_path"`
364 UserAgent *string `json:"user_agent"`
365 DevUser *string `json:"dev_user"`
366 DevAuthID *int64 `json:"dev_auth_id"`
367 TenantID *string `json:"tenant_id"`
368 Issuer *string `json:"issuer"`
369 } `json:"auth"`
370 Git *struct {
371 Binary *string `json:"binary"`
372 DefaultBranch *string `json:"default_branch"`
373 HookBinary *string `json:"hook_binary"`
374 MaintenanceInterval *string `json:"maintenance_interval"`
375 } `json:"git"`
376 SSH *struct {
377 Enabled *bool `json:"enabled"`
378 Listen *string `json:"listen"`
379 PublicHost *string `json:"public_host"`
380 PublicPort *int `json:"public_port"`
381 } `json:"ssh"`
382 Runner *struct {
383 Name *string `json:"name"`
384 } `json:"runner"`
385 CI *struct {
386 Enabled *bool `json:"enabled"`
387 Docker *string `json:"docker_binary"`
388 Concurrency *int `json:"concurrency"`
389 Network *string `json:"network"`
390 TimeoutSec *int `json:"timeout_seconds"`
391 UpdateMaxWaitMin *int `json:"update_max_wait_minutes"`
392 } `json:"ci"`
393 }
394
395 func (in instancePatchJSON) toPatch() config.Persisted {
396 p := config.Persisted{BaseURL: in.BaseURL, Listen: in.Listen, TrustedProxies: in.TrustedProxies}
397 if a := in.Auth; a != nil {
398 p.Auth = &config.PersistedAuth{
399 Mode: a.Mode, BaseURL: a.BaseURL, ClientID: a.ClientID, ClientSecret: a.ClientSecret,
400 ClientSecretFile: a.ClientSecretFile, RedirectPath: a.RedirectPath, UserAgent: a.UserAgent,
401 DevUser: a.DevUser, DevAuthID: a.DevAuthID, TenantID: a.TenantID, Issuer: a.Issuer,
402 }
403 }
404 if g := in.Git; g != nil {
405 p.Git = &config.PersistedGit{Binary: g.Binary, DefaultBranch: g.DefaultBranch, HookBinary: g.HookBinary, MaintenanceInterval: g.MaintenanceInterval}
406 }
407 if h := in.SSH; h != nil {
408 p.SSH = &config.PersistedSSH{Enabled: h.Enabled, Listen: h.Listen, PublicHost: h.PublicHost, PublicPort: h.PublicPort}
409 }
410 if r := in.Runner; r != nil {
411 p.Runner = &config.PersistedRunner{Name: r.Name}
412 }
413 if c := in.CI; c != nil {
414 p.CI = &config.PersistedCI{Enabled: c.Enabled, Docker: c.Docker, Concurrency: c.Concurrency, Network: c.Network, TimeoutSec: c.TimeoutSec, UpdateMaxWaitMin: c.UpdateMaxWaitMin}
415 }
416 return p
417 }
@@ -0,0 +1,417 @@
1package server
2
3import (
4 "net/http"
5 "path/filepath"
6 "strconv"
7 "strings"
8
9 "gitlab.com/Timfa/bluegit/internal/auth"
10 "gitlab.com/Timfa/bluegit/internal/config"
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12)
13
14// ApplySSH past een wijziging van de git-SSH-listener live toe.
15// Nil: alleen opslaan; de listener verandert bij de volgende start.
16type ApplySSHFunc func(enabled bool, listen string) error
17
18// InstanceView is de machineconfiguratie voor de UI en API, zonder geheimen.
19type InstanceView struct {
20 BaseURL string `json:"base_url"`
21 Listen string `json:"listen"`
22 Listening string `json:"listening,omitempty"`
23 ListenNotice string `json:"listen_notice,omitempty"`
24 StatePath string `json:"state_path"`
25 ConfigPath string `json:"config_path,omitempty"`
26 SettingsPath string `json:"settings_path,omitempty"`
27 StoragePath string `json:"storage_path,omitempty"`
28 TrustedProxies []string `json:"trusted_proxies"`
29 Auth InstanceAuthView `json:"auth"`
30 Git InstanceGitView `json:"git"`
31 SSH InstanceSSHView `json:"ssh"`
32 Runner InstanceRunnerView `json:"runner"`
33 CI InstanceCIView `json:"ci"`
34}
35
36// InstanceAuthView is auth zonder het clientgeheim zelf.
37type InstanceAuthView struct {
38 Mode string `json:"mode"`
39 BaseURL string `json:"base_url"`
40 ClientID string `json:"client_id"`
41 ClientSecretSet bool `json:"client_secret_set"`
42 ClientSecretFile string `json:"client_secret_file,omitempty"`
43 RedirectPath string `json:"redirect_path"`
44 UserAgent string `json:"user_agent"`
45 TenantID string `json:"tenant_id,omitempty"`
46 Issuer string `json:"issuer,omitempty"`
47 DevUser string `json:"dev_user,omitempty"`
48 DevAuthID int64 `json:"dev_auth_id,omitempty"`
49}
50
51// InstanceGitView is het git-blok.
52type InstanceGitView struct {
53 Binary string `json:"binary"`
54 DefaultBranch string `json:"default_branch"`
55 HookBinary string `json:"hook_binary,omitempty"`
56 MaintenanceInterval string `json:"maintenance_interval,omitempty"`
57}
58
59// InstanceSSHView is het ssh-blok.
60type InstanceSSHView struct {
61 Enabled bool `json:"enabled"`
62 Listen string `json:"listen"`
63 PublicHost string `json:"public_host,omitempty"`
64 PublicPort int `json:"public_port"`
65}
66
67// InstanceRunnerView is de naam van de ingebouwde runner.
68type InstanceRunnerView struct {
69 Name string `json:"name"`
70}
71
72// InstanceCIView is het ci-blok zonder presets (die staan onder Beheer → Runner).
73type InstanceCIView struct {
74 Enabled bool `json:"enabled"`
75 Docker string `json:"docker_binary"`
76 Concurrency int `json:"concurrency"`
77 Network string `json:"network"`
78 TimeoutSec int `json:"timeout_seconds"`
79 UpdateMaxWaitMin int `json:"update_max_wait_minutes"`
80}
81
82func (s *Server) instanceView() InstanceView {
83 c := s.Cfg
84 return InstanceView{
85 BaseURL: c.BaseURL,
86 Listen: c.Listen,
87 Listening: s.BoundAddr(),
88 ListenNotice: s.ListenNotice,
89 StatePath: c.StatePath,
90 ConfigPath: s.ConfigPath,
91 SettingsPath: s.SettingsPath,
92 StoragePath: s.StoragePath(),
93 TrustedProxies: append([]string(nil), c.TrustedProxies...),
94 Auth: InstanceAuthView{
95 Mode: c.Auth.Mode,
96 BaseURL: c.Auth.BaseURL,
97 ClientID: c.Auth.ClientID,
98 ClientSecretSet: strings.TrimSpace(c.Auth.ClientSecret) != "",
99 ClientSecretFile: c.Auth.ClientSecretFile,
100 RedirectPath: c.Auth.RedirectPath,
101 UserAgent: c.Auth.UserAgent,
102 TenantID: c.Auth.TenantID,
103 Issuer: c.Auth.Issuer,
104 DevUser: c.Auth.DevUser,
105 DevAuthID: c.Auth.DevAuthID,
106 },
107 Git: InstanceGitView{
108 Binary: c.Git.Binary,
109 DefaultBranch: c.Git.DefaultBranch,
110 HookBinary: c.Git.HookBinary,
111 MaintenanceInterval: c.Git.MaintenanceInterval,
112 },
113 SSH: InstanceSSHView{
114 Enabled: c.SSH.Enabled,
115 Listen: c.SSH.Listen,
116 PublicHost: c.SSH.PublicHost,
117 PublicPort: c.SSH.PublicPort,
118 },
119 Runner: InstanceRunnerView{Name: c.Runner.Name},
120 CI: InstanceCIView{
121 Enabled: c.CI.Enabled,
122 Docker: c.CI.Docker,
123 Concurrency: c.CI.Concurrency,
124 Network: c.CI.Network,
125 TimeoutSec: c.CI.TimeoutSec,
126 UpdateMaxWaitMin: c.CI.UpdateMaxWaitMin,
127 },
128 }
129}
130
131func (s *Server) adminSettings(w http.ResponseWriter, r *http.Request) {
132 if ok, _ := s.adminOnly(w, r); !ok {
133 return
134 }
135 v := s.view(w, r, "title.adminSettings")
136 v.Page = "adminsettings"
137 iv := s.instanceView()
138 v.Instance = &iv
139 s.render(w, "adminsettings", v)
140}
141
142func (s *Server) adminSettingsSave(w http.ResponseWriter, r *http.Request) {
143 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
144 return
145 }
146 _ = r.ParseForm()
147 patch := patchFromForm(r)
148 bound, err := s.ApplyInstance(patch)
149 if err != nil {
150 s.redirect(w, r, "/admin/settings", "", s.trErr(r, err))
151 return
152 }
153 msg := s.tr(r, "admin.settings.saved")
154 if bound != "" {
155 msg = s.tr(r, "admin.settings.listenNow", bound)
156 }
157 s.redirect(w, r, "/admin/settings", msg, "")
158}
159
160func (s *Server) apiAdminSettings(w http.ResponseWriter, r *http.Request) {
161 if !apiUser(r).InstanceAdmin {
162 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
163 return
164 }
165 switch r.Method {
166 case http.MethodGet:
167 writeJSON(w, http.StatusOK, s.instanceView())
168 case http.MethodPut:
169 var in instancePatchJSON
170 if err := readJSON(r, &in); err != nil {
171 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
172 return
173 }
174 notice, err := s.ApplyInstance(in.toPatch())
175 if !s.apiOK(w, r, err) {
176 return
177 }
178 out := s.instanceView()
179 out.ListenNotice = notice
180 writeJSON(w, http.StatusOK, out)
181 default:
182 w.WriteHeader(http.StatusMethodNotAllowed)
183 }
184}
185
186// ApplyInstance valideert, bindt listen/SSH indien nodig, slaat settings.yml
187// op en zet de nieuwe waarden live. config.yml blijft ongemoeid.
188func (s *Server) ApplyInstance(patch config.Persisted) (string, error) {
189 next, saved := config.MergeUpdate(s.Cfg, patch)
190 if err := next.Validate(); err != nil {
191 return "", fail(400, err)
192 }
193 notice := ""
194 if next.Listen != s.Cfg.Listen && s.isServing() {
195 if err := s.Relisten(next.Listen); err != nil {
196 return "", fail(400, err)
197 }
198 notice = s.BoundAddr()
199 s.ListenNotice = notice
200 }
201 if s.ApplySSH != nil && (next.SSH.Enabled != s.Cfg.SSH.Enabled || next.SSH.Listen != s.Cfg.SSH.Listen) {
202 if err := s.ApplySSH(next.SSH.Enabled, next.SSH.Listen); err != nil {
203 return notice, fail(400, err)
204 }
205 }
206 if dir := s.StateDir; dir != "" {
207 if err := config.SaveSettings(dir, saved); err != nil {
208 return notice, err
209 }
210 s.SettingsPath = filepath.Join(dir, config.SettingsFile)
211 }
212 s.Cfg = next
213 if next.Git.Binary != "" {
214 s.Git = next.Git.Binary
215 }
216 if next.Git.HookBinary != "" {
217 s.HookBin = next.Git.HookBinary
218 }
219 s.applyAuth(next)
220 if s.Runner != nil {
221 s.Runner.BaseURL = next.BaseURL
222 if next.Runner.Name != "" {
223 s.Runner.Name = next.Runner.Name
224 }
225 if next.CI.Docker != "" {
226 s.Runner.Docker = next.CI.Docker
227 }
228 }
229 return notice, nil
230}
231
232func (s *Server) applyAuth(cfg config.Config) {
233 switch cfg.Auth.Mode {
234 case "dev":
235 s.Auth = auth.Dev{Username: cfg.Auth.DevUser, AuthID: cfg.Auth.DevAuthID}
236 s.Dev = true
237 case "entra":
238 s.Auth = auth.NewEntra(cfg.EntraIssuer(), cfg.Auth.TenantID, cfg.Auth.ClientID, cfg.Auth.ClientSecret, cfg.Auth.UserAgent)
239 s.Dev = false
240 default:
241 s.Auth = auth.NewTimFalken(cfg.Auth.BaseURL, cfg.Auth.ClientID, cfg.Auth.ClientSecret, cfg.Auth.UserAgent)
242 s.Dev = false
243 }
244 if m, ok := s.Auth.(auth.Mailer); ok && cfg.Auth.ClientSecret != "" {
245 s.Mail = m
246 } else {
247 s.Mail = nil
248 }
249}
250
251func formLast(r *http.Request, name string) (string, bool) {
252 vals, ok := r.Form[name]
253 if !ok || len(vals) == 0 {
254 return "", false
255 }
256 return strings.TrimSpace(vals[len(vals)-1]), true
257}
258
259func patchFromForm(r *http.Request) config.Persisted {
260 str := func(name string) *string {
261 v, ok := formLast(r, name)
262 if !ok {
263 return nil
264 }
265 return &v
266 }
267 boolp := func(name string) *bool {
268 v, ok := formLast(r, name)
269 if !ok {
270 return nil
271 }
272 b := v == "1" || v == "on" || v == "true"
273 return &b
274 }
275 intp := func(name string) *int {
276 v, ok := formLast(r, name)
277 if !ok {
278 return nil
279 }
280 n, err := strconv.Atoi(v)
281 if err != nil {
282 return nil
283 }
284 return &n
285 }
286 int64p := func(name string) *int64 {
287 v, ok := formLast(r, name)
288 if !ok {
289 return nil
290 }
291 n, err := strconv.ParseInt(v, 10, 64)
292 if err != nil {
293 return nil
294 }
295 return &n
296 }
297 var proxies *[]string
298 if _, ok := r.Form["trusted_proxies"]; ok {
299 var list []string
300 for _, line := range strings.Split(r.FormValue("trusted_proxies"), "\n") {
301 line = strings.TrimSpace(line)
302 if line != "" {
303 list = append(list, line)
304 }
305 }
306 if list == nil {
307 list = []string{}
308 }
309 proxies = &list
310 }
311 p := config.Persisted{
312 BaseURL: str("base_url"),
313 Listen: str("listen"),
314 TrustedProxies: proxies,
315 Auth: &config.PersistedAuth{
316 Mode: str("auth.mode"),
317 BaseURL: str("auth.base_url"),
318 ClientID: str("auth.client_id"),
319 ClientSecret: str("auth.client_secret"),
320 ClientSecretFile: str("auth.client_secret_file"),
321 RedirectPath: str("auth.redirect_path"),
322 UserAgent: str("auth.user_agent"),
323 DevUser: str("auth.dev_user"),
324 DevAuthID: int64p("auth.dev_auth_id"),
325 TenantID: str("auth.tenant_id"),
326 Issuer: str("auth.issuer"),
327 },
328 Git: &config.PersistedGit{
329 Binary: str("git.binary"),
330 DefaultBranch: str("git.default_branch"),
331 HookBinary: str("git.hook_binary"),
332 MaintenanceInterval: str("git.maintenance_interval"),
333 },
334 SSH: &config.PersistedSSH{
335 Enabled: boolp("ssh.enabled"),
336 Listen: str("ssh.listen"),
337 PublicHost: str("ssh.public_host"),
338 PublicPort: intp("ssh.public_port"),
339 },
340 Runner: &config.PersistedRunner{Name: str("runner.name")},
341 CI: &config.PersistedCI{
342 Enabled: boolp("ci.enabled"),
343 Docker: str("ci.docker_binary"),
344 Concurrency: intp("ci.concurrency"),
345 Network: str("ci.network"),
346 TimeoutSec: intp("ci.timeout_seconds"),
347 UpdateMaxWaitMin: intp("ci.update_max_wait_minutes"),
348 },
349 }
350 return p
351}
352
353type instancePatchJSON struct {
354 BaseURL *string `json:"base_url"`
355 Listen *string `json:"listen"`
356 TrustedProxies *[]string `json:"trusted_proxies"`
357 Auth *struct {
358 Mode *string `json:"mode"`
359 BaseURL *string `json:"base_url"`
360 ClientID *string `json:"client_id"`
361 ClientSecret *string `json:"client_secret"`
362 ClientSecretFile *string `json:"client_secret_file"`
363 RedirectPath *string `json:"redirect_path"`
364 UserAgent *string `json:"user_agent"`
365 DevUser *string `json:"dev_user"`
366 DevAuthID *int64 `json:"dev_auth_id"`
367 TenantID *string `json:"tenant_id"`
368 Issuer *string `json:"issuer"`
369 } `json:"auth"`
370 Git *struct {
371 Binary *string `json:"binary"`
372 DefaultBranch *string `json:"default_branch"`
373 HookBinary *string `json:"hook_binary"`
374 MaintenanceInterval *string `json:"maintenance_interval"`
375 } `json:"git"`
376 SSH *struct {
377 Enabled *bool `json:"enabled"`
378 Listen *string `json:"listen"`
379 PublicHost *string `json:"public_host"`
380 PublicPort *int `json:"public_port"`
381 } `json:"ssh"`
382 Runner *struct {
383 Name *string `json:"name"`
384 } `json:"runner"`
385 CI *struct {
386 Enabled *bool `json:"enabled"`
387 Docker *string `json:"docker_binary"`
388 Concurrency *int `json:"concurrency"`
389 Network *string `json:"network"`
390 TimeoutSec *int `json:"timeout_seconds"`
391 UpdateMaxWaitMin *int `json:"update_max_wait_minutes"`
392 } `json:"ci"`
393}
394
395func (in instancePatchJSON) toPatch() config.Persisted {
396 p := config.Persisted{BaseURL: in.BaseURL, Listen: in.Listen, TrustedProxies: in.TrustedProxies}
397 if a := in.Auth; a != nil {
398 p.Auth = &config.PersistedAuth{
399 Mode: a.Mode, BaseURL: a.BaseURL, ClientID: a.ClientID, ClientSecret: a.ClientSecret,
400 ClientSecretFile: a.ClientSecretFile, RedirectPath: a.RedirectPath, UserAgent: a.UserAgent,
401 DevUser: a.DevUser, DevAuthID: a.DevAuthID, TenantID: a.TenantID, Issuer: a.Issuer,
402 }
403 }
404 if g := in.Git; g != nil {
405 p.Git = &config.PersistedGit{Binary: g.Binary, DefaultBranch: g.DefaultBranch, HookBinary: g.HookBinary, MaintenanceInterval: g.MaintenanceInterval}
406 }
407 if h := in.SSH; h != nil {
408 p.SSH = &config.PersistedSSH{Enabled: h.Enabled, Listen: h.Listen, PublicHost: h.PublicHost, PublicPort: h.PublicPort}
409 }
410 if r := in.Runner; r != nil {
411 p.Runner = &config.PersistedRunner{Name: r.Name}
412 }
413 if c := in.CI; c != nil {
414 p.CI = &config.PersistedCI{Enabled: c.Enabled, Docker: c.Docker, Concurrency: c.Concurrency, Network: c.Network, TimeoutSec: c.TimeoutSec, UpdateMaxWaitMin: c.UpdateMaxWaitMin}
415 }
416 return p
417}
internal/server/admin_instance_test.go added +172 −0
@@ -0,0 +1,172 @@
1 package server
2
3 import (
4 "encoding/json"
5 "net/http"
6 "net/url"
7 "os"
8 "path/filepath"
9 "strings"
10 "testing"
11
12 "gitlab.com/Timfa/bluegit/internal/config"
13 )
14
15 func TestAdminSettingsRequiresAdminAndHidesSecret(t *testing.T) {
16 e := newCIEnv(t)
17 state := t.TempDir()
18 e.srv.StateDir = state
19 e.srv.Cfg.StatePath = state
20 e.srv.Cfg.Auth.ClientSecret = "supergeheim"
21 e.srv.Cfg.Auth.ClientID = "git.example.test"
22 e.srv.ConfigPath = "/etc/bluegit/config.yml"
23
24 ctx := e.st
25 bob, _ := ctx.UpsertUser(t.Context(), 2, "bob", "", false)
26 bc, _ := sessionClient(t, ctx, e.ts.URL, bob.ID)
27 res, _ := bc.Get(e.ts.URL + "/admin/settings")
28 if res.StatusCode != http.StatusForbidden {
29 t.Fatalf("bob ui: %d", res.StatusCode)
30 }
31 res.Body.Close()
32 bobTok := issue(t, ctx, bob.ID, "api")
33 if code, _ := rapi(t, e.ts.URL, bobTok, "GET", "/admin/settings", nil); code != http.StatusForbidden {
34 t.Fatalf("bob api: %d", code)
35 }
36
37 tc, tcsrf := sessionClient(t, ctx, e.ts.URL, e.user.ID)
38 res, _ = tc.Get(e.ts.URL + "/admin/settings")
39 page := body(t, res)
40 if res.StatusCode != 200 {
41 t.Fatalf("admin page %d: %.300s", res.StatusCode, page)
42 }
43 if !strings.Contains(page, `name="base_url"`) || !strings.Contains(page, `name="auth.client_secret"`) {
44 t.Fatalf("form ontbreekt: %.400s", page)
45 }
46 if strings.Contains(page, "supergeheim") {
47 t.Fatal("clientgeheim stond in de HTML")
48 }
49 if !strings.Contains(page, "admin.tab.settings") && !strings.Contains(page, "Instellingen") && !strings.Contains(page, "Settings") {
50 // tab label is vertaald
51 if !strings.Contains(page, `href="/admin/settings"`) {
52 t.Fatal("tab instellingen ontbreekt")
53 }
54 }
55
56 adminTok := issue(t, ctx, e.user.ID, "api")
57 code, raw := rapi(t, e.ts.URL, adminTok, "GET", "/admin/settings", nil)
58 if code != 200 {
59 t.Fatalf("GET settings %d %s", code, raw)
60 }
61 if strings.Contains(string(raw), "supergeheim") {
62 t.Fatal("geheim in de API")
63 }
64 var got map[string]any
65 if err := json.Unmarshal([]byte(raw), &got); err != nil {
66 t.Fatal(err)
67 }
68 auth := got["auth"].(map[string]any)
69 if auth["client_secret_set"] != true {
70 t.Fatalf("secret_set: %v", auth)
71 }
72 if _, ok := auth["client_secret"]; ok {
73 t.Fatal("client_secret-veld hoort niet in de JSON")
74 }
75
76 // Leeg geheim houdt het oude; andere velden wijzigen.
77 code, raw = rapi(t, e.ts.URL, adminTok, "PUT", "/admin/settings", map[string]any{
78 "listen": "127.0.0.1:9199",
79 "auth": map[string]any{"client_secret": ""},
80 })
81 if code != 200 {
82 t.Fatalf("PUT %d %s", code, raw)
83 }
84 if e.srv.Cfg.Auth.ClientSecret != "supergeheim" {
85 t.Fatalf("geheim gewist: %q", e.srv.Cfg.Auth.ClientSecret)
86 }
87 if e.srv.Cfg.Listen != "127.0.0.1:9199" {
88 t.Fatalf("listen: %s", e.srv.Cfg.Listen)
89 }
90 saved, err := os.ReadFile(filepath.Join(state, config.SettingsFile))
91 if err != nil {
92 t.Fatal(err)
93 }
94 if !strings.Contains(string(saved), "supergeheim") {
95 t.Fatal("settings.yml mist het geheim")
96 }
97 if strings.Contains(string(raw), "supergeheim") {
98 t.Fatal("PUT-antwoord lekte het geheim")
99 }
100
101 // CSRF: POST zonder token wordt geweigerd.
102 res, _ = tc.PostForm(e.ts.URL+"/admin/settings", url.Values{"base_url": {e.srv.Cfg.BaseURL}})
103 if res.StatusCode != http.StatusBadRequest && res.StatusCode != http.StatusForbidden {
104 t.Fatalf("zonder csrf: %d", res.StatusCode)
105 }
106 res.Body.Close()
107 res, _ = tc.PostForm(e.ts.URL+"/admin/settings", url.Values{
108 "csrf": {tcsrf}, "base_url": {e.srv.Cfg.BaseURL}, "listen": {"127.0.0.1:9200"},
109 "auth.mode": {"dev"}, "auth.client_id": {"git.example.test"}, "auth.client_secret": {""},
110 })
111 loc := res.Header.Get("Location")
112 res.Body.Close()
113 if res.StatusCode/100 != 3 {
114 t.Fatalf("POST settings %d %s", res.StatusCode, loc)
115 }
116 if e.srv.Cfg.Listen != "127.0.0.1:9200" {
117 t.Fatalf("na POST listen %s", e.srv.Cfg.Listen)
118 }
119 }
120
121 func TestAdminCreatesUserTokenOnce(t *testing.T) {
122 e := newCIEnv(t)
123 bob, _ := e.st.UpsertUser(t.Context(), 2, "bob", "", false)
124 tc, tcsrf := sessionClient(t, e.st, e.ts.URL, e.user.ID)
125 res, _ := tc.PostForm(e.ts.URL+"/admin/users/token", url.Values{
126 "csrf": {tcsrf}, "id": {itoa(bob.ID)}, "name": {"laptop"},
127 })
128 res.Body.Close()
129 if res.StatusCode/100 != 3 {
130 t.Fatalf("token post %d", res.StatusCode)
131 }
132 res, _ = tc.Get(e.ts.URL + "/admin/users")
133 page := body(t, res)
134 if !strings.Contains(page, "class=\"code\"") && !strings.Contains(page, "bgpat_") && !strings.Contains(page, "bgt_") {
135 // token prefix may vary; at least the once-block or a long token-like string
136 if !strings.Contains(page, "token") && !strings.Contains(page, "Token") && !strings.Contains(page, "een keer") && !strings.Contains(page, "only once") && !strings.Contains(page, "einmal") {
137 t.Fatalf("token niet getoond: %.500s", page)
138 }
139 }
140
141 adminTok := issue(t, e.st, e.user.ID, "api")
142 code, raw := rapi(t, e.ts.URL, adminTok, "POST", "/admin/users/bob/tokens", map[string]any{"name": "ci"})
143 if code != http.StatusCreated {
144 t.Fatalf("api token %d %s", code, raw)
145 }
146 var out map[string]any
147 if err := json.Unmarshal([]byte(raw), &out); err != nil {
148 t.Fatal(err)
149 }
150 tok, _ := out["token"].(string)
151 if tok == "" {
152 t.Fatalf("geen token in antwoord: %s", raw)
153 }
154 bobTok := issue(t, e.st, bob.ID, "nope")
155 if code, _ = rapi(t, e.ts.URL, bobTok, "POST", "/admin/users/tim/tokens", map[string]any{"name": "x"}); code != http.StatusForbidden {
156 t.Fatalf("bob maakt token: %d", code)
157 }
158 }
159
160 func TestDevModeRejectedForProductionHost(t *testing.T) {
161 e := newCIEnv(t)
162 e.srv.StateDir = t.TempDir()
163 e.srv.Cfg.StatePath = e.srv.StateDir
164 e.srv.Cfg.BaseURL = "https://git.timfalken.com"
165 adminTok := issue(t, e.st, e.user.ID, "api")
166 code, raw := rapi(t, e.ts.URL, adminTok, "PUT", "/admin/settings", map[string]any{
167 "auth": map[string]any{"mode": "dev"},
168 })
169 if code == 200 {
170 t.Fatalf("dev op git.timfalken.com moest falen: %s", raw)
171 }
172 }
@@ -0,0 +1,172 @@
1package server
2
3import (
4 "encoding/json"
5 "net/http"
6 "net/url"
7 "os"
8 "path/filepath"
9 "strings"
10 "testing"
11
12 "gitlab.com/Timfa/bluegit/internal/config"
13)
14
15func TestAdminSettingsRequiresAdminAndHidesSecret(t *testing.T) {
16 e := newCIEnv(t)
17 state := t.TempDir()
18 e.srv.StateDir = state
19 e.srv.Cfg.StatePath = state
20 e.srv.Cfg.Auth.ClientSecret = "supergeheim"
21 e.srv.Cfg.Auth.ClientID = "git.example.test"
22 e.srv.ConfigPath = "/etc/bluegit/config.yml"
23
24 ctx := e.st
25 bob, _ := ctx.UpsertUser(t.Context(), 2, "bob", "", false)
26 bc, _ := sessionClient(t, ctx, e.ts.URL, bob.ID)
27 res, _ := bc.Get(e.ts.URL + "/admin/settings")
28 if res.StatusCode != http.StatusForbidden {
29 t.Fatalf("bob ui: %d", res.StatusCode)
30 }
31 res.Body.Close()
32 bobTok := issue(t, ctx, bob.ID, "api")
33 if code, _ := rapi(t, e.ts.URL, bobTok, "GET", "/admin/settings", nil); code != http.StatusForbidden {
34 t.Fatalf("bob api: %d", code)
35 }
36
37 tc, tcsrf := sessionClient(t, ctx, e.ts.URL, e.user.ID)
38 res, _ = tc.Get(e.ts.URL + "/admin/settings")
39 page := body(t, res)
40 if res.StatusCode != 200 {
41 t.Fatalf("admin page %d: %.300s", res.StatusCode, page)
42 }
43 if !strings.Contains(page, `name="base_url"`) || !strings.Contains(page, `name="auth.client_secret"`) {
44 t.Fatalf("form ontbreekt: %.400s", page)
45 }
46 if strings.Contains(page, "supergeheim") {
47 t.Fatal("clientgeheim stond in de HTML")
48 }
49 if !strings.Contains(page, "admin.tab.settings") && !strings.Contains(page, "Instellingen") && !strings.Contains(page, "Settings") {
50 // tab label is vertaald
51 if !strings.Contains(page, `href="/admin/settings"`) {
52 t.Fatal("tab instellingen ontbreekt")
53 }
54 }
55
56 adminTok := issue(t, ctx, e.user.ID, "api")
57 code, raw := rapi(t, e.ts.URL, adminTok, "GET", "/admin/settings", nil)
58 if code != 200 {
59 t.Fatalf("GET settings %d %s", code, raw)
60 }
61 if strings.Contains(string(raw), "supergeheim") {
62 t.Fatal("geheim in de API")
63 }
64 var got map[string]any
65 if err := json.Unmarshal([]byte(raw), &got); err != nil {
66 t.Fatal(err)
67 }
68 auth := got["auth"].(map[string]any)
69 if auth["client_secret_set"] != true {
70 t.Fatalf("secret_set: %v", auth)
71 }
72 if _, ok := auth["client_secret"]; ok {
73 t.Fatal("client_secret-veld hoort niet in de JSON")
74 }
75
76 // Leeg geheim houdt het oude; andere velden wijzigen.
77 code, raw = rapi(t, e.ts.URL, adminTok, "PUT", "/admin/settings", map[string]any{
78 "listen": "127.0.0.1:9199",
79 "auth": map[string]any{"client_secret": ""},
80 })
81 if code != 200 {
82 t.Fatalf("PUT %d %s", code, raw)
83 }
84 if e.srv.Cfg.Auth.ClientSecret != "supergeheim" {
85 t.Fatalf("geheim gewist: %q", e.srv.Cfg.Auth.ClientSecret)
86 }
87 if e.srv.Cfg.Listen != "127.0.0.1:9199" {
88 t.Fatalf("listen: %s", e.srv.Cfg.Listen)
89 }
90 saved, err := os.ReadFile(filepath.Join(state, config.SettingsFile))
91 if err != nil {
92 t.Fatal(err)
93 }
94 if !strings.Contains(string(saved), "supergeheim") {
95 t.Fatal("settings.yml mist het geheim")
96 }
97 if strings.Contains(string(raw), "supergeheim") {
98 t.Fatal("PUT-antwoord lekte het geheim")
99 }
100
101 // CSRF: POST zonder token wordt geweigerd.
102 res, _ = tc.PostForm(e.ts.URL+"/admin/settings", url.Values{"base_url": {e.srv.Cfg.BaseURL}})
103 if res.StatusCode != http.StatusBadRequest && res.StatusCode != http.StatusForbidden {
104 t.Fatalf("zonder csrf: %d", res.StatusCode)
105 }
106 res.Body.Close()
107 res, _ = tc.PostForm(e.ts.URL+"/admin/settings", url.Values{
108 "csrf": {tcsrf}, "base_url": {e.srv.Cfg.BaseURL}, "listen": {"127.0.0.1:9200"},
109 "auth.mode": {"dev"}, "auth.client_id": {"git.example.test"}, "auth.client_secret": {""},
110 })
111 loc := res.Header.Get("Location")
112 res.Body.Close()
113 if res.StatusCode/100 != 3 {
114 t.Fatalf("POST settings %d %s", res.StatusCode, loc)
115 }
116 if e.srv.Cfg.Listen != "127.0.0.1:9200" {
117 t.Fatalf("na POST listen %s", e.srv.Cfg.Listen)
118 }
119}
120
121func TestAdminCreatesUserTokenOnce(t *testing.T) {
122 e := newCIEnv(t)
123 bob, _ := e.st.UpsertUser(t.Context(), 2, "bob", "", false)
124 tc, tcsrf := sessionClient(t, e.st, e.ts.URL, e.user.ID)
125 res, _ := tc.PostForm(e.ts.URL+"/admin/users/token", url.Values{
126 "csrf": {tcsrf}, "id": {itoa(bob.ID)}, "name": {"laptop"},
127 })
128 res.Body.Close()
129 if res.StatusCode/100 != 3 {
130 t.Fatalf("token post %d", res.StatusCode)
131 }
132 res, _ = tc.Get(e.ts.URL + "/admin/users")
133 page := body(t, res)
134 if !strings.Contains(page, "class=\"code\"") && !strings.Contains(page, "bgpat_") && !strings.Contains(page, "bgt_") {
135 // token prefix may vary; at least the once-block or a long token-like string
136 if !strings.Contains(page, "token") && !strings.Contains(page, "Token") && !strings.Contains(page, "een keer") && !strings.Contains(page, "only once") && !strings.Contains(page, "einmal") {
137 t.Fatalf("token niet getoond: %.500s", page)
138 }
139 }
140
141 adminTok := issue(t, e.st, e.user.ID, "api")
142 code, raw := rapi(t, e.ts.URL, adminTok, "POST", "/admin/users/bob/tokens", map[string]any{"name": "ci"})
143 if code != http.StatusCreated {
144 t.Fatalf("api token %d %s", code, raw)
145 }
146 var out map[string]any
147 if err := json.Unmarshal([]byte(raw), &out); err != nil {
148 t.Fatal(err)
149 }
150 tok, _ := out["token"].(string)
151 if tok == "" {
152 t.Fatalf("geen token in antwoord: %s", raw)
153 }
154 bobTok := issue(t, e.st, bob.ID, "nope")
155 if code, _ = rapi(t, e.ts.URL, bobTok, "POST", "/admin/users/tim/tokens", map[string]any{"name": "x"}); code != http.StatusForbidden {
156 t.Fatalf("bob maakt token: %d", code)
157 }
158}
159
160func TestDevModeRejectedForProductionHost(t *testing.T) {
161 e := newCIEnv(t)
162 e.srv.StateDir = t.TempDir()
163 e.srv.Cfg.StatePath = e.srv.StateDir
164 e.srv.Cfg.BaseURL = "https://git.timfalken.com"
165 adminTok := issue(t, e.st, e.user.ID, "api")
166 code, raw := rapi(t, e.ts.URL, adminTok, "PUT", "/admin/settings", map[string]any{
167 "auth": map[string]any{"mode": "dev"},
168 })
169 if code == 200 {
170 t.Fatalf("dev op git.timfalken.com moest falen: %s", raw)
171 }
172}
internal/server/admin_users.go +80 −3
@@ -5,6 +5,7 @@ import (
5 5 "net/http"
6 6 "strconv"
7 7 "strings"
8 "time"
8 9
9 10 "gitlab.com/Timfa/bluegit/internal/i18n"
10 11 "gitlab.com/Timfa/bluegit/internal/store"
@@ -23,27 +24,41 @@ type AdminTab struct {
23 24
24 25 func adminTabs(page string) []AdminTab {
25 26 tabs := []AdminTab{
27 {Key: "admin.tab.settings", Href: "/admin/settings"},
26 28 {Key: "admin.tab.users", Href: "/admin/users"},
27 29 {Key: "admin.tab.runner", Href: "/admin/runner"},
28 30 {Key: "admin.tab.storage", Href: "/setup"},
29 31 {Key: "admin.tab.pipelines", Href: "/admin/pipelines"},
30 32 {Key: "admin.tab.backup", Href: "/admin/backup"},
31 33 }
34 on := map[string]string{
35 "adminsettings": "/admin/settings",
36 "adminusers": "/admin/users",
37 "adminrunner": "/admin/runner",
38 "setup": "/setup",
39 "adminpipelines": "/admin/pipelines",
40 "adminbackup": "/admin/backup",
41 "adminbackupserver": "/admin/backup",
42 }
43 href := on[page]
32 44 for i := range tabs {
33 tabs[i].On = (page == "adminusers" && i == 0) || (page == "adminrunner" && i == 1) || (page == "setup" && i == 2) || (page == "adminpipelines" && i == 3) || ((page == "adminbackup" || page == "adminbackupserver") && i == 4)
45 tabs[i].On = tabs[i].Href == href
34 46 }
35 47 return tabs
36 48 }
37 49
38 50 func isAdminPage(page string) bool {
39 return page == "adminusers" || page == "adminrunner" || page == "setup" || page == "adminpipelines" || page == "adminbackup" || page == "adminbackupserver"
51 return page == "adminsettings" || page == "adminusers" || page == "adminrunner" || page == "setup" || page == "adminpipelines" || page == "adminbackup" || page == "adminbackupserver"
40 52 }
41 53
42 54 func (s *Server) mountAdmin(mux *http.ServeMux) {
43 55 mux.HandleFunc("GET /admin", s.adminHome)
44 56 mux.HandleFunc("GET /admin/{$}", s.adminHome)
57 mux.HandleFunc("GET /admin/settings", s.adminSettings)
58 mux.HandleFunc("POST /admin/settings", s.adminSettingsSave)
45 59 mux.HandleFunc("GET /admin/users", s.adminUsers)
46 60 mux.HandleFunc("POST /admin/users/role", s.adminUserRole)
61 mux.HandleFunc("POST /admin/users/token", s.adminUserToken)
47 62 mux.HandleFunc("GET /admin/pipelines", s.adminPipelines)
48 63 mux.HandleFunc("POST /admin/pipelines", s.adminPipelinesSave)
49 64 mux.HandleFunc("GET /admin/storage", func(w http.ResponseWriter, r *http.Request) {
@@ -55,7 +70,7 @@ func (s *Server) mountAdmin(mux *http.ServeMux) {
55 70
56 71 func (s *Server) adminHome(w http.ResponseWriter, r *http.Request) {
57 72 if ok, _ := s.adminOnly(w, r); ok {
58 http.Redirect(w, r, "/admin/users", http.StatusFound)
73 http.Redirect(w, r, "/admin/settings", http.StatusFound)
59 74 }
60 75 }
61 76
@@ -76,6 +91,12 @@ func (s *Server) adminUsers(w http.ResponseWriter, r *http.Request) {
76 91 }
77 92 v := s.view(w, r, "title.admin")
78 93 v.Page = "adminusers"
94 v.NewAdminToken = cookieVal(r, "bluegit_admin_token_once")
95 v.AdminTokenUser = cookieVal(r, "bluegit_admin_token_user")
96 if v.NewAdminToken != "" {
97 http.SetCookie(w, &http.Cookie{Name: "bluegit_admin_token_once", Value: "", Path: "/", MaxAge: -1})
98 http.SetCookie(w, &http.Cookie{Name: "bluegit_admin_token_user", Value: "", Path: "/", MaxAge: -1})
99 }
79 100 me := s.who(r).User.ID
80 101 for _, u := range users {
81 102 v.AdminUsers = append(v.AdminUsers, AdminUserRow{User: u, Self: u.ID == me})
@@ -174,3 +195,59 @@ func (s *Server) apiAdminUserRole(w http.ResponseWriter, r *http.Request) {
174 195 }
175 196 writeJSON(w, http.StatusOK, adminUserJSON(u))
176 197 }
198
199 func (s *Server) issueTokenForUser(r *http.Request, u store.User, name string) (string, store.TokenInfo, error) {
200 plain, info, err := s.opIssueToken(r.Context(), u, name, nil, time.Time{})
201 if err != nil {
202 return "", info, err
203 }
204 if s.Log != nil {
205 s.Log.Info("admin audit", "action", "create_token", "by", s.who(r).User.Username, "target", u.Username, "name", info.Name)
206 }
207 return plain, info, nil
208 }
209
210 func (s *Server) adminUserToken(w http.ResponseWriter, r *http.Request) {
211 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
212 return
213 }
214 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
215 u, err := s.Store.UserByID(r.Context(), id)
216 if err != nil {
217 s.redirect(w, r, "/admin/users", "", s.trErr(r, i18n.E("admin.err.user")))
218 return
219 }
220 plain, _, err := s.issueTokenForUser(r, u, r.FormValue("name"))
221 if err != nil {
222 s.redirect(w, r, "/admin/users", "", s.trErr(r, err))
223 return
224 }
225 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
226 http.SetCookie(w, &http.Cookie{Name: "bluegit_admin_token_once", Value: plain, Path: "/", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
227 http.SetCookie(w, &http.Cookie{Name: "bluegit_admin_token_user", Value: u.Username, Path: "/", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
228 s.redirect(w, r, "/admin/users", s.tr(r, "admin.token.created", u.Username), "")
229 }
230
231 func (s *Server) apiAdminUserToken(w http.ResponseWriter, r *http.Request) {
232 if !apiUser(r).InstanceAdmin {
233 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
234 return
235 }
236 var in struct {
237 Name string `json:"name"`
238 }
239 if err := readJSON(r, &in); err != nil {
240 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
241 return
242 }
243 u, err := s.Store.UserByUsername(r.Context(), strings.TrimSpace(r.PathValue("username")))
244 if err != nil {
245 s.writeAPIErr(w, r, fail(404, i18n.E("admin.err.user")))
246 return
247 }
248 plain, info, err := s.issueTokenForUser(r, u, in.Name)
249 if !s.apiOK(w, r, err) {
250 return
251 }
252 writeJSON(w, http.StatusCreated, tokenJSON(info, plain))
253 }
@@ -5,6 +5,7 @@ import (
5 "net/http"
5 "net/http"
6 "strconv"
6 "strconv"
7 "strings"
7 "strings"
8 "time"
8
9
9 "gitlab.com/Timfa/bluegit/internal/i18n"
10 "gitlab.com/Timfa/bluegit/internal/i18n"
10 "gitlab.com/Timfa/bluegit/internal/store"
11 "gitlab.com/Timfa/bluegit/internal/store"
@@ -23,27 +24,41 @@ type AdminTab struct {
23
24
24func adminTabs(page string) []AdminTab {
25func adminTabs(page string) []AdminTab {
25 tabs := []AdminTab{
26 tabs := []AdminTab{
27 {Key: "admin.tab.settings", Href: "/admin/settings"},
26 {Key: "admin.tab.users", Href: "/admin/users"},
28 {Key: "admin.tab.users", Href: "/admin/users"},
27 {Key: "admin.tab.runner", Href: "/admin/runner"},
29 {Key: "admin.tab.runner", Href: "/admin/runner"},
28 {Key: "admin.tab.storage", Href: "/setup"},
30 {Key: "admin.tab.storage", Href: "/setup"},
29 {Key: "admin.tab.pipelines", Href: "/admin/pipelines"},
31 {Key: "admin.tab.pipelines", Href: "/admin/pipelines"},
30 {Key: "admin.tab.backup", Href: "/admin/backup"},
32 {Key: "admin.tab.backup", Href: "/admin/backup"},
31 }
33 }
34 on := map[string]string{
35 "adminsettings": "/admin/settings",
36 "adminusers": "/admin/users",
37 "adminrunner": "/admin/runner",
38 "setup": "/setup",
39 "adminpipelines": "/admin/pipelines",
40 "adminbackup": "/admin/backup",
41 "adminbackupserver": "/admin/backup",
42 }
43 href := on[page]
32 for i := range tabs {
44 for i := range tabs {
33 tabs[i].On = (page == "adminusers" && i == 0) || (page == "adminrunner" && i == 1) || (page == "setup" && i == 2) || (page == "adminpipelines" && i == 3) || ((page == "adminbackup" || page == "adminbackupserver") && i == 4)
45 tabs[i].On = tabs[i].Href == href
34 }
46 }
35 return tabs
47 return tabs
36}
48}
37
49
38func isAdminPage(page string) bool {
50func isAdminPage(page string) bool {
39 return page == "adminusers" || page == "adminrunner" || page == "setup" || page == "adminpipelines" || page == "adminbackup" || page == "adminbackupserver"
51 return page == "adminsettings" || page == "adminusers" || page == "adminrunner" || page == "setup" || page == "adminpipelines" || page == "adminbackup" || page == "adminbackupserver"
40}
52}
41
53
42func (s *Server) mountAdmin(mux *http.ServeMux) {
54func (s *Server) mountAdmin(mux *http.ServeMux) {
43 mux.HandleFunc("GET /admin", s.adminHome)
55 mux.HandleFunc("GET /admin", s.adminHome)
44 mux.HandleFunc("GET /admin/{$}", s.adminHome)
56 mux.HandleFunc("GET /admin/{$}", s.adminHome)
57 mux.HandleFunc("GET /admin/settings", s.adminSettings)
58 mux.HandleFunc("POST /admin/settings", s.adminSettingsSave)
45 mux.HandleFunc("GET /admin/users", s.adminUsers)
59 mux.HandleFunc("GET /admin/users", s.adminUsers)
46 mux.HandleFunc("POST /admin/users/role", s.adminUserRole)
60 mux.HandleFunc("POST /admin/users/role", s.adminUserRole)
61 mux.HandleFunc("POST /admin/users/token", s.adminUserToken)
47 mux.HandleFunc("GET /admin/pipelines", s.adminPipelines)
62 mux.HandleFunc("GET /admin/pipelines", s.adminPipelines)
48 mux.HandleFunc("POST /admin/pipelines", s.adminPipelinesSave)
63 mux.HandleFunc("POST /admin/pipelines", s.adminPipelinesSave)
49 mux.HandleFunc("GET /admin/storage", func(w http.ResponseWriter, r *http.Request) {
64 mux.HandleFunc("GET /admin/storage", func(w http.ResponseWriter, r *http.Request) {
@@ -55,7 +70,7 @@ func (s *Server) mountAdmin(mux *http.ServeMux) {
55
70
56func (s *Server) adminHome(w http.ResponseWriter, r *http.Request) {
71func (s *Server) adminHome(w http.ResponseWriter, r *http.Request) {
57 if ok, _ := s.adminOnly(w, r); ok {
72 if ok, _ := s.adminOnly(w, r); ok {
58 http.Redirect(w, r, "/admin/users", http.StatusFound)
73 http.Redirect(w, r, "/admin/settings", http.StatusFound)
59 }
74 }
60}
75}
61
76
@@ -76,6 +91,12 @@ func (s *Server) adminUsers(w http.ResponseWriter, r *http.Request) {
76 }
91 }
77 v := s.view(w, r, "title.admin")
92 v := s.view(w, r, "title.admin")
78 v.Page = "adminusers"
93 v.Page = "adminusers"
94 v.NewAdminToken = cookieVal(r, "bluegit_admin_token_once")
95 v.AdminTokenUser = cookieVal(r, "bluegit_admin_token_user")
96 if v.NewAdminToken != "" {
97 http.SetCookie(w, &http.Cookie{Name: "bluegit_admin_token_once", Value: "", Path: "/", MaxAge: -1})
98 http.SetCookie(w, &http.Cookie{Name: "bluegit_admin_token_user", Value: "", Path: "/", MaxAge: -1})
99 }
79 me := s.who(r).User.ID
100 me := s.who(r).User.ID
80 for _, u := range users {
101 for _, u := range users {
81 v.AdminUsers = append(v.AdminUsers, AdminUserRow{User: u, Self: u.ID == me})
102 v.AdminUsers = append(v.AdminUsers, AdminUserRow{User: u, Self: u.ID == me})
@@ -174,3 +195,59 @@ func (s *Server) apiAdminUserRole(w http.ResponseWriter, r *http.Request) {
174 }
195 }
175 writeJSON(w, http.StatusOK, adminUserJSON(u))
196 writeJSON(w, http.StatusOK, adminUserJSON(u))
176}
197}
198
199func (s *Server) issueTokenForUser(r *http.Request, u store.User, name string) (string, store.TokenInfo, error) {
200 plain, info, err := s.opIssueToken(r.Context(), u, name, nil, time.Time{})
201 if err != nil {
202 return "", info, err
203 }
204 if s.Log != nil {
205 s.Log.Info("admin audit", "action", "create_token", "by", s.who(r).User.Username, "target", u.Username, "name", info.Name)
206 }
207 return plain, info, nil
208}
209
210func (s *Server) adminUserToken(w http.ResponseWriter, r *http.Request) {
211 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
212 return
213 }
214 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
215 u, err := s.Store.UserByID(r.Context(), id)
216 if err != nil {
217 s.redirect(w, r, "/admin/users", "", s.trErr(r, i18n.E("admin.err.user")))
218 return
219 }
220 plain, _, err := s.issueTokenForUser(r, u, r.FormValue("name"))
221 if err != nil {
222 s.redirect(w, r, "/admin/users", "", s.trErr(r, err))
223 return
224 }
225 secure := strings.HasPrefix(s.Cfg.BaseURL, "https://")
226 http.SetCookie(w, &http.Cookie{Name: "bluegit_admin_token_once", Value: plain, Path: "/", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
227 http.SetCookie(w, &http.Cookie{Name: "bluegit_admin_token_user", Value: u.Username, Path: "/", MaxAge: 120, HttpOnly: true, Secure: secure, SameSite: http.SameSiteLaxMode})
228 s.redirect(w, r, "/admin/users", s.tr(r, "admin.token.created", u.Username), "")
229}
230
231func (s *Server) apiAdminUserToken(w http.ResponseWriter, r *http.Request) {
232 if !apiUser(r).InstanceAdmin {
233 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
234 return
235 }
236 var in struct {
237 Name string `json:"name"`
238 }
239 if err := readJSON(r, &in); err != nil {
240 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
241 return
242 }
243 u, err := s.Store.UserByUsername(r.Context(), strings.TrimSpace(r.PathValue("username")))
244 if err != nil {
245 s.writeAPIErr(w, r, fail(404, i18n.E("admin.err.user")))
246 return
247 }
248 plain, info, err := s.issueTokenForUser(r, u, in.Name)
249 if !s.apiOK(w, r, err) {
250 return
251 }
252 writeJSON(w, http.StatusCreated, tokenJSON(info, plain))
253}
internal/server/admin_users_test.go +2 −2
@@ -27,7 +27,7 @@ func TestAdminUsersRoles(t *testing.T) {
27 27 if strings.Contains(body(t, res), `href="/admin"`) {
28 28 t.Fatal("bob ziet Beheer-link")
29 29 }
30 for _, p := range []string{"/admin/users", "/admin/storage"} {
30 for _, p := range []string{"/admin/users", "/admin/storage", "/admin/settings"} {
31 31 res, _ = bc.Get(base + p)
32 32 if res.StatusCode != http.StatusForbidden {
33 33 t.Fatalf("bob %s: %d", p, res.StatusCode)
@@ -50,7 +50,7 @@ func TestAdminUsersRoles(t *testing.T) {
50 50 // Beheerder: nav, redirect, pagina met eigen knop uitgeschakeld.
51 51 tc, tcsrf := sessionClient(t, st, base, tim.ID)
52 52 res, _ = tc.Get(base + "/admin")
53 if res.StatusCode/100 != 3 || res.Header.Get("Location") != "/admin/users" {
53 if res.StatusCode/100 != 3 || res.Header.Get("Location") != "/admin/settings" {
54 54 t.Fatalf("/admin: %d %s", res.StatusCode, res.Header.Get("Location"))
55 55 }
56 56 res.Body.Close()
@@ -27,7 +27,7 @@ func TestAdminUsersRoles(t *testing.T) {
27 if strings.Contains(body(t, res), `href="/admin"`) {
27 if strings.Contains(body(t, res), `href="/admin"`) {
28 t.Fatal("bob ziet Beheer-link")
28 t.Fatal("bob ziet Beheer-link")
29 }
29 }
30 for _, p := range []string{"/admin/users", "/admin/storage"} {
30 for _, p := range []string{"/admin/users", "/admin/storage", "/admin/settings"} {
31 res, _ = bc.Get(base + p)
31 res, _ = bc.Get(base + p)
32 if res.StatusCode != http.StatusForbidden {
32 if res.StatusCode != http.StatusForbidden {
33 t.Fatalf("bob %s: %d", p, res.StatusCode)
33 t.Fatalf("bob %s: %d", p, res.StatusCode)
@@ -50,7 +50,7 @@ func TestAdminUsersRoles(t *testing.T) {
50 // Beheerder: nav, redirect, pagina met eigen knop uitgeschakeld.
50 // Beheerder: nav, redirect, pagina met eigen knop uitgeschakeld.
51 tc, tcsrf := sessionClient(t, st, base, tim.ID)
51 tc, tcsrf := sessionClient(t, st, base, tim.ID)
52 res, _ = tc.Get(base + "/admin")
52 res, _ = tc.Get(base + "/admin")
53 if res.StatusCode/100 != 3 || res.Header.Get("Location") != "/admin/users" {
53 if res.StatusCode/100 != 3 || res.Header.Get("Location") != "/admin/settings" {
54 t.Fatalf("/admin: %d %s", res.StatusCode, res.Header.Get("Location"))
54 t.Fatalf("/admin: %d %s", res.StatusCode, res.Header.Get("Location"))
55 }
55 }
56 res.Body.Close()
56 res.Body.Close()
internal/server/api_routes.go +3 −0
@@ -14,6 +14,9 @@ var apiCatalog = []apiRoute{
14 14 {http.MethodPost, "/api/v1/admin/git-maintenance", access.ScopeAdmin, authUser, "Run git maintenance now, optionally on one repo (instance admin)", (*Server).apiAdminGitMaintenance},
15 15 {http.MethodGet, "/api/v1/admin/users", access.ScopeAdmin, authUser, "List users and their admin status (instance admin)", (*Server).apiAdminUsers},
16 16 {http.MethodPut, "/api/v1/admin/users/{username}/admin", access.ScopeAdmin, authUser, "Grant or revoke instance admin (instance admin; not yourself)", (*Server).apiAdminUserRole},
17 {http.MethodPost, "/api/v1/admin/users/{username}/tokens", access.ScopeAdmin, authUser, "Create a personal access token for a user (instance admin; the token is shown only once)", (*Server).apiAdminUserToken},
18 {http.MethodGet, "/api/v1/admin/settings", access.ScopeAdmin, authUser, "Read instance machine settings (no secrets)", (*Server).apiAdminSettings},
19 {http.MethodPut, "/api/v1/admin/settings", access.ScopeAdmin, authUser, "Update instance machine settings; client_secret is write-only and optional (empty keeps the current secret)", (*Server).apiAdminSettings},
17 20 {http.MethodGet, "/api/v1/admin/runner/status", access.ScopeRunnerRead, authUser, "Built-in runner status (instance admin)", (*Server).apiAdminRunnerStatus},
18 21 {http.MethodGet, "/api/v1/admin/runner/settings", access.ScopeRunnerRead, authUser, "Get built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
19 22 {http.MethodPut, "/api/v1/admin/runner/settings", access.ScopeRunnerWrite, authUser, "Change built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
@@ -14,6 +14,9 @@ var apiCatalog = []apiRoute{
14 {http.MethodPost, "/api/v1/admin/git-maintenance", access.ScopeAdmin, authUser, "Run git maintenance now, optionally on one repo (instance admin)", (*Server).apiAdminGitMaintenance},
14 {http.MethodPost, "/api/v1/admin/git-maintenance", access.ScopeAdmin, authUser, "Run git maintenance now, optionally on one repo (instance admin)", (*Server).apiAdminGitMaintenance},
15 {http.MethodGet, "/api/v1/admin/users", access.ScopeAdmin, authUser, "List users and their admin status (instance admin)", (*Server).apiAdminUsers},
15 {http.MethodGet, "/api/v1/admin/users", access.ScopeAdmin, authUser, "List users and their admin status (instance admin)", (*Server).apiAdminUsers},
16 {http.MethodPut, "/api/v1/admin/users/{username}/admin", access.ScopeAdmin, authUser, "Grant or revoke instance admin (instance admin; not yourself)", (*Server).apiAdminUserRole},
16 {http.MethodPut, "/api/v1/admin/users/{username}/admin", access.ScopeAdmin, authUser, "Grant or revoke instance admin (instance admin; not yourself)", (*Server).apiAdminUserRole},
17 {http.MethodPost, "/api/v1/admin/users/{username}/tokens", access.ScopeAdmin, authUser, "Create a personal access token for a user (instance admin; the token is shown only once)", (*Server).apiAdminUserToken},
18 {http.MethodGet, "/api/v1/admin/settings", access.ScopeAdmin, authUser, "Read instance machine settings (no secrets)", (*Server).apiAdminSettings},
19 {http.MethodPut, "/api/v1/admin/settings", access.ScopeAdmin, authUser, "Update instance machine settings; client_secret is write-only and optional (empty keeps the current secret)", (*Server).apiAdminSettings},
17 {http.MethodGet, "/api/v1/admin/runner/status", access.ScopeRunnerRead, authUser, "Built-in runner status (instance admin)", (*Server).apiAdminRunnerStatus},
20 {http.MethodGet, "/api/v1/admin/runner/status", access.ScopeRunnerRead, authUser, "Built-in runner status (instance admin)", (*Server).apiAdminRunnerStatus},
18 {http.MethodGet, "/api/v1/admin/runner/settings", access.ScopeRunnerRead, authUser, "Get built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
21 {http.MethodGet, "/api/v1/admin/runner/settings", access.ScopeRunnerRead, authUser, "Get built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
19 {http.MethodPut, "/api/v1/admin/runner/settings", access.ScopeRunnerWrite, authUser, "Change built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
22 {http.MethodPut, "/api/v1/admin/runner/settings", access.ScopeRunnerWrite, authUser, "Change built-in runner settings (instance admin)", (*Server).apiAdminRunnerSettings},
internal/server/listen.go added +133 −0
@@ -0,0 +1,133 @@
1 package server
2
3 import (
4 "context"
5 "errors"
6 "fmt"
7 "net"
8 "net/http"
9 "sync"
10 "time"
11 )
12
13 // httpServe beschermt de draaiende http.Server en listener, zodat listen
14 // live omgezet kan worden zonder het proces te herstarten.
15 type httpServe struct {
16 mu sync.Mutex
17 hs *http.Server
18 ln net.Listener
19 gen uint64
20 bound string
21 stopping bool
22 serving bool
23 }
24
25 // BoundAddr is het adres waarop de server nu luistert (leeg als hij niet
26 // via ListenAndServe draait).
27 func (s *Server) BoundAddr() string {
28 s.http.mu.Lock()
29 defer s.http.mu.Unlock()
30 return s.http.bound
31 }
32
33 func (s *Server) isServing() bool {
34 s.http.mu.Lock()
35 defer s.http.mu.Unlock()
36 return s.http.serving && !s.http.stopping
37 }
38
39 // ListenAndServe luistert op s.Cfg.Listen tot StopHTTP of een fatale fout.
40 // Relisten zet de listener om zonder terug te keren.
41 func (s *Server) ListenAndServe() error {
42 addr := s.Cfg.Listen
43 ln, err := net.Listen("tcp", addr)
44 if err != nil {
45 return err
46 }
47 s.setListener(ln, &http.Server{Handler: s.Handler(), ReadHeaderTimeout: 10 * time.Second})
48 if s.Log != nil {
49 s.Log.Info("BlueGit luistert", "addr", ln.Addr().String(), "base", s.Cfg.BaseURL)
50 }
51
52 for {
53 s.http.mu.Lock()
54 hs, ln, gen, stopping := s.http.hs, s.http.ln, s.http.gen, s.http.stopping
55 s.http.mu.Unlock()
56 if stopping || hs == nil || ln == nil {
57 return nil
58 }
59 err := hs.Serve(ln)
60 s.http.mu.Lock()
61 rebound := s.http.gen != gen
62 stopping = s.http.stopping
63 s.http.mu.Unlock()
64 if rebound {
65 continue
66 }
67 if err != nil && !errors.Is(err, http.ErrServerClosed) && !stopping {
68 return err
69 }
70 return nil
71 }
72 }
73
74 func (s *Server) setListener(ln net.Listener, hs *http.Server) {
75 s.http.mu.Lock()
76 defer s.http.mu.Unlock()
77 s.http.hs = hs
78 s.http.ln = ln
79 s.http.bound = ln.Addr().String()
80 s.http.serving = true
81 }
82
83 // Relisten probeert op addr te gaan luisteren. Lukt dat niet, dan blijft
84 // de oude listener staan.
85 func (s *Server) Relisten(addr string) error {
86 ln, err := net.Listen("tcp", addr)
87 if err != nil {
88 cur := s.BoundAddr()
89 if cur == "" {
90 cur = s.Cfg.Listen
91 }
92 return fmt.Errorf("kan niet luisteren op %s: %w; blijft luisteren op %s", addr, err, cur)
93 }
94 s.http.mu.Lock()
95 if s.http.hs == nil {
96 s.http.mu.Unlock()
97 _ = ln.Close()
98 return fmt.Errorf("niet aan het luisteren")
99 }
100 newHS := &http.Server{Handler: s.http.hs.Handler, ReadHeaderTimeout: 10 * time.Second}
101 oldHS := s.http.hs
102 s.http.hs = newHS
103 s.http.ln = ln
104 s.http.bound = ln.Addr().String()
105 s.http.gen++
106 s.http.serving = true
107 s.http.mu.Unlock()
108 if oldHS != nil {
109 go func() {
110 ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
111 defer cancel()
112 _ = oldHS.Shutdown(ctx)
113 }()
114 }
115 if s.Log != nil {
116 s.Log.Info("BlueGit luistert nu elders", "addr", ln.Addr().String())
117 }
118 return nil
119 }
120
121 // StopHTTP sluit de listener af (na een eventuele WaitProtected in main).
122 func (s *Server) StopHTTP() {
123 s.http.mu.Lock()
124 s.http.stopping = true
125 hs := s.http.hs
126 s.http.mu.Unlock()
127 if hs == nil {
128 return
129 }
130 ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
131 defer cancel()
132 _ = hs.Shutdown(ctx)
133 }
@@ -0,0 +1,133 @@
1package server
2
3import (
4 "context"
5 "errors"
6 "fmt"
7 "net"
8 "net/http"
9 "sync"
10 "time"
11)
12
13// httpServe beschermt de draaiende http.Server en listener, zodat listen
14// live omgezet kan worden zonder het proces te herstarten.
15type httpServe struct {
16 mu sync.Mutex
17 hs *http.Server
18 ln net.Listener
19 gen uint64
20 bound string
21 stopping bool
22 serving bool
23}
24
25// BoundAddr is het adres waarop de server nu luistert (leeg als hij niet
26// via ListenAndServe draait).
27func (s *Server) BoundAddr() string {
28 s.http.mu.Lock()
29 defer s.http.mu.Unlock()
30 return s.http.bound
31}
32
33func (s *Server) isServing() bool {
34 s.http.mu.Lock()
35 defer s.http.mu.Unlock()
36 return s.http.serving && !s.http.stopping
37}
38
39// ListenAndServe luistert op s.Cfg.Listen tot StopHTTP of een fatale fout.
40// Relisten zet de listener om zonder terug te keren.
41func (s *Server) ListenAndServe() error {
42 addr := s.Cfg.Listen
43 ln, err := net.Listen("tcp", addr)
44 if err != nil {
45 return err
46 }
47 s.setListener(ln, &http.Server{Handler: s.Handler(), ReadHeaderTimeout: 10 * time.Second})
48 if s.Log != nil {
49 s.Log.Info("BlueGit luistert", "addr", ln.Addr().String(), "base", s.Cfg.BaseURL)
50 }
51
52 for {
53 s.http.mu.Lock()
54 hs, ln, gen, stopping := s.http.hs, s.http.ln, s.http.gen, s.http.stopping
55 s.http.mu.Unlock()
56 if stopping || hs == nil || ln == nil {
57 return nil
58 }
59 err := hs.Serve(ln)
60 s.http.mu.Lock()
61 rebound := s.http.gen != gen
62 stopping = s.http.stopping
63 s.http.mu.Unlock()
64 if rebound {
65 continue
66 }
67 if err != nil && !errors.Is(err, http.ErrServerClosed) && !stopping {
68 return err
69 }
70 return nil
71 }
72}
73
74func (s *Server) setListener(ln net.Listener, hs *http.Server) {
75 s.http.mu.Lock()
76 defer s.http.mu.Unlock()
77 s.http.hs = hs
78 s.http.ln = ln
79 s.http.bound = ln.Addr().String()
80 s.http.serving = true
81}
82
83// Relisten probeert op addr te gaan luisteren. Lukt dat niet, dan blijft
84// de oude listener staan.
85func (s *Server) Relisten(addr string) error {
86 ln, err := net.Listen("tcp", addr)
87 if err != nil {
88 cur := s.BoundAddr()
89 if cur == "" {
90 cur = s.Cfg.Listen
91 }
92 return fmt.Errorf("kan niet luisteren op %s: %w; blijft luisteren op %s", addr, err, cur)
93 }
94 s.http.mu.Lock()
95 if s.http.hs == nil {
96 s.http.mu.Unlock()
97 _ = ln.Close()
98 return fmt.Errorf("niet aan het luisteren")
99 }
100 newHS := &http.Server{Handler: s.http.hs.Handler, ReadHeaderTimeout: 10 * time.Second}
101 oldHS := s.http.hs
102 s.http.hs = newHS
103 s.http.ln = ln
104 s.http.bound = ln.Addr().String()
105 s.http.gen++
106 s.http.serving = true
107 s.http.mu.Unlock()
108 if oldHS != nil {
109 go func() {
110 ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
111 defer cancel()
112 _ = oldHS.Shutdown(ctx)
113 }()
114 }
115 if s.Log != nil {
116 s.Log.Info("BlueGit luistert nu elders", "addr", ln.Addr().String())
117 }
118 return nil
119}
120
121// StopHTTP sluit de listener af (na een eventuele WaitProtected in main).
122func (s *Server) StopHTTP() {
123 s.http.mu.Lock()
124 s.http.stopping = true
125 hs := s.http.hs
126 s.http.mu.Unlock()
127 if hs == nil {
128 return
129 }
130 ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
131 defer cancel()
132 _ = hs.Shutdown(ctx)
133}
internal/server/listen_test.go added +73 −0
@@ -0,0 +1,73 @@
1 package server
2
3 import (
4 "io"
5 "net"
6 "net/http"
7 "testing"
8 "time"
9
10 "gitlab.com/Timfa/bluegit/internal/config"
11 )
12
13 func TestHTTPRelistenKeepsOldOnFailure(t *testing.T) {
14 s := &Server{Cfg: config.Config{Listen: "127.0.0.1:0", BaseURL: "http://127.0.0.1"}}
15 errCh := make(chan error, 1)
16 go func() { errCh <- s.ListenAndServe() }()
17 t.Cleanup(func() { s.StopHTTP(); <-errCh })
18
19 var addr string
20 deadline := time.Now().Add(2 * time.Second)
21 for time.Now().Before(deadline) {
22 if addr = s.BoundAddr(); addr != "" {
23 break
24 }
25 time.Sleep(10 * time.Millisecond)
26 }
27 if addr == "" {
28 t.Fatal("niet gaan luisteren")
29 }
30 waitOK(t, "http://"+addr+"/healthz")
31
32 busy, err := net.Listen("tcp", "127.0.0.1:0")
33 if err != nil {
34 t.Fatal(err)
35 }
36 defer busy.Close()
37 if err := s.Relisten(busy.Addr().String()); err == nil {
38 t.Fatal("bezet adres moest falen")
39 }
40 if s.BoundAddr() != addr {
41 t.Fatalf("oude listener weg: %s", s.BoundAddr())
42 }
43 waitOK(t, "http://"+addr+"/healthz")
44
45 if err := s.Relisten("127.0.0.1:0"); err != nil {
46 t.Fatal(err)
47 }
48 newAddr := s.BoundAddr()
49 if newAddr == "" || newAddr == addr {
50 t.Fatalf("geen nieuwe listener: %s", newAddr)
51 }
52 waitOK(t, "http://"+newAddr+"/healthz")
53 }
54
55 func waitOK(t *testing.T, url string) {
56 t.Helper()
57 var last error
58 for i := 0; i < 50; i++ {
59 res, err := http.Get(url)
60 if err == nil {
61 _, _ = io.Copy(io.Discard, res.Body)
62 res.Body.Close()
63 if res.StatusCode == 200 {
64 return
65 }
66 last = err
67 } else {
68 last = err
69 }
70 time.Sleep(20 * time.Millisecond)
71 }
72 t.Fatalf("niet bereikbaar %s: %v", url, last)
73 }
@@ -0,0 +1,73 @@
1package server
2
3import (
4 "io"
5 "net"
6 "net/http"
7 "testing"
8 "time"
9
10 "gitlab.com/Timfa/bluegit/internal/config"
11)
12
13func TestHTTPRelistenKeepsOldOnFailure(t *testing.T) {
14 s := &Server{Cfg: config.Config{Listen: "127.0.0.1:0", BaseURL: "http://127.0.0.1"}}
15 errCh := make(chan error, 1)
16 go func() { errCh <- s.ListenAndServe() }()
17 t.Cleanup(func() { s.StopHTTP(); <-errCh })
18
19 var addr string
20 deadline := time.Now().Add(2 * time.Second)
21 for time.Now().Before(deadline) {
22 if addr = s.BoundAddr(); addr != "" {
23 break
24 }
25 time.Sleep(10 * time.Millisecond)
26 }
27 if addr == "" {
28 t.Fatal("niet gaan luisteren")
29 }
30 waitOK(t, "http://"+addr+"/healthz")
31
32 busy, err := net.Listen("tcp", "127.0.0.1:0")
33 if err != nil {
34 t.Fatal(err)
35 }
36 defer busy.Close()
37 if err := s.Relisten(busy.Addr().String()); err == nil {
38 t.Fatal("bezet adres moest falen")
39 }
40 if s.BoundAddr() != addr {
41 t.Fatalf("oude listener weg: %s", s.BoundAddr())
42 }
43 waitOK(t, "http://"+addr+"/healthz")
44
45 if err := s.Relisten("127.0.0.1:0"); err != nil {
46 t.Fatal(err)
47 }
48 newAddr := s.BoundAddr()
49 if newAddr == "" || newAddr == addr {
50 t.Fatalf("geen nieuwe listener: %s", newAddr)
51 }
52 waitOK(t, "http://"+newAddr+"/healthz")
53}
54
55func waitOK(t *testing.T, url string) {
56 t.Helper()
57 var last error
58 for i := 0; i < 50; i++ {
59 res, err := http.Get(url)
60 if err == nil {
61 _, _ = io.Copy(io.Discard, res.Body)
62 res.Body.Close()
63 if res.StatusCode == 200 {
64 return
65 }
66 last = err
67 } else {
68 last = err
69 }
70 time.Sleep(20 * time.Millisecond)
71 }
72 t.Fatalf("niet bereikbaar %s: %v", url, last)
73}
internal/server/server.go +12 −0
@@ -52,6 +52,15 @@ type Server struct {
52 52 hookSink func([]byte)
53 53 // StateDir is de map met database en het bestand storage_path.
54 54 StateDir string
55 // ConfigPath is het pad van de eventuele config.yml (alleen ter info).
56 ConfigPath string
57 // SettingsPath is state_path/settings.yml.
58 SettingsPath string
59 // ListenNotice vertelt de beheerder waar de server na een live rebind luistert.
60 ListenNotice string
61 // ApplySSH past een wijziging van de git-SSH-listener live toe. Nil: bij de volgende start.
62 ApplySSH ApplySSHFunc
63 http httpServe
55 64 // AfterStorage krijgt het nieuwe datadisk-pad, voor runner en SSH.
56 65 AfterStorage func(path string)
57 66 // UpdateStarter start bluegit-update.service. Nil gebruikt systemctl.
@@ -732,6 +741,9 @@ type View struct {
732 741 HelpDoc *HelpDoc
733 742 RunnerUI template.HTML
734 743 AdminUsers []AdminUserRow
744 Instance *InstanceView
745 NewAdminToken string
746 AdminTokenUser string
735 747 StaleDays int // Beheer > Pipelines: instance-instelling; repo-instellingen: eigen waarde (-1 = volgen)
736 748 StaleDaysDefault int
737 749 ReleaseOnly bool
@@ -52,6 +52,15 @@ type Server struct {
52 hookSink func([]byte)
52 hookSink func([]byte)
53 // StateDir is de map met database en het bestand storage_path.
53 // StateDir is de map met database en het bestand storage_path.
54 StateDir string
54 StateDir string
55 // ConfigPath is het pad van de eventuele config.yml (alleen ter info).
56 ConfigPath string
57 // SettingsPath is state_path/settings.yml.
58 SettingsPath string
59 // ListenNotice vertelt de beheerder waar de server na een live rebind luistert.
60 ListenNotice string
61 // ApplySSH past een wijziging van de git-SSH-listener live toe. Nil: bij de volgende start.
62 ApplySSH ApplySSHFunc
63 http httpServe
55 // AfterStorage krijgt het nieuwe datadisk-pad, voor runner en SSH.
64 // AfterStorage krijgt het nieuwe datadisk-pad, voor runner en SSH.
56 AfterStorage func(path string)
65 AfterStorage func(path string)
57 // UpdateStarter start bluegit-update.service. Nil gebruikt systemctl.
66 // UpdateStarter start bluegit-update.service. Nil gebruikt systemctl.
@@ -732,6 +741,9 @@ type View struct {
732 HelpDoc *HelpDoc
741 HelpDoc *HelpDoc
733 RunnerUI template.HTML
742 RunnerUI template.HTML
734 AdminUsers []AdminUserRow
743 AdminUsers []AdminUserRow
744 Instance *InstanceView
745 NewAdminToken string
746 AdminTokenUser string
735 StaleDays int // Beheer > Pipelines: instance-instelling; repo-instellingen: eigen waarde (-1 = volgen)
747 StaleDays int // Beheer > Pipelines: instance-instelling; repo-instellingen: eigen waarde (-1 = volgen)
736 StaleDaysDefault int
748 StaleDaysDefault int
737 ReleaseOnly bool
749 ReleaseOnly bool
internal/server/setup.go +1 −1
@@ -94,7 +94,7 @@ func (s *Server) noStorageText(r *http.Request) string {
94 94
95 95 func allowsWithoutStorage(r *http.Request) bool {
96 96 switch r.URL.Path {
97 case "/healthz", "/login", "/auth/callback", "/logout", "/setup", "/-/info", "/api/v1/ci/spec", "/api/v1/ci/presets", "/api/v1/openapi.json", "/api/v1/webhooks/openapi.json", "/api/v1/admin/storage", "/api/v1/admin/self-update":
97 case "/healthz", "/login", "/auth/callback", "/logout", "/setup", "/admin/settings", "/-/info", "/api/v1/ci/spec", "/api/v1/ci/presets", "/api/v1/openapi.json", "/api/v1/webhooks/openapi.json", "/api/v1/admin/storage", "/api/v1/admin/settings", "/api/v1/admin/self-update":
98 98 return true
99 99 }
100 100 return strings.HasPrefix(r.URL.Path, "/assets/")
@@ -94,7 +94,7 @@ func (s *Server) noStorageText(r *http.Request) string {
94
94
95func allowsWithoutStorage(r *http.Request) bool {
95func allowsWithoutStorage(r *http.Request) bool {
96 switch r.URL.Path {
96 switch r.URL.Path {
97 case "/healthz", "/login", "/auth/callback", "/logout", "/setup", "/-/info", "/api/v1/ci/spec", "/api/v1/ci/presets", "/api/v1/openapi.json", "/api/v1/webhooks/openapi.json", "/api/v1/admin/storage", "/api/v1/admin/self-update":
97 case "/healthz", "/login", "/auth/callback", "/logout", "/setup", "/admin/settings", "/-/info", "/api/v1/ci/spec", "/api/v1/ci/presets", "/api/v1/openapi.json", "/api/v1/webhooks/openapi.json", "/api/v1/admin/storage", "/api/v1/admin/settings", "/api/v1/admin/self-update":
98 return true
98 return true
99 }
99 }
100 return strings.HasPrefix(r.URL.Path, "/assets/")
100 return strings.HasPrefix(r.URL.Path, "/assets/")
internal/server/templates/help.html +86 −0
@@ -77,6 +77,11 @@
77 77 {{template "layout-start" .}}
78 78 <h1>{{t "admin.users.title"}}</h1>
79 79 <p class="muted">{{t "admin.users.lead"}} {{tip "admin.tip.admin"}}</p>
80 {{if .NewAdminToken}}
81 <p class="muted">{{t "admin.token.showOnce" .AdminTokenUser}}</p>
82 <p class="code">{{.NewAdminToken}}</p>
83 <p class="muted">{{t "admin.token.once"}}</p>
84 {{end}}
80 85 <section class="panel">
81 86 <div class="hscroll">
82 87 <table class="rui-table adminusers">
@@ -91,6 +96,12 @@
91 96 {{if .Self}}<button type="button" class="ghost" disabled aria-describedby="why-self">{{t "admin.revoke"}}</button><div class="why" id="why-self">{{t "admin.selfWhy"}}</div>
92 97 {{else}}<form method="post" action="/admin/users/role" data-confirm="{{t "admin.revokeAsk" .User.Username}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.User.ID}}"><input type="hidden" name="admin" value="0"><button type="submit" class="danger">{{t "admin.revoke"}}</button></form>{{end}}
93 98 {{else}}<form method="post" action="/admin/users/role" data-confirm="{{t "admin.grantAsk" .User.Username}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.User.ID}}"><input type="hidden" name="admin" value="1"><button type="submit">{{t "admin.grant"}}</button></form>{{end}}
99 <form method="post" action="/admin/users/token" class="formline">
100 <input type="hidden" name="csrf" value="{{$.CSRF}}">
101 <input type="hidden" name="id" value="{{.User.ID}}">
102 <input name="name" placeholder="{{t "admin.token.name"}}" aria-label="{{t "admin.token.name"}}" required>
103 <button type="submit">{{t "admin.token.create"}}</button>
104 </form>
94 105 </td>
95 106 </tr>{{end}}
96 107 </tbody>
@@ -99,3 +110,78 @@
99 110 </section>
100 111 {{template "layout-end" .}}
101 112 {{end}}
113
114 {{define "adminsettings"}}
115 {{template "layout-start" .}}
116 <h1>{{t "title.adminSettings"}}</h1>
117 <p class="muted">{{t "admin.settings.lead"}}</p>
118 {{with .Instance}}
119 {{if .ListenNotice}}<p class="flash">{{t "admin.settings.listening" .ListenNotice}}</p>{{end}}
120 <form method="post" action="/admin/settings">
121 <input type="hidden" name="csrf" value="{{$.CSRF}}">
122 <section class="panel">
123 <h2>{{t "admin.settings.machine"}}</h2>
124 <label>{{t "admin.settings.baseURL"}} <input name="base_url" value="{{.BaseURL}}" required></label>
125 <label>{{t "admin.settings.listen"}} <input name="listen" value="{{.Listen}}" required></label>
126 {{if .Listening}}<p class="muted">{{t "admin.settings.listening" .Listening}}</p>{{end}}
127 <label>{{t "admin.settings.statePath"}} <input value="{{.StatePath}}" readonly></label>
128 <p class="muted">{{t "admin.settings.stateWhy"}}</p>
129 {{if .ConfigPath}}<label>{{t "admin.settings.configPath"}} <input value="{{.ConfigPath}}" readonly></label>
130 <p class="muted">{{t "admin.settings.configWhy"}}</p>{{end}}
131 {{if .SettingsPath}}<label>{{t "admin.settings.settingsPath"}} <input value="{{.SettingsPath}}" readonly></label>{{end}}
132 {{if .StoragePath}}<p>{{t "admin.settings.storagePath"}}: <a href="/setup"><code>{{.StoragePath}}</code></a></p>{{end}}
133 <label>{{t "admin.settings.trustedProxies"}} <textarea name="trusted_proxies" rows="3">{{range .TrustedProxies}}{{.}}&#10;{{end}}</textarea></label>
134 <p class="muted">{{t "admin.settings.trustedWhy"}}</p>
135 </section>
136 <section class="panel">
137 <h2>{{t "admin.settings.auth"}}</h2>
138 <label>{{t "admin.settings.authMode"}}
139 <select name="auth.mode">
140 <option value="oauth" {{if eq .Auth.Mode "oauth"}}selected{{end}}>oauth</option>
141 <option value="entra" {{if eq .Auth.Mode "entra"}}selected{{end}}>entra</option>
142 <option value="dev" {{if eq .Auth.Mode "dev"}}selected{{end}}>dev</option>
143 </select>
144 </label>
145 <p class="muted">{{t "admin.settings.authModeWhy"}}</p>
146 <label>{{t "admin.settings.authBase"}} <input name="auth.base_url" value="{{.Auth.BaseURL}}"></label>
147 <label>{{t "admin.settings.clientID"}} <input name="auth.client_id" value="{{.Auth.ClientID}}"></label>
148 <label>{{t "admin.settings.clientSecret"}} <input name="auth.client_secret" type="password" autocomplete="new-password" placeholder="{{if .Auth.ClientSecretSet}}{{t "admin.settings.secretSet"}}{{else}}{{t "admin.settings.secretKeep"}}{{end}}"></label>
149 <label>{{t "admin.settings.secretFile"}} <input name="auth.client_secret_file" value="{{.Auth.ClientSecretFile}}"></label>
150 <label>{{t "admin.settings.redirect"}} <input name="auth.redirect_path" value="{{.Auth.RedirectPath}}"></label>
151 <label>{{t "admin.settings.userAgent"}} <input name="auth.user_agent" value="{{.Auth.UserAgent}}"></label>
152 <label>{{t "admin.settings.tenant"}} <input name="auth.tenant_id" value="{{.Auth.TenantID}}"></label>
153 <label>{{t "admin.settings.issuer"}} <input name="auth.issuer" value="{{.Auth.Issuer}}"></label>
154 {{if eq .Auth.Mode "dev"}}<label>{{t "admin.settings.devUser"}} <input name="auth.dev_user" value="{{.Auth.DevUser}}"></label>{{end}}
155 </section>
156 <section class="panel">
157 <h2>{{t "admin.settings.git"}}</h2>
158 <label>{{t "admin.settings.gitBinary"}} <input name="git.binary" value="{{.Git.Binary}}"></label>
159 <label>{{t "admin.settings.defaultBranch"}} <input name="git.default_branch" value="{{.Git.DefaultBranch}}"></label>
160 <label>{{t "admin.settings.hookBinary"}} <input name="git.hook_binary" value="{{.Git.HookBinary}}"></label>
161 <label>{{t "admin.settings.maintenance"}} <input name="git.maintenance_interval" value="{{.Git.MaintenanceInterval}}" placeholder="24h"></label>
162 </section>
163 <section class="panel">
164 <h2>{{t "admin.settings.ssh"}}</h2>
165 <input type="hidden" name="ssh.enabled" value="0">
166 <label><input type="checkbox" name="ssh.enabled" value="1" {{if .SSH.Enabled}}checked{{end}}> {{t "admin.settings.sshEnabled"}}</label>
167 <label>{{t "admin.settings.sshListen"}} <input name="ssh.listen" value="{{.SSH.Listen}}"></label>
168 <label>{{t "admin.settings.publicHost"}} <input name="ssh.public_host" value="{{.SSH.PublicHost}}"></label>
169 <label>{{t "admin.settings.publicPort"}} <input name="ssh.public_port" type="number" min="0" max="65535" value="{{.SSH.PublicPort}}"></label>
170 </section>
171 <section class="panel">
172 <h2>{{t "admin.settings.ci"}}</h2>
173 <input type="hidden" name="ci.enabled" value="0">
174 <label><input type="checkbox" name="ci.enabled" value="1" {{if .CI.Enabled}}checked{{end}}> {{t "admin.settings.ciEnabled"}}</label>
175 <label>{{t "admin.settings.runnerName"}} <input name="runner.name" value="{{.Runner.Name}}"></label>
176 <label>{{t "admin.settings.docker"}} <input name="ci.docker_binary" value="{{.CI.Docker}}"></label>
177 <label>{{t "admin.settings.concurrency"}} <input name="ci.concurrency" type="number" min="1" value="{{.CI.Concurrency}}"></label>
178 <label>{{t "admin.settings.network"}} <input name="ci.network" value="{{.CI.Network}}"></label>
179 <label>{{t "admin.settings.timeout"}} <input name="ci.timeout_seconds" type="number" min="0" value="{{.CI.TimeoutSec}}"></label>
180 <label>{{t "admin.settings.updateWait"}} <input name="ci.update_max_wait_minutes" type="number" min="0" value="{{.CI.UpdateMaxWaitMin}}"></label>
181 <p class="muted">{{t "admin.settings.ciPresets"}}</p>
182 </section>
183 <button type="submit">{{t "action.save"}}</button>
184 </form>
185 {{end}}
186 {{template "layout-end" .}}
187 {{end}}
@@ -77,6 +77,11 @@
77{{template "layout-start" .}}
77{{template "layout-start" .}}
78<h1>{{t "admin.users.title"}}</h1>
78<h1>{{t "admin.users.title"}}</h1>
79<p class="muted">{{t "admin.users.lead"}} {{tip "admin.tip.admin"}}</p>
79<p class="muted">{{t "admin.users.lead"}} {{tip "admin.tip.admin"}}</p>
80{{if .NewAdminToken}}
81<p class="muted">{{t "admin.token.showOnce" .AdminTokenUser}}</p>
82<p class="code">{{.NewAdminToken}}</p>
83<p class="muted">{{t "admin.token.once"}}</p>
84{{end}}
80<section class="panel">
85<section class="panel">
81<div class="hscroll">
86<div class="hscroll">
82<table class="rui-table adminusers">
87<table class="rui-table adminusers">
@@ -91,6 +96,12 @@
91 {{if .Self}}<button type="button" class="ghost" disabled aria-describedby="why-self">{{t "admin.revoke"}}</button><div class="why" id="why-self">{{t "admin.selfWhy"}}</div>
96 {{if .Self}}<button type="button" class="ghost" disabled aria-describedby="why-self">{{t "admin.revoke"}}</button><div class="why" id="why-self">{{t "admin.selfWhy"}}</div>
92 {{else}}<form method="post" action="/admin/users/role" data-confirm="{{t "admin.revokeAsk" .User.Username}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.User.ID}}"><input type="hidden" name="admin" value="0"><button type="submit" class="danger">{{t "admin.revoke"}}</button></form>{{end}}
97 {{else}}<form method="post" action="/admin/users/role" data-confirm="{{t "admin.revokeAsk" .User.Username}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.User.ID}}"><input type="hidden" name="admin" value="0"><button type="submit" class="danger">{{t "admin.revoke"}}</button></form>{{end}}
93 {{else}}<form method="post" action="/admin/users/role" data-confirm="{{t "admin.grantAsk" .User.Username}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.User.ID}}"><input type="hidden" name="admin" value="1"><button type="submit">{{t "admin.grant"}}</button></form>{{end}}
98 {{else}}<form method="post" action="/admin/users/role" data-confirm="{{t "admin.grantAsk" .User.Username}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.User.ID}}"><input type="hidden" name="admin" value="1"><button type="submit">{{t "admin.grant"}}</button></form>{{end}}
99 <form method="post" action="/admin/users/token" class="formline">
100 <input type="hidden" name="csrf" value="{{$.CSRF}}">
101 <input type="hidden" name="id" value="{{.User.ID}}">
102 <input name="name" placeholder="{{t "admin.token.name"}}" aria-label="{{t "admin.token.name"}}" required>
103 <button type="submit">{{t "admin.token.create"}}</button>
104 </form>
94 </td>
105 </td>
95 </tr>{{end}}
106 </tr>{{end}}
96 </tbody>
107 </tbody>
@@ -99,3 +110,78 @@
99</section>
110</section>
100{{template "layout-end" .}}
111{{template "layout-end" .}}
101{{end}}
112{{end}}
113
114{{define "adminsettings"}}
115{{template "layout-start" .}}
116<h1>{{t "title.adminSettings"}}</h1>
117<p class="muted">{{t "admin.settings.lead"}}</p>
118{{with .Instance}}
119{{if .ListenNotice}}<p class="flash">{{t "admin.settings.listening" .ListenNotice}}</p>{{end}}
120<form method="post" action="/admin/settings">
121 <input type="hidden" name="csrf" value="{{$.CSRF}}">
122 <section class="panel">
123 <h2>{{t "admin.settings.machine"}}</h2>
124 <label>{{t "admin.settings.baseURL"}} <input name="base_url" value="{{.BaseURL}}" required></label>
125 <label>{{t "admin.settings.listen"}} <input name="listen" value="{{.Listen}}" required></label>
126 {{if .Listening}}<p class="muted">{{t "admin.settings.listening" .Listening}}</p>{{end}}
127 <label>{{t "admin.settings.statePath"}} <input value="{{.StatePath}}" readonly></label>
128 <p class="muted">{{t "admin.settings.stateWhy"}}</p>
129 {{if .ConfigPath}}<label>{{t "admin.settings.configPath"}} <input value="{{.ConfigPath}}" readonly></label>
130 <p class="muted">{{t "admin.settings.configWhy"}}</p>{{end}}
131 {{if .SettingsPath}}<label>{{t "admin.settings.settingsPath"}} <input value="{{.SettingsPath}}" readonly></label>{{end}}
132 {{if .StoragePath}}<p>{{t "admin.settings.storagePath"}}: <a href="/setup"><code>{{.StoragePath}}</code></a></p>{{end}}
133 <label>{{t "admin.settings.trustedProxies"}} <textarea name="trusted_proxies" rows="3">{{range .TrustedProxies}}{{.}}&#10;{{end}}</textarea></label>
134 <p class="muted">{{t "admin.settings.trustedWhy"}}</p>
135 </section>
136 <section class="panel">
137 <h2>{{t "admin.settings.auth"}}</h2>
138 <label>{{t "admin.settings.authMode"}}
139 <select name="auth.mode">
140 <option value="oauth" {{if eq .Auth.Mode "oauth"}}selected{{end}}>oauth</option>
141 <option value="entra" {{if eq .Auth.Mode "entra"}}selected{{end}}>entra</option>
142 <option value="dev" {{if eq .Auth.Mode "dev"}}selected{{end}}>dev</option>
143 </select>
144 </label>
145 <p class="muted">{{t "admin.settings.authModeWhy"}}</p>
146 <label>{{t "admin.settings.authBase"}} <input name="auth.base_url" value="{{.Auth.BaseURL}}"></label>
147 <label>{{t "admin.settings.clientID"}} <input name="auth.client_id" value="{{.Auth.ClientID}}"></label>
148 <label>{{t "admin.settings.clientSecret"}} <input name="auth.client_secret" type="password" autocomplete="new-password" placeholder="{{if .Auth.ClientSecretSet}}{{t "admin.settings.secretSet"}}{{else}}{{t "admin.settings.secretKeep"}}{{end}}"></label>
149 <label>{{t "admin.settings.secretFile"}} <input name="auth.client_secret_file" value="{{.Auth.ClientSecretFile}}"></label>
150 <label>{{t "admin.settings.redirect"}} <input name="auth.redirect_path" value="{{.Auth.RedirectPath}}"></label>
151 <label>{{t "admin.settings.userAgent"}} <input name="auth.user_agent" value="{{.Auth.UserAgent}}"></label>
152 <label>{{t "admin.settings.tenant"}} <input name="auth.tenant_id" value="{{.Auth.TenantID}}"></label>
153 <label>{{t "admin.settings.issuer"}} <input name="auth.issuer" value="{{.Auth.Issuer}}"></label>
154 {{if eq .Auth.Mode "dev"}}<label>{{t "admin.settings.devUser"}} <input name="auth.dev_user" value="{{.Auth.DevUser}}"></label>{{end}}
155 </section>
156 <section class="panel">
157 <h2>{{t "admin.settings.git"}}</h2>
158 <label>{{t "admin.settings.gitBinary"}} <input name="git.binary" value="{{.Git.Binary}}"></label>
159 <label>{{t "admin.settings.defaultBranch"}} <input name="git.default_branch" value="{{.Git.DefaultBranch}}"></label>
160 <label>{{t "admin.settings.hookBinary"}} <input name="git.hook_binary" value="{{.Git.HookBinary}}"></label>
161 <label>{{t "admin.settings.maintenance"}} <input name="git.maintenance_interval" value="{{.Git.MaintenanceInterval}}" placeholder="24h"></label>
162 </section>
163 <section class="panel">
164 <h2>{{t "admin.settings.ssh"}}</h2>
165 <input type="hidden" name="ssh.enabled" value="0">
166 <label><input type="checkbox" name="ssh.enabled" value="1" {{if .SSH.Enabled}}checked{{end}}> {{t "admin.settings.sshEnabled"}}</label>
167 <label>{{t "admin.settings.sshListen"}} <input name="ssh.listen" value="{{.SSH.Listen}}"></label>
168 <label>{{t "admin.settings.publicHost"}} <input name="ssh.public_host" value="{{.SSH.PublicHost}}"></label>
169 <label>{{t "admin.settings.publicPort"}} <input name="ssh.public_port" type="number" min="0" max="65535" value="{{.SSH.PublicPort}}"></label>
170 </section>
171 <section class="panel">
172 <h2>{{t "admin.settings.ci"}}</h2>
173 <input type="hidden" name="ci.enabled" value="0">
174 <label><input type="checkbox" name="ci.enabled" value="1" {{if .CI.Enabled}}checked{{end}}> {{t "admin.settings.ciEnabled"}}</label>
175 <label>{{t "admin.settings.runnerName"}} <input name="runner.name" value="{{.Runner.Name}}"></label>
176 <label>{{t "admin.settings.docker"}} <input name="ci.docker_binary" value="{{.CI.Docker}}"></label>
177 <label>{{t "admin.settings.concurrency"}} <input name="ci.concurrency" type="number" min="1" value="{{.CI.Concurrency}}"></label>
178 <label>{{t "admin.settings.network"}} <input name="ci.network" value="{{.CI.Network}}"></label>
179 <label>{{t "admin.settings.timeout"}} <input name="ci.timeout_seconds" type="number" min="0" value="{{.CI.TimeoutSec}}"></label>
180 <label>{{t "admin.settings.updateWait"}} <input name="ci.update_max_wait_minutes" type="number" min="0" value="{{.CI.UpdateMaxWaitMin}}"></label>
181 <p class="muted">{{t "admin.settings.ciPresets"}}</p>
182 </section>
183 <button type="submit">{{t "action.save"}}</button>
184</form>
185{{end}}
186{{template "layout-end" .}}
187{{end}}
internal/sshd/server.go +76 −4
@@ -46,6 +46,11 @@ type Server struct {
46 46 // kex vervangt de standaardlijst. Tests zetten hier een korte lijst.
47 47 kex []string
48 48 mu sync.RWMutex
49
50 lnMu sync.Mutex
51 ln net.Listener
52 lnGen uint64
53 stopping bool
49 54 }
50 55
51 56 // SetStorage wijzigt de map met repositories. De hostkey blijft apart.
@@ -61,7 +66,7 @@ func (s *Server) storage() string {
61 66 return s.Storage
62 67 }
63 68
64 // Run luistert tot ctx afloopt.
69 // Run luistert tot ctx afloopt. Relisten zet de listener om zonder terug te keren.
65 70 func (s *Server) Run(ctx context.Context) error {
66 71 signer, err := loadOrCreateHostKey(s.HostKey)
67 72 if err != nil {
@@ -76,23 +81,90 @@ func (s *Server) Run(ctx context.Context) error {
76 81 if err != nil {
77 82 return err
78 83 }
84 s.setSSHListener(ln)
79 85 go func() {
80 86 <-ctx.Done()
81 _ = ln.Close()
87 s.stopSSH()
82 88 }()
83 89 for {
90 s.lnMu.Lock()
91 ln, gen, stopping := s.ln, s.lnGen, s.stopping
92 s.lnMu.Unlock()
93 if stopping || ln == nil {
94 return nil
95 }
84 96 conn, err := ln.Accept()
85 97 if err != nil {
86 if ctx.Err() != nil {
98 s.lnMu.Lock()
99 rebound, stopping := s.lnGen != gen, s.stopping
100 s.lnMu.Unlock()
101 if rebound {
102 continue
103 }
104 if ctx.Err() != nil || stopping {
87 105 return nil
88 106 }
89 s.Log.Error("ssh accept", "err", err)
107 if s.Log != nil {
108 s.Log.Error("ssh accept", "err", err)
109 }
90 110 continue
91 111 }
92 112 go s.handle(conn, cfg)
93 113 }
94 114 }
95 115
116 func (s *Server) setSSHListener(ln net.Listener) {
117 s.lnMu.Lock()
118 defer s.lnMu.Unlock()
119 s.ln = ln
120 s.Listen = ln.Addr().String()
121 }
122
123 func (s *Server) stopSSH() {
124 s.lnMu.Lock()
125 s.stopping = true
126 ln := s.ln
127 s.lnMu.Unlock()
128 if ln != nil {
129 _ = ln.Close()
130 }
131 }
132
133 // BoundAddr is het adres waarop SSH nu luistert (leeg als Run niet draait).
134 func (s *Server) BoundAddr() string {
135 s.lnMu.Lock()
136 defer s.lnMu.Unlock()
137 if s.ln == nil {
138 return ""
139 }
140 return s.ln.Addr().String()
141 }
142
143 // Relisten bindt eerst op addr; lukt dat niet, dan blijft de oude listener.
144 func (s *Server) Relisten(addr string) error {
145 ln, err := net.Listen("tcp", addr)
146 if err != nil {
147 cur := s.BoundAddr()
148 if cur == "" {
149 cur = s.Listen
150 }
151 return fmt.Errorf("kan niet luisteren op %s: %w; blijft luisteren op %s", addr, err, cur)
152 }
153 s.lnMu.Lock()
154 old := s.ln
155 s.ln = ln
156 s.Listen = ln.Addr().String()
157 s.lnGen++
158 s.lnMu.Unlock()
159 if old != nil {
160 _ = old.Close()
161 }
162 if s.Log != nil {
163 s.Log.Info("ssh luistert nu elders", "addr", ln.Addr().String())
164 }
165 return nil
166 }
167
96 168 func (s *Server) kexList() []string {
97 169 if len(s.kex) > 0 {
98 170 return s.kex
@@ -46,6 +46,11 @@ type Server struct {
46 // kex vervangt de standaardlijst. Tests zetten hier een korte lijst.
46 // kex vervangt de standaardlijst. Tests zetten hier een korte lijst.
47 kex []string
47 kex []string
48 mu sync.RWMutex
48 mu sync.RWMutex
49
50 lnMu sync.Mutex
51 ln net.Listener
52 lnGen uint64
53 stopping bool
49}
54}
50
55
51// SetStorage wijzigt de map met repositories. De hostkey blijft apart.
56// SetStorage wijzigt de map met repositories. De hostkey blijft apart.
@@ -61,7 +66,7 @@ func (s *Server) storage() string {
61 return s.Storage
66 return s.Storage
62}
67}
63
68
64// Run luistert tot ctx afloopt.
69// Run luistert tot ctx afloopt. Relisten zet de listener om zonder terug te keren.
65func (s *Server) Run(ctx context.Context) error {
70func (s *Server) Run(ctx context.Context) error {
66 signer, err := loadOrCreateHostKey(s.HostKey)
71 signer, err := loadOrCreateHostKey(s.HostKey)
67 if err != nil {
72 if err != nil {
@@ -76,23 +81,90 @@ func (s *Server) Run(ctx context.Context) error {
76 if err != nil {
81 if err != nil {
77 return err
82 return err
78 }
83 }
84 s.setSSHListener(ln)
79 go func() {
85 go func() {
80 <-ctx.Done()
86 <-ctx.Done()
81 _ = ln.Close()
87 s.stopSSH()
82 }()
88 }()
83 for {
89 for {
90 s.lnMu.Lock()
91 ln, gen, stopping := s.ln, s.lnGen, s.stopping
92 s.lnMu.Unlock()
93 if stopping || ln == nil {
94 return nil
95 }
84 conn, err := ln.Accept()
96 conn, err := ln.Accept()
85 if err != nil {
97 if err != nil {
86 if ctx.Err() != nil {
98 s.lnMu.Lock()
99 rebound, stopping := s.lnGen != gen, s.stopping
100 s.lnMu.Unlock()
101 if rebound {
102 continue
103 }
104 if ctx.Err() != nil || stopping {
87 return nil
105 return nil
88 }
106 }
89 s.Log.Error("ssh accept", "err", err)
107 if s.Log != nil {
108 s.Log.Error("ssh accept", "err", err)
109 }
90 continue
110 continue
91 }
111 }
92 go s.handle(conn, cfg)
112 go s.handle(conn, cfg)
93 }
113 }
94}
114}
95
115
116func (s *Server) setSSHListener(ln net.Listener) {
117 s.lnMu.Lock()
118 defer s.lnMu.Unlock()
119 s.ln = ln
120 s.Listen = ln.Addr().String()
121}
122
123func (s *Server) stopSSH() {
124 s.lnMu.Lock()
125 s.stopping = true
126 ln := s.ln
127 s.lnMu.Unlock()
128 if ln != nil {
129 _ = ln.Close()
130 }
131}
132
133// BoundAddr is het adres waarop SSH nu luistert (leeg als Run niet draait).
134func (s *Server) BoundAddr() string {
135 s.lnMu.Lock()
136 defer s.lnMu.Unlock()
137 if s.ln == nil {
138 return ""
139 }
140 return s.ln.Addr().String()
141}
142
143// Relisten bindt eerst op addr; lukt dat niet, dan blijft de oude listener.
144func (s *Server) Relisten(addr string) error {
145 ln, err := net.Listen("tcp", addr)
146 if err != nil {
147 cur := s.BoundAddr()
148 if cur == "" {
149 cur = s.Listen
150 }
151 return fmt.Errorf("kan niet luisteren op %s: %w; blijft luisteren op %s", addr, err, cur)
152 }
153 s.lnMu.Lock()
154 old := s.ln
155 s.ln = ln
156 s.Listen = ln.Addr().String()
157 s.lnGen++
158 s.lnMu.Unlock()
159 if old != nil {
160 _ = old.Close()
161 }
162 if s.Log != nil {
163 s.Log.Info("ssh luistert nu elders", "addr", ln.Addr().String())
164 }
165 return nil
166}
167
96func (s *Server) kexList() []string {
168func (s *Server) kexList() []string {
97 if len(s.kex) > 0 {
169 if len(s.kex) > 0 {
98 return s.kex
170 return s.kex
packaging/aur-runner/bluegit-runner.install +8 −10
@@ -1,6 +1,6 @@
1 1 # bluegit-runner: systemd-unit met User=bluegit-runner (groep docker).
2 # Na installatie draait de service zodra er een config is
3 # (bluegit-runner register). Een upgrade herstart de service.
2 # Na installatie start de service; koppelen gaat in de webinterface.
3 # Een upgrade herstart de service.
4 4 # Zonder draaiende systemd (chroot of container) faalt de transactie niet.
5 5
6 6 _bgr_systemctl() {
@@ -16,15 +16,13 @@ post_install() {
16 16 systemd-tmpfiles --create bluegit-runner.conf || true
17 17 _bgr_systemctl daemon-reload
18 18 _bgr_systemctl enable --now bluegit-runner.service
19 if [[ ! -f /etc/bluegit-runner/config.yml ]]; then
20 cat <<'MSG'
21 bluegit-runner: register this machine to start the service:
22 1. In BlueGit: Settings → Runners → "New registration token"
23 (or a group's Settings → Runners).
24 2. sudo bluegit-runner register --url https://your-bluegit --token bgrr_...
25 The service is enabled and starts as soon as the config exists.
19 cat <<'MSG'
20 bluegit-runner: open de webinterface op http://127.0.0.1:8765
21 1. sudo -u bluegit-runner bluegit-runner ui-token --work-dir /var/lib/bluegit-runner
22 2. Meld je aan en vul onder Koppeling de BlueGit-URL en het registratietoken in
23 (Instellingen → Runners, of bij een groep).
24 De CLI "bluegit-runner register" blijft een alternatief.
26 25 MSG
27 fi
28 26 }
29 27
30 28 post_upgrade() {
@@ -1,6 +1,6 @@
1# bluegit-runner: systemd-unit met User=bluegit-runner (groep docker).
1# bluegit-runner: systemd-unit met User=bluegit-runner (groep docker).
2# Na installatie draait de service zodra er een config is
2# Na installatie start de service; koppelen gaat in de webinterface.
3# (bluegit-runner register). Een upgrade herstart de service.
3# Een upgrade herstart de service.
4# Zonder draaiende systemd (chroot of container) faalt de transactie niet.
4# Zonder draaiende systemd (chroot of container) faalt de transactie niet.
5
5
6_bgr_systemctl() {
6_bgr_systemctl() {
@@ -16,15 +16,13 @@ post_install() {
16 systemd-tmpfiles --create bluegit-runner.conf || true
16 systemd-tmpfiles --create bluegit-runner.conf || true
17 _bgr_systemctl daemon-reload
17 _bgr_systemctl daemon-reload
18 _bgr_systemctl enable --now bluegit-runner.service
18 _bgr_systemctl enable --now bluegit-runner.service
19 if [[ ! -f /etc/bluegit-runner/config.yml ]]; then
19 cat <<'MSG'
20 cat <<'MSG'
20bluegit-runner: open de webinterface op http://127.0.0.1:8765
21bluegit-runner: register this machine to start the service:
21 1. sudo -u bluegit-runner bluegit-runner ui-token --work-dir /var/lib/bluegit-runner
22 1. In BlueGit: Settings → Runners → "New registration token"
22 2. Meld je aan en vul onder Koppeling de BlueGit-URL en het registratietoken in
23 (or a group's Settings → Runners).
23 (Instellingen → Runners, of bij een groep).
24 2. sudo bluegit-runner register --url https://your-bluegit --token bgrr_...
24De CLI "bluegit-runner register" blijft een alternatief.
25The service is enabled and starts as soon as the config exists.
26MSG
25MSG
27 fi
28}
26}
29
27
30post_upgrade() {
28post_upgrade() {
packaging/aur/bluegit.install +3 −0
@@ -75,6 +75,9 @@ Vervolg:
75 75 2. Schrijf het clientgeheim naar /etc/bluegit/client_secret (mode 0600),
76 76 of zet BLUEGIT_AUTH_CLIENT_SECRET in /etc/bluegit/secret.env.
77 77 Een lege client_secret: "" in de config telt niet.
78 Na de eerste start beheer je listen, base_url, auth en de rest onder
79 Beheer → Instellingen. config.yml blijft ongewijzigd als terugval.
80 Toegangstokens maak je in Instellingen of onder Beheer → Gebruikers.
78 81 3. Kopieer /usr/share/bluegit/storage.conf.example naar
79 82 /etc/systemd/system/bluegit.service.d/storage.conf en zet ReadWritePaths.
80 83 4. systemctl daemon-reload && systemctl enable --now bluegit.service
@@ -75,6 +75,9 @@ Vervolg:
752. Schrijf het clientgeheim naar /etc/bluegit/client_secret (mode 0600),
752. Schrijf het clientgeheim naar /etc/bluegit/client_secret (mode 0600),
76 of zet BLUEGIT_AUTH_CLIENT_SECRET in /etc/bluegit/secret.env.
76 of zet BLUEGIT_AUTH_CLIENT_SECRET in /etc/bluegit/secret.env.
77 Een lege client_secret: "" in de config telt niet.
77 Een lege client_secret: "" in de config telt niet.
78 Na de eerste start beheer je listen, base_url, auth en de rest onder
79 Beheer → Instellingen. config.yml blijft ongewijzigd als terugval.
80 Toegangstokens maak je in Instellingen of onder Beheer → Gebruikers.
783. Kopieer /usr/share/bluegit/storage.conf.example naar
813. Kopieer /usr/share/bluegit/storage.conf.example naar
79 /etc/systemd/system/bluegit.service.d/storage.conf en zet ReadWritePaths.
82 /etc/systemd/system/bluegit.service.d/storage.conf en zet ReadWritePaths.
804. systemctl daemon-reload && systemctl enable --now bluegit.service
834. systemctl daemon-reload && systemctl enable --now bluegit.service
packaging/nfpm/bluegit-runner.postinstall.sh +10 −1
@@ -3,7 +3,8 @@
3 3 # bluegit-runner (lid van docker), /etc/bluegit-runner en
4 4 # /var/lib/bluegit-runner, zoals sysusers.d en tmpfiles.d. Zonder
5 5 # systemd-sysusers (een kale container) doen groupadd/useradd het.
6 # De service start pas na "bluegit-runner register"; een draaiende herstart.
6 # De service kan starten zonder config.yml; koppelen gaat in de webinterface.
7 # Een draaiende service wordt herstart.
7 8 set -e
8 9 if command -v systemd-sysusers >/dev/null 2>&1; then
9 10 systemd-sysusers /usr/lib/sysusers.d/bluegit-runner.conf || true
@@ -30,4 +31,12 @@ if [ -d /run/systemd/system ] && command -v systemctl >/dev/null 2>&1; then
30 31 systemctl daemon-reload || true
31 32 systemctl try-restart bluegit-runner.service || true
32 33 fi
34
35 cat <<'EOF' || true
36 bluegit-runner: open de webinterface op http://127.0.0.1:8765 (of het adres in ui_listen).
37 Meld je aan met het beheertoken:
38 sudo -u bluegit-runner bluegit-runner ui-token --work-dir /var/lib/bluegit-runner
39 Daarna: Koppeling (BlueGit-URL + registratietoken) en instellingen.
40 De CLI "bluegit-runner register" blijft een alternatief.
41 EOF
33 42 exit 0
@@ -3,7 +3,8 @@
3# bluegit-runner (lid van docker), /etc/bluegit-runner en
3# bluegit-runner (lid van docker), /etc/bluegit-runner en
4# /var/lib/bluegit-runner, zoals sysusers.d en tmpfiles.d. Zonder
4# /var/lib/bluegit-runner, zoals sysusers.d en tmpfiles.d. Zonder
5# systemd-sysusers (een kale container) doen groupadd/useradd het.
5# systemd-sysusers (een kale container) doen groupadd/useradd het.
6# De service start pas na "bluegit-runner register"; een draaiende herstart.
6# De service kan starten zonder config.yml; koppelen gaat in de webinterface.
7# Een draaiende service wordt herstart.
7set -e
8set -e
8if command -v systemd-sysusers >/dev/null 2>&1; then
9if command -v systemd-sysusers >/dev/null 2>&1; then
9 systemd-sysusers /usr/lib/sysusers.d/bluegit-runner.conf || true
10 systemd-sysusers /usr/lib/sysusers.d/bluegit-runner.conf || true
@@ -30,4 +31,12 @@ if [ -d /run/systemd/system ] && command -v systemctl >/dev/null 2>&1; then
30 systemctl daemon-reload || true
31 systemctl daemon-reload || true
31 systemctl try-restart bluegit-runner.service || true
32 systemctl try-restart bluegit-runner.service || true
32fi
33fi
34
35cat <<'EOF' || true
36bluegit-runner: open de webinterface op http://127.0.0.1:8765 (of het adres in ui_listen).
37Meld je aan met het beheertoken:
38 sudo -u bluegit-runner bluegit-runner ui-token --work-dir /var/lib/bluegit-runner
39Daarna: Koppeling (BlueGit-URL + registratietoken) en instellingen.
40De CLI "bluegit-runner register" blijft een alternatief.
41EOF
33exit 0
42exit 0
packaging/runner/bluegit-runner.service +1 −3
@@ -3,8 +3,6 @@ Description=BlueGit runner (separate CI runner)
3 3 Documentation=https://git.timfalken.com/timfa/bluegit/-/blob/docs/runner.md
4 4 After=network-online.target docker.service
5 5 Wants=network-online.target
6 # Pas na "bluegit-runner register" is er een config.
7 ConditionPathExists=/etc/bluegit-runner/config.yml
8 6
9 7 [Service]
10 8 # doNotInterrupt-jobs lopen bij stoppen uit (hun eigen timeout begrenst dat).
@@ -14,7 +12,7 @@ User=bluegit-runner
14 12 Group=bluegit-runner
15 13 # Jobs draaien in Docker-containers via de socket (root:docker).
16 14 SupplementaryGroups=docker
17 ExecStart=/usr/bin/bluegit-runner run --config /etc/bluegit-runner/config.yml
15 ExecStart=/usr/bin/bluegit-runner run --work-dir /var/lib/bluegit-runner --config /etc/bluegit-runner/config.yml
18 16 Restart=always
19 17 RestartSec=10
20 18 NoNewPrivileges=true
@@ -3,8 +3,6 @@ Description=BlueGit runner (separate CI runner)
3Documentation=https://git.timfalken.com/timfa/bluegit/-/blob/docs/runner.md
3Documentation=https://git.timfalken.com/timfa/bluegit/-/blob/docs/runner.md
4After=network-online.target docker.service
4After=network-online.target docker.service
5Wants=network-online.target
5Wants=network-online.target
6# Pas na "bluegit-runner register" is er een config.
7ConditionPathExists=/etc/bluegit-runner/config.yml
8
6
9[Service]
7[Service]
10# doNotInterrupt-jobs lopen bij stoppen uit (hun eigen timeout begrenst dat).
8# doNotInterrupt-jobs lopen bij stoppen uit (hun eigen timeout begrenst dat).
@@ -14,7 +12,7 @@ User=bluegit-runner
14Group=bluegit-runner
12Group=bluegit-runner
15# Jobs draaien in Docker-containers via de socket (root:docker).
13# Jobs draaien in Docker-containers via de socket (root:docker).
16SupplementaryGroups=docker
14SupplementaryGroups=docker
17ExecStart=/usr/bin/bluegit-runner run --config /etc/bluegit-runner/config.yml
15ExecStart=/usr/bin/bluegit-runner run --work-dir /var/lib/bluegit-runner --config /etc/bluegit-runner/config.yml
18Restart=always
16Restart=always
19RestartSec=10
17RestartSec=10
20NoNewPrivileges=true
18NoNewPrivileges=true
packaging/runner/config.yml.example +7 −8
@@ -1,15 +1,14 @@
1 # /etc/bluegit-runner/config.yml — written by "bluegit-runner register".
2 # url and token are filled in by register; the token is the runner's own
3 # token (bgr_...), only its hash is stored on the server.
4 url: https://git.example.com
5 token: ""
6 name: my-machine
7 # Optional:
1 # Optionele, oude config.yml. Nieuwe installaties koppelen in de webinterface
2 # (http://127.0.0.1:8765, token: bluegit-runner ui-token). Een bestaande
3 # config.yml wordt eenmalig overgenomen in work_dir/connection.yml en daarna
4 # alleen nog als terugval gelezen.
5 # url: https://git.example.com
6 # token: ""
7 # name: my-machine
8 8 # docker: docker
9 9 # git: git
10 10 # work_dir: /var/lib/bluegit-runner
11 11 # network: bridge
12 12 # concurrency: 1
13 # Web UI (admin token: sudo bluegit-runner ui-token); "off" disables it.
14 13 # ui_listen: 127.0.0.1:8765
15 14 # language: en
@@ -1,15 +1,14 @@
1# /etc/bluegit-runner/config.yml — written by "bluegit-runner register".
1# Optionele, oude config.yml. Nieuwe installaties koppelen in de webinterface
2# url and token are filled in by register; the token is the runner's own
2# (http://127.0.0.1:8765, token: bluegit-runner ui-token). Een bestaande
3# token (bgr_...), only its hash is stored on the server.
3# config.yml wordt eenmalig overgenomen in work_dir/connection.yml en daarna
4url: https://git.example.com
4# alleen nog als terugval gelezen.
5token: ""
5# url: https://git.example.com
6name: my-machine
6# token: ""
7# Optional:
7# name: my-machine
8# docker: docker
8# docker: docker
9# git: git
9# git: git
10# work_dir: /var/lib/bluegit-runner
10# work_dir: /var/lib/bluegit-runner
11# network: bridge
11# network: bridge
12# concurrency: 1
12# concurrency: 1
13# Web UI (admin token: sudo bluegit-runner ui-token); "off" disables it.
14# ui_listen: 127.0.0.1:8765
13# ui_listen: 127.0.0.1:8765
15# language: en
14# language: en