Merged
Release: stage naar master
timfa
wants to merge
2 commits
from
stage
into
master
Overview Commits 2 Pipelines 1 Changes 17
Release: runnerbeheer via de API (!51)
Activity
- timfa Pipeline #211 is Passed 24 October 2026
- timfa opened this merge request 24 October 2026
- timfa merged this merge request 24 October 2026
Commits
Pipelines
- #211 Passed
Changes
@@ -117,9 +117,16 @@ func cmdRegister(args []string) error {
117
117
name := fs.String("name", "", "runner name (default: hostname)")
118
118
cfgPath := fs.String("config", defaultConfig, "config file")
119
119
_ = fs.Parse(args)
120
// Niet-interactief (agents): alles mag ook via de omgeving.
120
121
if *token == "" {
121
122
*token = os.Getenv("BLUEGIT_RUNNER_REGISTRATION_TOKEN")
122
123
}
124
if *url == "" {
125
*url = os.Getenv("BLUEGIT_RUNNER_URL")
126
}
127
if *name == "" {
128
*name = os.Getenv("BLUEGIT_RUNNER_NAME")
129
}
123
130
if *url == "" || *token == "" {
124
131
return errors.New("--url and --token are required")
125
132
}
@@ -117,9 +117,16 @@ func cmdRegister(args []string) error {117
name := fs.String("name", "", "runner name (default: hostname)")117
name := fs.String("name", "", "runner name (default: hostname)")118
cfgPath := fs.String("config", defaultConfig, "config file")118
cfgPath := fs.String("config", defaultConfig, "config file")119
_ = fs.Parse(args)119
_ = fs.Parse(args)120
// Niet-interactief (agents): alles mag ook via de omgeving.120
if *token == "" {121
if *token == "" {121
*token = os.Getenv("BLUEGIT_RUNNER_REGISTRATION_TOKEN")122
*token = os.Getenv("BLUEGIT_RUNNER_REGISTRATION_TOKEN")122
}123
}124
if *url == "" {125
*url = os.Getenv("BLUEGIT_RUNNER_URL")126
}127
if *name == "" {128
*name = os.Getenv("BLUEGIT_RUNNER_NAME")129
}123
if *url == "" || *token == "" {130
if *url == "" || *token == "" {124
return errors.New("--url and --token are required")131
return errors.New("--url and --token are required")125
}132
}@@ -97,3 +97,24 @@ Staat er een self-update klaar, dan starten nieuwe pipelines niet. Ze hebben dan
97
97
- **Forceren** (installeren zonder te wachten):
98
98
- als beheerder: `POST /api/v1/admin/self-update/force`
99
99
- met het update-token: `POST /api/v1/admin/self-update` met `{"force":true}`
100
101
## Runners
102
103
Runnerbeheer kan helemaal met een access token met scope `runners`
104
(zie [runner.md](runner.md#beheer-via-de-api-en-voor-agents)):
105
106
```sh
107
bg runner list [--group PAD] # id, status, naam, laatst gezien, versie
108
bg runner token [--group PAD] # registratietoken (eenmalig, 24 uur) op stdout
109
bg runner setup [NAAM] [--group PAD] # token + sudo bluegit-runner register + wachten tot online
110
bg runner wait NAAM|ID [--timeout S] # exit 0 online, 2 timeout
111
bg runner rename ID NAAM | pause ID | resume ID | delete ID | jobs ID
112
bg runner pref [own_first|builtin_first] # accountvoorkeur
113
bg runner builtin-first --group PAD [true|false]
114
bg runner optin --group PAD [on|off] # alleen je eigen toestemming, als maintainer
115
```
116
117
Het registratietoken is het enige geheim dat `bg` print, en alleen bij
118
`bg runner token`; geef het via `BLUEGIT_RUNNER_REGISTRATION_TOKEN` door
119
in plaats van op de commandoregel. Een job-token (`CI_JOB_TOKEN`) kan geen
120
runners beheren.
@@ -97,3 +97,24 @@ Staat er een self-update klaar, dan starten nieuwe pipelines niet. Ze hebben dan97
- **Forceren** (installeren zonder te wachten):97
- **Forceren** (installeren zonder te wachten):98
- als beheerder: `POST /api/v1/admin/self-update/force`98
- als beheerder: `POST /api/v1/admin/self-update/force`99
- met het update-token: `POST /api/v1/admin/self-update` met `{"force":true}`99
- met het update-token: `POST /api/v1/admin/self-update` met `{"force":true}`100
101
## Runners102
103
Runnerbeheer kan helemaal met een access token met scope `runners`104
(zie [runner.md](runner.md#beheer-via-de-api-en-voor-agents)):105
106
```sh107
bg runner list [--group PAD] # id, status, naam, laatst gezien, versie108
bg runner token [--group PAD] # registratietoken (eenmalig, 24 uur) op stdout109
bg runner setup [NAAM] [--group PAD] # token + sudo bluegit-runner register + wachten tot online110
bg runner wait NAAM|ID [--timeout S] # exit 0 online, 2 timeout111
bg runner rename ID NAAM | pause ID | resume ID | delete ID | jobs ID112
bg runner pref [own_first|builtin_first] # accountvoorkeur113
bg runner builtin-first --group PAD [true|false]114
bg runner optin --group PAD [on|off] # alleen je eigen toestemming, als maintainer115
```116
117
Het registratietoken is het enige geheim dat `bg` print, en alleen bij118
`bg runner token`; geef het via `BLUEGIT_RUNNER_REGISTRATION_TOKEN` door119
in plaats van op de commandoregel. Een job-token (`CI_JOB_TOKEN`) kan geen120
runners beheren.@@ -98,6 +98,42 @@ runnermachine in `work_dir/cache`.
98
98
De job-UI en de API (`runner` in job-JSON: `{id, name, kind}`) tonen
99
99
welke runner een job draaide.
100
100
101
## Beheer via de API (en voor agents)
102
103
Zelfde regels als de UI: account-endpoints alleen voor de eigenaar zelf,
104
groepsendpoints alleen voor maintainers/eigenaar van de groep. Gebruik een
105
access token (`bg_…`) met scope **`runners`** (alleen runnerbeheer) of
106
`api`; `read_api` mag alleen lezen. Job-tokens (`CI_JOB_TOKEN`) en
107
runner-tokens krijgen hier `401`.
108
109
| Methode | Pad (account: `/api/v1/user`, groep: `/api/v1/groups/{pad}`) | |
110
|---|---|---|
111
| GET | `…/runners` | lijst: `id, name, status (online/offline/paused), online, paused, last_seen, version` |
112
| POST | `…/runners/registration-token` | `{token, expires_at}`; het token staat alleen in deze response |
113
| GET | `…/runners/{id}` | één runner |
114
| PUT | `…/runners/{id}` | `{"name": "...", "paused": true}` (beide optioneel) |
115
| POST | `…/runners/{id}/pause`, `…/runners/{id}/resume` | pauzeren/hervatten; gepauzeerd krijgt geen nieuwe jobs |
116
| DELETE | `…/runners/{id}` | intrekken (token werkt meteen niet meer) |
117
| GET | `…/runners/{id}/jobs?limit=20` | recente jobs (project alleen als je dat mag zien) |
118
| GET/PUT | `/api/v1/user/runner-settings` | `{"preference": "builtin_first" \| "own_first"}` |
119
| GET/PUT | `/api/v1/groups/{pad}/runner-settings` | `{"builtin_first": true}`; antwoord noemt ook `opted_in` |
120
| GET/PUT | `/api/v1/groups/{pad}/runner-optin` | `{"enabled": true}` — alleen je eigen toestemming (maintainer) |
121
122
### Volledige setup met alleen een token
123
124
```sh
125
export BLUEGIT_URL=https://git.timfalken.com BLUEGIT_TOKEN=bg_... # scope runners
126
bg runner setup mijn-pc # token maken, sudo bluegit-runner register, wachten tot online
127
# of los:
128
BLUEGIT_RUNNER_REGISTRATION_TOKEN=$(bg runner token) \
129
BLUEGIT_RUNNER_URL=$BLUEGIT_URL BLUEGIT_RUNNER_NAME=mijn-pc \
130
sudo -E bluegit-runner register
131
bg runner wait mijn-pc && bg runner list
132
```
133
134
`bluegit-runner register` leest `BLUEGIT_RUNNER_REGISTRATION_TOKEN`,
135
`BLUEGIT_RUNNER_URL` en `BLUEGIT_RUNNER_NAME` als de vlaggen ontbreken.
136
101
137
## Problemen
102
138
103
139
```sh
@@ -98,6 +98,42 @@ runnermachine in `work_dir/cache`.98
De job-UI en de API (`runner` in job-JSON: `{id, name, kind}`) tonen98
De job-UI en de API (`runner` in job-JSON: `{id, name, kind}`) tonen99
welke runner een job draaide.99
welke runner een job draaide.100
100
101
## Beheer via de API (en voor agents)102
103
Zelfde regels als de UI: account-endpoints alleen voor de eigenaar zelf,104
groepsendpoints alleen voor maintainers/eigenaar van de groep. Gebruik een105
access token (`bg_…`) met scope **`runners`** (alleen runnerbeheer) of106
`api`; `read_api` mag alleen lezen. Job-tokens (`CI_JOB_TOKEN`) en107
runner-tokens krijgen hier `401`.108
109
| Methode | Pad (account: `/api/v1/user`, groep: `/api/v1/groups/{pad}`) | |110
|---|---|---|111
| GET | `…/runners` | lijst: `id, name, status (online/offline/paused), online, paused, last_seen, version` |112
| POST | `…/runners/registration-token` | `{token, expires_at}`; het token staat alleen in deze response |113
| GET | `…/runners/{id}` | één runner |114
| PUT | `…/runners/{id}` | `{"name": "...", "paused": true}` (beide optioneel) |115
| POST | `…/runners/{id}/pause`, `…/runners/{id}/resume` | pauzeren/hervatten; gepauzeerd krijgt geen nieuwe jobs |116
| DELETE | `…/runners/{id}` | intrekken (token werkt meteen niet meer) |117
| GET | `…/runners/{id}/jobs?limit=20` | recente jobs (project alleen als je dat mag zien) |118
| GET/PUT | `/api/v1/user/runner-settings` | `{"preference": "builtin_first" \| "own_first"}` |119
| GET/PUT | `/api/v1/groups/{pad}/runner-settings` | `{"builtin_first": true}`; antwoord noemt ook `opted_in` |120
| GET/PUT | `/api/v1/groups/{pad}/runner-optin` | `{"enabled": true}` — alleen je eigen toestemming (maintainer) |121
122
### Volledige setup met alleen een token123
124
```sh125
export BLUEGIT_URL=https://git.timfalken.com BLUEGIT_TOKEN=bg_... # scope runners126
bg runner setup mijn-pc # token maken, sudo bluegit-runner register, wachten tot online127
# of los:128
BLUEGIT_RUNNER_REGISTRATION_TOKEN=$(bg runner token) \129
BLUEGIT_RUNNER_URL=$BLUEGIT_URL BLUEGIT_RUNNER_NAME=mijn-pc \130
sudo -E bluegit-runner register131
bg runner wait mijn-pc && bg runner list132
```133
134
`bluegit-runner register` leest `BLUEGIT_RUNNER_REGISTRATION_TOKEN`,135
`BLUEGIT_RUNNER_URL` en `BLUEGIT_RUNNER_NAME` als de vlaggen ontbreken.136
101
## Problemen137
## Problemen102
138
103
```sh139
```sh@@ -12,6 +12,8 @@ const (
12
12
ScopeReadAPI = "read_api"
13
13
ScopeReadRepo = "read_repository"
14
14
ScopeWriteRepo = "write_repository"
15
// ScopeRunners is alleen runnerbeheer (lijsten, tokens, pauzeren, voorkeuren).
16
ScopeRunners = "runners"
15
17
)
16
18
17
19
// ScopeClass is het soort aanroep dat een token moet toestaan.
@@ -24,6 +26,8 @@ const (
24
26
ScopeRepoRead
25
27
ScopeRepoWrite
26
28
ScopeAdmin
29
ScopeRunnerRead
30
ScopeRunnerWrite
27
31
)
28
32
29
33
// Scopes is de verzameling rechten op een toegangstoken.
@@ -47,7 +51,7 @@ func ParseScopes(in []string) (string, Scopes, error) {
47
51
continue
48
52
}
49
53
switch name {
50
case ScopeAPI, ScopeReadAPI, ScopeReadRepo, ScopeWriteRepo:
54
case ScopeAPI, ScopeReadAPI, ScopeReadRepo, ScopeWriteRepo, ScopeRunners:
51
55
default:
52
56
return "", Scopes{}, i18n.E("err.scopeName", name)
53
57
}
@@ -114,6 +118,10 @@ func (s Scopes) Allows(class ScopeClass) bool {
114
118
return s.APIRead() || s.RepoRead()
115
119
case ScopeRepoWrite:
116
120
return s.APIWrite() || s.RepoWrite()
121
case ScopeRunnerRead:
122
return s.APIRead() || s.set[ScopeRunners]
123
case ScopeRunnerWrite:
124
return s.APIWrite() || s.set[ScopeRunners]
117
125
default:
118
126
return false
119
127
}
@@ -12,6 +12,8 @@ const (12
ScopeReadAPI = "read_api"12
ScopeReadAPI = "read_api"13
ScopeReadRepo = "read_repository"13
ScopeReadRepo = "read_repository"14
ScopeWriteRepo = "write_repository"14
ScopeWriteRepo = "write_repository"15
// ScopeRunners is alleen runnerbeheer (lijsten, tokens, pauzeren, voorkeuren).16
ScopeRunners = "runners"15
)17
)16
18
17
// ScopeClass is het soort aanroep dat een token moet toestaan.19
// ScopeClass is het soort aanroep dat een token moet toestaan.@@ -24,6 +26,8 @@ const (24
ScopeRepoRead26
ScopeRepoRead25
ScopeRepoWrite27
ScopeRepoWrite26
ScopeAdmin28
ScopeAdmin29
ScopeRunnerRead30
ScopeRunnerWrite27
)31
)28
32
29
// Scopes is de verzameling rechten op een toegangstoken.33
// Scopes is de verzameling rechten op een toegangstoken.@@ -47,7 +51,7 @@ func ParseScopes(in []string) (string, Scopes, error) {47
continue51
continue48
}52
}49
switch name {53
switch name {50
case ScopeAPI, ScopeReadAPI, ScopeReadRepo, ScopeWriteRepo:54
case ScopeAPI, ScopeReadAPI, ScopeReadRepo, ScopeWriteRepo, ScopeRunners:51
default:55
default:52
return "", Scopes{}, i18n.E("err.scopeName", name)56
return "", Scopes{}, i18n.E("err.scopeName", name)53
}57
}@@ -114,6 +118,10 @@ func (s Scopes) Allows(class ScopeClass) bool {114
return s.APIRead() || s.RepoRead()118
return s.APIRead() || s.RepoRead()115
case ScopeRepoWrite:119
case ScopeRepoWrite:116
return s.APIWrite() || s.RepoWrite()120
return s.APIWrite() || s.RepoWrite()121
case ScopeRunnerRead:122
return s.APIRead() || s.set[ScopeRunners]123
case ScopeRunnerWrite:124
return s.APIWrite() || s.set[ScopeRunners]117
default:125
default:118
return false126
return false119
}127
}@@ -17,7 +17,7 @@ var apiEN = map[string]string{
17
17
"err.mrBlocked": "%s",
18
18
"info.api.title": "API",
19
19
"info.api.lead": "Everything the web interface can do is also available under /api/v1. The machine-readable description is the OpenAPI document.",
20
"info.api.auth": "Send the token as Authorization: Bearer, as the PRIVATE-TOKEN header, or as the password of HTTP basic authentication. Git over HTTP uses the same token. Scopes are api, read_api, read_repository and write_repository. api covers the whole API and git. A token can expire.",
20
"info.api.auth": "Send the token as Authorization: Bearer, as the PRIVATE-TOKEN header, or as the password of HTTP basic authentication. Git over HTTP uses the same token. Scopes are api, read_api, read_repository, write_repository and runners (runner management only). api covers the whole API and git. A token can expire.",
21
21
"info.api.ssh": "An SSH key can call the same handlers: ssh git@host api METHOD /api/v1/... with a JSON body on stdin. The exit status is 0 when the HTTP status is below 400. The numeric status is written to stderr.",
22
22
"info.api.spec": "OpenAPI",
23
23
}
@@ -32,7 +32,7 @@ var apiNL = map[string]string{
32
32
"err.mrBlocked": "%s",
33
33
"info.api.title": "API",
34
34
"info.api.lead": "Alles wat de webinterface kan, kan ook via /api/v1. De machine-leesbare beschrijving is het OpenAPI-document.",
35
"info.api.auth": "Stuur het token als Authorization: Bearer, als PRIVATE-TOKEN-header, of als wachtwoord van HTTP basic. Git over HTTP gebruikt hetzelfde token. Scopes zijn api, read_api, read_repository en write_repository. api dekt de hele API en git. Een token kan verlopen.",
35
"info.api.auth": "Stuur het token als Authorization: Bearer, als PRIVATE-TOKEN-header, of als wachtwoord van HTTP basic. Git over HTTP gebruikt hetzelfde token. Scopes zijn api, read_api, read_repository, write_repository en runners (alleen runnerbeheer). api dekt de hele API en git. Een token kan verlopen.",
36
36
"info.api.ssh": "Een SSH-sleutel roept dezelfde handlers aan: ssh git@host api METHOD /api/v1/... met een JSON-body op stdin. De exitstatus is 0 als de HTTP-status onder 400 ligt. Het statusgetal gaat naar stderr.",
37
37
"info.api.spec": "OpenAPI",
38
38
}
@@ -47,7 +47,7 @@ var apiDE = map[string]string{
47
47
"err.mrBlocked": "%s",
48
48
"info.api.title": "API",
49
49
"info.api.lead": "Alles, was die Weboberfläche kann, geht auch über /api/v1. Die maschinenlesbare Beschreibung ist das OpenAPI-Dokument.",
50
"info.api.auth": "Sende das Token als Authorization: Bearer, als PRIVATE-TOKEN-Header oder als Passwort von HTTP Basic. Git über HTTP nutzt dasselbe Token. Scopes sind api, read_api, read_repository und write_repository. api deckt die ganze API und Git ab. Ein Token kann ablaufen.",
50
"info.api.auth": "Sende das Token als Authorization: Bearer, als PRIVATE-TOKEN-Header oder als Passwort von HTTP Basic. Git über HTTP nutzt dasselbe Token. Scopes sind api, read_api, read_repository, write_repository und runners (nur Runner-Verwaltung). api deckt die ganze API und Git ab. Ein Token kann ablaufen.",
51
51
"info.api.ssh": "Ein SSH-Schlüssel ruft dieselben Handler auf: ssh git@host api METHOD /api/v1/... mit einem JSON-Body auf stdin. Der Exit-Status ist 0, wenn der HTTP-Status unter 400 liegt. Die Statuszahl geht nach stderr.",
52
52
"info.api.spec": "OpenAPI",
53
53
}
@@ -62,7 +62,7 @@ var apiFR = map[string]string{
62
62
"err.mrBlocked": "%s",
63
63
"info.api.title": "API",
64
64
"info.api.lead": "Tout ce que l'interface web sait faire est aussi disponible sous /api/v1. La description lisible par une machine est le document OpenAPI.",
65
"info.api.auth": "Envoie le jeton dans Authorization: Bearer, dans l'en-tête PRIVATE-TOKEN, ou comme mot de passe de l'authentification HTTP basic. Git via HTTP utilise le même jeton. Les portées sont api, read_api, read_repository et write_repository. api couvre toute l'API et git. Un jeton peut expirer.",
65
"info.api.auth": "Envoie le jeton dans Authorization: Bearer, dans l'en-tête PRIVATE-TOKEN, ou comme mot de passe de l'authentification HTTP basic. Git via HTTP utilise le même jeton. Les portées sont api, read_api, read_repository, write_repository et runners (gestion des runners uniquement). api couvre toute l'API et git. Un jeton peut expirer.",
66
66
"info.api.ssh": "Une clé SSH appelle les mêmes handlers : ssh git@host api METHOD /api/v1/... avec un corps JSON sur stdin. Le code de sortie est 0 si le statut HTTP est inférieur à 400. Le numéro de statut va sur stderr.",
67
67
"info.api.spec": "OpenAPI",
68
68
}
@@ -17,7 +17,7 @@ var apiEN = map[string]string{17
"err.mrBlocked": "%s",17
"err.mrBlocked": "%s",18
"info.api.title": "API",18
"info.api.title": "API",19
"info.api.lead": "Everything the web interface can do is also available under /api/v1. The machine-readable description is the OpenAPI document.",19
"info.api.lead": "Everything the web interface can do is also available under /api/v1. The machine-readable description is the OpenAPI document.",20
"info.api.auth": "Send the token as Authorization: Bearer, as the PRIVATE-TOKEN header, or as the password of HTTP basic authentication. Git over HTTP uses the same token. Scopes are api, read_api, read_repository and write_repository. api covers the whole API and git. A token can expire.",20
"info.api.auth": "Send the token as Authorization: Bearer, as the PRIVATE-TOKEN header, or as the password of HTTP basic authentication. Git over HTTP uses the same token. Scopes are api, read_api, read_repository, write_repository and runners (runner management only). api covers the whole API and git. A token can expire.",21
"info.api.ssh": "An SSH key can call the same handlers: ssh git@host api METHOD /api/v1/... with a JSON body on stdin. The exit status is 0 when the HTTP status is below 400. The numeric status is written to stderr.",21
"info.api.ssh": "An SSH key can call the same handlers: ssh git@host api METHOD /api/v1/... with a JSON body on stdin. The exit status is 0 when the HTTP status is below 400. The numeric status is written to stderr.",22
"info.api.spec": "OpenAPI",22
"info.api.spec": "OpenAPI",23
}23
}@@ -32,7 +32,7 @@ var apiNL = map[string]string{32
"err.mrBlocked": "%s",32
"err.mrBlocked": "%s",33
"info.api.title": "API",33
"info.api.title": "API",34
"info.api.lead": "Alles wat de webinterface kan, kan ook via /api/v1. De machine-leesbare beschrijving is het OpenAPI-document.",34
"info.api.lead": "Alles wat de webinterface kan, kan ook via /api/v1. De machine-leesbare beschrijving is het OpenAPI-document.",35
"info.api.auth": "Stuur het token als Authorization: Bearer, als PRIVATE-TOKEN-header, of als wachtwoord van HTTP basic. Git over HTTP gebruikt hetzelfde token. Scopes zijn api, read_api, read_repository en write_repository. api dekt de hele API en git. Een token kan verlopen.",35
"info.api.auth": "Stuur het token als Authorization: Bearer, als PRIVATE-TOKEN-header, of als wachtwoord van HTTP basic. Git over HTTP gebruikt hetzelfde token. Scopes zijn api, read_api, read_repository, write_repository en runners (alleen runnerbeheer). api dekt de hele API en git. Een token kan verlopen.",36
"info.api.ssh": "Een SSH-sleutel roept dezelfde handlers aan: ssh git@host api METHOD /api/v1/... met een JSON-body op stdin. De exitstatus is 0 als de HTTP-status onder 400 ligt. Het statusgetal gaat naar stderr.",36
"info.api.ssh": "Een SSH-sleutel roept dezelfde handlers aan: ssh git@host api METHOD /api/v1/... met een JSON-body op stdin. De exitstatus is 0 als de HTTP-status onder 400 ligt. Het statusgetal gaat naar stderr.",37
"info.api.spec": "OpenAPI",37
"info.api.spec": "OpenAPI",38
}38
}@@ -47,7 +47,7 @@ var apiDE = map[string]string{47
"err.mrBlocked": "%s",47
"err.mrBlocked": "%s",48
"info.api.title": "API",48
"info.api.title": "API",49
"info.api.lead": "Alles, was die Weboberfläche kann, geht auch über /api/v1. Die maschinenlesbare Beschreibung ist das OpenAPI-Dokument.",49
"info.api.lead": "Alles, was die Weboberfläche kann, geht auch über /api/v1. Die maschinenlesbare Beschreibung ist das OpenAPI-Dokument.",50
"info.api.auth": "Sende das Token als Authorization: Bearer, als PRIVATE-TOKEN-Header oder als Passwort von HTTP Basic. Git über HTTP nutzt dasselbe Token. Scopes sind api, read_api, read_repository und write_repository. api deckt die ganze API und Git ab. Ein Token kann ablaufen.",50
"info.api.auth": "Sende das Token als Authorization: Bearer, als PRIVATE-TOKEN-Header oder als Passwort von HTTP Basic. Git über HTTP nutzt dasselbe Token. Scopes sind api, read_api, read_repository, write_repository und runners (nur Runner-Verwaltung). api deckt die ganze API und Git ab. Ein Token kann ablaufen.",51
"info.api.ssh": "Ein SSH-Schlüssel ruft dieselben Handler auf: ssh git@host api METHOD /api/v1/... mit einem JSON-Body auf stdin. Der Exit-Status ist 0, wenn der HTTP-Status unter 400 liegt. Die Statuszahl geht nach stderr.",51
"info.api.ssh": "Ein SSH-Schlüssel ruft dieselben Handler auf: ssh git@host api METHOD /api/v1/... mit einem JSON-Body auf stdin. Der Exit-Status ist 0, wenn der HTTP-Status unter 400 liegt. Die Statuszahl geht nach stderr.",52
"info.api.spec": "OpenAPI",52
"info.api.spec": "OpenAPI",53
}53
}@@ -62,7 +62,7 @@ var apiFR = map[string]string{62
"err.mrBlocked": "%s",62
"err.mrBlocked": "%s",63
"info.api.title": "API",63
"info.api.title": "API",64
"info.api.lead": "Tout ce que l'interface web sait faire est aussi disponible sous /api/v1. La description lisible par une machine est le document OpenAPI.",64
"info.api.lead": "Tout ce que l'interface web sait faire est aussi disponible sous /api/v1. La description lisible par une machine est le document OpenAPI.",65
"info.api.auth": "Envoie le jeton dans Authorization: Bearer, dans l'en-tête PRIVATE-TOKEN, ou comme mot de passe de l'authentification HTTP basic. Git via HTTP utilise le même jeton. Les portées sont api, read_api, read_repository et write_repository. api couvre toute l'API et git. Un jeton peut expirer.",65
"info.api.auth": "Envoie le jeton dans Authorization: Bearer, dans l'en-tête PRIVATE-TOKEN, ou comme mot de passe de l'authentification HTTP basic. Git via HTTP utilise le même jeton. Les portées sont api, read_api, read_repository, write_repository et runners (gestion des runners uniquement). api couvre toute l'API et git. Un jeton peut expirer.",66
"info.api.ssh": "Une clé SSH appelle les mêmes handlers : ssh git@host api METHOD /api/v1/... avec un corps JSON sur stdin. Le code de sortie est 0 si le statut HTTP est inférieur à 400. Le numéro de statut va sur stderr.",66
"info.api.ssh": "Une clé SSH appelle les mêmes handlers : ssh git@host api METHOD /api/v1/... avec un corps JSON sur stdin. Le code de sortie est 0 si le statut HTTP est inférieur à 400. Le numéro de statut va sur stderr.",67
"info.api.spec": "OpenAPI",67
"info.api.spec": "OpenAPI",68
}68
}@@ -8,6 +8,7 @@ func init() {
8
8
}
9
9
10
10
var runnerEN = map[string]string{
11
"runner.paused": "paused",
11
12
"runner.title": "Runners",
12
13
"runner.userLead": "Run CI jobs of your projects on your own machine with bluegit-runner. Create a registration token and run the command on that machine.",
13
14
"runner.groupLead": "Order for this group: group runners, then account runners of maintainers who allowed it, then the BlueGit runner.",
@@ -34,6 +35,7 @@ var runnerEN = map[string]string{
34
35
}
35
36
36
37
var runnerNL = map[string]string{
38
"runner.paused": "gepauzeerd",
37
39
"runner.title": "Runners",
38
40
"runner.userLead": "Draai CI-jobs van je projecten op je eigen machine met bluegit-runner. Maak een registratietoken en voer het commando uit op die machine.",
39
41
"runner.groupLead": "Volgorde voor deze groep: groepsrunners, dan account-runners van maintainers die toestemming gaven, dan de BlueGit-runner.",
@@ -60,6 +62,7 @@ var runnerNL = map[string]string{
60
62
}
61
63
62
64
var runnerDE = map[string]string{
65
"runner.paused": "pausiert",
63
66
"runner.title": "Runner",
64
67
"runner.userLead": "Führe CI-Jobs deiner Projekte mit bluegit-runner auf deinem eigenen Rechner aus. Erstelle ein Registrierungstoken und führe den Befehl dort aus.",
65
68
"runner.groupLead": "Reihenfolge für diese Gruppe: Gruppen-Runner, dann Konto-Runner von Maintainern mit Zustimmung, dann der BlueGit-Runner.",
@@ -86,6 +89,7 @@ var runnerDE = map[string]string{
86
89
}
87
90
88
91
var runnerFR = map[string]string{
92
"runner.paused": "en pause",
89
93
"runner.title": "Runners",
90
94
"runner.userLead": "Exécutez les jobs CI de vos projets sur votre propre machine avec bluegit-runner. Créez un jeton d'enregistrement et lancez la commande sur cette machine.",
91
95
"runner.groupLead": "Ordre pour ce groupe : runners du groupe, puis runners de compte des mainteneurs qui l'ont autorisé, puis le runner BlueGit.",
@@ -8,6 +8,7 @@ func init() {8
}8
}9
9
10
var runnerEN = map[string]string{10
var runnerEN = map[string]string{11
"runner.paused": "paused",11
"runner.title": "Runners",12
"runner.title": "Runners",12
"runner.userLead": "Run CI jobs of your projects on your own machine with bluegit-runner. Create a registration token and run the command on that machine.",13
"runner.userLead": "Run CI jobs of your projects on your own machine with bluegit-runner. Create a registration token and run the command on that machine.",13
"runner.groupLead": "Order for this group: group runners, then account runners of maintainers who allowed it, then the BlueGit runner.",14
"runner.groupLead": "Order for this group: group runners, then account runners of maintainers who allowed it, then the BlueGit runner.",@@ -34,6 +35,7 @@ var runnerEN = map[string]string{34
}35
}35
36
36
var runnerNL = map[string]string{37
var runnerNL = map[string]string{38
"runner.paused": "gepauzeerd",37
"runner.title": "Runners",39
"runner.title": "Runners",38
"runner.userLead": "Draai CI-jobs van je projecten op je eigen machine met bluegit-runner. Maak een registratietoken en voer het commando uit op die machine.",40
"runner.userLead": "Draai CI-jobs van je projecten op je eigen machine met bluegit-runner. Maak een registratietoken en voer het commando uit op die machine.",39
"runner.groupLead": "Volgorde voor deze groep: groepsrunners, dan account-runners van maintainers die toestemming gaven, dan de BlueGit-runner.",41
"runner.groupLead": "Volgorde voor deze groep: groepsrunners, dan account-runners van maintainers die toestemming gaven, dan de BlueGit-runner.",@@ -60,6 +62,7 @@ var runnerNL = map[string]string{60
}62
}61
63
62
var runnerDE = map[string]string{64
var runnerDE = map[string]string{65
"runner.paused": "pausiert",63
"runner.title": "Runner",66
"runner.title": "Runner",64
"runner.userLead": "Führe CI-Jobs deiner Projekte mit bluegit-runner auf deinem eigenen Rechner aus. Erstelle ein Registrierungstoken und führe den Befehl dort aus.",67
"runner.userLead": "Führe CI-Jobs deiner Projekte mit bluegit-runner auf deinem eigenen Rechner aus. Erstelle ein Registrierungstoken und führe den Befehl dort aus.",65
"runner.groupLead": "Reihenfolge für diese Gruppe: Gruppen-Runner, dann Konto-Runner von Maintainern mit Zustimmung, dann der BlueGit-Runner.",68
"runner.groupLead": "Reihenfolge für diese Gruppe: Gruppen-Runner, dann Konto-Runner von Maintainern mit Zustimmung, dann der BlueGit-Runner.",@@ -86,6 +89,7 @@ var runnerDE = map[string]string{86
}89
}87
90
88
var runnerFR = map[string]string{91
var runnerFR = map[string]string{92
"runner.paused": "en pause",89
"runner.title": "Runners",93
"runner.title": "Runners",90
"runner.userLead": "Exécutez les jobs CI de vos projets sur votre propre machine avec bluegit-runner. Créez un jeton d'enregistrement et lancez la commande sur cette machine.",94
"runner.userLead": "Exécutez les jobs CI de vos projets sur votre propre machine avec bluegit-runner. Créez un jeton d'enregistrement et lancez la commande sur cette machine.",91
"runner.groupLead": "Ordre pour ce groupe : runners du groupe, puis runners de compte des mainteneurs qui l'ont autorisé, puis le runner BlueGit.",95
"runner.groupLead": "Ordre pour ce groupe : runners du groupe, puis runners de compte des mainteneurs qui l'ont autorisé, puis le runner BlueGit.",@@ -79,13 +79,24 @@ func Tiers(ctx context.Context, st *store.Store, repo store.Repo) ([]Tier, error
79
79
}
80
80
opted = append(opted, rs...)
81
81
}
82
return Order("group", "", st.GroupBuiltinFirst(ctx, repo.OwnerID), nil, group, opted), nil
82
return Order("group", "", st.GroupBuiltinFirst(ctx, repo.OwnerID), nil, active(group), active(opted)), nil
83
83
}
84
84
own, err := st.ListRunners(ctx, "user", repo.OwnerID)
85
85
if err != nil {
86
86
return nil, err
87
87
}
88
return Order("user", st.UserRunnerPref(ctx, repo.OwnerID), false, own, nil, nil), nil
88
return Order("user", st.UserRunnerPref(ctx, repo.OwnerID), false, active(own), nil, nil), nil
89
}
90
91
// active laat gepauzeerde runners weg uit de volgorde.
92
func active(rs []store.Runner) []store.Runner {
93
var out []store.Runner
94
for _, r := range rs {
95
if !r.Paused {
96
out = append(out, r)
97
}
98
}
99
return out
89
100
}
90
101
91
102
func anyOnline(rs []store.Runner, now time.Time) bool {
@@ -79,13 +79,24 @@ func Tiers(ctx context.Context, st *store.Store, repo store.Repo) ([]Tier, error79
}79
}80
opted = append(opted, rs...)80
opted = append(opted, rs...)81
}81
}82
return Order("group", "", st.GroupBuiltinFirst(ctx, repo.OwnerID), nil, group, opted), nil82
return Order("group", "", st.GroupBuiltinFirst(ctx, repo.OwnerID), nil, active(group), active(opted)), nil83
}83
}84
own, err := st.ListRunners(ctx, "user", repo.OwnerID)84
own, err := st.ListRunners(ctx, "user", repo.OwnerID)85
if err != nil {85
if err != nil {86
return nil, err86
return nil, err87
}87
}88
return Order("user", st.UserRunnerPref(ctx, repo.OwnerID), false, own, nil, nil), nil88
return Order("user", st.UserRunnerPref(ctx, repo.OwnerID), false, active(own), nil, nil), nil89
}90
91
// active laat gepauzeerde runners weg uit de volgorde.92
func active(rs []store.Runner) []store.Runner {93
var out []store.Runner94
for _, r := range rs {95
if !r.Paused {96
out = append(out, r)97
}98
}99
return out89
}100
}90
101
91
func anyOnline(rs []store.Runner, now time.Time) bool {102
func anyOnline(rs []store.Runner, now time.Time) bool {@@ -169,6 +169,21 @@ func TestTiersAndPrivacy(t *testing.T) {
169
169
tiers, _ = Tiers(ctx, s, trepo)
170
170
eq(t, names(tiers), "tim-pc", "builtin")
171
171
172
// Gepauzeerd: valt uit de volgorde, blijft in de lijst.
173
paused := true
174
if _, err := s.UpdateRunner(ctx, "user", carol.ID, carolRn.ID, nil, &paused); err != nil {
175
t.Fatal(err)
176
}
177
_ = s.SetGroupBuiltinFirst(ctx, g.ID, false)
178
tiers, _ = Tiers(ctx, s, grepo)
179
eq(t, names(tiers), "grp", "builtin")
180
if rs, _ := s.ListRunners(ctx, "user", carol.ID); len(rs) != 1 || !rs[0].Paused {
181
t.Fatal("paused runner listed")
182
}
183
if _, err := s.UpdateRunner(ctx, "user", tim.ID, carolRn.ID, nil, &paused); err == nil {
184
t.Fatal("tim paused carol's runner")
185
}
186
172
187
r := &Runner{Store: s}
173
188
if !r.mayRun(ctx, grn, grepo) || r.mayRun(ctx, grn, trepo) {
174
189
t.Fatal("group runner scope")
@@ -169,6 +169,21 @@ func TestTiersAndPrivacy(t *testing.T) {169
tiers, _ = Tiers(ctx, s, trepo)169
tiers, _ = Tiers(ctx, s, trepo)170
eq(t, names(tiers), "tim-pc", "builtin")170
eq(t, names(tiers), "tim-pc", "builtin")171
171
172
// Gepauzeerd: valt uit de volgorde, blijft in de lijst.173
paused := true174
if _, err := s.UpdateRunner(ctx, "user", carol.ID, carolRn.ID, nil, &paused); err != nil {175
t.Fatal(err)176
}177
_ = s.SetGroupBuiltinFirst(ctx, g.ID, false)178
tiers, _ = Tiers(ctx, s, grepo)179
eq(t, names(tiers), "grp", "builtin")180
if rs, _ := s.ListRunners(ctx, "user", carol.ID); len(rs) != 1 || !rs[0].Paused {181
t.Fatal("paused runner listed")182
}183
if _, err := s.UpdateRunner(ctx, "user", tim.ID, carolRn.ID, nil, &paused); err == nil {184
t.Fatal("tim paused carol's runner")185
}186
172
r := &Runner{Store: s}187
r := &Runner{Store: s}173
if !r.mayRun(ctx, grn, grepo) || r.mayRun(ctx, grn, trepo) {188
if !r.mayRun(ctx, grn, grepo) || r.mayRun(ctx, grn, trepo) {174
t.Fatal("group runner scope")189
t.Fatal("group runner scope")@@ -7,6 +7,29 @@ import (
7
7
)
8
8
9
9
var apiCatalog = []apiRoute{
10
{http.MethodGet, "/api/v1/user/runners", access.ScopeRunnerRead, authUser, "List account runners", (*Server).apiRunners},
11
{http.MethodPost, "/api/v1/user/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create account runner registration token", (*Server).apiRunnerRegToken},
12
{http.MethodGet, "/api/v1/user/runners/{id}", access.ScopeRunnerRead, authUser, "Get account runner", (*Server).apiRunnerGet},
13
{http.MethodPut, "/api/v1/user/runners/{id}", access.ScopeRunnerWrite, authUser, "Rename or pause account runner", (*Server).apiRunnerPut},
14
{http.MethodPost, "/api/v1/user/runners/{id}/pause", access.ScopeRunnerWrite, authUser, "Pause account runner", (*Server).apiRunnerPause},
15
{http.MethodPost, "/api/v1/user/runners/{id}/resume", access.ScopeRunnerWrite, authUser, "Resume account runner", (*Server).apiRunnerResume},
16
{http.MethodDelete, "/api/v1/user/runners/{id}", access.ScopeRunnerWrite, authUser, "Revoke account runner", (*Server).apiRunnerDelete},
17
{http.MethodGet, "/api/v1/user/runners/{id}/jobs", access.ScopeRunnerRead, authUser, "Recent jobs of account runner", (*Server).apiRunnerJobs},
18
{http.MethodGet, "/api/v1/groups/{path}/runners", access.ScopeRunnerRead, authUser, "List group runners", (*Server).apiRunners},
19
{http.MethodPost, "/api/v1/groups/{path}/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create group runner registration token", (*Server).apiRunnerRegToken},
20
{http.MethodGet, "/api/v1/groups/{path}/runners/{id}", access.ScopeRunnerRead, authUser, "Get group runner", (*Server).apiRunnerGet},
21
{http.MethodPut, "/api/v1/groups/{path}/runners/{id}", access.ScopeRunnerWrite, authUser, "Rename or pause group runner", (*Server).apiRunnerPut},
22
{http.MethodPost, "/api/v1/groups/{path}/runners/{id}/pause", access.ScopeRunnerWrite, authUser, "Pause group runner", (*Server).apiRunnerPause},
23
{http.MethodPost, "/api/v1/groups/{path}/runners/{id}/resume", access.ScopeRunnerWrite, authUser, "Resume group runner", (*Server).apiRunnerResume},
24
{http.MethodDelete, "/api/v1/groups/{path}/runners/{id}", access.ScopeRunnerWrite, authUser, "Revoke group runner", (*Server).apiRunnerDelete},
25
{http.MethodGet, "/api/v1/groups/{path}/runners/{id}/jobs", access.ScopeRunnerRead, authUser, "Recent jobs of group runner", (*Server).apiRunnerJobs},
26
{http.MethodGet, "/api/v1/user/runner-settings", access.ScopeRunnerRead, authUser, "Get runner preference", (*Server).apiUserRunnerSettings},
27
{http.MethodPut, "/api/v1/user/runner-settings", access.ScopeRunnerWrite, authUser, "Set runner preference", (*Server).apiUserRunnerSettings},
28
{http.MethodGet, "/api/v1/groups/{path}/runner-settings", access.ScopeRunnerRead, authUser, "Get group runner settings", (*Server).apiGroupRunnerSettings},
29
{http.MethodPut, "/api/v1/groups/{path}/runner-settings", access.ScopeRunnerWrite, authUser, "Set group runner settings", (*Server).apiGroupRunnerSettings},
30
{http.MethodGet, "/api/v1/groups/{path}/runner-optin", access.ScopeRunnerRead, authUser, "Get own runner opt-in for group", (*Server).apiGroupRunnerOptIn},
31
{http.MethodPut, "/api/v1/groups/{path}/runner-optin", access.ScopeRunnerWrite, authUser, "Set own runner opt-in for group", (*Server).apiGroupRunnerOptIn},
32
10
33
{http.MethodGet, "/api/v1/ci/spec", access.ScopePublic, authPublic, "CI specification", (*Server).ciSpec},
11
34
{http.MethodGet, "/api/v1/ci/presets", access.ScopePublic, authPublic, "CI image presets", (*Server).apiPresets},
12
35
@@ -7,6 +7,29 @@ import (7
)7
)8
8
9
var apiCatalog = []apiRoute{9
var apiCatalog = []apiRoute{10
{http.MethodGet, "/api/v1/user/runners", access.ScopeRunnerRead, authUser, "List account runners", (*Server).apiRunners},11
{http.MethodPost, "/api/v1/user/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create account runner registration token", (*Server).apiRunnerRegToken},12
{http.MethodGet, "/api/v1/user/runners/{id}", access.ScopeRunnerRead, authUser, "Get account runner", (*Server).apiRunnerGet},13
{http.MethodPut, "/api/v1/user/runners/{id}", access.ScopeRunnerWrite, authUser, "Rename or pause account runner", (*Server).apiRunnerPut},14
{http.MethodPost, "/api/v1/user/runners/{id}/pause", access.ScopeRunnerWrite, authUser, "Pause account runner", (*Server).apiRunnerPause},15
{http.MethodPost, "/api/v1/user/runners/{id}/resume", access.ScopeRunnerWrite, authUser, "Resume account runner", (*Server).apiRunnerResume},16
{http.MethodDelete, "/api/v1/user/runners/{id}", access.ScopeRunnerWrite, authUser, "Revoke account runner", (*Server).apiRunnerDelete},17
{http.MethodGet, "/api/v1/user/runners/{id}/jobs", access.ScopeRunnerRead, authUser, "Recent jobs of account runner", (*Server).apiRunnerJobs},18
{http.MethodGet, "/api/v1/groups/{path}/runners", access.ScopeRunnerRead, authUser, "List group runners", (*Server).apiRunners},19
{http.MethodPost, "/api/v1/groups/{path}/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create group runner registration token", (*Server).apiRunnerRegToken},20
{http.MethodGet, "/api/v1/groups/{path}/runners/{id}", access.ScopeRunnerRead, authUser, "Get group runner", (*Server).apiRunnerGet},21
{http.MethodPut, "/api/v1/groups/{path}/runners/{id}", access.ScopeRunnerWrite, authUser, "Rename or pause group runner", (*Server).apiRunnerPut},22
{http.MethodPost, "/api/v1/groups/{path}/runners/{id}/pause", access.ScopeRunnerWrite, authUser, "Pause group runner", (*Server).apiRunnerPause},23
{http.MethodPost, "/api/v1/groups/{path}/runners/{id}/resume", access.ScopeRunnerWrite, authUser, "Resume group runner", (*Server).apiRunnerResume},24
{http.MethodDelete, "/api/v1/groups/{path}/runners/{id}", access.ScopeRunnerWrite, authUser, "Revoke group runner", (*Server).apiRunnerDelete},25
{http.MethodGet, "/api/v1/groups/{path}/runners/{id}/jobs", access.ScopeRunnerRead, authUser, "Recent jobs of group runner", (*Server).apiRunnerJobs},26
{http.MethodGet, "/api/v1/user/runner-settings", access.ScopeRunnerRead, authUser, "Get runner preference", (*Server).apiUserRunnerSettings},27
{http.MethodPut, "/api/v1/user/runner-settings", access.ScopeRunnerWrite, authUser, "Set runner preference", (*Server).apiUserRunnerSettings},28
{http.MethodGet, "/api/v1/groups/{path}/runner-settings", access.ScopeRunnerRead, authUser, "Get group runner settings", (*Server).apiGroupRunnerSettings},29
{http.MethodPut, "/api/v1/groups/{path}/runner-settings", access.ScopeRunnerWrite, authUser, "Set group runner settings", (*Server).apiGroupRunnerSettings},30
{http.MethodGet, "/api/v1/groups/{path}/runner-optin", access.ScopeRunnerRead, authUser, "Get own runner opt-in for group", (*Server).apiGroupRunnerOptIn},31
{http.MethodPut, "/api/v1/groups/{path}/runner-optin", access.ScopeRunnerWrite, authUser, "Set own runner opt-in for group", (*Server).apiGroupRunnerOptIn},32
10
{http.MethodGet, "/api/v1/ci/spec", access.ScopePublic, authPublic, "CI specification", (*Server).ciSpec},33
{http.MethodGet, "/api/v1/ci/spec", access.ScopePublic, authPublic, "CI specification", (*Server).ciSpec},11
{http.MethodGet, "/api/v1/ci/presets", access.ScopePublic, authPublic, "CI image presets", (*Server).apiPresets},34
{http.MethodGet, "/api/v1/ci/presets", access.ScopePublic, authPublic, "CI image presets", (*Server).apiPresets},12
35
@@ -23,13 +23,14 @@ type RunnerView struct {
23
23
LastSeen time.Time
24
24
Created time.Time
25
25
Version string
26
Paused bool
26
27
}
27
28
28
29
func runnerViews(rs []store.Runner) []RunnerView {
29
30
now := time.Now()
30
31
out := make([]RunnerView, 0, len(rs))
31
32
for _, r := range rs {
32
out = append(out, RunnerView{ID: r.ID, Name: r.Name, Online: r.Online(now), LastSeen: r.LastSeen, Created: r.CreatedAt, Version: r.Version})
33
out = append(out, RunnerView{ID: r.ID, Name: r.Name, Online: r.Online(now), LastSeen: r.LastSeen, Created: r.CreatedAt, Version: r.Version, Paused: r.Paused})
33
34
}
34
35
return out
35
36
}
@@ -23,13 +23,14 @@ type RunnerView struct {23
LastSeen time.Time23
LastSeen time.Time24
Created time.Time24
Created time.Time25
Version string25
Version string26
Paused bool26
}27
}27
28
28
func runnerViews(rs []store.Runner) []RunnerView {29
func runnerViews(rs []store.Runner) []RunnerView {29
now := time.Now()30
now := time.Now()30
out := make([]RunnerView, 0, len(rs))31
out := make([]RunnerView, 0, len(rs))31
for _, r := range rs {32
for _, r := range rs {32
out = append(out, RunnerView{ID: r.ID, Name: r.Name, Online: r.Online(now), LastSeen: r.LastSeen, Created: r.CreatedAt, Version: r.Version})33
out = append(out, RunnerView{ID: r.ID, Name: r.Name, Online: r.Online(now), LastSeen: r.LastSeen, Created: r.CreatedAt, Version: r.Version, Paused: r.Paused})33
}34
}34
return out35
return out35
}36
}@@ -0,0 +1,239 @@
1
package server
2
3
import (
4
"net/http"
5
"strconv"
6
"time"
7
8
"gitlab.com/Timfa/bluegit/internal/access"
9
"gitlab.com/Timfa/bluegit/internal/i18n"
10
"gitlab.com/Timfa/bluegit/internal/store"
11
)
12
13
// Runnerbeheer via de API: dezelfde regels als de UI. Account-runners
14
// alleen voor de eigenaar zelf, groepsrunners alleen voor maintainers.
15
// Scope runners (of api; read_api voor lezen). Job-tokens (bgj_) en
16
// runner-tokens (bgr_) komen hier niet in: authUser accepteert alleen bg_.
17
18
func runnerJSON(r store.Runner) map[string]any {
19
status := "offline"
20
if r.Paused {
21
status = "paused"
22
} else if r.Online(time.Now()) {
23
status = "online"
24
}
25
return map[string]any{
26
"id": r.ID, "name": r.Name, "owner_kind": r.OwnerKind, "owner_id": r.OwnerID,
27
"status": status, "online": r.Online(time.Now()), "paused": r.Paused,
28
"last_seen": rfcTime(r.LastSeen), "created_at": rfcTime(r.CreatedAt), "version": r.Version,
29
}
30
}
31
32
// runnerScope bepaalt de eigenaar uit het pad: /user/... of /groups/{path}/...
33
func (s *Server) runnerScope(w http.ResponseWriter, r *http.Request) (string, int64, bool) {
34
if r.PathValue("path") != "" {
35
g, ok := s.apiGroup(w, r, access.RoleMaintainer)
36
if !ok {
37
return "", 0, false
38
}
39
return "group", g.ID, true
40
}
41
return "user", apiUser(r).ID, true
42
}
43
44
func (s *Server) scopedRunner(w http.ResponseWriter, r *http.Request) (string, int64, store.Runner, bool) {
45
kind, owner, ok := s.runnerScope(w, r)
46
if !ok {
47
return "", 0, store.Runner{}, false
48
}
49
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
50
rn, rerr := s.Store.RunnerByID(r.Context(), id)
51
if err != nil || rerr != nil || rn.Revoked || rn.OwnerKind != kind || rn.OwnerID != owner {
52
s.writeAPIErr(w, r, fail(http.StatusNotFound, i18n.E("err.notFound")))
53
return "", 0, store.Runner{}, false
54
}
55
return kind, owner, rn, true
56
}
57
58
func (s *Server) apiRunners(w http.ResponseWriter, r *http.Request) {
59
kind, owner, ok := s.runnerScope(w, r)
60
if !ok {
61
return
62
}
63
rs, err := s.Store.ListRunners(r.Context(), kind, owner)
64
if !s.apiOK(w, r, err) {
65
return
66
}
67
out := make([]map[string]any, 0, len(rs))
68
for _, rn := range rs {
69
out = append(out, runnerJSON(rn))
70
}
71
writeJSON(w, http.StatusOK, out)
72
}
73
74
func (s *Server) apiRunnerRegToken(w http.ResponseWriter, r *http.Request) {
75
kind, owner, ok := s.runnerScope(w, r)
76
if !ok {
77
return
78
}
79
plain, err := s.Store.CreateRunnerRegToken(r.Context(), kind, owner, apiUser(r).ID)
80
if !s.apiOK(w, r, err) {
81
return
82
}
83
writeJSON(w, http.StatusCreated, map[string]any{
84
"token": plain, "owner_kind": kind, "owner_id": owner,
85
"expires_at": rfcTime(time.Now().Add(24 * time.Hour)),
86
"register": "bluegit-runner register --url " + s.Cfg.BaseURL + " --token <token>",
87
})
88
}
89
90
func (s *Server) apiRunnerGet(w http.ResponseWriter, r *http.Request) {
91
if _, _, rn, ok := s.scopedRunner(w, r); ok {
92
writeJSON(w, http.StatusOK, runnerJSON(rn))
93
}
94
}
95
96
func (s *Server) apiRunnerPut(w http.ResponseWriter, r *http.Request) {
97
kind, owner, rn, ok := s.scopedRunner(w, r)
98
if !ok {
99
return
100
}
101
var body struct {
102
Name *string `json:"name"`
103
Paused *bool `json:"paused"`
104
}
105
if err := readJSON(r, &body); err != nil {
106
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
107
return
108
}
109
upd, err := s.Store.UpdateRunner(r.Context(), kind, owner, rn.ID, body.Name, body.Paused)
110
if err != nil {
111
s.writeAPIErr(w, r, fail(400, err))
112
return
113
}
114
writeJSON(w, http.StatusOK, runnerJSON(upd))
115
}
116
117
func (s *Server) setPaused(w http.ResponseWriter, r *http.Request, paused bool) {
118
kind, owner, rn, ok := s.scopedRunner(w, r)
119
if !ok {
120
return
121
}
122
upd, err := s.Store.UpdateRunner(r.Context(), kind, owner, rn.ID, nil, &paused)
123
if !s.apiOK(w, r, err) {
124
return
125
}
126
writeJSON(w, http.StatusOK, runnerJSON(upd))
127
}
128
129
func (s *Server) apiRunnerPause(w http.ResponseWriter, r *http.Request) { s.setPaused(w, r, true) }
130
func (s *Server) apiRunnerResume(w http.ResponseWriter, r *http.Request) { s.setPaused(w, r, false) }
131
132
func (s *Server) apiRunnerDelete(w http.ResponseWriter, r *http.Request) {
133
kind, owner, rn, ok := s.scopedRunner(w, r)
134
if !ok {
135
return
136
}
137
if !s.apiOK(w, r, s.Store.RevokeRunner(r.Context(), kind, owner, rn.ID)) {
138
return
139
}
140
w.WriteHeader(http.StatusNoContent)
141
}
142
143
func (s *Server) apiRunnerJobs(w http.ResponseWriter, r *http.Request) {
144
_, _, rn, ok := s.scopedRunner(w, r)
145
if !ok {
146
return
147
}
148
limit, _ := strconv.Atoi(r.URL.Query().Get("limit"))
149
jobs, err := s.Store.RunnerJobs(r.Context(), rn.ID, limit)
150
if !s.apiOK(w, r, err) {
151
return
152
}
153
uid := apiUser(r).ID
154
out := []map[string]any{}
155
for _, j := range jobs {
156
row := map[string]any{"id": j.JobID, "pipeline_id": j.PipelineID, "name": j.Name, "status": j.Status,
157
"started_at": rfcTime(j.StartedAt), "finished_at": rfcTime(j.FinishedAt), "project": nil}
158
// Alleen projectnamen die de vrager zelf mag zien.
159
if repo, err := s.Store.RepoByID(r.Context(), j.RepoID); err == nil {
160
if role, err := s.Store.EffectiveRole(r.Context(), uid, repo.ID); err == nil && (role.CanRead() || repo.Visibility == "public") {
161
row["project"] = repo.FullPath()
162
row["web_url"] = s.Cfg.BaseURL + "/" + repo.FullPath() + "/-/pipelines/" + strconv.FormatInt(j.PipelineID, 10) + "/jobs/" + strconv.FormatInt(j.JobID, 10)
163
}
164
}
165
out = append(out, row)
166
}
167
writeJSON(w, http.StatusOK, out)
168
}
169
170
func (s *Server) apiUserRunnerSettings(w http.ResponseWriter, r *http.Request) {
171
u := apiUser(r)
172
if r.Method == http.MethodPut {
173
var body struct {
174
Preference string `json:"preference"`
175
}
176
if err := readJSON(r, &body); err != nil || (body.Preference != store.RunnerPrefOwnFirst && body.Preference != store.RunnerPrefBuiltinFirst) {
177
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
178
return
179
}
180
if !s.apiOK(w, r, s.Store.SetUserRunnerPref(r.Context(), u.ID, body.Preference)) {
181
return
182
}
183
}
184
writeJSON(w, http.StatusOK, map[string]any{"preference": s.Store.UserRunnerPref(r.Context(), u.ID)})
185
}
186
187
func (s *Server) apiGroupRunnerSettings(w http.ResponseWriter, r *http.Request) {
188
g, ok := s.apiGroup(w, r, access.RoleMaintainer)
189
if !ok {
190
return
191
}
192
if r.Method == http.MethodPut {
193
var body struct {
194
BuiltinFirst *bool `json:"builtin_first"`
195
}
196
if err := readJSON(r, &body); err != nil || body.BuiltinFirst == nil {
197
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
198
return
199
}
200
if !s.apiOK(w, r, s.Store.SetGroupBuiltinFirst(r.Context(), g.ID, *body.BuiltinFirst)) {
201
return
202
}
203
}
204
ids, _ := s.Store.RunnerOptIns(r.Context(), g.ID)
205
names := []string{}
206
for _, id := range ids {
207
if u, err := s.Store.UserByID(r.Context(), id); err == nil {
208
names = append(names, u.Username)
209
}
210
}
211
writeJSON(w, http.StatusOK, map[string]any{"builtin_first": s.Store.GroupBuiltinFirst(r.Context(), g.ID), "opted_in": names})
212
}
213
214
// apiGroupRunnerOptIn: alleen je eigen toestemming, en alleen als maintainer.
215
func (s *Server) apiGroupRunnerOptIn(w http.ResponseWriter, r *http.Request) {
216
g, ok := s.apiGroup(w, r, access.RoleMaintainer)
217
if !ok {
218
return
219
}
220
u := apiUser(r)
221
if r.Method == http.MethodPut {
222
var body struct {
223
Enabled *bool `json:"enabled"`
224
}
225
if err := readJSON(r, &body); err != nil || body.Enabled == nil {
226
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
227
return
228
}
229
if !s.apiOK(w, r, s.Store.SetRunnerOptIn(r.Context(), g.ID, u.ID, *body.Enabled)) {
230
return
231
}
232
}
233
ids, _ := s.Store.RunnerOptIns(r.Context(), g.ID)
234
on := false
235
for _, id := range ids {
236
on = on || id == u.ID
237
}
238
writeJSON(w, http.StatusOK, map[string]any{"enabled": on, "username": u.Username})
239
}
@@ -0,0 +1,239 @@1
package server2
3
import (4
"net/http"5
"strconv"6
"time"7
8
"gitlab.com/Timfa/bluegit/internal/access"9
"gitlab.com/Timfa/bluegit/internal/i18n"10
"gitlab.com/Timfa/bluegit/internal/store"11
)12
13
// Runnerbeheer via de API: dezelfde regels als de UI. Account-runners14
// alleen voor de eigenaar zelf, groepsrunners alleen voor maintainers.15
// Scope runners (of api; read_api voor lezen). Job-tokens (bgj_) en16
// runner-tokens (bgr_) komen hier niet in: authUser accepteert alleen bg_.17
18
func runnerJSON(r store.Runner) map[string]any {19
status := "offline"20
if r.Paused {21
status = "paused"22
} else if r.Online(time.Now()) {23
status = "online"24
}25
return map[string]any{26
"id": r.ID, "name": r.Name, "owner_kind": r.OwnerKind, "owner_id": r.OwnerID,27
"status": status, "online": r.Online(time.Now()), "paused": r.Paused,28
"last_seen": rfcTime(r.LastSeen), "created_at": rfcTime(r.CreatedAt), "version": r.Version,29
}30
}31
32
// runnerScope bepaalt de eigenaar uit het pad: /user/... of /groups/{path}/...33
func (s *Server) runnerScope(w http.ResponseWriter, r *http.Request) (string, int64, bool) {34
if r.PathValue("path") != "" {35
g, ok := s.apiGroup(w, r, access.RoleMaintainer)36
if !ok {37
return "", 0, false38
}39
return "group", g.ID, true40
}41
return "user", apiUser(r).ID, true42
}43
44
func (s *Server) scopedRunner(w http.ResponseWriter, r *http.Request) (string, int64, store.Runner, bool) {45
kind, owner, ok := s.runnerScope(w, r)46
if !ok {47
return "", 0, store.Runner{}, false48
}49
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)50
rn, rerr := s.Store.RunnerByID(r.Context(), id)51
if err != nil || rerr != nil || rn.Revoked || rn.OwnerKind != kind || rn.OwnerID != owner {52
s.writeAPIErr(w, r, fail(http.StatusNotFound, i18n.E("err.notFound")))53
return "", 0, store.Runner{}, false54
}55
return kind, owner, rn, true56
}57
58
func (s *Server) apiRunners(w http.ResponseWriter, r *http.Request) {59
kind, owner, ok := s.runnerScope(w, r)60
if !ok {61
return62
}63
rs, err := s.Store.ListRunners(r.Context(), kind, owner)64
if !s.apiOK(w, r, err) {65
return66
}67
out := make([]map[string]any, 0, len(rs))68
for _, rn := range rs {69
out = append(out, runnerJSON(rn))70
}71
writeJSON(w, http.StatusOK, out)72
}73
74
func (s *Server) apiRunnerRegToken(w http.ResponseWriter, r *http.Request) {75
kind, owner, ok := s.runnerScope(w, r)76
if !ok {77
return78
}79
plain, err := s.Store.CreateRunnerRegToken(r.Context(), kind, owner, apiUser(r).ID)80
if !s.apiOK(w, r, err) {81
return82
}83
writeJSON(w, http.StatusCreated, map[string]any{84
"token": plain, "owner_kind": kind, "owner_id": owner,85
"expires_at": rfcTime(time.Now().Add(24 * time.Hour)),86
"register": "bluegit-runner register --url " + s.Cfg.BaseURL + " --token <token>",87
})88
}89
90
func (s *Server) apiRunnerGet(w http.ResponseWriter, r *http.Request) {91
if _, _, rn, ok := s.scopedRunner(w, r); ok {92
writeJSON(w, http.StatusOK, runnerJSON(rn))93
}94
}95
96
func (s *Server) apiRunnerPut(w http.ResponseWriter, r *http.Request) {97
kind, owner, rn, ok := s.scopedRunner(w, r)98
if !ok {99
return100
}101
var body struct {102
Name *string `json:"name"`103
Paused *bool `json:"paused"`104
}105
if err := readJSON(r, &body); err != nil {106
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))107
return108
}109
upd, err := s.Store.UpdateRunner(r.Context(), kind, owner, rn.ID, body.Name, body.Paused)110
if err != nil {111
s.writeAPIErr(w, r, fail(400, err))112
return113
}114
writeJSON(w, http.StatusOK, runnerJSON(upd))115
}116
117
func (s *Server) setPaused(w http.ResponseWriter, r *http.Request, paused bool) {118
kind, owner, rn, ok := s.scopedRunner(w, r)119
if !ok {120
return121
}122
upd, err := s.Store.UpdateRunner(r.Context(), kind, owner, rn.ID, nil, &paused)123
if !s.apiOK(w, r, err) {124
return125
}126
writeJSON(w, http.StatusOK, runnerJSON(upd))127
}128
129
func (s *Server) apiRunnerPause(w http.ResponseWriter, r *http.Request) { s.setPaused(w, r, true) }130
func (s *Server) apiRunnerResume(w http.ResponseWriter, r *http.Request) { s.setPaused(w, r, false) }131
132
func (s *Server) apiRunnerDelete(w http.ResponseWriter, r *http.Request) {133
kind, owner, rn, ok := s.scopedRunner(w, r)134
if !ok {135
return136
}137
if !s.apiOK(w, r, s.Store.RevokeRunner(r.Context(), kind, owner, rn.ID)) {138
return139
}140
w.WriteHeader(http.StatusNoContent)141
}142
143
func (s *Server) apiRunnerJobs(w http.ResponseWriter, r *http.Request) {144
_, _, rn, ok := s.scopedRunner(w, r)145
if !ok {146
return147
}148
limit, _ := strconv.Atoi(r.URL.Query().Get("limit"))149
jobs, err := s.Store.RunnerJobs(r.Context(), rn.ID, limit)150
if !s.apiOK(w, r, err) {151
return152
}153
uid := apiUser(r).ID154
out := []map[string]any{}155
for _, j := range jobs {156
row := map[string]any{"id": j.JobID, "pipeline_id": j.PipelineID, "name": j.Name, "status": j.Status,157
"started_at": rfcTime(j.StartedAt), "finished_at": rfcTime(j.FinishedAt), "project": nil}158
// Alleen projectnamen die de vrager zelf mag zien.159
if repo, err := s.Store.RepoByID(r.Context(), j.RepoID); err == nil {160
if role, err := s.Store.EffectiveRole(r.Context(), uid, repo.ID); err == nil && (role.CanRead() || repo.Visibility == "public") {161
row["project"] = repo.FullPath()162
row["web_url"] = s.Cfg.BaseURL + "/" + repo.FullPath() + "/-/pipelines/" + strconv.FormatInt(j.PipelineID, 10) + "/jobs/" + strconv.FormatInt(j.JobID, 10)163
}164
}165
out = append(out, row)166
}167
writeJSON(w, http.StatusOK, out)168
}169
170
func (s *Server) apiUserRunnerSettings(w http.ResponseWriter, r *http.Request) {171
u := apiUser(r)172
if r.Method == http.MethodPut {173
var body struct {174
Preference string `json:"preference"`175
}176
if err := readJSON(r, &body); err != nil || (body.Preference != store.RunnerPrefOwnFirst && body.Preference != store.RunnerPrefBuiltinFirst) {177
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))178
return179
}180
if !s.apiOK(w, r, s.Store.SetUserRunnerPref(r.Context(), u.ID, body.Preference)) {181
return182
}183
}184
writeJSON(w, http.StatusOK, map[string]any{"preference": s.Store.UserRunnerPref(r.Context(), u.ID)})185
}186
187
func (s *Server) apiGroupRunnerSettings(w http.ResponseWriter, r *http.Request) {188
g, ok := s.apiGroup(w, r, access.RoleMaintainer)189
if !ok {190
return191
}192
if r.Method == http.MethodPut {193
var body struct {194
BuiltinFirst *bool `json:"builtin_first"`195
}196
if err := readJSON(r, &body); err != nil || body.BuiltinFirst == nil {197
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))198
return199
}200
if !s.apiOK(w, r, s.Store.SetGroupBuiltinFirst(r.Context(), g.ID, *body.BuiltinFirst)) {201
return202
}203
}204
ids, _ := s.Store.RunnerOptIns(r.Context(), g.ID)205
names := []string{}206
for _, id := range ids {207
if u, err := s.Store.UserByID(r.Context(), id); err == nil {208
names = append(names, u.Username)209
}210
}211
writeJSON(w, http.StatusOK, map[string]any{"builtin_first": s.Store.GroupBuiltinFirst(r.Context(), g.ID), "opted_in": names})212
}213
214
// apiGroupRunnerOptIn: alleen je eigen toestemming, en alleen als maintainer.215
func (s *Server) apiGroupRunnerOptIn(w http.ResponseWriter, r *http.Request) {216
g, ok := s.apiGroup(w, r, access.RoleMaintainer)217
if !ok {218
return219
}220
u := apiUser(r)221
if r.Method == http.MethodPut {222
var body struct {223
Enabled *bool `json:"enabled"`224
}225
if err := readJSON(r, &body); err != nil || body.Enabled == nil {226
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))227
return228
}229
if !s.apiOK(w, r, s.Store.SetRunnerOptIn(r.Context(), g.ID, u.ID, *body.Enabled)) {230
return231
}232
}233
ids, _ := s.Store.RunnerOptIns(r.Context(), g.ID)234
on := false235
for _, id := range ids {236
on = on || id == u.ID237
}238
writeJSON(w, http.StatusOK, map[string]any{"enabled": on, "username": u.Username})239
}@@ -0,0 +1,243 @@
1
package server
2
3
import (
4
"bytes"
5
"context"
6
"encoding/json"
7
"io"
8
"net/http"
9
"os"
10
"os/exec"
11
"path/filepath"
12
"strings"
13
"testing"
14
"time"
15
16
"gitlab.com/Timfa/bluegit/internal/access"
17
"gitlab.com/Timfa/bluegit/internal/store"
18
)
19
20
func rapi(t *testing.T, base, tok, method, path string, body any) (int, []byte) {
21
t.Helper()
22
var rd io.Reader
23
if body != nil {
24
b, _ := json.Marshal(body)
25
rd = bytes.NewReader(b)
26
}
27
req, _ := http.NewRequest(method, base+"/api/v1"+path, rd)
28
if tok != "" {
29
req.Header.Set("Authorization", "Bearer "+tok)
30
}
31
if body != nil {
32
req.Header.Set("Content-Type", "application/json")
33
}
34
res, err := http.DefaultClient.Do(req)
35
if err != nil {
36
t.Fatal(err)
37
}
38
defer res.Body.Close()
39
b, _ := io.ReadAll(res.Body)
40
return res.StatusCode, b
41
}
42
43
func issue(t *testing.T, st *store.Store, uid int64, scopes string) string {
44
t.Helper()
45
tok, _, err := st.IssueToken(context.Background(), uid, store.TokenRequest{Name: "t-" + scopes, Scopes: scopes})
46
if err != nil {
47
t.Fatal(err)
48
}
49
return tok
50
}
51
52
func TestRunnerAPIAuthorization(t *testing.T) {
53
e := newCIEnv(t)
54
ctx := context.Background()
55
st, base := e.st, e.ts.URL
56
bob, _ := st.UpsertUser(ctx, 2, "bob", "", false)
57
carol, _ := st.UpsertUser(ctx, 3, "carol", "", false)
58
g, err := st.CreateGroup(ctx, e.user.ID, "Team", "team", "", access.RoleReadonly)
59
if err != nil {
60
t.Fatal(err)
61
}
62
_ = st.SetMember(ctx, "group", g.ID, "bob", access.RoleDeveloper)
63
_ = st.SetMember(ctx, "group", g.ID, "carol", access.RoleMaintainer)
64
65
timTok := issue(t, st, e.user.ID, "runners")
66
timRead := issue(t, st, e.user.ID, "read_api")
67
timRepo := issue(t, st, e.user.ID, "read_repository")
68
bobTok := issue(t, st, bob.ID, "api")
69
carolTok := issue(t, st, carol.ID, "runners")
70
71
// Account: token maken, lijst, hernoemen, pauzeren, hervatten.
72
code, b := rapi(t, base, timTok, "POST", "/user/runners/registration-token", map[string]any{})
73
if code != 201 || !strings.Contains(string(b), `"token":"bgrr_`) {
74
t.Fatalf("reg token: %d", code)
75
}
76
var reg struct{ Token string }
77
_ = json.Unmarshal(b, ®)
78
rn, _, err := st.RegisterRunner(ctx, reg.Token, "tim-pc", "test")
79
if err != nil {
80
t.Fatal(err)
81
}
82
id := "/user/runners/" + itoa(rn.ID)
83
if code, b = rapi(t, base, timRead, "GET", "/user/runners", nil); code != 200 || !strings.Contains(string(b), `"tim-pc"`) || !strings.Contains(string(b), `"last_seen"`) {
84
t.Fatalf("list: %d %s", code, b)
85
}
86
if code, _ = rapi(t, base, timRead, "POST", id+"/pause", nil); code != 403 {
87
t.Fatalf("read_api may not pause: %d", code)
88
}
89
if code, _ = rapi(t, base, timRepo, "GET", "/user/runners", nil); code != 403 {
90
t.Fatalf("read_repository may not list runners: %d", code)
91
}
92
if code, b = rapi(t, base, timTok, "PUT", id, map[string]any{"name": "tim-laptop"}); code != 200 || !strings.Contains(string(b), "tim-laptop") {
93
t.Fatalf("rename: %d %s", code, b)
94
}
95
if code, b = rapi(t, base, timTok, "POST", id+"/pause", nil); code != 200 || !strings.Contains(string(b), `"status":"paused"`) {
96
t.Fatalf("pause: %d %s", code, b)
97
}
98
if code, b = rapi(t, base, timTok, "POST", id+"/resume", nil); code != 200 || !strings.Contains(string(b), `"paused":false`) {
99
t.Fatalf("resume: %d %s", code, b)
100
}
101
if code, b = rapi(t, base, timTok, "PUT", "/user/runner-settings", map[string]any{"preference": "own_first"}); code != 200 || !strings.Contains(string(b), "own_first") {
102
t.Fatalf("pref: %d %s", code, b)
103
}
104
if code, b = rapi(t, base, timTok, "GET", id+"/jobs", nil); code != 200 || string(bytes.TrimSpace(b)) != "[]" {
105
t.Fatalf("jobs: %d %s", code, b)
106
}
107
108
// Cross-account: bob (api-token) ziet of wijzigt tims runner niet.
109
for _, c := range []struct{ m, p string }{{"GET", id}, {"PUT", id}, {"POST", id + "/pause"}, {"DELETE", id}, {"GET", id + "/jobs"}} {
110
if code, _ = rapi(t, base, bobTok, c.m, c.p, map[string]any{"name": "x"}); code != 404 {
111
t.Fatalf("bob %s %s: %d", c.m, c.p, code)
112
}
113
}
114
if code, b = rapi(t, base, bobTok, "GET", "/user/runners", nil); code != 200 || strings.Contains(string(b), "tim-laptop") {
115
t.Fatalf("bob list: %d %s", code, b)
116
}
117
118
// Groep: carol (maintainer) mag, bob (developer) niet.
119
if code, b = rapi(t, base, carolTok, "POST", "/groups/team/runners/registration-token", map[string]any{}); code != 201 {
120
t.Fatalf("carol group token: %d %s", code, b)
121
}
122
_ = json.Unmarshal(b, ®)
123
grn, _, err := st.RegisterRunner(ctx, reg.Token, "grp", "test")
124
if err != nil {
125
t.Fatal(err)
126
}
127
gid := "/groups/team/runners/" + itoa(grn.ID)
128
for _, c := range []struct{ m, p string }{
129
{"GET", "/groups/team/runners"}, {"POST", "/groups/team/runners/registration-token"},
130
{"POST", gid + "/pause"}, {"DELETE", gid}, {"PUT", "/groups/team/runner-settings"}, {"PUT", "/groups/team/runner-optin"},
131
} {
132
if code, _ = rapi(t, base, bobTok, c.m, c.p, map[string]any{"builtin_first": true, "enabled": true}); code != 403 {
133
t.Fatalf("bob (developer) %s %s: %d", c.m, c.p, code)
134
}
135
}
136
// Tims account-runner is niet bereikbaar via het groepspad (en omgekeerd).
137
if code, _ = rapi(t, base, carolTok, "GET", "/groups/team/runners/"+itoa(rn.ID), nil); code != 404 {
138
t.Fatalf("account runner via group path: %d", code)
139
}
140
if code, _ = rapi(t, base, timTok, "GET", "/user/runners/"+itoa(grn.ID), nil); code != 404 {
141
t.Fatalf("group runner via user path: %d", code)
142
}
143
if code, b = rapi(t, base, carolTok, "PUT", "/groups/team/runner-settings", map[string]any{"builtin_first": true}); code != 200 || !strings.Contains(string(b), `"builtin_first":true`) {
144
t.Fatalf("builtin_first: %d %s", code, b)
145
}
146
if code, b = rapi(t, base, carolTok, "PUT", "/groups/team/runner-optin", map[string]any{"enabled": true}); code != 200 || !strings.Contains(string(b), `"enabled":true`) || !strings.Contains(string(b), "carol") {
147
t.Fatalf("optin: %d %s", code, b)
148
}
149
// Opt-in geldt alleen voor jezelf: tim ziet zijn eigen (uit), carol staat in de lijst.
150
if code, b = rapi(t, base, timTok, "GET", "/groups/team/runner-optin", nil); code != 200 || !strings.Contains(string(b), `"enabled":false`) {
151
t.Fatalf("tim optin: %d %s", code, b)
152
}
153
if code, b = rapi(t, base, timTok, "GET", "/groups/team/runner-settings", nil); !strings.Contains(string(b), `"carol"`) {
154
t.Fatalf("opted_in list: %d %s", code, b)
155
}
156
// Onbekende/privé groep voor een buitenstaander: 404.
157
dave, _ := st.UpsertUser(ctx, 4, "dave", "", false)
158
daveTok := issue(t, st, dave.ID, "api")
159
if code, _ = rapi(t, base, daveTok, "GET", "/groups/team/runners", nil); code != 404 && code != 403 {
160
t.Fatalf("dave: %d", code)
161
}
162
163
// Job-token en runner-token: geen toegang tot runnerbeheer.
164
pid := e.pipeline()
165
jobs, _ := st.JobsByPipeline(ctx, pid)
166
jobTok, err := st.CreateJobToken(ctx, jobs[0].ID)
167
if err != nil {
168
t.Fatal(err)
169
}
170
reg2, _ := st.CreateRunnerRegToken(ctx, "user", e.user.ID, e.user.ID)
171
_, runnerTok, _ := st.RegisterRunner(ctx, reg2, "other", "test")
172
for _, tok := range []string{jobTok, runnerTok, ""} {
173
for _, c := range []struct{ m, p string }{{"GET", "/user/runners"}, {"POST", "/user/runners/registration-token"}, {"GET", "/groups/team/runners"}, {"PUT", "/user/runner-settings"}} {
174
if code, _ = rapi(t, base, tok, c.m, c.p, map[string]any{}); code != 401 {
175
t.Fatalf("token %.4s… %s %s: %d", tok, c.m, c.p, code)
176
}
177
}
178
}
179
180
// Verwijderen: daarna weg uit de lijst en het runner-token werkt niet meer.
181
if code, _ = rapi(t, base, timTok, "DELETE", id, nil); code != 204 {
182
t.Fatalf("delete: %d", code)
183
}
184
if code, b = rapi(t, base, timTok, "GET", "/user/runners", nil); strings.Contains(string(b), "tim-laptop") {
185
t.Fatalf("still listed: %s", b)
186
}
187
}
188
189
func itoa(n int64) string { return jsonNum(n) }
190
191
func jsonNum(n int64) string { b, _ := json.Marshal(n); return string(b) }
192
193
// Volledige agent-setup met alleen een access token: token via de API,
194
// bluegit-runner register via env, en via de API zien dat hij online komt.
195
func TestRunnerAgentSetupViaAPI(t *testing.T) {
196
e := newCIEnv(t)
197
bin := buildRunnerBinary(t)
198
tok := issue(t, e.st, e.user.ID, "runners")
199
code, b := rapi(t, e.ts.URL, tok, "POST", "/user/runners/registration-token", map[string]any{})
200
if code != 201 {
201
t.Fatalf("reg token: %d", code)
202
}
203
var reg struct{ Token string }
204
_ = json.Unmarshal(b, ®)
205
cfg := filepath.Join(t.TempDir(), "config.yml")
206
_ = os.WriteFile(cfg, []byte("docker: "+e.docker+"\nwork_dir: "+t.TempDir()+"\n"), 0o600)
207
cmd := exec.Command(bin, "register", "--config", cfg)
208
cmd.Env = append(os.Environ(), "BLUEGIT_RUNNER_URL="+e.ts.URL, "BLUEGIT_RUNNER_REGISTRATION_TOKEN="+reg.Token, "BLUEGIT_RUNNER_NAME=agent-box")
209
if out, err := cmd.CombinedOutput(); err != nil {
210
t.Fatalf("register: %v %s", err, out)
211
}
212
// Direct na registratie: in de lijst. Zet last_seen terug zodat we
213
// zien dat "run" hem online maakt.
214
ctx, stop := context.WithCancel(context.Background())
215
defer stop()
216
run := exec.CommandContext(ctx, bin, "run", "--config", cfg)
217
if err := run.Start(); err != nil {
218
t.Fatal(err)
219
}
220
defer func() { stop(); _ = run.Wait() }()
221
deadline := time.Now().Add(30 * time.Second)
222
for time.Now().Before(deadline) {
223
_, b = rapi(t, e.ts.URL, tok, "GET", "/user/runners", nil)
224
var rs []map[string]any
225
_ = json.Unmarshal(b, &rs)
226
if len(rs) == 1 && rs[0]["name"] == "agent-box" && rs[0]["status"] == "online" && rs[0]["version"] == "dev" {
227
// En hij draait echt een job.
228
_ = e.st.SetUserRunnerPref(context.Background(), e.user.ID, store.RunnerPrefOwnFirst)
229
pid := e.pipeline()
230
p := e.wait(pid, 60*time.Second)
231
if p.Status != "success" {
232
t.Fatalf("pipeline %s", p.Status)
233
}
234
_, b = rapi(t, e.ts.URL, tok, "GET", "/user/runners/"+jsonNum(int64(rs[0]["id"].(float64)))+"/jobs", nil)
235
if !strings.Contains(string(b), `"project":"tim/app"`) || !strings.Contains(string(b), `"success"`) {
236
t.Fatalf("runner jobs: %s", b)
237
}
238
return
239
}
240
time.Sleep(300 * time.Millisecond)
241
}
242
t.Fatalf("runner not online via API: %s", b)
243
}
@@ -0,0 +1,243 @@1
package server2
3
import (4
"bytes"5
"context"6
"encoding/json"7
"io"8
"net/http"9
"os"10
"os/exec"11
"path/filepath"12
"strings"13
"testing"14
"time"15
16
"gitlab.com/Timfa/bluegit/internal/access"17
"gitlab.com/Timfa/bluegit/internal/store"18
)19
20
func rapi(t *testing.T, base, tok, method, path string, body any) (int, []byte) {21
t.Helper()22
var rd io.Reader23
if body != nil {24
b, _ := json.Marshal(body)25
rd = bytes.NewReader(b)26
}27
req, _ := http.NewRequest(method, base+"/api/v1"+path, rd)28
if tok != "" {29
req.Header.Set("Authorization", "Bearer "+tok)30
}31
if body != nil {32
req.Header.Set("Content-Type", "application/json")33
}34
res, err := http.DefaultClient.Do(req)35
if err != nil {36
t.Fatal(err)37
}38
defer res.Body.Close()39
b, _ := io.ReadAll(res.Body)40
return res.StatusCode, b41
}42
43
func issue(t *testing.T, st *store.Store, uid int64, scopes string) string {44
t.Helper()45
tok, _, err := st.IssueToken(context.Background(), uid, store.TokenRequest{Name: "t-" + scopes, Scopes: scopes})46
if err != nil {47
t.Fatal(err)48
}49
return tok50
}51
52
func TestRunnerAPIAuthorization(t *testing.T) {53
e := newCIEnv(t)54
ctx := context.Background()55
st, base := e.st, e.ts.URL56
bob, _ := st.UpsertUser(ctx, 2, "bob", "", false)57
carol, _ := st.UpsertUser(ctx, 3, "carol", "", false)58
g, err := st.CreateGroup(ctx, e.user.ID, "Team", "team", "", access.RoleReadonly)59
if err != nil {60
t.Fatal(err)61
}62
_ = st.SetMember(ctx, "group", g.ID, "bob", access.RoleDeveloper)63
_ = st.SetMember(ctx, "group", g.ID, "carol", access.RoleMaintainer)64
65
timTok := issue(t, st, e.user.ID, "runners")66
timRead := issue(t, st, e.user.ID, "read_api")67
timRepo := issue(t, st, e.user.ID, "read_repository")68
bobTok := issue(t, st, bob.ID, "api")69
carolTok := issue(t, st, carol.ID, "runners")70
71
// Account: token maken, lijst, hernoemen, pauzeren, hervatten.72
code, b := rapi(t, base, timTok, "POST", "/user/runners/registration-token", map[string]any{})73
if code != 201 || !strings.Contains(string(b), `"token":"bgrr_`) {74
t.Fatalf("reg token: %d", code)75
}76
var reg struct{ Token string }77
_ = json.Unmarshal(b, ®)78
rn, _, err := st.RegisterRunner(ctx, reg.Token, "tim-pc", "test")79
if err != nil {80
t.Fatal(err)81
}82
id := "/user/runners/" + itoa(rn.ID)83
if code, b = rapi(t, base, timRead, "GET", "/user/runners", nil); code != 200 || !strings.Contains(string(b), `"tim-pc"`) || !strings.Contains(string(b), `"last_seen"`) {84
t.Fatalf("list: %d %s", code, b)85
}86
if code, _ = rapi(t, base, timRead, "POST", id+"/pause", nil); code != 403 {87
t.Fatalf("read_api may not pause: %d", code)88
}89
if code, _ = rapi(t, base, timRepo, "GET", "/user/runners", nil); code != 403 {90
t.Fatalf("read_repository may not list runners: %d", code)91
}92
if code, b = rapi(t, base, timTok, "PUT", id, map[string]any{"name": "tim-laptop"}); code != 200 || !strings.Contains(string(b), "tim-laptop") {93
t.Fatalf("rename: %d %s", code, b)94
}95
if code, b = rapi(t, base, timTok, "POST", id+"/pause", nil); code != 200 || !strings.Contains(string(b), `"status":"paused"`) {96
t.Fatalf("pause: %d %s", code, b)97
}98
if code, b = rapi(t, base, timTok, "POST", id+"/resume", nil); code != 200 || !strings.Contains(string(b), `"paused":false`) {99
t.Fatalf("resume: %d %s", code, b)100
}101
if code, b = rapi(t, base, timTok, "PUT", "/user/runner-settings", map[string]any{"preference": "own_first"}); code != 200 || !strings.Contains(string(b), "own_first") {102
t.Fatalf("pref: %d %s", code, b)103
}104
if code, b = rapi(t, base, timTok, "GET", id+"/jobs", nil); code != 200 || string(bytes.TrimSpace(b)) != "[]" {105
t.Fatalf("jobs: %d %s", code, b)106
}107
108
// Cross-account: bob (api-token) ziet of wijzigt tims runner niet.109
for _, c := range []struct{ m, p string }{{"GET", id}, {"PUT", id}, {"POST", id + "/pause"}, {"DELETE", id}, {"GET", id + "/jobs"}} {110
if code, _ = rapi(t, base, bobTok, c.m, c.p, map[string]any{"name": "x"}); code != 404 {111
t.Fatalf("bob %s %s: %d", c.m, c.p, code)112
}113
}114
if code, b = rapi(t, base, bobTok, "GET", "/user/runners", nil); code != 200 || strings.Contains(string(b), "tim-laptop") {115
t.Fatalf("bob list: %d %s", code, b)116
}117
118
// Groep: carol (maintainer) mag, bob (developer) niet.119
if code, b = rapi(t, base, carolTok, "POST", "/groups/team/runners/registration-token", map[string]any{}); code != 201 {120
t.Fatalf("carol group token: %d %s", code, b)121
}122
_ = json.Unmarshal(b, ®)123
grn, _, err := st.RegisterRunner(ctx, reg.Token, "grp", "test")124
if err != nil {125
t.Fatal(err)126
}127
gid := "/groups/team/runners/" + itoa(grn.ID)128
for _, c := range []struct{ m, p string }{129
{"GET", "/groups/team/runners"}, {"POST", "/groups/team/runners/registration-token"},130
{"POST", gid + "/pause"}, {"DELETE", gid}, {"PUT", "/groups/team/runner-settings"}, {"PUT", "/groups/team/runner-optin"},131
} {132
if code, _ = rapi(t, base, bobTok, c.m, c.p, map[string]any{"builtin_first": true, "enabled": true}); code != 403 {133
t.Fatalf("bob (developer) %s %s: %d", c.m, c.p, code)134
}135
}136
// Tims account-runner is niet bereikbaar via het groepspad (en omgekeerd).137
if code, _ = rapi(t, base, carolTok, "GET", "/groups/team/runners/"+itoa(rn.ID), nil); code != 404 {138
t.Fatalf("account runner via group path: %d", code)139
}140
if code, _ = rapi(t, base, timTok, "GET", "/user/runners/"+itoa(grn.ID), nil); code != 404 {141
t.Fatalf("group runner via user path: %d", code)142
}143
if code, b = rapi(t, base, carolTok, "PUT", "/groups/team/runner-settings", map[string]any{"builtin_first": true}); code != 200 || !strings.Contains(string(b), `"builtin_first":true`) {144
t.Fatalf("builtin_first: %d %s", code, b)145
}146
if code, b = rapi(t, base, carolTok, "PUT", "/groups/team/runner-optin", map[string]any{"enabled": true}); code != 200 || !strings.Contains(string(b), `"enabled":true`) || !strings.Contains(string(b), "carol") {147
t.Fatalf("optin: %d %s", code, b)148
}149
// Opt-in geldt alleen voor jezelf: tim ziet zijn eigen (uit), carol staat in de lijst.150
if code, b = rapi(t, base, timTok, "GET", "/groups/team/runner-optin", nil); code != 200 || !strings.Contains(string(b), `"enabled":false`) {151
t.Fatalf("tim optin: %d %s", code, b)152
}153
if code, b = rapi(t, base, timTok, "GET", "/groups/team/runner-settings", nil); !strings.Contains(string(b), `"carol"`) {154
t.Fatalf("opted_in list: %d %s", code, b)155
}156
// Onbekende/privé groep voor een buitenstaander: 404.157
dave, _ := st.UpsertUser(ctx, 4, "dave", "", false)158
daveTok := issue(t, st, dave.ID, "api")159
if code, _ = rapi(t, base, daveTok, "GET", "/groups/team/runners", nil); code != 404 && code != 403 {160
t.Fatalf("dave: %d", code)161
}162
163
// Job-token en runner-token: geen toegang tot runnerbeheer.164
pid := e.pipeline()165
jobs, _ := st.JobsByPipeline(ctx, pid)166
jobTok, err := st.CreateJobToken(ctx, jobs[0].ID)167
if err != nil {168
t.Fatal(err)169
}170
reg2, _ := st.CreateRunnerRegToken(ctx, "user", e.user.ID, e.user.ID)171
_, runnerTok, _ := st.RegisterRunner(ctx, reg2, "other", "test")172
for _, tok := range []string{jobTok, runnerTok, ""} {173
for _, c := range []struct{ m, p string }{{"GET", "/user/runners"}, {"POST", "/user/runners/registration-token"}, {"GET", "/groups/team/runners"}, {"PUT", "/user/runner-settings"}} {174
if code, _ = rapi(t, base, tok, c.m, c.p, map[string]any{}); code != 401 {175
t.Fatalf("token %.4s… %s %s: %d", tok, c.m, c.p, code)176
}177
}178
}179
180
// Verwijderen: daarna weg uit de lijst en het runner-token werkt niet meer.181
if code, _ = rapi(t, base, timTok, "DELETE", id, nil); code != 204 {182
t.Fatalf("delete: %d", code)183
}184
if code, b = rapi(t, base, timTok, "GET", "/user/runners", nil); strings.Contains(string(b), "tim-laptop") {185
t.Fatalf("still listed: %s", b)186
}187
}188
189
func itoa(n int64) string { return jsonNum(n) }190
191
func jsonNum(n int64) string { b, _ := json.Marshal(n); return string(b) }192
193
// Volledige agent-setup met alleen een access token: token via de API,194
// bluegit-runner register via env, en via de API zien dat hij online komt.195
func TestRunnerAgentSetupViaAPI(t *testing.T) {196
e := newCIEnv(t)197
bin := buildRunnerBinary(t)198
tok := issue(t, e.st, e.user.ID, "runners")199
code, b := rapi(t, e.ts.URL, tok, "POST", "/user/runners/registration-token", map[string]any{})200
if code != 201 {201
t.Fatalf("reg token: %d", code)202
}203
var reg struct{ Token string }204
_ = json.Unmarshal(b, ®)205
cfg := filepath.Join(t.TempDir(), "config.yml")206
_ = os.WriteFile(cfg, []byte("docker: "+e.docker+"\nwork_dir: "+t.TempDir()+"\n"), 0o600)207
cmd := exec.Command(bin, "register", "--config", cfg)208
cmd.Env = append(os.Environ(), "BLUEGIT_RUNNER_URL="+e.ts.URL, "BLUEGIT_RUNNER_REGISTRATION_TOKEN="+reg.Token, "BLUEGIT_RUNNER_NAME=agent-box")209
if out, err := cmd.CombinedOutput(); err != nil {210
t.Fatalf("register: %v %s", err, out)211
}212
// Direct na registratie: in de lijst. Zet last_seen terug zodat we213
// zien dat "run" hem online maakt.214
ctx, stop := context.WithCancel(context.Background())215
defer stop()216
run := exec.CommandContext(ctx, bin, "run", "--config", cfg)217
if err := run.Start(); err != nil {218
t.Fatal(err)219
}220
defer func() { stop(); _ = run.Wait() }()221
deadline := time.Now().Add(30 * time.Second)222
for time.Now().Before(deadline) {223
_, b = rapi(t, e.ts.URL, tok, "GET", "/user/runners", nil)224
var rs []map[string]any225
_ = json.Unmarshal(b, &rs)226
if len(rs) == 1 && rs[0]["name"] == "agent-box" && rs[0]["status"] == "online" && rs[0]["version"] == "dev" {227
// En hij draait echt een job.228
_ = e.st.SetUserRunnerPref(context.Background(), e.user.ID, store.RunnerPrefOwnFirst)229
pid := e.pipeline()230
p := e.wait(pid, 60*time.Second)231
if p.Status != "success" {232
t.Fatalf("pipeline %s", p.Status)233
}234
_, b = rapi(t, e.ts.URL, tok, "GET", "/user/runners/"+jsonNum(int64(rs[0]["id"].(float64)))+"/jobs", nil)235
if !strings.Contains(string(b), `"project":"tim/app"`) || !strings.Contains(string(b), `"success"`) {236
t.Fatalf("runner jobs: %s", b)237
}238
return239
}240
time.Sleep(300 * time.Millisecond)241
}242
t.Fatalf("runner not online via API: %s", b)243
}@@ -701,7 +701,7 @@
701
701
<tbody>
702
702
{{range .Runners}}<tr>
703
703
<td>{{.Name}}</td>
704
<td>{{if .Online}}<span class="pill">{{t "runner.online"}}</span>{{else}}<span class="muted">{{t "runner.offline"}}</span>{{end}}</td>
704
<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>
705
705
<td>{{date .LastSeen}}</td>
706
706
<td>{{.Version}}</td>
707
707
<td class="act">
@@ -701,7 +701,7 @@701
<tbody>701
<tbody>702
{{range .Runners}}<tr>702
{{range .Runners}}<tr>703
<td>{{.Name}}</td>703
<td>{{.Name}}</td>704
<td>{{if .Online}}<span class="pill">{{t "runner.online"}}</span>{{else}}<span class="muted">{{t "runner.offline"}}</span>{{end}}</td>704
<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>705
<td>{{date .LastSeen}}</td>705
<td>{{date .LastSeen}}</td>706
<td>{{.Version}}</td>706
<td>{{.Version}}</td>707
<td class="act">707
<td class="act">@@ -19,6 +19,7 @@ type Runner struct {
19
19
LastSeen time.Time
20
20
Version string
21
21
Revoked bool
22
Paused bool
22
23
}
23
24
24
25
// RunnerOnlineWindow: zo lang na de laatste heartbeat telt een runner als online.
@@ -91,16 +92,16 @@ func (s *Store) RegisterRunner(ctx context.Context, regToken, name, version stri
91
92
return Runner{ID: rid, OwnerKind: kind, OwnerID: ownerID, Name: name, CreatedAt: parseTime(at), LastSeen: parseTime(at), Version: version}, plain, nil
92
93
}
93
94
94
const runnerCols = `id, owner_kind, owner_id, name, created_at, last_seen, version, revoked`
95
const runnerCols = `id, owner_kind, owner_id, name, created_at, last_seen, version, revoked, paused`
95
96
96
97
func scanRunner(sc interface{ Scan(...any) error }) (Runner, error) {
97
98
var r Runner
98
99
var created, seen string
99
var revoked int
100
if err := sc.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &r.Name, &created, &seen, &r.Version, &revoked); err != nil {
100
var revoked, paused int
101
if err := sc.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &r.Name, &created, &seen, &r.Version, &revoked, &paused); err != nil {
101
102
return Runner{}, err
102
103
}
103
r.CreatedAt, r.LastSeen, r.Revoked = parseTime(created), parseTime(seen), revoked == 1
104
r.CreatedAt, r.LastSeen, r.Revoked, r.Paused = parseTime(created), parseTime(seen), revoked == 1, paused == 1
104
105
return r, nil
105
106
}
106
107
@@ -350,3 +351,65 @@ func (s *Store) RunnerRunsRepo(ctx context.Context, runnerID, repoID int64) bool
350
351
_ = s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM jobs j JOIN job_runs r ON r.job_id = j.id WHERE r.runner_id = ? AND j.repo_id = ? AND j.status = 'running'`, runnerID, repoID).Scan(&n)
351
352
return n > 0 && runnerID > 0
352
353
}
354
355
// UpdateRunner hernoemt en/of pauzeert een runner van deze eigenaar.
356
func (s *Store) UpdateRunner(ctx context.Context, ownerKind string, ownerID, id int64, name *string, paused *bool) (Runner, error) {
357
r, err := s.RunnerByID(ctx, id)
358
if err != nil || r.Revoked || r.OwnerKind != ownerKind || r.OwnerID != ownerID {
359
return Runner{}, errNotFound
360
}
361
if name != nil {
362
n := strings.TrimSpace(*name)
363
if n == "" || len(n) > 80 {
364
return Runner{}, errors.New("runner name must be 1-80 characters")
365
}
366
if _, err := s.db.ExecContext(ctx, `UPDATE runners SET name = ? WHERE id = ?`, n, id); err != nil {
367
return Runner{}, err
368
}
369
}
370
if paused != nil {
371
v := 0
372
if *paused {
373
v = 1
374
}
375
if _, err := s.db.ExecContext(ctx, `UPDATE runners SET paused = ? WHERE id = ?`, v, id); err != nil {
376
return Runner{}, err
377
}
378
}
379
return s.RunnerByID(ctx, id)
380
}
381
382
// RunnerJob is een recente job van een runner.
383
type RunnerJob struct {
384
JobID int64
385
PipelineID int64
386
RepoID int64
387
Name string
388
Status string
389
StartedAt time.Time
390
FinishedAt time.Time
391
}
392
393
// RunnerJobs geeft de recentste jobs van een runner.
394
func (s *Store) RunnerJobs(ctx context.Context, runnerID int64, limit int) ([]RunnerJob, error) {
395
if limit <= 0 || limit > 100 {
396
limit = 20
397
}
398
rows, err := s.db.QueryContext(ctx, `SELECT j.id, j.pipeline_id, j.repo_id, j.name, j.status, COALESCE(j.started_at, ''), COALESCE(j.finished_at, '')
399
FROM job_runs r JOIN jobs j ON j.id = r.job_id WHERE r.runner_id = ? ORDER BY j.id DESC LIMIT ?`, runnerID, limit)
400
if err != nil {
401
return nil, err
402
}
403
defer rows.Close()
404
var out []RunnerJob
405
for rows.Next() {
406
var j RunnerJob
407
var st, fin string
408
if err := rows.Scan(&j.JobID, &j.PipelineID, &j.RepoID, &j.Name, &j.Status, &st, &fin); err != nil {
409
return nil, err
410
}
411
j.StartedAt, j.FinishedAt = parseTime(st), parseTime(fin)
412
out = append(out, j)
413
}
414
return out, rows.Err()
415
}
@@ -19,6 +19,7 @@ type Runner struct {19
LastSeen time.Time19
LastSeen time.Time20
Version string20
Version string21
Revoked bool21
Revoked bool22
Paused bool22
}23
}23
24
24
// RunnerOnlineWindow: zo lang na de laatste heartbeat telt een runner als online.25
// RunnerOnlineWindow: zo lang na de laatste heartbeat telt een runner als online.@@ -91,16 +92,16 @@ func (s *Store) RegisterRunner(ctx context.Context, regToken, name, version stri91
return Runner{ID: rid, OwnerKind: kind, OwnerID: ownerID, Name: name, CreatedAt: parseTime(at), LastSeen: parseTime(at), Version: version}, plain, nil92
return Runner{ID: rid, OwnerKind: kind, OwnerID: ownerID, Name: name, CreatedAt: parseTime(at), LastSeen: parseTime(at), Version: version}, plain, nil92
}93
}93
94
94
const runnerCols = `id, owner_kind, owner_id, name, created_at, last_seen, version, revoked`95
const runnerCols = `id, owner_kind, owner_id, name, created_at, last_seen, version, revoked, paused`95
96
96
func scanRunner(sc interface{ Scan(...any) error }) (Runner, error) {97
func scanRunner(sc interface{ Scan(...any) error }) (Runner, error) {97
var r Runner98
var r Runner98
var created, seen string99
var created, seen string99
var revoked int100
var revoked, paused int100
if err := sc.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &r.Name, &created, &seen, &r.Version, &revoked); err != nil {101
if err := sc.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &r.Name, &created, &seen, &r.Version, &revoked, &paused); err != nil {101
return Runner{}, err102
return Runner{}, err102
}103
}103
r.CreatedAt, r.LastSeen, r.Revoked = parseTime(created), parseTime(seen), revoked == 1104
r.CreatedAt, r.LastSeen, r.Revoked, r.Paused = parseTime(created), parseTime(seen), revoked == 1, paused == 1104
return r, nil105
return r, nil105
}106
}106
107
@@ -350,3 +351,65 @@ func (s *Store) RunnerRunsRepo(ctx context.Context, runnerID, repoID int64) bool350
_ = s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM jobs j JOIN job_runs r ON r.job_id = j.id WHERE r.runner_id = ? AND j.repo_id = ? AND j.status = 'running'`, runnerID, repoID).Scan(&n)351
_ = s.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM jobs j JOIN job_runs r ON r.job_id = j.id WHERE r.runner_id = ? AND j.repo_id = ? AND j.status = 'running'`, runnerID, repoID).Scan(&n)351
return n > 0 && runnerID > 0352
return n > 0 && runnerID > 0352
}353
}354
355
// UpdateRunner hernoemt en/of pauzeert een runner van deze eigenaar.356
func (s *Store) UpdateRunner(ctx context.Context, ownerKind string, ownerID, id int64, name *string, paused *bool) (Runner, error) {357
r, err := s.RunnerByID(ctx, id)358
if err != nil || r.Revoked || r.OwnerKind != ownerKind || r.OwnerID != ownerID {359
return Runner{}, errNotFound360
}361
if name != nil {362
n := strings.TrimSpace(*name)363
if n == "" || len(n) > 80 {364
return Runner{}, errors.New("runner name must be 1-80 characters")365
}366
if _, err := s.db.ExecContext(ctx, `UPDATE runners SET name = ? WHERE id = ?`, n, id); err != nil {367
return Runner{}, err368
}369
}370
if paused != nil {371
v := 0372
if *paused {373
v = 1374
}375
if _, err := s.db.ExecContext(ctx, `UPDATE runners SET paused = ? WHERE id = ?`, v, id); err != nil {376
return Runner{}, err377
}378
}379
return s.RunnerByID(ctx, id)380
}381
382
// RunnerJob is een recente job van een runner.383
type RunnerJob struct {384
JobID int64385
PipelineID int64386
RepoID int64387
Name string388
Status string389
StartedAt time.Time390
FinishedAt time.Time391
}392
393
// RunnerJobs geeft de recentste jobs van een runner.394
func (s *Store) RunnerJobs(ctx context.Context, runnerID int64, limit int) ([]RunnerJob, error) {395
if limit <= 0 || limit > 100 {396
limit = 20397
}398
rows, err := s.db.QueryContext(ctx, `SELECT j.id, j.pipeline_id, j.repo_id, j.name, j.status, COALESCE(j.started_at, ''), COALESCE(j.finished_at, '')399
FROM job_runs r JOIN jobs j ON j.id = r.job_id WHERE r.runner_id = ? ORDER BY j.id DESC LIMIT ?`, runnerID, limit)400
if err != nil {401
return nil, err402
}403
defer rows.Close()404
var out []RunnerJob405
for rows.Next() {406
var j RunnerJob407
var st, fin string408
if err := rows.Scan(&j.JobID, &j.PipelineID, &j.RepoID, &j.Name, &j.Status, &st, &fin); err != nil {409
return nil, err410
}411
j.StartedAt, j.FinishedAt = parseTime(st), parseTime(fin)412
out = append(out, j)413
}414
return out, rows.Err()415
}@@ -104,6 +104,7 @@ func (s *Store) migrate() error {
104
104
`ALTER TABLE users ADD COLUMN bio TEXT NOT NULL DEFAULT ''`,
105
105
`ALTER TABLE users ADD COLUMN runner_pref TEXT NOT NULL DEFAULT 'builtin_first'`,
106
106
`ALTER TABLE groups ADD COLUMN builtin_first INTEGER NOT NULL DEFAULT 0`,
107
`ALTER TABLE runners ADD COLUMN paused INTEGER NOT NULL DEFAULT 0`,
107
108
}
108
109
for _, q := range alters {
109
110
if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
@@ -104,6 +104,7 @@ func (s *Store) migrate() error {104
`ALTER TABLE users ADD COLUMN bio TEXT NOT NULL DEFAULT ''`,104
`ALTER TABLE users ADD COLUMN bio TEXT NOT NULL DEFAULT ''`,105
`ALTER TABLE users ADD COLUMN runner_pref TEXT NOT NULL DEFAULT 'builtin_first'`,105
`ALTER TABLE users ADD COLUMN runner_pref TEXT NOT NULL DEFAULT 'builtin_first'`,106
`ALTER TABLE groups ADD COLUMN builtin_first INTEGER NOT NULL DEFAULT 0`,106
`ALTER TABLE groups ADD COLUMN builtin_first INTEGER NOT NULL DEFAULT 0`,107
`ALTER TABLE runners ADD COLUMN paused INTEGER NOT NULL DEFAULT 0`,107
}108
}108
for _, q := range alters {109
for _, q := range alters {109
if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {110
if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {@@ -137,6 +137,67 @@ cmd_mr() {
137
137
esac
138
138
}
139
139
140
# ---------- runners ----------
141
# Account-runners standaard; --group PAD voor groepsrunners (maintainer).
142
cmd_runner() {
143
local sub=${1:-}; shift || true
144
local group="" args=()
145
while (($#)); do case $1 in --group) group=$2; shift 2 ;; *) args+=("$1"); shift ;; esac; done
146
set -- "${args[@]+"${args[@]}"}"
147
local base="/user/runners"
148
[[ -n $group ]] && base="/groups/$(enc "$group")/runners"
149
local fmt='"\(.id)\t\(.status)\t\(.name)\tlaatst gezien \(.last_seen // "nooit")\t\(.version)"'
150
case $sub in
151
list) get "$base" | jq -r ".[]|$fmt" ;;
152
show) get "$base/${1:?runner-id}" | jq . ;;
153
token)
154
# Het registratietoken is het doel van dit commando; alleen hier op stdout.
155
local out; out=$(req POST "$base/registration-token" '{}')
156
if [[ ${1:-} == --json ]]; then printf '%s\n' "$out"; else jq -r .token <<<"$out"; fi ;;
157
rename) req PUT "$base/${1:?runner-id}" "$(json --arg n "${2:?naam}" '{name:$n}')" | jq -r "$fmt" ;;
158
pause) req POST "$base/${1:?runner-id}/pause" '{}' | jq -r "$fmt" ;;
159
resume) req POST "$base/${1:?runner-id}/resume" '{}' | jq -r "$fmt" ;;
160
delete|revoke) req DELETE "$base/${1:?runner-id}" >/dev/null && echo "ingetrokken" ;;
161
jobs) get "$base/${1:?runner-id}/jobs?limit=${2:-20}" | jq -r '.[]|"\(.id)\t\(.status)\t\(.project // "-")\t\(.name)\t\(.finished_at // .started_at // "")"' ;;
162
pref)
163
if [[ -n ${1:-} ]]; then req PUT /user/runner-settings "$(json --arg p "$1" '{preference:$p}')" | jq -r .preference
164
else get /user/runner-settings | jq -r .preference; fi ;;
165
builtin-first)
166
[[ -n $group ]] || die "runner builtin-first --group PAD [true|false]"
167
if [[ -n ${1:-} ]]; then req PUT "/groups/$(enc "$group")/runner-settings" "$(json --argjson b "$1" '{builtin_first:$b}')" | jq -c .
168
else get "/groups/$(enc "$group")/runner-settings" | jq -c .; fi ;;
169
optin)
170
[[ -n $group ]] || die "runner optin --group PAD [on|off]"
171
case ${1:-} in
172
on) req PUT "/groups/$(enc "$group")/runner-optin" '{"enabled":true}' | jq -c . ;;
173
off) req PUT "/groups/$(enc "$group")/runner-optin" '{"enabled":false}' | jq -c . ;;
174
"") get "/groups/$(enc "$group")/runner-optin" | jq -c . ;;
175
*) die "optin on|off" ;;
176
esac ;;
177
wait)
178
# wait NAAM-of-ID [--timeout S]: tot de runner online is.
179
local want=${1:?naam of id} timeout=${3:-120} t=0 row
180
[[ ${2:-} == --timeout ]] || timeout=120
181
while (( t < timeout )); do
182
row=$(get "$base" | jq -c --arg w "$want" '.[]|select((.id|tostring)==$w or .name==$w)' | head -n1)
183
if [[ -n $row && $(jq -r .status <<<"$row") == online ]]; then jq -r "$fmt" <<<"$row"; return 0; fi
184
sleep 3; t=$((t+3))
185
done
186
echo "bg: runner $want niet online binnen ${timeout}s" >&2; return 2 ;;
187
setup)
188
# setup [--group PAD] [NAAM]: token maken, deze machine registreren
189
# (sudo bluegit-runner register, token via env) en wachten tot online.
190
local name=${1:-$(hostname)} tok
191
command -v bluegit-runner >/dev/null || die "bluegit-runner ontbreekt (yay -S bluegit-runner)"
192
tok=$(req POST "$base/registration-token" '{}' | jq -r .token)
193
local sudo=(); (( EUID == 0 )) || sudo=(sudo --preserve-env=BLUEGIT_RUNNER_REGISTRATION_TOKEN)
194
BLUEGIT_RUNNER_REGISTRATION_TOKEN="$tok" "${sudo[@]}" bluegit-runner register --url "$BASE" --name "$name"
195
unset tok
196
cmd_runner wait "$name" ${group:+--group "$group"} ;;
197
*) die "runner list|show|token|rename|pause|resume|delete|jobs|pref|builtin-first|optin|wait|setup [--group PAD]" ;;
198
esac
199
}
200
140
201
# ---------- issues ----------
141
202
cmd_issue() {
142
203
local sub=${1:-}; shift || true
@@ -193,6 +254,14 @@ usage() {
193
254
bg branch create PROJECT NAAM [--from REF]
194
255
bg release create PROJECT TAG [--commit SHA] [--asset JOB:PAD[:NAAM]]
195
256
bg file get PROJECT PAD [--ref REF]
257
bg runner list|show ID|jobs ID [N] [--group PAD] (account-runners zonder --group)
258
bg runner token [--json] [--group PAD] registratietoken (eenmalig, 24 uur)
259
bg runner rename ID NAAM | pause ID | resume ID | delete ID [--group PAD]
260
bg runner pref [own_first|builtin_first]
261
bg runner builtin-first --group PAD [true|false]
262
bg runner optin --group PAD [on|off] alleen je eigen toestemming (maintainer)
263
bg runner wait NAAM|ID [--timeout S] [--group PAD]
264
bg runner setup [NAAM] [--group PAD] token + register op deze machine + wachten
196
265
U
197
266
}
198
267
@@ -203,6 +272,7 @@ case ${1:-help} in
203
272
branch) shift; cmd_branch "$@" ;;
204
273
release) shift; cmd_release "$@" ;;
205
274
file) shift; cmd_file "$@" ;;
275
runner) shift; cmd_runner "$@" ;;
206
276
help|-h|--help) usage ;;
207
277
*) usage >&2; exit 64 ;;
208
278
esac
@@ -137,6 +137,67 @@ cmd_mr() {137
esac137
esac138
}138
}139
139
140
# ---------- runners ----------141
# Account-runners standaard; --group PAD voor groepsrunners (maintainer).142
cmd_runner() {143
local sub=${1:-}; shift || true144
local group="" args=()145
while (($#)); do case $1 in --group) group=$2; shift 2 ;; *) args+=("$1"); shift ;; esac; done146
set -- "${args[@]+"${args[@]}"}"147
local base="/user/runners"148
[[ -n $group ]] && base="/groups/$(enc "$group")/runners"149
local fmt='"\(.id)\t\(.status)\t\(.name)\tlaatst gezien \(.last_seen // "nooit")\t\(.version)"'150
case $sub in151
list) get "$base" | jq -r ".[]|$fmt" ;;152
show) get "$base/${1:?runner-id}" | jq . ;;153
token)154
# Het registratietoken is het doel van dit commando; alleen hier op stdout.155
local out; out=$(req POST "$base/registration-token" '{}')156
if [[ ${1:-} == --json ]]; then printf '%s\n' "$out"; else jq -r .token <<<"$out"; fi ;;157
rename) req PUT "$base/${1:?runner-id}" "$(json --arg n "${2:?naam}" '{name:$n}')" | jq -r "$fmt" ;;158
pause) req POST "$base/${1:?runner-id}/pause" '{}' | jq -r "$fmt" ;;159
resume) req POST "$base/${1:?runner-id}/resume" '{}' | jq -r "$fmt" ;;160
delete|revoke) req DELETE "$base/${1:?runner-id}" >/dev/null && echo "ingetrokken" ;;161
jobs) get "$base/${1:?runner-id}/jobs?limit=${2:-20}" | jq -r '.[]|"\(.id)\t\(.status)\t\(.project // "-")\t\(.name)\t\(.finished_at // .started_at // "")"' ;;162
pref)163
if [[ -n ${1:-} ]]; then req PUT /user/runner-settings "$(json --arg p "$1" '{preference:$p}')" | jq -r .preference164
else get /user/runner-settings | jq -r .preference; fi ;;165
builtin-first)166
[[ -n $group ]] || die "runner builtin-first --group PAD [true|false]"167
if [[ -n ${1:-} ]]; then req PUT "/groups/$(enc "$group")/runner-settings" "$(json --argjson b "$1" '{builtin_first:$b}')" | jq -c .168
else get "/groups/$(enc "$group")/runner-settings" | jq -c .; fi ;;169
optin)170
[[ -n $group ]] || die "runner optin --group PAD [on|off]"171
case ${1:-} in172
on) req PUT "/groups/$(enc "$group")/runner-optin" '{"enabled":true}' | jq -c . ;;173
off) req PUT "/groups/$(enc "$group")/runner-optin" '{"enabled":false}' | jq -c . ;;174
"") get "/groups/$(enc "$group")/runner-optin" | jq -c . ;;175
*) die "optin on|off" ;;176
esac ;;177
wait)178
# wait NAAM-of-ID [--timeout S]: tot de runner online is.179
local want=${1:?naam of id} timeout=${3:-120} t=0 row180
[[ ${2:-} == --timeout ]] || timeout=120181
while (( t < timeout )); do182
row=$(get "$base" | jq -c --arg w "$want" '.[]|select((.id|tostring)==$w or .name==$w)' | head -n1)183
if [[ -n $row && $(jq -r .status <<<"$row") == online ]]; then jq -r "$fmt" <<<"$row"; return 0; fi184
sleep 3; t=$((t+3))185
done186
echo "bg: runner $want niet online binnen ${timeout}s" >&2; return 2 ;;187
setup)188
# setup [--group PAD] [NAAM]: token maken, deze machine registreren189
# (sudo bluegit-runner register, token via env) en wachten tot online.190
local name=${1:-$(hostname)} tok191
command -v bluegit-runner >/dev/null || die "bluegit-runner ontbreekt (yay -S bluegit-runner)"192
tok=$(req POST "$base/registration-token" '{}' | jq -r .token)193
local sudo=(); (( EUID == 0 )) || sudo=(sudo --preserve-env=BLUEGIT_RUNNER_REGISTRATION_TOKEN)194
BLUEGIT_RUNNER_REGISTRATION_TOKEN="$tok" "${sudo[@]}" bluegit-runner register --url "$BASE" --name "$name"195
unset tok196
cmd_runner wait "$name" ${group:+--group "$group"} ;;197
*) die "runner list|show|token|rename|pause|resume|delete|jobs|pref|builtin-first|optin|wait|setup [--group PAD]" ;;198
esac199
}200
140
# ---------- issues ----------201
# ---------- issues ----------141
cmd_issue() {202
cmd_issue() {142
local sub=${1:-}; shift || true203
local sub=${1:-}; shift || true@@ -193,6 +254,14 @@ usage() {193
bg branch create PROJECT NAAM [--from REF]254
bg branch create PROJECT NAAM [--from REF]194
bg release create PROJECT TAG [--commit SHA] [--asset JOB:PAD[:NAAM]]255
bg release create PROJECT TAG [--commit SHA] [--asset JOB:PAD[:NAAM]]195
bg file get PROJECT PAD [--ref REF]256
bg file get PROJECT PAD [--ref REF]257
bg runner list|show ID|jobs ID [N] [--group PAD] (account-runners zonder --group)258
bg runner token [--json] [--group PAD] registratietoken (eenmalig, 24 uur)259
bg runner rename ID NAAM | pause ID | resume ID | delete ID [--group PAD]260
bg runner pref [own_first|builtin_first]261
bg runner builtin-first --group PAD [true|false]262
bg runner optin --group PAD [on|off] alleen je eigen toestemming (maintainer)263
bg runner wait NAAM|ID [--timeout S] [--group PAD]264
bg runner setup [NAAM] [--group PAD] token + register op deze machine + wachten196
U265
U197
}266
}198
267
@@ -203,6 +272,7 @@ case ${1:-help} in203
branch) shift; cmd_branch "$@" ;;272
branch) shift; cmd_branch "$@" ;;204
release) shift; cmd_release "$@" ;;273
release) shift; cmd_release "$@" ;;205
file) shift; cmd_file "$@" ;;274
file) shift; cmd_file "$@" ;;275
runner) shift; cmd_runner "$@" ;;206
help|-h|--help) usage ;;276
help|-h|--help) usage ;;207
*) usage >&2; exit 64 ;;277
*) usage >&2; exit 64 ;;208
esac278
esac@@ -95,3 +95,48 @@ func TestBGWaitExitCodes(t *testing.T) {
95
95
t.Fatalf("404: %d %s", code, errs)
96
96
}
97
97
}
98
99
func TestBGRunnerCommands(t *testing.T) {
100
var seen []string
101
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
102
seen = append(seen, r.Method+" "+r.URL.Path)
103
if r.Header.Get("Authorization") != "Bearer bg_secret" {
104
w.WriteHeader(401)
105
return
106
}
107
w.Header().Set("Content-Type", "application/json")
108
switch r.Method + " " + r.URL.Path {
109
case "GET /api/v1/user/runners", "GET /api/v1/groups/team/runners":
110
_, _ = w.Write([]byte(`[{"id":7,"name":"pc","status":"online","last_seen":"2026-10-24T12:00:00Z","version":"1"}]`))
111
case "POST /api/v1/groups/team/runners/registration-token":
112
w.WriteHeader(201)
113
_, _ = w.Write([]byte(`{"token":"bgrr_abc"}`))
114
case "POST /api/v1/user/runners/7/pause":
115
_, _ = w.Write([]byte(`{"id":7,"name":"pc","status":"paused","version":"1"}`))
116
case "PUT /api/v1/user/runner-settings":
117
_, _ = w.Write([]byte(`{"preference":"own_first"}`))
118
default:
119
w.WriteHeader(404)
120
}
121
}))
122
defer srv.Close()
123
if code, out, _ := runBG(t, srv.URL, "bg_secret", "runner", "list"); code != 0 || !strings.Contains(out, "7\tonline\tpc") {
124
t.Fatalf("list %d %q", code, out)
125
}
126
if code, out, _ := runBG(t, srv.URL, "bg_secret", "runner", "token", "--group", "team"); code != 0 || strings.TrimSpace(out) != "bgrr_abc" {
127
t.Fatalf("token %d %q", code, out)
128
}
129
if code, out, _ := runBG(t, srv.URL, "bg_secret", "runner", "pause", "7"); code != 0 || !strings.Contains(out, "paused") {
130
t.Fatalf("pause %d %q", code, out)
131
}
132
if code, out, _ := runBG(t, srv.URL, "bg_secret", "runner", "pref", "own_first"); code != 0 || strings.TrimSpace(out) != "own_first" {
133
t.Fatalf("pref %d %q", code, out)
134
}
135
if code, out, _ := runBG(t, srv.URL, "bg_secret", "runner", "wait", "pc", "--group", "team"); code != 0 || !strings.Contains(out, "online") {
136
t.Fatalf("wait %d %q", code, out)
137
}
138
code, out, errOut := runBG(t, srv.URL, "bg_wrong", "runner", "list")
139
if code == 0 || strings.Contains(out+errOut, "bg_wrong") || strings.Contains(out+errOut, "bg_secret") {
140
t.Fatalf("bad token %d %q %q", code, out, errOut)
141
}
142
}
@@ -95,3 +95,48 @@ func TestBGWaitExitCodes(t *testing.T) {95
t.Fatalf("404: %d %s", code, errs)95
t.Fatalf("404: %d %s", code, errs)96
}96
}97
}97
}98
99
func TestBGRunnerCommands(t *testing.T) {100
var seen []string101
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {102
seen = append(seen, r.Method+" "+r.URL.Path)103
if r.Header.Get("Authorization") != "Bearer bg_secret" {104
w.WriteHeader(401)105
return106
}107
w.Header().Set("Content-Type", "application/json")108
switch r.Method + " " + r.URL.Path {109
case "GET /api/v1/user/runners", "GET /api/v1/groups/team/runners":110
_, _ = w.Write([]byte(`[{"id":7,"name":"pc","status":"online","last_seen":"2026-10-24T12:00:00Z","version":"1"}]`))111
case "POST /api/v1/groups/team/runners/registration-token":112
w.WriteHeader(201)113
_, _ = w.Write([]byte(`{"token":"bgrr_abc"}`))114
case "POST /api/v1/user/runners/7/pause":115
_, _ = w.Write([]byte(`{"id":7,"name":"pc","status":"paused","version":"1"}`))116
case "PUT /api/v1/user/runner-settings":117
_, _ = w.Write([]byte(`{"preference":"own_first"}`))118
default:119
w.WriteHeader(404)120
}121
}))122
defer srv.Close()123
if code, out, _ := runBG(t, srv.URL, "bg_secret", "runner", "list"); code != 0 || !strings.Contains(out, "7\tonline\tpc") {124
t.Fatalf("list %d %q", code, out)125
}126
if code, out, _ := runBG(t, srv.URL, "bg_secret", "runner", "token", "--group", "team"); code != 0 || strings.TrimSpace(out) != "bgrr_abc" {127
t.Fatalf("token %d %q", code, out)128
}129
if code, out, _ := runBG(t, srv.URL, "bg_secret", "runner", "pause", "7"); code != 0 || !strings.Contains(out, "paused") {130
t.Fatalf("pause %d %q", code, out)131
}132
if code, out, _ := runBG(t, srv.URL, "bg_secret", "runner", "pref", "own_first"); code != 0 || strings.TrimSpace(out) != "own_first" {133
t.Fatalf("pref %d %q", code, out)134
}135
if code, out, _ := runBG(t, srv.URL, "bg_secret", "runner", "wait", "pc", "--group", "team"); code != 0 || !strings.Contains(out, "online") {136
t.Fatalf("wait %d %q", code, out)137
}138
code, out, errOut := runBG(t, srv.URL, "bg_wrong", "runner", "list")139
if code == 0 || strings.Contains(out+errOut, "bg_wrong") || strings.Contains(out+errOut, "bg_secret") {140
t.Fatalf("bad token %d %q %q", code, out, errOut)141
}142
}