BlueGit

timfa bluegit

Globale externe runners: door beheerders, voor alle repo's, vóór de ingebouwde runner (API, bg, UI, i18n, docs, tests)

timfa Tim Falken · pushed by timfa

Authored 2026-10-25 · 3 weeks ago

Hash
da1054d632025b4df2de017f15650cd0ff21ba2b
Parent
0dac9a09
Pipeline
Passed
15 files changed +369 −2
docs/agents.md +10 −0
@@ -146,6 +146,16 @@ bg admin grant bob
146 146 bg admin revoke bob
147 147 ```
148 148
149 ## Globale runners (beheerders)
150
151 ```sh
152 bg admin runner token # registratietoken + waarschuwing; daarna bluegit-runner register
153 bg admin runner list
154 bg admin runner pause 7 ; bg admin runner resume 7 ; bg admin runner rename 7 ci-box ; bg admin runner delete 7
155 ```
156
157 API onder `/api/v1/admin/runners` (zelfde vorm als `/api/v1/user/runners`), alleen voor beheerders (`403` anders). Globale runners krijgen jobs uit alle repo's, vóór de ingebouwde runner. Zie /help/runners.
158
149 159 ## Releases en assets verwijderen
150 160
151 161 ```sh
@@ -146,6 +146,16 @@ bg admin grant bob
146bg admin revoke bob
146bg admin revoke bob
147```
147```
148
148
149## Globale runners (beheerders)
150
151```sh
152bg admin runner token # registratietoken + waarschuwing; daarna bluegit-runner register
153bg admin runner list
154bg admin runner pause 7 ; bg admin runner resume 7 ; bg admin runner rename 7 ci-box ; bg admin runner delete 7
155```
156
157API onder `/api/v1/admin/runners` (zelfde vorm als `/api/v1/user/runners`), alleen voor beheerders (`403` anders). Globale runners krijgen jobs uit alle repo's, vóór de ingebouwde runner. Zie /help/runners.
158
149## Releases en assets verwijderen
159## Releases en assets verwijderen
150
160
151```sh
161```sh
docs/runner.en.md +6 −0
@@ -112,6 +112,12 @@ an update; queued jobs start after resuming.
112 112
113 113 A job can reach its own repo without its own login, also when the repo is private. `origin` points to `CI_PROJECT_URL.git`, and the runner sets `http.<project url>.extraHeader` (`Authorization: Bearer $CI_JOB_TOKEN`) through `GIT_CONFIG_*` environment variables, only for this project's URL. No file is written, so it works in any image (including `bluegit/base`) with git ≥ 2.31. `git ls-remote origin`, `git fetch` and `git clone` work, as do `GET` API routes for the own repo with the job token (read-only). Pushing, other repos and any use after the job ends are refused.
114 114
115 ## Global runners
116
117 Instance admins register runners under **Admin → Runner → Global runners** (or `POST /api/v1/admin/runners/registration-token`, `bg admin runner token`). A global runner serves **every repository**, public and private, like the built-in runner, and comes **first** in the order: global runners → group/account runners and the built-in runner in the usual order. Offline or paused global runners are skipped. Manage them in the same tab, via `/api/v1/admin/runners[/{id}]` or `bg admin runner …`; non-admins get `403`.
118
119 **Security**: a global runner receives the code and the secrets of every job it runs, from any repository. Only that job's secrets are sent, and the runner token can only clone the repo of a job it is running. Only register machines you fully trust; the UI, API (`warning`) and `bg` show this warning when registering.
120
115 121 ## Security and isolation
116 122
117 123 - 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.
@@ -112,6 +112,12 @@ an update; queued jobs start after resuming.
112
112
113A job can reach its own repo without its own login, also when the repo is private. `origin` points to `CI_PROJECT_URL.git`, and the runner sets `http.<project url>.extraHeader` (`Authorization: Bearer $CI_JOB_TOKEN`) through `GIT_CONFIG_*` environment variables, only for this project's URL. No file is written, so it works in any image (including `bluegit/base`) with git ≥ 2.31. `git ls-remote origin`, `git fetch` and `git clone` work, as do `GET` API routes for the own repo with the job token (read-only). Pushing, other repos and any use after the job ends are refused.
113A job can reach its own repo without its own login, also when the repo is private. `origin` points to `CI_PROJECT_URL.git`, and the runner sets `http.<project url>.extraHeader` (`Authorization: Bearer $CI_JOB_TOKEN`) through `GIT_CONFIG_*` environment variables, only for this project's URL. No file is written, so it works in any image (including `bluegit/base`) with git ≥ 2.31. `git ls-remote origin`, `git fetch` and `git clone` work, as do `GET` API routes for the own repo with the job token (read-only). Pushing, other repos and any use after the job ends are refused.
114
114
115## Global runners
116
117Instance admins register runners under **Admin → Runner → Global runners** (or `POST /api/v1/admin/runners/registration-token`, `bg admin runner token`). A global runner serves **every repository**, public and private, like the built-in runner, and comes **first** in the order: global runners → group/account runners and the built-in runner in the usual order. Offline or paused global runners are skipped. Manage them in the same tab, via `/api/v1/admin/runners[/{id}]` or `bg admin runner …`; non-admins get `403`.
118
119**Security**: a global runner receives the code and the secrets of every job it runs, from any repository. Only that job's secrets are sent, and the runner token can only clone the repo of a job it is running. Only register machines you fully trust; the UI, API (`warning`) and `bg` show this warning when registering.
120
115## Security and isolation
121## Security and isolation
116
122
117- 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.
123- 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.
docs/runner.md +28 −0
@@ -84,6 +84,11 @@ Wat je in de webinterface instelt, staat in `work_dir/settings.json`
84 84
85 85 ## Welke runner krijgt een job?
86 86
87 **Globale runners** (door beheerders geregistreerd, zie hieronder) staan
88 voor elke repo vooraan: globale runners → de volgorde hieronder (die
89 eindigt of begint met de BlueGit-runner). Is er geen globale runner
90 online, dan wordt die trede meteen overgeslagen.
91
87 92 **Repo van een account** — voorkeur onder Instellingen → Runners:
88 93
89 94 - *Mijn runners alleen als de BlueGit-runner niet meteen beschikbaar is* (standaard): BlueGit-runner → eigen runners.
@@ -109,6 +114,29 @@ Het runner-token mag alleen de repo clonen van een job die die runner op
109 114 dat moment draait. `CI_JOB_TOKEN` geeft alleen leestoegang tot de eigen
110 115 repo (zie hieronder).
111 116
117 ## Globale runners
118
119 Beheerders registreren onder **Beheer → Runner → Globale runners** (of
120 `POST /api/v1/admin/runners/registration-token`, `bg admin runner token`)
121 een runner die voor **alle repo's** beschikbaar is, publiek en privé, net
122 als de ingebouwde runner. Registreren gaat met hetzelfde
123 `bluegit-runner register --url … --token …`. Overzicht, hernoemen,
124 pauzeren en verwijderen: in dezelfde tab, via `/api/v1/admin/runners[/{id}]`
125 of `bg admin runner list|rename|pause|resume|delete|jobs`. Niet-beheerders
126 krijgen `403`.
127
128 **Volgorde**: globale runners → groeps-/account-runners en de
129 BlueGit-runner in de bestaande volgorde. Een globale runner krijgt dus
130 een job vóór de ingebouwde runner; pakt hij hem niet binnen 20 seconden
131 op (of is hij offline/gepauzeerd), dan schuift de job door.
132
133 **Security**: een globale runner krijgt jobs uit élke repo, dus ook de
134 broncode en de geheimen van die jobs. Per job gaan alleen de geheimen van
135 die job mee (repo/groep, met de bescherming voor beschermde refs), en het
136 runner-token mag alleen de repo clonen van een job die hij op dat moment
137 draait. Registreer alleen machines die je volledig vertrouwt; de UI, de
138 API (`warning`) en `bg` tonen die waarschuwing bij het registreren.
139
112 140 ## Wat gebeurt er per job
113 141
114 142 - **1.** Long-poll `POST /api/v1/runner/jobs/request` geeft de job: script, variabelen (incl. geheimen en `CI_JOB_TOKEN`), maskers, clone-URL, sha.
@@ -84,6 +84,11 @@ Wat je in de webinterface instelt, staat in `work_dir/settings.json`
84
84
85## Welke runner krijgt een job?
85## Welke runner krijgt een job?
86
86
87**Globale runners** (door beheerders geregistreerd, zie hieronder) staan
88voor elke repo vooraan: globale runners → de volgorde hieronder (die
89eindigt of begint met de BlueGit-runner). Is er geen globale runner
90online, dan wordt die trede meteen overgeslagen.
91
87**Repo van een account** — voorkeur onder Instellingen → Runners:
92**Repo van een account** — voorkeur onder Instellingen → Runners:
88
93
89- *Mijn runners alleen als de BlueGit-runner niet meteen beschikbaar is* (standaard): BlueGit-runner → eigen runners.
94- *Mijn runners alleen als de BlueGit-runner niet meteen beschikbaar is* (standaard): BlueGit-runner → eigen runners.
@@ -109,6 +114,29 @@ Het runner-token mag alleen de repo clonen van een job die die runner op
109dat moment draait. `CI_JOB_TOKEN` geeft alleen leestoegang tot de eigen
114dat moment draait. `CI_JOB_TOKEN` geeft alleen leestoegang tot de eigen
110repo (zie hieronder).
115repo (zie hieronder).
111
116
117## Globale runners
118
119Beheerders registreren onder **Beheer → Runner → Globale runners** (of
120`POST /api/v1/admin/runners/registration-token`, `bg admin runner token`)
121een runner die voor **alle repo's** beschikbaar is, publiek en privé, net
122als de ingebouwde runner. Registreren gaat met hetzelfde
123`bluegit-runner register --url … --token …`. Overzicht, hernoemen,
124pauzeren en verwijderen: in dezelfde tab, via `/api/v1/admin/runners[/{id}]`
125of `bg admin runner list|rename|pause|resume|delete|jobs`. Niet-beheerders
126krijgen `403`.
127
128**Volgorde**: globale runners → groeps-/account-runners en de
129BlueGit-runner in de bestaande volgorde. Een globale runner krijgt dus
130een job vóór de ingebouwde runner; pakt hij hem niet binnen 20 seconden
131op (of is hij offline/gepauzeerd), dan schuift de job door.
132
133**Security**: een globale runner krijgt jobs uit élke repo, dus ook de
134broncode en de geheimen van die jobs. Per job gaan alleen de geheimen van
135die job mee (repo/groep, met de bescherming voor beschermde refs), en het
136runner-token mag alleen de repo clonen van een job die hij op dat moment
137draait. Registreer alleen machines die je volledig vertrouwt; de UI, de
138API (`warning`) en `bg` tonen die waarschuwing bij het registreren.
139
112## Wat gebeurt er per job
140## Wat gebeurt er per job
113
141
114- **1.** Long-poll `POST /api/v1/runner/jobs/request` geeft de job: script, variabelen (incl. geheimen en `CI_JOB_TOKEN`), maskers, clone-URL, sha.
142- **1.** Long-poll `POST /api/v1/runner/jobs/request` geeft de job: script, variabelen (incl. geheimen en `CI_JOB_TOKEN`), maskers, clone-URL, sha.
internal/i18n/catalog_runner.go +40 −0
@@ -16,6 +16,16 @@ var runnerEN = map[string]string{
16 16 "runner.prefOwn": "My own runners first",
17 17 "runner.builtinFirst": "Try the BlueGit runner first",
18 18 "runner.optinOff": "Your account runners are not used for this group.",
19 "grun.title": "Global runners",
20 "grun.lead": "Separate runners registered by admins. They are available to every repository, public and private, and get jobs before the built-in runner.",
21 "grun.warning": "Warning: a global runner receives jobs from ALL repositories, including private ones: the source code and the secrets of each job it runs. Only register machines you fully trust and manage yourself.",
22 "grun.tokenAsk": "Create a registration token for a global runner? That runner will receive jobs and secrets from every repository.",
23 "grun.rename": "Rename",
24 "grun.pause": "Pause",
25 "grun.resume": "Resume",
26 "grun.tip.token": "One-time token, valid 24 hours. Register with: bluegit-runner register --url … --token …",
27 "grun.tip.rename": "Change the display name. Does not affect the token.",
28 "grun.tip.pause": "A paused runner gets no new jobs; a running job finishes.",
19 29 "runner.optinOn": "Your account runners may run jobs of this group.",
20 30 "runner.optinStart": "Allow my runners for this group",
21 31 "runner.optinStop": "Stop using my runners here",
@@ -43,6 +53,16 @@ var runnerNL = map[string]string{
43 53 "runner.prefOwn": "Eigen runners eerst",
44 54 "runner.builtinFirst": "Probeer BlueGit runner eerst",
45 55 "runner.optinOff": "Je account-runners worden niet gebruikt voor deze groep.",
56 "grun.title": "Globale runners",
57 "grun.lead": "Aparte runners die beheerders registreren. Ze zijn beschikbaar voor elke repo, publiek en privé, en krijgen jobs vóór de ingebouwde runner.",
58 "grun.warning": "Let op: een globale runner krijgt jobs uit ALLE repo's, ook privé: de broncode en de geheimen van elke job die hij draait. Registreer alleen machines die je volledig vertrouwt en zelf beheert.",
59 "grun.tokenAsk": "Registratietoken voor een globale runner maken? Die runner krijgt jobs en geheimen uit elke repo.",
60 "grun.rename": "Hernoemen",
61 "grun.pause": "Pauzeren",
62 "grun.resume": "Hervatten",
63 "grun.tip.token": "Eenmalig token, 24 uur geldig. Registreren met: bluegit-runner register --url … --token …",
64 "grun.tip.rename": "Verandert de weergavenaam. Het token blijft hetzelfde.",
65 "grun.tip.pause": "Een gepauzeerde runner krijgt geen nieuwe jobs; een lopende job maakt hij af.",
46 66 "runner.optinOn": "Je account-runners mogen jobs van deze groep draaien.",
47 67 "runner.optinStart": "Mijn runners toestaan voor deze groep",
48 68 "runner.optinStop": "Mijn runners hier niet meer gebruiken",
@@ -70,6 +90,16 @@ var runnerDE = map[string]string{
70 90 "runner.prefOwn": "Eigene Runner zuerst",
71 91 "runner.builtinFirst": "Zuerst den BlueGit-Runner versuchen",
72 92 "runner.optinOff": "Deine Konto-Runner werden für diese Gruppe nicht verwendet.",
93 "grun.title": "Globale Runner",
94 "grun.lead": "Separate Runner, von Admins registriert. Sie stehen jedem Repo zur Verfügung, öffentlich und privat, und bekommen Jobs vor dem eingebauten Runner.",
95 "grun.warning": "Achtung: ein globaler Runner bekommt Jobs aus ALLEN Repos, auch privaten: den Quellcode und die Secrets jedes Jobs, den er ausführt. Registriere nur Maschinen, denen du voll vertraust und die du selbst verwaltest.",
96 "grun.tokenAsk": "Registrierungstoken für einen globalen Runner erstellen? Dieser Runner bekommt Jobs und Secrets aus jedem Repo.",
97 "grun.rename": "Umbenennen",
98 "grun.pause": "Pausieren",
99 "grun.resume": "Fortsetzen",
100 "grun.tip.token": "Einmaliges Token, 24 Stunden gültig. Registrieren mit: bluegit-runner register --url … --token …",
101 "grun.tip.rename": "Ändert den Anzeigenamen. Das Token bleibt gleich.",
102 "grun.tip.pause": "Ein pausierter Runner bekommt keine neuen Jobs; ein laufender Job wird beendet.",
73 103 "runner.optinOn": "Deine Konto-Runner dürfen Jobs dieser Gruppe ausführen.",
74 104 "runner.optinStart": "Meine Runner für diese Gruppe erlauben",
75 105 "runner.optinStop": "Meine Runner hier nicht mehr verwenden",
@@ -97,6 +127,16 @@ var runnerFR = map[string]string{
97 127 "runner.prefOwn": "Mes runners d'abord",
98 128 "runner.builtinFirst": "Essayer d'abord le runner BlueGit",
99 129 "runner.optinOff": "Vos runners de compte ne sont pas utilisés pour ce groupe.",
130 "grun.title": "Runners globaux",
131 "grun.lead": "Runners séparés enregistrés par les admins. Ils sont disponibles pour chaque dépôt, public et privé, et reçoivent les jobs avant le runner intégré.",
132 "grun.warning": "Attention : un runner global reçoit les jobs de TOUS les dépôts, y compris privés : le code source et les secrets de chaque job qu'il exécute. N'enregistre que des machines de pleine confiance que tu gères toi-même.",
133 "grun.tokenAsk": "Créer un jeton d'enregistrement pour un runner global ? Ce runner recevra les jobs et secrets de chaque dépôt.",
134 "grun.rename": "Renommer",
135 "grun.pause": "Mettre en pause",
136 "grun.resume": "Reprendre",
137 "grun.tip.token": "Jeton à usage unique, valable 24 heures. Enregistrer avec : bluegit-runner register --url … --token …",
138 "grun.tip.rename": "Change le nom affiché. Le jeton reste le même.",
139 "grun.tip.pause": "Un runner en pause ne reçoit plus de jobs ; un job en cours se termine.",
100 140 "runner.optinOn": "Vos runners de compte peuvent exécuter les jobs de ce groupe.",
101 141 "runner.optinStart": "Autoriser mes runners pour ce groupe",
102 142 "runner.optinStop": "Ne plus utiliser mes runners ici",
@@ -16,6 +16,16 @@ var runnerEN = map[string]string{
16 "runner.prefOwn": "My own runners first",
16 "runner.prefOwn": "My own runners first",
17 "runner.builtinFirst": "Try the BlueGit runner first",
17 "runner.builtinFirst": "Try the BlueGit runner first",
18 "runner.optinOff": "Your account runners are not used for this group.",
18 "runner.optinOff": "Your account runners are not used for this group.",
19 "grun.title": "Global runners",
20 "grun.lead": "Separate runners registered by admins. They are available to every repository, public and private, and get jobs before the built-in runner.",
21 "grun.warning": "Warning: a global runner receives jobs from ALL repositories, including private ones: the source code and the secrets of each job it runs. Only register machines you fully trust and manage yourself.",
22 "grun.tokenAsk": "Create a registration token for a global runner? That runner will receive jobs and secrets from every repository.",
23 "grun.rename": "Rename",
24 "grun.pause": "Pause",
25 "grun.resume": "Resume",
26 "grun.tip.token": "One-time token, valid 24 hours. Register with: bluegit-runner register --url … --token …",
27 "grun.tip.rename": "Change the display name. Does not affect the token.",
28 "grun.tip.pause": "A paused runner gets no new jobs; a running job finishes.",
19 "runner.optinOn": "Your account runners may run jobs of this group.",
29 "runner.optinOn": "Your account runners may run jobs of this group.",
20 "runner.optinStart": "Allow my runners for this group",
30 "runner.optinStart": "Allow my runners for this group",
21 "runner.optinStop": "Stop using my runners here",
31 "runner.optinStop": "Stop using my runners here",
@@ -43,6 +53,16 @@ var runnerNL = map[string]string{
43 "runner.prefOwn": "Eigen runners eerst",
53 "runner.prefOwn": "Eigen runners eerst",
44 "runner.builtinFirst": "Probeer BlueGit runner eerst",
54 "runner.builtinFirst": "Probeer BlueGit runner eerst",
45 "runner.optinOff": "Je account-runners worden niet gebruikt voor deze groep.",
55 "runner.optinOff": "Je account-runners worden niet gebruikt voor deze groep.",
56 "grun.title": "Globale runners",
57 "grun.lead": "Aparte runners die beheerders registreren. Ze zijn beschikbaar voor elke repo, publiek en privé, en krijgen jobs vóór de ingebouwde runner.",
58 "grun.warning": "Let op: een globale runner krijgt jobs uit ALLE repo's, ook privé: de broncode en de geheimen van elke job die hij draait. Registreer alleen machines die je volledig vertrouwt en zelf beheert.",
59 "grun.tokenAsk": "Registratietoken voor een globale runner maken? Die runner krijgt jobs en geheimen uit elke repo.",
60 "grun.rename": "Hernoemen",
61 "grun.pause": "Pauzeren",
62 "grun.resume": "Hervatten",
63 "grun.tip.token": "Eenmalig token, 24 uur geldig. Registreren met: bluegit-runner register --url … --token …",
64 "grun.tip.rename": "Verandert de weergavenaam. Het token blijft hetzelfde.",
65 "grun.tip.pause": "Een gepauzeerde runner krijgt geen nieuwe jobs; een lopende job maakt hij af.",
46 "runner.optinOn": "Je account-runners mogen jobs van deze groep draaien.",
66 "runner.optinOn": "Je account-runners mogen jobs van deze groep draaien.",
47 "runner.optinStart": "Mijn runners toestaan voor deze groep",
67 "runner.optinStart": "Mijn runners toestaan voor deze groep",
48 "runner.optinStop": "Mijn runners hier niet meer gebruiken",
68 "runner.optinStop": "Mijn runners hier niet meer gebruiken",
@@ -70,6 +90,16 @@ var runnerDE = map[string]string{
70 "runner.prefOwn": "Eigene Runner zuerst",
90 "runner.prefOwn": "Eigene Runner zuerst",
71 "runner.builtinFirst": "Zuerst den BlueGit-Runner versuchen",
91 "runner.builtinFirst": "Zuerst den BlueGit-Runner versuchen",
72 "runner.optinOff": "Deine Konto-Runner werden für diese Gruppe nicht verwendet.",
92 "runner.optinOff": "Deine Konto-Runner werden für diese Gruppe nicht verwendet.",
93 "grun.title": "Globale Runner",
94 "grun.lead": "Separate Runner, von Admins registriert. Sie stehen jedem Repo zur Verfügung, öffentlich und privat, und bekommen Jobs vor dem eingebauten Runner.",
95 "grun.warning": "Achtung: ein globaler Runner bekommt Jobs aus ALLEN Repos, auch privaten: den Quellcode und die Secrets jedes Jobs, den er ausführt. Registriere nur Maschinen, denen du voll vertraust und die du selbst verwaltest.",
96 "grun.tokenAsk": "Registrierungstoken für einen globalen Runner erstellen? Dieser Runner bekommt Jobs und Secrets aus jedem Repo.",
97 "grun.rename": "Umbenennen",
98 "grun.pause": "Pausieren",
99 "grun.resume": "Fortsetzen",
100 "grun.tip.token": "Einmaliges Token, 24 Stunden gültig. Registrieren mit: bluegit-runner register --url … --token …",
101 "grun.tip.rename": "Ändert den Anzeigenamen. Das Token bleibt gleich.",
102 "grun.tip.pause": "Ein pausierter Runner bekommt keine neuen Jobs; ein laufender Job wird beendet.",
73 "runner.optinOn": "Deine Konto-Runner dürfen Jobs dieser Gruppe ausführen.",
103 "runner.optinOn": "Deine Konto-Runner dürfen Jobs dieser Gruppe ausführen.",
74 "runner.optinStart": "Meine Runner für diese Gruppe erlauben",
104 "runner.optinStart": "Meine Runner für diese Gruppe erlauben",
75 "runner.optinStop": "Meine Runner hier nicht mehr verwenden",
105 "runner.optinStop": "Meine Runner hier nicht mehr verwenden",
@@ -97,6 +127,16 @@ var runnerFR = map[string]string{
97 "runner.prefOwn": "Mes runners d'abord",
127 "runner.prefOwn": "Mes runners d'abord",
98 "runner.builtinFirst": "Essayer d'abord le runner BlueGit",
128 "runner.builtinFirst": "Essayer d'abord le runner BlueGit",
99 "runner.optinOff": "Vos runners de compte ne sont pas utilisés pour ce groupe.",
129 "runner.optinOff": "Vos runners de compte ne sont pas utilisés pour ce groupe.",
130 "grun.title": "Runners globaux",
131 "grun.lead": "Runners séparés enregistrés par les admins. Ils sont disponibles pour chaque dépôt, public et privé, et reçoivent les jobs avant le runner intégré.",
132 "grun.warning": "Attention : un runner global reçoit les jobs de TOUS les dépôts, y compris privés : le code source et les secrets de chaque job qu'il exécute. N'enregistre que des machines de pleine confiance que tu gères toi-même.",
133 "grun.tokenAsk": "Créer un jeton d'enregistrement pour un runner global ? Ce runner recevra les jobs et secrets de chaque dépôt.",
134 "grun.rename": "Renommer",
135 "grun.pause": "Mettre en pause",
136 "grun.resume": "Reprendre",
137 "grun.tip.token": "Jeton à usage unique, valable 24 heures. Enregistrer avec : bluegit-runner register --url … --token …",
138 "grun.tip.rename": "Change le nom affiché. Le jeton reste le même.",
139 "grun.tip.pause": "Un runner en pause ne reçoit plus de jobs ; un job en cours se termine.",
100 "runner.optinOn": "Vos runners de compte peuvent exécuter les jobs de ce groupe.",
140 "runner.optinOn": "Vos runners de compte peuvent exécuter les jobs de ce groupe.",
101 "runner.optinStart": "Autoriser mes runners pour ce groupe",
141 "runner.optinStart": "Autoriser mes runners pour ce groupe",
102 "runner.optinStop": "Ne plus utiliser mes runners ici",
142 "runner.optinStop": "Ne plus utiliser mes runners ici",
internal/runner/global_test.go added +69 −0
@@ -0,0 +1,69 @@
1 package runner
2
3 import (
4 "context"
5 "path/filepath"
6 "testing"
7 "time"
8
9 "gitlab.com/Timfa/bluegit/internal/access"
10 "gitlab.com/Timfa/bluegit/internal/store"
11 )
12
13 // Globale runners staan vóór alles (ook vóór de ingebouwde runner), voor
14 // publieke én privé repo's van accounts en groepen; offline wordt overgeslagen.
15 func TestGlobalRunners(t *testing.T) {
16 s, err := store.Open(filepath.Join(t.TempDir(), "b.db"), make([]byte, 32))
17 if err != nil {
18 t.Fatal(err)
19 }
20 defer s.Close()
21 ctx := context.Background()
22 tim, _ := s.UpsertUser(ctx, 1, "tim", "", false)
23 g, _ := s.CreateGroup(ctx, tim.ID, "Team", "team", "", access.RoleReadonly)
24 priv, _ := s.CreateRepo(ctx, "user", tim.ID, "secret", "", "master", "private")
25 pub, _ := s.CreateRepo(ctx, "user", tim.ID, "open", "", "master", "public")
26 grepo, _ := s.CreateRepo(ctx, "group", g.ID, "app", "", "master", "private")
27 reg := func(kind string, id int64, name string) store.Runner {
28 tok, err := s.CreateRunnerRegToken(ctx, kind, id, tim.ID)
29 if err != nil {
30 t.Fatal(err)
31 }
32 rn, _, err := s.RegisterRunner(ctx, tok, name, "test")
33 if err != nil {
34 t.Fatal(err)
35 }
36 return rn
37 }
38 reg("user", tim.ID, "tim-pc")
39 reg("group", g.ID, "grp")
40 glob := reg(store.RunnerGlobal, 0, "global-1")
41
42 tiers, _ := Tiers(ctx, s, priv)
43 eq(t, names(tiers), "global-1", "builtin", "tim-pc")
44 tiers, _ = Tiers(ctx, s, pub)
45 eq(t, names(tiers), "global-1", "builtin", "tim-pc")
46 tiers, _ = Tiers(ctx, s, grepo)
47 eq(t, names(tiers), "global-1", "grp", "builtin")
48
49 r := &Runner{Store: s}
50 for _, repo := range []store.Repo{priv, pub, grepo} {
51 if !r.mayRun(ctx, glob, repo) {
52 t.Fatalf("global runner may run %s", repo.Name)
53 }
54 }
55 // Offline globale runner: de job gaat meteen door naar de volgende trede.
56 off := glob
57 off.LastSeen = time.Now().Add(-time.Hour)
58 st := Advance([]Tier{{Runners: []store.Runner{off}}, {Builtin: true}}, 0, time.Time{}, time.Now(), true)
59 if !st.Builtin || st.Tier != 1 {
60 t.Fatalf("offline global not skipped: %+v", st)
61 }
62 // Gepauzeerd: valt uit de volgorde.
63 paused := true
64 if _, err := s.UpdateRunner(ctx, store.RunnerGlobal, 0, glob.ID, nil, &paused); err != nil {
65 t.Fatal(err)
66 }
67 tiers, _ = Tiers(ctx, s, priv)
68 eq(t, names(tiers), "builtin", "tim-pc")
69 }
@@ -0,0 +1,69 @@
1package runner
2
3import (
4 "context"
5 "path/filepath"
6 "testing"
7 "time"
8
9 "gitlab.com/Timfa/bluegit/internal/access"
10 "gitlab.com/Timfa/bluegit/internal/store"
11)
12
13// Globale runners staan vóór alles (ook vóór de ingebouwde runner), voor
14// publieke én privé repo's van accounts en groepen; offline wordt overgeslagen.
15func TestGlobalRunners(t *testing.T) {
16 s, err := store.Open(filepath.Join(t.TempDir(), "b.db"), make([]byte, 32))
17 if err != nil {
18 t.Fatal(err)
19 }
20 defer s.Close()
21 ctx := context.Background()
22 tim, _ := s.UpsertUser(ctx, 1, "tim", "", false)
23 g, _ := s.CreateGroup(ctx, tim.ID, "Team", "team", "", access.RoleReadonly)
24 priv, _ := s.CreateRepo(ctx, "user", tim.ID, "secret", "", "master", "private")
25 pub, _ := s.CreateRepo(ctx, "user", tim.ID, "open", "", "master", "public")
26 grepo, _ := s.CreateRepo(ctx, "group", g.ID, "app", "", "master", "private")
27 reg := func(kind string, id int64, name string) store.Runner {
28 tok, err := s.CreateRunnerRegToken(ctx, kind, id, tim.ID)
29 if err != nil {
30 t.Fatal(err)
31 }
32 rn, _, err := s.RegisterRunner(ctx, tok, name, "test")
33 if err != nil {
34 t.Fatal(err)
35 }
36 return rn
37 }
38 reg("user", tim.ID, "tim-pc")
39 reg("group", g.ID, "grp")
40 glob := reg(store.RunnerGlobal, 0, "global-1")
41
42 tiers, _ := Tiers(ctx, s, priv)
43 eq(t, names(tiers), "global-1", "builtin", "tim-pc")
44 tiers, _ = Tiers(ctx, s, pub)
45 eq(t, names(tiers), "global-1", "builtin", "tim-pc")
46 tiers, _ = Tiers(ctx, s, grepo)
47 eq(t, names(tiers), "global-1", "grp", "builtin")
48
49 r := &Runner{Store: s}
50 for _, repo := range []store.Repo{priv, pub, grepo} {
51 if !r.mayRun(ctx, glob, repo) {
52 t.Fatalf("global runner may run %s", repo.Name)
53 }
54 }
55 // Offline globale runner: de job gaat meteen door naar de volgende trede.
56 off := glob
57 off.LastSeen = time.Now().Add(-time.Hour)
58 st := Advance([]Tier{{Runners: []store.Runner{off}}, {Builtin: true}}, 0, time.Time{}, time.Now(), true)
59 if !st.Builtin || st.Tier != 1 {
60 t.Fatalf("offline global not skipped: %+v", st)
61 }
62 // Gepauzeerd: valt uit de volgorde.
63 paused := true
64 if _, err := s.UpdateRunner(ctx, store.RunnerGlobal, 0, glob.ID, nil, &paused); err != nil {
65 t.Fatal(err)
66 }
67 tiers, _ = Tiers(ctx, s, priv)
68 eq(t, names(tiers), "builtin", "tim-pc")
69}
internal/runner/remote.go +3 −0
@@ -82,6 +82,9 @@ func (r *Runner) Claim(ctx context.Context, rn store.Runner) (*RemotePayload, er
82 82 // repo's van die groep.
83 83 func (r *Runner) mayRun(ctx context.Context, rn store.Runner, repo store.Repo) bool {
84 84 switch rn.OwnerKind {
85 case store.RunnerGlobal:
86 // Zoals de ingebouwde runner: jobs uit alle repo's.
87 return true
85 88 case "group":
86 89 return repo.OwnerKind == "group" && repo.OwnerID == rn.OwnerID
87 90 case "user":
@@ -82,6 +82,9 @@ func (r *Runner) Claim(ctx context.Context, rn store.Runner) (*RemotePayload, er
82// repo's van die groep.
82// repo's van die groep.
83func (r *Runner) mayRun(ctx context.Context, rn store.Runner, repo store.Repo) bool {
83func (r *Runner) mayRun(ctx context.Context, rn store.Runner, repo store.Repo) bool {
84 switch rn.OwnerKind {
84 switch rn.OwnerKind {
85 case store.RunnerGlobal:
86 // Zoals de ingebouwde runner: jobs uit alle repo's.
87 return true
85 case "group":
88 case "group":
86 return repo.OwnerKind == "group" && repo.OwnerID == rn.OwnerID
89 return repo.OwnerKind == "group" && repo.OwnerID == rn.OwnerID
87 case "user":
90 case "user":
internal/runner/routing.go +17 −1
@@ -54,8 +54,24 @@ func Order(ownerKind, userPref string, builtinFirst bool, own, group, optedIn []
54 54 return tiers
55 55 }
56 56
57 // Tiers geeft de runnervolgorde voor een repo.
57 // Tiers geeft de runnervolgorde voor een repo. Globale runners (van de
58 // beheerders) staan altijd vooraan, daarna de volgorde van Order.
58 59 func Tiers(ctx context.Context, st *store.Store, repo store.Repo) ([]Tier, error) {
60 global, err := st.ListRunners(ctx, store.RunnerGlobal, 0)
61 if err != nil {
62 return nil, err
63 }
64 rest, err := repoTiers(ctx, st, repo)
65 if err != nil {
66 return nil, err
67 }
68 if g := active(global); len(g) > 0 {
69 return append([]Tier{{Runners: g}}, rest...), nil
70 }
71 return rest, nil
72 }
73
74 func repoTiers(ctx context.Context, st *store.Store, repo store.Repo) ([]Tier, error) {
59 75 if repo.OwnerKind == "group" {
60 76 group, err := st.ListRunners(ctx, "group", repo.OwnerID)
61 77 if err != nil {
@@ -54,8 +54,24 @@ func Order(ownerKind, userPref string, builtinFirst bool, own, group, optedIn []
54 return tiers
54 return tiers
55}
55}
56
56
57// Tiers geeft de runnervolgorde voor een repo.
57// Tiers geeft de runnervolgorde voor een repo. Globale runners (van de
58// beheerders) staan altijd vooraan, daarna de volgorde van Order.
58func Tiers(ctx context.Context, st *store.Store, repo store.Repo) ([]Tier, error) {
59func Tiers(ctx context.Context, st *store.Store, repo store.Repo) ([]Tier, error) {
60 global, err := st.ListRunners(ctx, store.RunnerGlobal, 0)
61 if err != nil {
62 return nil, err
63 }
64 rest, err := repoTiers(ctx, st, repo)
65 if err != nil {
66 return nil, err
67 }
68 if g := active(global); len(g) > 0 {
69 return append([]Tier{{Runners: g}}, rest...), nil
70 }
71 return rest, nil
72}
73
74func repoTiers(ctx context.Context, st *store.Store, repo store.Repo) ([]Tier, error) {
59 if repo.OwnerKind == "group" {
75 if repo.OwnerKind == "group" {
60 group, err := st.ListRunners(ctx, "group", repo.OwnerID)
76 group, err := st.ListRunners(ctx, "group", repo.OwnerID)
61 if err != nil {
77 if err != nil {
internal/server/admin_runner.go +65 −0
@@ -2,9 +2,11 @@ package server
2 2
3 3 import (
4 4 "context"
5 "gitlab.com/Timfa/bluegit/internal/store"
5 6 "html/template"
6 7 "net/http"
7 8 "path/filepath"
9 "strconv"
8 10 "strings"
9 11 "time"
10 12
@@ -140,6 +142,9 @@ func (s *Server) runnerAdmin() *runnercfg.Handler {
140 142 v.Page = "adminrunner"
141 143 v.Wide = true
142 144 v.RunnerUI = body
145 rs, _ := s.Store.ListRunners(r.Context(), store.RunnerGlobal, 0)
146 v.RunnerList = runnerViews(rs)
147 v.NewRunnerToken = s.takeRunnerOnce(w, r, "/admin")
143 148 s.render(w, "adminrunner", v)
144 149 },
145 150 }
@@ -187,3 +192,63 @@ func (l *lazyRunnerAdmin) ServeHTTP(w http.ResponseWriter, r *http.Request) {
187 192 l.s.runnerAdmin().Mount(m, false)
188 193 m.ServeHTTP(w, r)
189 194 }
195
196 // ---- globale runners (beheer) ----
197
198 func (s *Server) globalRunnerGuard(w http.ResponseWriter, r *http.Request) bool {
199 if ok, _ := s.adminOnly(w, r); !ok {
200 return false
201 }
202 return s.csrfOK(w, r)
203 }
204
205 const globalBack = "/admin/runner#global"
206
207 func (s *Server) globalRunnerToken(w http.ResponseWriter, r *http.Request) {
208 if !s.globalRunnerGuard(w, r) {
209 return
210 }
211 plain, err := s.Store.CreateRunnerRegToken(r.Context(), store.RunnerGlobal, 0, s.who(r).User.ID)
212 if err != nil {
213 s.redirect(w, r, globalBack, "", s.trErr(r, err))
214 return
215 }
216 s.setRunnerOnce(w, "/admin", plain)
217 s.redirect(w, r, globalBack, s.tr(r, "runner.tokenMade"), "")
218 }
219
220 func (s *Server) globalRunnerID(r *http.Request) int64 {
221 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
222 return id
223 }
224
225 func (s *Server) globalRunnerDelete(w http.ResponseWriter, r *http.Request) {
226 if !s.globalRunnerGuard(w, r) {
227 return
228 }
229 if err := s.Store.RevokeRunner(r.Context(), store.RunnerGlobal, 0, s.globalRunnerID(r)); err != nil {
230 s.redirect(w, r, globalBack, "", s.tr(r, "runner.missing"))
231 return
232 }
233 s.redirect(w, r, globalBack, s.tr(r, "runner.revoked"), "")
234 }
235
236 func (s *Server) globalRunnerUpdate(w http.ResponseWriter, r *http.Request) {
237 if !s.globalRunnerGuard(w, r) {
238 return
239 }
240 var name *string
241 var paused *bool
242 if n := strings.TrimSpace(r.FormValue("name")); n != "" {
243 name = &n
244 }
245 if p := r.FormValue("paused"); p != "" {
246 b := p == "1"
247 paused = &b
248 }
249 if _, err := s.Store.UpdateRunner(r.Context(), store.RunnerGlobal, 0, s.globalRunnerID(r), name, paused); err != nil {
250 s.redirect(w, r, globalBack, "", s.trErr(r, err))
251 return
252 }
253 s.redirect(w, r, globalBack, s.tr(r, "flash.saved"), "")
254 }
@@ -2,9 +2,11 @@ package server
2
2
3import (
3import (
4 "context"
4 "context"
5 "gitlab.com/Timfa/bluegit/internal/store"
5 "html/template"
6 "html/template"
6 "net/http"
7 "net/http"
7 "path/filepath"
8 "path/filepath"
9 "strconv"
8 "strings"
10 "strings"
9 "time"
11 "time"
10
12
@@ -140,6 +142,9 @@ func (s *Server) runnerAdmin() *runnercfg.Handler {
140 v.Page = "adminrunner"
142 v.Page = "adminrunner"
141 v.Wide = true
143 v.Wide = true
142 v.RunnerUI = body
144 v.RunnerUI = body
145 rs, _ := s.Store.ListRunners(r.Context(), store.RunnerGlobal, 0)
146 v.RunnerList = runnerViews(rs)
147 v.NewRunnerToken = s.takeRunnerOnce(w, r, "/admin")
143 s.render(w, "adminrunner", v)
148 s.render(w, "adminrunner", v)
144 },
149 },
145 }
150 }
@@ -187,3 +192,63 @@ func (l *lazyRunnerAdmin) ServeHTTP(w http.ResponseWriter, r *http.Request) {
187 l.s.runnerAdmin().Mount(m, false)
192 l.s.runnerAdmin().Mount(m, false)
188 m.ServeHTTP(w, r)
193 m.ServeHTTP(w, r)
189}
194}
195
196// ---- globale runners (beheer) ----
197
198func (s *Server) globalRunnerGuard(w http.ResponseWriter, r *http.Request) bool {
199 if ok, _ := s.adminOnly(w, r); !ok {
200 return false
201 }
202 return s.csrfOK(w, r)
203}
204
205const globalBack = "/admin/runner#global"
206
207func (s *Server) globalRunnerToken(w http.ResponseWriter, r *http.Request) {
208 if !s.globalRunnerGuard(w, r) {
209 return
210 }
211 plain, err := s.Store.CreateRunnerRegToken(r.Context(), store.RunnerGlobal, 0, s.who(r).User.ID)
212 if err != nil {
213 s.redirect(w, r, globalBack, "", s.trErr(r, err))
214 return
215 }
216 s.setRunnerOnce(w, "/admin", plain)
217 s.redirect(w, r, globalBack, s.tr(r, "runner.tokenMade"), "")
218}
219
220func (s *Server) globalRunnerID(r *http.Request) int64 {
221 id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
222 return id
223}
224
225func (s *Server) globalRunnerDelete(w http.ResponseWriter, r *http.Request) {
226 if !s.globalRunnerGuard(w, r) {
227 return
228 }
229 if err := s.Store.RevokeRunner(r.Context(), store.RunnerGlobal, 0, s.globalRunnerID(r)); err != nil {
230 s.redirect(w, r, globalBack, "", s.tr(r, "runner.missing"))
231 return
232 }
233 s.redirect(w, r, globalBack, s.tr(r, "runner.revoked"), "")
234}
235
236func (s *Server) globalRunnerUpdate(w http.ResponseWriter, r *http.Request) {
237 if !s.globalRunnerGuard(w, r) {
238 return
239 }
240 var name *string
241 var paused *bool
242 if n := strings.TrimSpace(r.FormValue("name")); n != "" {
243 name = &n
244 }
245 if p := r.FormValue("paused"); p != "" {
246 b := p == "1"
247 paused = &b
248 }
249 if _, err := s.Store.UpdateRunner(r.Context(), store.RunnerGlobal, 0, s.globalRunnerID(r), name, paused); err != nil {
250 s.redirect(w, r, globalBack, "", s.trErr(r, err))
251 return
252 }
253 s.redirect(w, r, globalBack, s.tr(r, "flash.saved"), "")
254}
internal/server/api_routes.go +8 −0
@@ -15,6 +15,14 @@ var apiCatalog = []apiRoute{
15 15 {http.MethodGet, "/api/v1/admin/runner/jobs", access.ScopeRunnerRead, authUser, "Active and recent jobs of the built-in runner (instance admin)", (*Server).apiAdminRunnerJobs},
16 16 {http.MethodPost, "/api/v1/admin/runner/pause", access.ScopeRunnerWrite, authUser, "Pause (drain) the built-in runner (instance admin)", (*Server).apiAdminRunnerPause},
17 17 {http.MethodPost, "/api/v1/admin/runner/resume", access.ScopeRunnerWrite, authUser, "Resume the built-in runner (instance admin)", (*Server).apiAdminRunnerResume},
18 {http.MethodGet, "/api/v1/admin/runners", access.ScopeRunnerRead, authUser, "List global runners (instance admin)", (*Server).apiRunners},
19 {http.MethodPost, "/api/v1/admin/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create global runner registration token (instance admin)", (*Server).apiRunnerRegToken},
20 {http.MethodGet, "/api/v1/admin/runners/{id}", access.ScopeRunnerRead, authUser, "Get global runner", (*Server).apiRunnerGet},
21 {http.MethodPut, "/api/v1/admin/runners/{id}", access.ScopeRunnerWrite, authUser, "Rename or pause global runner", (*Server).apiRunnerPut},
22 {http.MethodPost, "/api/v1/admin/runners/{id}/pause", access.ScopeRunnerWrite, authUser, "Pause global runner", (*Server).apiRunnerPause},
23 {http.MethodPost, "/api/v1/admin/runners/{id}/resume", access.ScopeRunnerWrite, authUser, "Resume global runner", (*Server).apiRunnerResume},
24 {http.MethodDelete, "/api/v1/admin/runners/{id}", access.ScopeRunnerWrite, authUser, "Revoke global runner", (*Server).apiRunnerDelete},
25 {http.MethodGet, "/api/v1/admin/runners/{id}/jobs", access.ScopeRunnerRead, authUser, "Recent jobs of global runner", (*Server).apiRunnerJobs},
18 26 {http.MethodGet, "/api/v1/user/runners", access.ScopeRunnerRead, authUser, "List account runners", (*Server).apiRunners},
19 27 {http.MethodPost, "/api/v1/user/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create account runner registration token", (*Server).apiRunnerRegToken},
20 28 {http.MethodGet, "/api/v1/user/runners/{id}", access.ScopeRunnerRead, authUser, "Get account runner", (*Server).apiRunnerGet},
@@ -15,6 +15,14 @@ var apiCatalog = []apiRoute{
15 {http.MethodGet, "/api/v1/admin/runner/jobs", access.ScopeRunnerRead, authUser, "Active and recent jobs of the built-in runner (instance admin)", (*Server).apiAdminRunnerJobs},
15 {http.MethodGet, "/api/v1/admin/runner/jobs", access.ScopeRunnerRead, authUser, "Active and recent jobs of the built-in runner (instance admin)", (*Server).apiAdminRunnerJobs},
16 {http.MethodPost, "/api/v1/admin/runner/pause", access.ScopeRunnerWrite, authUser, "Pause (drain) the built-in runner (instance admin)", (*Server).apiAdminRunnerPause},
16 {http.MethodPost, "/api/v1/admin/runner/pause", access.ScopeRunnerWrite, authUser, "Pause (drain) the built-in runner (instance admin)", (*Server).apiAdminRunnerPause},
17 {http.MethodPost, "/api/v1/admin/runner/resume", access.ScopeRunnerWrite, authUser, "Resume the built-in runner (instance admin)", (*Server).apiAdminRunnerResume},
17 {http.MethodPost, "/api/v1/admin/runner/resume", access.ScopeRunnerWrite, authUser, "Resume the built-in runner (instance admin)", (*Server).apiAdminRunnerResume},
18 {http.MethodGet, "/api/v1/admin/runners", access.ScopeRunnerRead, authUser, "List global runners (instance admin)", (*Server).apiRunners},
19 {http.MethodPost, "/api/v1/admin/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create global runner registration token (instance admin)", (*Server).apiRunnerRegToken},
20 {http.MethodGet, "/api/v1/admin/runners/{id}", access.ScopeRunnerRead, authUser, "Get global runner", (*Server).apiRunnerGet},
21 {http.MethodPut, "/api/v1/admin/runners/{id}", access.ScopeRunnerWrite, authUser, "Rename or pause global runner", (*Server).apiRunnerPut},
22 {http.MethodPost, "/api/v1/admin/runners/{id}/pause", access.ScopeRunnerWrite, authUser, "Pause global runner", (*Server).apiRunnerPause},
23 {http.MethodPost, "/api/v1/admin/runners/{id}/resume", access.ScopeRunnerWrite, authUser, "Resume global runner", (*Server).apiRunnerResume},
24 {http.MethodDelete, "/api/v1/admin/runners/{id}", access.ScopeRunnerWrite, authUser, "Revoke global runner", (*Server).apiRunnerDelete},
25 {http.MethodGet, "/api/v1/admin/runners/{id}/jobs", access.ScopeRunnerRead, authUser, "Recent jobs of global runner", (*Server).apiRunnerJobs},
18 {http.MethodGet, "/api/v1/user/runners", access.ScopeRunnerRead, authUser, "List account runners", (*Server).apiRunners},
26 {http.MethodGet, "/api/v1/user/runners", access.ScopeRunnerRead, authUser, "List account runners", (*Server).apiRunners},
19 {http.MethodPost, "/api/v1/user/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create account runner registration token", (*Server).apiRunnerRegToken},
27 {http.MethodPost, "/api/v1/user/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create account runner registration token", (*Server).apiRunnerRegToken},
20 {http.MethodGet, "/api/v1/user/runners/{id}", access.ScopeRunnerRead, authUser, "Get account runner", (*Server).apiRunnerGet},
28 {http.MethodGet, "/api/v1/user/runners/{id}", access.ScopeRunnerRead, authUser, "Get account runner", (*Server).apiRunnerGet},
internal/server/global_runners_test.go added +55 −0
@@ -0,0 +1,55 @@
1 package server
2
3 import (
4 "context"
5 "encoding/json"
6 "strings"
7 "testing"
8 )
9
10 func TestGlobalRunnersAPI(t *testing.T) {
11 e := newCIEnv(t)
12 ctx := context.Background()
13 st, base := e.st, e.ts.URL
14 bob, _ := st.UpsertUser(ctx, 2, "bob", "", false)
15 bobTok := issue(t, st, bob.ID, "api")
16 if _, err := st.SetInstanceAdmin(ctx, e.user.ID, e.user.ID, true); err != nil {
17 t.Fatal(err)
18 }
19 timTok := issue(t, st, e.user.ID, "api")
20 for _, c := range []struct{ m, p string }{{"GET", "/admin/runners"}, {"POST", "/admin/runners/registration-token"}} {
21 if code, _ := rapi(t, base, bobTok, c.m, c.p, map[string]any{}); code != 403 {
22 t.Fatalf("non-admin %s %s: %d", c.m, c.p, code)
23 }
24 if code, _ := rapi(t, base, "", c.m, c.p, map[string]any{}); code != 401 {
25 t.Fatalf("anon %s %s: %d", c.m, c.p, code)
26 }
27 }
28 code, b := rapi(t, base, timTok, "POST", "/admin/runners/registration-token", map[string]any{})
29 if code != 201 || !strings.Contains(string(b), `"owner_kind":"global"`) || !strings.Contains(string(b), "every repository") {
30 t.Fatalf("token: %d %s", code, b)
31 }
32 var reg struct{ Token string }
33 _ = json.Unmarshal(b, &reg)
34 rn, _, err := st.RegisterRunner(ctx, reg.Token, "glob", "test")
35 if err != nil {
36 t.Fatal(err)
37 }
38 id := "/admin/runners/" + itoa(rn.ID)
39 if code, b = rapi(t, base, timTok, "PUT", id, map[string]any{"name": "glob-2"}); code != 200 || !strings.Contains(string(b), "glob-2") {
40 t.Fatalf("rename: %d %s", code, b)
41 }
42 if code, b = rapi(t, base, timTok, "POST", id+"/pause", nil); code != 200 || !strings.Contains(string(b), `"paused":true`) {
43 t.Fatalf("pause: %d %s", code, b)
44 }
45 if code, _ = rapi(t, base, bobTok, "DELETE", id, nil); code != 403 {
46 t.Fatalf("bob delete: %d", code)
47 }
48 // Niet via het accountpad bereikbaar.
49 if code, _ = rapi(t, base, timTok, "GET", "/user/runners/"+itoa(rn.ID), nil); code != 404 {
50 t.Fatalf("global via user path: %d", code)
51 }
52 if code, _ = rapi(t, base, timTok, "DELETE", id, nil); code != 204 {
53 t.Fatalf("delete: %d", code)
54 }
55 }
@@ -0,0 +1,55 @@
1package server
2
3import (
4 "context"
5 "encoding/json"
6 "strings"
7 "testing"
8)
9
10func TestGlobalRunnersAPI(t *testing.T) {
11 e := newCIEnv(t)
12 ctx := context.Background()
13 st, base := e.st, e.ts.URL
14 bob, _ := st.UpsertUser(ctx, 2, "bob", "", false)
15 bobTok := issue(t, st, bob.ID, "api")
16 if _, err := st.SetInstanceAdmin(ctx, e.user.ID, e.user.ID, true); err != nil {
17 t.Fatal(err)
18 }
19 timTok := issue(t, st, e.user.ID, "api")
20 for _, c := range []struct{ m, p string }{{"GET", "/admin/runners"}, {"POST", "/admin/runners/registration-token"}} {
21 if code, _ := rapi(t, base, bobTok, c.m, c.p, map[string]any{}); code != 403 {
22 t.Fatalf("non-admin %s %s: %d", c.m, c.p, code)
23 }
24 if code, _ := rapi(t, base, "", c.m, c.p, map[string]any{}); code != 401 {
25 t.Fatalf("anon %s %s: %d", c.m, c.p, code)
26 }
27 }
28 code, b := rapi(t, base, timTok, "POST", "/admin/runners/registration-token", map[string]any{})
29 if code != 201 || !strings.Contains(string(b), `"owner_kind":"global"`) || !strings.Contains(string(b), "every repository") {
30 t.Fatalf("token: %d %s", code, b)
31 }
32 var reg struct{ Token string }
33 _ = json.Unmarshal(b, &reg)
34 rn, _, err := st.RegisterRunner(ctx, reg.Token, "glob", "test")
35 if err != nil {
36 t.Fatal(err)
37 }
38 id := "/admin/runners/" + itoa(rn.ID)
39 if code, b = rapi(t, base, timTok, "PUT", id, map[string]any{"name": "glob-2"}); code != 200 || !strings.Contains(string(b), "glob-2") {
40 t.Fatalf("rename: %d %s", code, b)
41 }
42 if code, b = rapi(t, base, timTok, "POST", id+"/pause", nil); code != 200 || !strings.Contains(string(b), `"paused":true`) {
43 t.Fatalf("pause: %d %s", code, b)
44 }
45 if code, _ = rapi(t, base, bobTok, "DELETE", id, nil); code != 403 {
46 t.Fatalf("bob delete: %d", code)
47 }
48 // Niet via het accountpad bereikbaar.
49 if code, _ = rapi(t, base, timTok, "GET", "/user/runners/"+itoa(rn.ID), nil); code != 404 {
50 t.Fatalf("global via user path: %d", code)
51 }
52 if code, _ = rapi(t, base, timTok, "DELETE", id, nil); code != 204 {
53 t.Fatalf("delete: %d", code)
54 }
55}
internal/server/runners.go +3 −0
@@ -47,6 +47,9 @@ func (s *Server) routeRunners(mux *http.ServeMux) {
47 47 mux.HandleFunc("POST /groups/{path}/runners/delete", s.groupRunnerDelete)
48 48 mux.HandleFunc("POST /groups/{path}/runners/options", s.groupRunnerOptions)
49 49 mux.HandleFunc("POST /groups/{path}/runners/optin", s.groupRunnerOptIn)
50 mux.HandleFunc("POST /admin/runners/token", s.globalRunnerToken)
51 mux.HandleFunc("POST /admin/runners/delete", s.globalRunnerDelete)
52 mux.HandleFunc("POST /admin/runners/update", s.globalRunnerUpdate)
50 53
51 54 mux.HandleFunc("POST /api/v1/runners/register", s.runnerRegister)
52 55 mux.HandleFunc("POST /api/v1/runner/heartbeat", s.runnerHeartbeat)
@@ -47,6 +47,9 @@ func (s *Server) routeRunners(mux *http.ServeMux) {
47 mux.HandleFunc("POST /groups/{path}/runners/delete", s.groupRunnerDelete)
47 mux.HandleFunc("POST /groups/{path}/runners/delete", s.groupRunnerDelete)
48 mux.HandleFunc("POST /groups/{path}/runners/options", s.groupRunnerOptions)
48 mux.HandleFunc("POST /groups/{path}/runners/options", s.groupRunnerOptions)
49 mux.HandleFunc("POST /groups/{path}/runners/optin", s.groupRunnerOptIn)
49 mux.HandleFunc("POST /groups/{path}/runners/optin", s.groupRunnerOptIn)
50 mux.HandleFunc("POST /admin/runners/token", s.globalRunnerToken)
51 mux.HandleFunc("POST /admin/runners/delete", s.globalRunnerDelete)
52 mux.HandleFunc("POST /admin/runners/update", s.globalRunnerUpdate)
50
53
51 mux.HandleFunc("POST /api/v1/runners/register", s.runnerRegister)
54 mux.HandleFunc("POST /api/v1/runners/register", s.runnerRegister)
52 mux.HandleFunc("POST /api/v1/runner/heartbeat", s.runnerHeartbeat)
55 mux.HandleFunc("POST /api/v1/runner/heartbeat", s.runnerHeartbeat)
internal/server/runners_api.go +17 −0
@@ -3,6 +3,7 @@ package server
3 3 import (
4 4 "net/http"
5 5 "strconv"
6 "strings"
6 7 "time"
7 8
8 9 "gitlab.com/Timfa/bluegit/internal/access"
@@ -33,6 +34,13 @@ func runnerJSON(r store.Runner) map[string]any {
33 34
34 35 // runnerScope bepaalt de eigenaar uit het pad: /user/... of /groups/{path}/...
35 36 func (s *Server) runnerScope(w http.ResponseWriter, r *http.Request) (string, int64, bool) {
37 if strings.HasPrefix(r.URL.Path, "/api/v1/admin/runners") {
38 if !apiUser(r).InstanceAdmin {
39 s.writeAPIErr(w, r, fail(http.StatusForbidden, i18n.E("err.onlyAdmin")))
40 return "", 0, false
41 }
42 return store.RunnerGlobal, 0, true
43 }
36 44 if r.PathValue("path") != "" {
37 45 g, ok := s.apiGroup(w, r, access.RoleMaintainer)
38 46 if !ok {
@@ -85,6 +93,7 @@ func (s *Server) apiRunnerRegToken(w http.ResponseWriter, r *http.Request) {
85 93 writeJSON(w, http.StatusCreated, map[string]any{
86 94 "token": plain, "owner_kind": kind, "owner_id": owner,
87 95 "expires_at": rfcTime(time.Now().Add(24 * time.Hour)),
96 "warning": globalWarning(kind),
88 97 "register": "bluegit-runner register --url " + s.Cfg.BaseURL + " --token <token>",
89 98 })
90 99 }
@@ -239,3 +248,11 @@ func (s *Server) apiGroupRunnerOptIn(w http.ResponseWriter, r *http.Request) {
239 248 }
240 249 writeJSON(w, http.StatusOK, map[string]any{"enabled": on, "username": u.Username})
241 250 }
251
252 // globalWarning: een globale runner krijgt jobs uit alle repo's, ook privé.
253 func globalWarning(kind string) string {
254 if kind != store.RunnerGlobal {
255 return ""
256 }
257 return "A global runner receives jobs (code and that job's secrets) from every repository, public and private. Only register machines you fully trust."
258 }
@@ -3,6 +3,7 @@ package server
3import (
3import (
4 "net/http"
4 "net/http"
5 "strconv"
5 "strconv"
6 "strings"
6 "time"
7 "time"
7
8
8 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/access"
@@ -33,6 +34,13 @@ func runnerJSON(r store.Runner) map[string]any {
33
34
34// runnerScope bepaalt de eigenaar uit het pad: /user/... of /groups/{path}/...
35// runnerScope bepaalt de eigenaar uit het pad: /user/... of /groups/{path}/...
35func (s *Server) runnerScope(w http.ResponseWriter, r *http.Request) (string, int64, bool) {
36func (s *Server) runnerScope(w http.ResponseWriter, r *http.Request) (string, int64, bool) {
37 if strings.HasPrefix(r.URL.Path, "/api/v1/admin/runners") {
38 if !apiUser(r).InstanceAdmin {
39 s.writeAPIErr(w, r, fail(http.StatusForbidden, i18n.E("err.onlyAdmin")))
40 return "", 0, false
41 }
42 return store.RunnerGlobal, 0, true
43 }
36 if r.PathValue("path") != "" {
44 if r.PathValue("path") != "" {
37 g, ok := s.apiGroup(w, r, access.RoleMaintainer)
45 g, ok := s.apiGroup(w, r, access.RoleMaintainer)
38 if !ok {
46 if !ok {
@@ -85,6 +93,7 @@ func (s *Server) apiRunnerRegToken(w http.ResponseWriter, r *http.Request) {
85 writeJSON(w, http.StatusCreated, map[string]any{
93 writeJSON(w, http.StatusCreated, map[string]any{
86 "token": plain, "owner_kind": kind, "owner_id": owner,
94 "token": plain, "owner_kind": kind, "owner_id": owner,
87 "expires_at": rfcTime(time.Now().Add(24 * time.Hour)),
95 "expires_at": rfcTime(time.Now().Add(24 * time.Hour)),
96 "warning": globalWarning(kind),
88 "register": "bluegit-runner register --url " + s.Cfg.BaseURL + " --token <token>",
97 "register": "bluegit-runner register --url " + s.Cfg.BaseURL + " --token <token>",
89 })
98 })
90}
99}
@@ -239,3 +248,11 @@ func (s *Server) apiGroupRunnerOptIn(w http.ResponseWriter, r *http.Request) {
239 }
248 }
240 writeJSON(w, http.StatusOK, map[string]any{"enabled": on, "username": u.Username})
249 writeJSON(w, http.StatusOK, map[string]any{"enabled": on, "username": u.Username})
241}
250}
251
252// globalWarning: een globale runner krijgt jobs uit alle repo's, ook privé.
253func globalWarning(kind string) string {
254 if kind != store.RunnerGlobal {
255 return ""
256 }
257 return "A global runner receives jobs (code and that job's secrets) from every repository, public and private. Only register machines you fully trust."
258}
internal/server/templates/help.html +30 −0
@@ -25,6 +25,36 @@
25 25 {{define "adminrunner"}}
26 26 {{template "layout-start" .}}
27 27 {{.RunnerUI}}
28 <section class="panel" id="global">
29 <h2>{{t "grun.title"}}</h2>
30 <p class="muted">{{t "grun.lead"}} <a class="helplink" href="/help/runners#globale-runners">{{t "help.runnerDocs"}}</a></p>
31 <p class="flash bad">{{t "grun.warning"}}</p>
32 {{if .NewRunnerToken}}<p>{{t "runner.tokenOnce"}}</p><p class="code">{{.NewRunnerToken}}</p>
33 <pre class="code">sudo bluegit-runner register --url {{.BaseURL}} --token {{.NewRunnerToken}}</pre>{{end}}
34 <form method="post" action="/admin/runners/token" data-confirm="{{t "grun.tokenAsk"}}">
35 <input type="hidden" name="csrf" value="{{.CSRF}}">
36 <span class="tiphost"><button type="submit">{{t "runner.new"}}</button> {{tip "grun.tip.token"}}</span>
37 </form>
38 {{if .RunnerList}}
39 <div class="hscroll">
40 <table class="acct">
41 <thead><tr><th>{{t "acct.col.name"}}</th><th>{{t "runner.status"}}</th><th>{{t "runner.seen"}}</th><th>{{t "runner.version"}}</th><th></th></tr></thead>
42 <tbody>
43 {{range .RunnerList}}<tr>
44 <td><form class="inline tiphost" method="post" action="/admin/runners/update"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}"><input name="name" value="{{.Name}}" maxlength="80" aria-label="{{t "acct.col.name"}}"> <button type="submit" class="ghost small">{{t "grun.rename"}}</button> {{tip "grun.tip.rename"}}</form></td>
45 <td>{{if .Paused}}<span class="pill">{{t "runner.paused"}}</span> {{end}}{{if .Online}}<span class="pill">{{t "runner.online"}}</span>{{else}}<span class="muted">{{t "runner.offline"}}</span>{{end}}</td>
46 <td>{{date .LastSeen}}</td>
47 <td>{{.Version}}</td>
48 <td class="act">
49 <form class="inline tiphost" method="post" action="/admin/runners/update"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}"><input type="hidden" name="paused" value="{{if .Paused}}0{{else}}1{{end}}"><button type="submit" class="ghost">{{if .Paused}}{{t "grun.resume"}}{{else}}{{t "grun.pause"}}{{end}}</button> {{tip "grun.tip.pause"}}</form>
50 <form class="inline" method="post" action="/admin/runners/delete" data-confirm="{{t "runner.revokeAsk"}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}"><button class="danger" type="submit">{{t "acct.revoke"}}</button></form>
51 </td>
52 </tr>{{end}}
53 </tbody>
54 </table>
55 </div>
56 {{else}}<p class="muted">{{t "runner.none"}}</p>{{end}}
57 </section>
28 58 {{template "layout-end" .}}
29 59 {{end}}
30 60
@@ -25,6 +25,36 @@
25{{define "adminrunner"}}
25{{define "adminrunner"}}
26{{template "layout-start" .}}
26{{template "layout-start" .}}
27{{.RunnerUI}}
27{{.RunnerUI}}
28<section class="panel" id="global">
29<h2>{{t "grun.title"}}</h2>
30<p class="muted">{{t "grun.lead"}} <a class="helplink" href="/help/runners#globale-runners">{{t "help.runnerDocs"}}</a></p>
31<p class="flash bad">{{t "grun.warning"}}</p>
32{{if .NewRunnerToken}}<p>{{t "runner.tokenOnce"}}</p><p class="code">{{.NewRunnerToken}}</p>
33<pre class="code">sudo bluegit-runner register --url {{.BaseURL}} --token {{.NewRunnerToken}}</pre>{{end}}
34<form method="post" action="/admin/runners/token" data-confirm="{{t "grun.tokenAsk"}}">
35 <input type="hidden" name="csrf" value="{{.CSRF}}">
36 <span class="tiphost"><button type="submit">{{t "runner.new"}}</button> {{tip "grun.tip.token"}}</span>
37</form>
38{{if .RunnerList}}
39<div class="hscroll">
40<table class="acct">
41 <thead><tr><th>{{t "acct.col.name"}}</th><th>{{t "runner.status"}}</th><th>{{t "runner.seen"}}</th><th>{{t "runner.version"}}</th><th></th></tr></thead>
42 <tbody>
43 {{range .RunnerList}}<tr>
44 <td><form class="inline tiphost" method="post" action="/admin/runners/update"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}"><input name="name" value="{{.Name}}" maxlength="80" aria-label="{{t "acct.col.name"}}"> <button type="submit" class="ghost small">{{t "grun.rename"}}</button> {{tip "grun.tip.rename"}}</form></td>
45 <td>{{if .Paused}}<span class="pill">{{t "runner.paused"}}</span> {{end}}{{if .Online}}<span class="pill">{{t "runner.online"}}</span>{{else}}<span class="muted">{{t "runner.offline"}}</span>{{end}}</td>
46 <td>{{date .LastSeen}}</td>
47 <td>{{.Version}}</td>
48 <td class="act">
49 <form class="inline tiphost" method="post" action="/admin/runners/update"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}"><input type="hidden" name="paused" value="{{if .Paused}}0{{else}}1{{end}}"><button type="submit" class="ghost">{{if .Paused}}{{t "grun.resume"}}{{else}}{{t "grun.pause"}}{{end}}</button> {{tip "grun.tip.pause"}}</form>
50 <form class="inline" method="post" action="/admin/runners/delete" data-confirm="{{t "runner.revokeAsk"}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}"><button class="danger" type="submit">{{t "acct.revoke"}}</button></form>
51 </td>
52 </tr>{{end}}
53 </tbody>
54</table>
55</div>
56{{else}}<p class="muted">{{t "runner.none"}}</p>{{end}}
57</section>
28{{template "layout-end" .}}
58{{template "layout-end" .}}
29{{end}}
59{{end}}
30
60
internal/store/runners.go +4 −0
@@ -41,6 +41,10 @@ const (
41 41 // ErrRegToken is een onbekend, gebruikt of verlopen registratietoken.
42 42 var ErrRegToken = errors.New("registration token invalid or expired")
43 43
44 // RunnerGlobal is een runner van de instance (owner_id 0), door beheerders
45 // geregistreerd, voor jobs uit alle repo's.
46 const RunnerGlobal = "global"
47
44 48 // CreateRunnerRegToken maakt een eenmalig registratietoken (24 uur geldig).
45 49 func (s *Store) CreateRunnerRegToken(ctx context.Context, ownerKind string, ownerID, by int64) (string, error) {
46 50 plain, err := newToken("bgrr_")
@@ -41,6 +41,10 @@ const (
41// ErrRegToken is een onbekend, gebruikt of verlopen registratietoken.
41// ErrRegToken is een onbekend, gebruikt of verlopen registratietoken.
42var ErrRegToken = errors.New("registration token invalid or expired")
42var ErrRegToken = errors.New("registration token invalid or expired")
43
43
44// RunnerGlobal is een runner van de instance (owner_id 0), door beheerders
45// geregistreerd, voor jobs uit alle repo's.
46const RunnerGlobal = "global"
47
44// CreateRunnerRegToken maakt een eenmalig registratietoken (24 uur geldig).
48// CreateRunnerRegToken maakt een eenmalig registratietoken (24 uur geldig).
45func (s *Store) CreateRunnerRegToken(ctx context.Context, ownerKind string, ownerID, by int64) (string, error) {
49func (s *Store) CreateRunnerRegToken(ctx context.Context, ownerKind string, ownerID, by int64) (string, error) {
46 plain, err := newToken("bgrr_")
50 plain, err := newToken("bgrr_")
scripts/bg +14 −1
@@ -206,7 +206,19 @@ cmd_admin() {
206 206 grant|revoke)
207 207 local v=true; [[ $sub == revoke ]] && v=false
208 208 req PUT "$API/admin/users/${1:?gebruiker}/admin" "{\"admin\":$v}" | jq -r '"\(.username) admin=\(.admin)"' ;;
209 *) die "admin list|grant GEBRUIKER|revoke GEBRUIKER" ;;
209 runner)
210 # globale runners (alleen beheerders)
211 local rs=${1:-list}; shift || true
212 case $rs in
213 list) get "$API/admin/runners" | jq -r '.[]|"\(.id)\t\(.name)\t\(.status)\t\(.version)"' ;;
214 token) req POST "$API/admin/runners/registration-token" '{}' | jq -r '"WAARSCHUWING: \(.warning)\ntoken: \(.token) (24 uur geldig)\n\(.register)"' ;;
215 rename) req PUT "$API/admin/runners/${1:?id}" "$(json --arg n "${2:?naam}" '{name:$n}')" | jq -r '"\(.id) \(.name)"' ;;
216 pause|resume) req POST "$API/admin/runners/${1:?id}/$rs" | jq -r '"\(.id) \(.name) \(.status)"' ;;
217 delete) req DELETE "$API/admin/runners/${1:?id}" >/dev/null && echo "verwijderd: ${1}" ;;
218 jobs) get "$API/admin/runners/${1:?id}/jobs" | jq -r '.[]|"\(.id)\t\(.status)\t\(.project // "-")\t\(.name)"' ;;
219 *) die "admin runner list|token|rename ID NAAM|pause ID|resume ID|delete ID|jobs ID" ;;
220 esac ;;
221 *) die "admin list|grant GEBRUIKER|revoke GEBRUIKER|runner …" ;;
210 222 esac
211 223 }
212 224
@@ -296,6 +308,7 @@ usage() {
296 308 bg runner optin --group PAD [on|off] alleen je eigen toestemming (maintainer)
297 309 bg runner wait NAAM|ID [--timeout S] [--group PAD]
298 310 bg runner setup [NAAM] [--group PAD] token + register op deze machine + wachten
311 bg admin runner list|token|rename ID NAAM|pause ID|resume ID|delete ID|jobs ID globale runners (alleen beheerders)
299 312 bg admin list | grant GEBRUIKER | revoke GEBRUIKER beheerders (alleen beheerders; jezelf afnemen kan niet)
300 313 U
301 314 }
@@ -206,7 +206,19 @@ cmd_admin() {
206 grant|revoke)
206 grant|revoke)
207 local v=true; [[ $sub == revoke ]] && v=false
207 local v=true; [[ $sub == revoke ]] && v=false
208 req PUT "$API/admin/users/${1:?gebruiker}/admin" "{\"admin\":$v}" | jq -r '"\(.username) admin=\(.admin)"' ;;
208 req PUT "$API/admin/users/${1:?gebruiker}/admin" "{\"admin\":$v}" | jq -r '"\(.username) admin=\(.admin)"' ;;
209 *) die "admin list|grant GEBRUIKER|revoke GEBRUIKER" ;;
209 runner)
210 # globale runners (alleen beheerders)
211 local rs=${1:-list}; shift || true
212 case $rs in
213 list) get "$API/admin/runners" | jq -r '.[]|"\(.id)\t\(.name)\t\(.status)\t\(.version)"' ;;
214 token) req POST "$API/admin/runners/registration-token" '{}' | jq -r '"WAARSCHUWING: \(.warning)\ntoken: \(.token) (24 uur geldig)\n\(.register)"' ;;
215 rename) req PUT "$API/admin/runners/${1:?id}" "$(json --arg n "${2:?naam}" '{name:$n}')" | jq -r '"\(.id) \(.name)"' ;;
216 pause|resume) req POST "$API/admin/runners/${1:?id}/$rs" | jq -r '"\(.id) \(.name) \(.status)"' ;;
217 delete) req DELETE "$API/admin/runners/${1:?id}" >/dev/null && echo "verwijderd: ${1}" ;;
218 jobs) get "$API/admin/runners/${1:?id}/jobs" | jq -r '.[]|"\(.id)\t\(.status)\t\(.project // "-")\t\(.name)"' ;;
219 *) die "admin runner list|token|rename ID NAAM|pause ID|resume ID|delete ID|jobs ID" ;;
220 esac ;;
221 *) die "admin list|grant GEBRUIKER|revoke GEBRUIKER|runner …" ;;
210 esac
222 esac
211}
223}
212
224
@@ -296,6 +308,7 @@ usage() {
296 bg runner optin --group PAD [on|off] alleen je eigen toestemming (maintainer)
308 bg runner optin --group PAD [on|off] alleen je eigen toestemming (maintainer)
297 bg runner wait NAAM|ID [--timeout S] [--group PAD]
309 bg runner wait NAAM|ID [--timeout S] [--group PAD]
298 bg runner setup [NAAM] [--group PAD] token + register op deze machine + wachten
310 bg runner setup [NAAM] [--group PAD] token + register op deze machine + wachten
311 bg admin runner list|token|rename ID NAAM|pause ID|resume ID|delete ID|jobs ID globale runners (alleen beheerders)
299 bg admin list | grant GEBRUIKER | revoke GEBRUIKER beheerders (alleen beheerders; jezelf afnemen kan niet)
312 bg admin list | grant GEBRUIKER | revoke GEBRUIKER beheerders (alleen beheerders; jezelf afnemen kan niet)
300U
313U
301}
314}