BlueGit

timfa bluegit

Merge branch 'stage' into 'master'

timfa

Authored 2026-10-25 · 3 weeks ago

Hash
923a303929caf3ba9681a309dc45a49a06601479
Pipeline
Passed
20 files changed +677 −8
docs/agents.md +10 −0
@@ -146,6 +146,16 @@ bg admin grant bob
146 146 bg admin revoke bob
147 147 ```
148 148
149 ## Releases en assets verwijderen
150
151 ```sh
152 bg release delete-asset timfa/app v1.2.0 app-linux.tar.gz # één bestand; release, tag en broncode blijven
153 bg release delete timfa/app v1.2.0 # release met alle bestanden; git-tag blijft
154 bg release delete timfa/app v1.2.0 --delete-tag # ook de git-tag weg
155 ```
156
157 API: `DELETE /api/v1/projects/{owner}/{repo}/releases/{tag}/assets/{naam}` en `DELETE /api/v1/projects/{owner}/{repo}/releases/{tag}[?delete_tag=true]`, beide `204`. Alleen eigenaar, maintainer of instance-admin; zonder token `401`, niet zichtbaar `404`, te weinig rechten `403`, onbekende release of asset `404`. De bestanden gaan ook van schijf. In de UI staan de knoppen op de Releases-pagina, met een bevestiging.
158
149 159 ## Zichtbaarheid van releases
150 160
151 161 Releases hebben een eigen zichtbaarheid naast die van de repo: `inherit` (zelfde als de repo, standaard), `private` of `public`. Instellen kan via Instellingen van de repo, of via:
@@ -146,6 +146,16 @@ bg admin grant bob
146bg admin revoke bob
146bg admin revoke bob
147```
147```
148
148
149## Releases en assets verwijderen
150
151```sh
152bg release delete-asset timfa/app v1.2.0 app-linux.tar.gz # één bestand; release, tag en broncode blijven
153bg release delete timfa/app v1.2.0 # release met alle bestanden; git-tag blijft
154bg release delete timfa/app v1.2.0 --delete-tag # ook de git-tag weg
155```
156
157API: `DELETE /api/v1/projects/{owner}/{repo}/releases/{tag}/assets/{naam}` en `DELETE /api/v1/projects/{owner}/{repo}/releases/{tag}[?delete_tag=true]`, beide `204`. Alleen eigenaar, maintainer of instance-admin; zonder token `401`, niet zichtbaar `404`, te weinig rechten `403`, onbekende release of asset `404`. De bestanden gaan ook van schijf. In de UI staan de knoppen op de Releases-pagina, met een bevestiging.
158
149## Zichtbaarheid van releases
159## Zichtbaarheid van releases
150
160
151Releases hebben een eigen zichtbaarheid naast die van de repo: `inherit` (zelfde als de repo, standaard), `private` of `public`. Instellen kan via Instellingen van de repo, of via:
161Releases hebben een eigen zichtbaarheid naast die van de repo: `inherit` (zelfde als de repo, standaard), `private` of `public`. Instellen kan via Instellingen van de repo, of via:
docs/runner.en.md +4 −0
@@ -108,6 +108,10 @@ Site administrators get the same screen for the runner inside BlueGit at
108 108 jobs that are actually *running*, so a paused built-in runner does not block
109 109 an update; queued jobs start after resuming.
110 110
111 ## Git and API from a job (`CI_JOB_TOKEN`)
112
113 A job can reach its own repo without its own login, also when the repo is private. `origin` points to `CI_PROJECT_URL.git`, and the runner sets `http.<project url>.extraHeader` (`Authorization: Bearer $CI_JOB_TOKEN`) through `GIT_CONFIG_*` environment variables, only for this project's URL. No file is written, so it works in any image (including `bluegit/base`) with git ≥ 2.31. `git ls-remote origin`, `git fetch` and `git clone` work, as do `GET` API routes for the own repo with the job token (read-only). Pushing, other repos and any use after the job ends are refused.
114
111 115 ## Security and isolation
112 116
113 117 - Every job runs in its own Docker container with the checkout on `/workspace`; services get a network per job. Per-job limits are set in the web interface.
@@ -108,6 +108,10 @@ Site administrators get the same screen for the runner inside BlueGit at
108jobs that are actually *running*, so a paused built-in runner does not block
108jobs that are actually *running*, so a paused built-in runner does not block
109an update; queued jobs start after resuming.
109an update; queued jobs start after resuming.
110
110
111## Git and API from a job (`CI_JOB_TOKEN`)
112
113A job can reach its own repo without its own login, also when the repo is private. `origin` points to `CI_PROJECT_URL.git`, and the runner sets `http.<project url>.extraHeader` (`Authorization: Bearer $CI_JOB_TOKEN`) through `GIT_CONFIG_*` environment variables, only for this project's URL. No file is written, so it works in any image (including `bluegit/base`) with git ≥ 2.31. `git ls-remote origin`, `git fetch` and `git clone` work, as do `GET` API routes for the own repo with the job token (read-only). Pushing, other repos and any use after the job ends are refused.
114
111## Security and isolation
115## Security and isolation
112
116
113- Every job runs in its own Docker container with the checkout on `/workspace`; services get a network per job. Per-job limits are set in the web interface.
117- Every job runs in its own Docker container with the checkout on `/workspace`; services get a network per job. Per-job limits are set in the web interface.
docs/runner.md +16 −1
@@ -104,7 +104,8 @@ mislukken met `runner_system_failure` (retry-regels gelden).
104 104 eigenaar mag lezen; een groepsrunner alleen uit repo's van die groep.
105 105 Toestemming van een maintainer telt alleen zolang die maintainer is.
106 106 Het runner-token mag alleen de repo clonen van een job die die runner op
107 dat moment draait. De rechten van `CI_JOB_TOKEN` zijn ongewijzigd.
107 dat moment draait. `CI_JOB_TOKEN` geeft alleen leestoegang tot de eigen
108 repo (zie hieronder).
108 109
109 110 ## Wat gebeurt er per job
110 111
@@ -122,6 +123,20 @@ runnermachine in `work_dir/cache`.
122 123 De job-UI en de API (`runner` in job-JSON: `{id, name, kind}`) tonen
123 124 welke runner een job draaide.
124 125
126 ## Git en API vanuit een job (`CI_JOB_TOKEN`)
127
128 Een job kan zonder eigen inlog bij de eigen repo, ook als die privé is:
129
130 - `origin` in `/workspace` wijst naar `CI_PROJECT_URL.git` (ook bij de ingebouwde runner).
131 - De runner zet via `GIT_CONFIG_COUNT`/`GIT_CONFIG_KEY_n`/`GIT_CONFIG_VALUE_n` een `http.<projecturl>.extraHeader` met `Authorization: Bearer $CI_JOB_TOKEN`, alleen voor de URL van dit project. Er komt geen bestand in de container, dus het werkt in elk image (ook `bluegit/base`) zolang git ≥ 2.31 is.
132 - `git ls-remote origin`, `git fetch`, `git clone $CI_PROJECT_URL.git` werken dus gewoon (scripts zoals `next-version.sh` hoeven niets te veranderen).
133 - De API: `GET`-routes onder `/api/v1/…/{owner}/{repo}` van de eigen repo met `Authorization: Bearer $CI_JOB_TOKEN` (of `PRIVATE-TOKEN`). Leesrechten, zoals een lid met de rol *readonly*.
134 - Niet: pushen, schrijven via de API (behalve releases publiceren, zoals voorheen), andere repo's, of iets na het einde van de job: het token vervalt dan.
135
136 Pipelines hebben zo dezelfde bescherming als de repo: wie de repo niet
137 mag lezen, ziet ook de pipelines niet, en het job-token komt niet verder
138 dan de eigen repo.
139
125 140 ## Beheer via de API (en voor agents)
126 141
127 142 Zelfde regels als de UI: account-endpoints alleen voor de eigenaar zelf,
@@ -104,7 +104,8 @@ mislukken met `runner_system_failure` (retry-regels gelden).
104eigenaar mag lezen; een groepsrunner alleen uit repo's van die groep.
104eigenaar mag lezen; een groepsrunner alleen uit repo's van die groep.
105Toestemming van een maintainer telt alleen zolang die maintainer is.
105Toestemming van een maintainer telt alleen zolang die maintainer is.
106Het runner-token mag alleen de repo clonen van een job die die runner op
106Het runner-token mag alleen de repo clonen van een job die die runner op
107dat moment draait. De rechten van `CI_JOB_TOKEN` zijn ongewijzigd.
107dat moment draait. `CI_JOB_TOKEN` geeft alleen leestoegang tot de eigen
108repo (zie hieronder).
108
109
109## Wat gebeurt er per job
110## Wat gebeurt er per job
110
111
@@ -122,6 +123,20 @@ runnermachine in `work_dir/cache`.
122De job-UI en de API (`runner` in job-JSON: `{id, name, kind}`) tonen
123De job-UI en de API (`runner` in job-JSON: `{id, name, kind}`) tonen
123welke runner een job draaide.
124welke runner een job draaide.
124
125
126## Git en API vanuit een job (`CI_JOB_TOKEN`)
127
128Een job kan zonder eigen inlog bij de eigen repo, ook als die privé is:
129
130- `origin` in `/workspace` wijst naar `CI_PROJECT_URL.git` (ook bij de ingebouwde runner).
131- De runner zet via `GIT_CONFIG_COUNT`/`GIT_CONFIG_KEY_n`/`GIT_CONFIG_VALUE_n` een `http.<projecturl>.extraHeader` met `Authorization: Bearer $CI_JOB_TOKEN`, alleen voor de URL van dit project. Er komt geen bestand in de container, dus het werkt in elk image (ook `bluegit/base`) zolang git ≥ 2.31 is.
132- `git ls-remote origin`, `git fetch`, `git clone $CI_PROJECT_URL.git` werken dus gewoon (scripts zoals `next-version.sh` hoeven niets te veranderen).
133- De API: `GET`-routes onder `/api/v1/…/{owner}/{repo}` van de eigen repo met `Authorization: Bearer $CI_JOB_TOKEN` (of `PRIVATE-TOKEN`). Leesrechten, zoals een lid met de rol *readonly*.
134- Niet: pushen, schrijven via de API (behalve releases publiceren, zoals voorheen), andere repo's, of iets na het einde van de job: het token vervalt dan.
135
136Pipelines hebben zo dezelfde bescherming als de repo: wie de repo niet
137mag lezen, ziet ook de pipelines niet, en het job-token komt niet verder
138dan de eigen repo.
139
125## Beheer via de API (en voor agents)
140## Beheer via de API (en voor agents)
126
141
127Zelfde regels als de UI: account-endpoints alleen voor de eigenaar zelf,
142Zelfde regels als de UI: account-endpoints alleen voor de eigenaar zelf,
internal/i18n/catalog.go +11 −2
@@ -284,8 +284,17 @@ var en = map[string]string{
284 284 "mail.fail.jobs": "Failed jobs",
285 285 "mail.fail.open": "Open the pipeline",
286 286
287 "rel.none": "No releases yet.",
288 "rel.bytes": "bytes",
287 "rel.none": "No releases yet.",
288 "rel.delete": "Delete release",
289 "rel.deleteAsset": "Delete",
290 "rel.deleteAsk": "Delete release %s and all its files? The source code stays.",
291 "rel.deleteAssetAsk": "Delete file %s from this release? The tag and source code stay.",
292 "rel.deleteTag": "Also delete the git tag",
293 "rel.deleted": "Release deleted.",
294 "rel.assetDeleted": "File deleted.",
295 "rel.tip.delete": "Removes the release and its files from the server. The git tag stays unless you tick the box.",
296 "rel.tip.deleteAsset": "Removes only this file. The release, tag and source code stay.",
297 "rel.bytes": "bytes",
289 298
290 299 "set.onlyAdmin": "Only a maintainer changes settings, secrets and webhooks. Your role: %s.",
291 300 "set.general": "General",
@@ -284,8 +284,17 @@ var en = map[string]string{
284 "mail.fail.jobs": "Failed jobs",
284 "mail.fail.jobs": "Failed jobs",
285 "mail.fail.open": "Open the pipeline",
285 "mail.fail.open": "Open the pipeline",
286
286
287 "rel.none": "No releases yet.",
287 "rel.none": "No releases yet.",
288 "rel.bytes": "bytes",
288 "rel.delete": "Delete release",
289 "rel.deleteAsset": "Delete",
290 "rel.deleteAsk": "Delete release %s and all its files? The source code stays.",
291 "rel.deleteAssetAsk": "Delete file %s from this release? The tag and source code stay.",
292 "rel.deleteTag": "Also delete the git tag",
293 "rel.deleted": "Release deleted.",
294 "rel.assetDeleted": "File deleted.",
295 "rel.tip.delete": "Removes the release and its files from the server. The git tag stays unless you tick the box.",
296 "rel.tip.deleteAsset": "Removes only this file. The release, tag and source code stay.",
297 "rel.bytes": "bytes",
289
298
290 "set.onlyAdmin": "Only a maintainer changes settings, secrets and webhooks. Your role: %s.",
299 "set.onlyAdmin": "Only a maintainer changes settings, secrets and webhooks. Your role: %s.",
291 "set.general": "General",
300 "set.general": "General",
internal/i18n/catalog_lang.go +27 −0
@@ -290,6 +290,15 @@ var nl = map[string]string{
290 290 "mail.fail.jobs": "Mislukte jobs",
291 291 "mail.fail.open": "Open de pipeline",
292 292 "rel.none": "Nog geen releases.",
293 "rel.delete": "Release verwijderen",
294 "rel.deleteAsset": "Verwijderen",
295 "rel.deleteAsk": "Release %s met alle bestanden verwijderen? De broncode blijft.",
296 "rel.deleteAssetAsk": "Bestand %s uit deze release verwijderen? Tag en broncode blijven.",
297 "rel.deleteTag": "Ook de git-tag verwijderen",
298 "rel.deleted": "Release verwijderd.",
299 "rel.assetDeleted": "Bestand verwijderd.",
300 "rel.tip.delete": "Haalt de release en zijn bestanden van de server. De git-tag blijft, tenzij je het vakje aanvinkt.",
301 "rel.tip.deleteAsset": "Haalt alleen dit bestand weg. Release, tag en broncode blijven.",
293 302 "rel.bytes": "bytes",
294 303 "set.onlyAdmin": "Alleen een beheerder wijzigt instellingen, geheimen en webhooks. Jouw rol: %s.",
295 304 "set.general": "Algemeen",
@@ -912,6 +921,15 @@ var de = map[string]string{
912 921 "mail.fail.jobs": "Fehlgeschlagene Jobs",
913 922 "mail.fail.open": "Pipeline öffnen",
914 923 "rel.none": "Noch keine Releases.",
924 "rel.delete": "Release löschen",
925 "rel.deleteAsset": "Löschen",
926 "rel.deleteAsk": "Release %s mit allen Dateien löschen? Der Quellcode bleibt.",
927 "rel.deleteAssetAsk": "Datei %s aus diesem Release löschen? Tag und Quellcode bleiben.",
928 "rel.deleteTag": "Auch den Git-Tag löschen",
929 "rel.deleted": "Release gelöscht.",
930 "rel.assetDeleted": "Datei gelöscht.",
931 "rel.tip.delete": "Entfernt das Release und seine Dateien vom Server. Der Git-Tag bleibt, außer du setzt das Häkchen.",
932 "rel.tip.deleteAsset": "Entfernt nur diese Datei. Release, Tag und Quellcode bleiben.",
915 933 "rel.bytes": "Bytes",
916 934 "set.onlyAdmin": "Nur ein Betreuer ändert Einstellungen, Geheimnisse und Webhooks. Deine Rolle: %s.",
917 935 "set.general": "Allgemein",
@@ -1534,6 +1552,15 @@ var fr = map[string]string{
1534 1552 "mail.fail.jobs": "Jobs échoués",
1535 1553 "mail.fail.open": "Ouvrir le pipeline",
1536 1554 "rel.none": "Pas encore de versions.",
1555 "rel.delete": "Supprimer la version",
1556 "rel.deleteAsset": "Supprimer",
1557 "rel.deleteAsk": "Supprimer la version %s et tous ses fichiers ? Le code source reste.",
1558 "rel.deleteAssetAsk": "Supprimer le fichier %s de cette version ? Le tag et le code source restent.",
1559 "rel.deleteTag": "Supprimer aussi le tag git",
1560 "rel.deleted": "Version supprimée.",
1561 "rel.assetDeleted": "Fichier supprimé.",
1562 "rel.tip.delete": "Retire la version et ses fichiers du serveur. Le tag git reste, sauf si tu coches la case.",
1563 "rel.tip.deleteAsset": "Retire seulement ce fichier. La version, le tag et le code source restent.",
1537 1564 "rel.bytes": "octets",
1538 1565 "set.onlyAdmin": "Seul un mainteneur modifie les paramètres, les secrets et les webhooks. Ton rôle : %s.",
1539 1566 "set.general": "Général",
@@ -290,6 +290,15 @@ var nl = map[string]string{
290 "mail.fail.jobs": "Mislukte jobs",
290 "mail.fail.jobs": "Mislukte jobs",
291 "mail.fail.open": "Open de pipeline",
291 "mail.fail.open": "Open de pipeline",
292 "rel.none": "Nog geen releases.",
292 "rel.none": "Nog geen releases.",
293 "rel.delete": "Release verwijderen",
294 "rel.deleteAsset": "Verwijderen",
295 "rel.deleteAsk": "Release %s met alle bestanden verwijderen? De broncode blijft.",
296 "rel.deleteAssetAsk": "Bestand %s uit deze release verwijderen? Tag en broncode blijven.",
297 "rel.deleteTag": "Ook de git-tag verwijderen",
298 "rel.deleted": "Release verwijderd.",
299 "rel.assetDeleted": "Bestand verwijderd.",
300 "rel.tip.delete": "Haalt de release en zijn bestanden van de server. De git-tag blijft, tenzij je het vakje aanvinkt.",
301 "rel.tip.deleteAsset": "Haalt alleen dit bestand weg. Release, tag en broncode blijven.",
293 "rel.bytes": "bytes",
302 "rel.bytes": "bytes",
294 "set.onlyAdmin": "Alleen een beheerder wijzigt instellingen, geheimen en webhooks. Jouw rol: %s.",
303 "set.onlyAdmin": "Alleen een beheerder wijzigt instellingen, geheimen en webhooks. Jouw rol: %s.",
295 "set.general": "Algemeen",
304 "set.general": "Algemeen",
@@ -912,6 +921,15 @@ var de = map[string]string{
912 "mail.fail.jobs": "Fehlgeschlagene Jobs",
921 "mail.fail.jobs": "Fehlgeschlagene Jobs",
913 "mail.fail.open": "Pipeline öffnen",
922 "mail.fail.open": "Pipeline öffnen",
914 "rel.none": "Noch keine Releases.",
923 "rel.none": "Noch keine Releases.",
924 "rel.delete": "Release löschen",
925 "rel.deleteAsset": "Löschen",
926 "rel.deleteAsk": "Release %s mit allen Dateien löschen? Der Quellcode bleibt.",
927 "rel.deleteAssetAsk": "Datei %s aus diesem Release löschen? Tag und Quellcode bleiben.",
928 "rel.deleteTag": "Auch den Git-Tag löschen",
929 "rel.deleted": "Release gelöscht.",
930 "rel.assetDeleted": "Datei gelöscht.",
931 "rel.tip.delete": "Entfernt das Release und seine Dateien vom Server. Der Git-Tag bleibt, außer du setzt das Häkchen.",
932 "rel.tip.deleteAsset": "Entfernt nur diese Datei. Release, Tag und Quellcode bleiben.",
915 "rel.bytes": "Bytes",
933 "rel.bytes": "Bytes",
916 "set.onlyAdmin": "Nur ein Betreuer ändert Einstellungen, Geheimnisse und Webhooks. Deine Rolle: %s.",
934 "set.onlyAdmin": "Nur ein Betreuer ändert Einstellungen, Geheimnisse und Webhooks. Deine Rolle: %s.",
917 "set.general": "Allgemein",
935 "set.general": "Allgemein",
@@ -1534,6 +1552,15 @@ var fr = map[string]string{
1534 "mail.fail.jobs": "Jobs échoués",
1552 "mail.fail.jobs": "Jobs échoués",
1535 "mail.fail.open": "Ouvrir le pipeline",
1553 "mail.fail.open": "Ouvrir le pipeline",
1536 "rel.none": "Pas encore de versions.",
1554 "rel.none": "Pas encore de versions.",
1555 "rel.delete": "Supprimer la version",
1556 "rel.deleteAsset": "Supprimer",
1557 "rel.deleteAsk": "Supprimer la version %s et tous ses fichiers ? Le code source reste.",
1558 "rel.deleteAssetAsk": "Supprimer le fichier %s de cette version ? Le tag et le code source restent.",
1559 "rel.deleteTag": "Supprimer aussi le tag git",
1560 "rel.deleted": "Version supprimée.",
1561 "rel.assetDeleted": "Fichier supprimé.",
1562 "rel.tip.delete": "Retire la version et ses fichiers du serveur. Le tag git reste, sauf si tu coches la case.",
1563 "rel.tip.deleteAsset": "Retire seulement ce fichier. La version, le tag et le code source restent.",
1537 "rel.bytes": "octets",
1564 "rel.bytes": "octets",
1538 "set.onlyAdmin": "Seul un mainteneur modifie les paramètres, les secrets et les webhooks. Ton rôle : %s.",
1565 "set.onlyAdmin": "Seul un mainteneur modifie les paramètres, les secrets et les webhooks. Ton rôle : %s.",
1539 "set.general": "Général",
1566 "set.general": "Général",
internal/runner/job_git_auth_test.go added +22 −0
@@ -0,0 +1,22 @@
1 package runner
2
3 import "testing"
4
5 func TestJobGitAuthScopedToProject(t *testing.T) {
6 env := map[string]string{"GIT_CONFIG_COUNT": "1", "GIT_CONFIG_KEY_0": "safe.directory", "GIT_CONFIG_VALUE_0": "*"}
7 JobGitAuth(env, "https://git.example/tim/app", "bgj_x")
8 if env["GIT_CONFIG_COUNT"] != "3" || env["GIT_CONFIG_KEY_0"] != "safe.directory" {
9 t.Fatalf("count/keep: %v", env)
10 }
11 if env["GIT_CONFIG_KEY_1"] != "http.https://git.example/tim/app.extraHeader" || env["GIT_CONFIG_KEY_2"] != "http.https://git.example/tim/app.git.extraHeader" {
12 t.Fatalf("keys: %v", env)
13 }
14 if env["GIT_CONFIG_VALUE_1"] != "Authorization: Bearer bgj_x" {
15 t.Fatalf("value: %v", env)
16 }
17 none := map[string]string{}
18 JobGitAuth(none, "", "bgj_x")
19 if len(none) != 0 {
20 t.Fatal("no URL: no config")
21 }
22 }
@@ -0,0 +1,22 @@
1package runner
2
3import "testing"
4
5func TestJobGitAuthScopedToProject(t *testing.T) {
6 env := map[string]string{"GIT_CONFIG_COUNT": "1", "GIT_CONFIG_KEY_0": "safe.directory", "GIT_CONFIG_VALUE_0": "*"}
7 JobGitAuth(env, "https://git.example/tim/app", "bgj_x")
8 if env["GIT_CONFIG_COUNT"] != "3" || env["GIT_CONFIG_KEY_0"] != "safe.directory" {
9 t.Fatalf("count/keep: %v", env)
10 }
11 if env["GIT_CONFIG_KEY_1"] != "http.https://git.example/tim/app.extraHeader" || env["GIT_CONFIG_KEY_2"] != "http.https://git.example/tim/app.git.extraHeader" {
12 t.Fatalf("keys: %v", env)
13 }
14 if env["GIT_CONFIG_VALUE_1"] != "Authorization: Bearer bgj_x" {
15 t.Fatalf("value: %v", env)
16 }
17 none := map[string]string{}
18 JobGitAuth(none, "", "bgj_x")
19 if len(none) != 0 {
20 t.Fatal("no URL: no config")
21 }
22}
internal/runner/runner.go +69 −2
@@ -7,6 +7,7 @@ import (
7 7 "errors"
8 8 "fmt"
9 9 "io"
10 "io/fs"
10 11 "log/slog"
11 12 "os"
12 13 "os/exec"
@@ -406,7 +407,10 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([
406 407 sink := &logSink{store: r.Store, jobID: job.ID}
407 408 sink.section("prepare", "Preparing the docker executor")
408 409 work := filepath.Join(r.storage(), "work", fmt.Sprint(p.ID), safeSegment(job.Name))
409 _ = os.RemoveAll(work)
410 if err := clearWorkDir(work); err != nil {
411 sink.closeSection()
412 return nil, fmt.Errorf("runner_system_failure: work dir: %w", err)
413 }
410 414 if err := os.MkdirAll(work, 0o755); err != nil {
411 415 sink.closeSection()
412 416 return nil, err
@@ -416,6 +420,11 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([
416 420 sink.closeSection()
417 421 return nil, fmt.Errorf("clone: %w", err)
418 422 }
423 // origin wijst naar de echte repo-URL, niet naar het pad van de bare repo
424 // op de host. In de container kan de job zo met CI_JOB_TOKEN fetchen.
425 if r.BaseURL != "" {
426 _, _ = execOut(ctx, r.GitBin, "-C", work, "remote", "set-url", "origin", strings.TrimRight(r.BaseURL, "/")+"/"+repo.FullPath()+".git")
427 }
419 428 if _, err := execOut(ctx, r.GitBin, "-C", work, "checkout", "--detach", p.CommitSHA); err != nil {
420 429 sink.closeSection()
421 430 return nil, fmt.Errorf("checkout %s: %w", p.CommitSHA, err)
@@ -502,7 +511,13 @@ func (r *Runner) execContainer(ctx context.Context, sink *logSink, job store.Job
502 511 // -e NAAM zonder waarde laat Docker de variabele uit de omgeving van
503 512 // deze client overnemen. Zo blijft een meerregelige sleutel heel en
504 513 // staat de waarde niet in de proceslijst.
505 args := []string{"run", "--rm", "--network", network, "-v", work + ":/workspace", "-w", "/workspace"}
514 // Een vaste naam per job: een geannuleerde of afgebroken container
515 // (de docker-client stopt dan, de container niet) wordt voor de start en
516 // na afloop opgeruimd.
517 cname := fmt.Sprintf("bluegit-job-%d", job.ID)
518 removeContainer(r.Docker, cname)
519 defer removeContainer(r.Docker, cname)
520 args := []string{"run", "--rm", "--name", cname, "--network", network, "-v", work + ":/workspace", "-w", "/workspace"}
506 521 ctl := r.controls()
507 522 args = append(args, ctl.runArgs...)
508 523 if ctl.pull == runnercfg.PullNever {
@@ -526,6 +541,37 @@ func (r *Runner) execContainer(ctx context.Context, sink *logSink, job store.Job
526 541 return nil
527 542 }
528 543
544 func removeContainer(docker, name string) {
545 ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
546 defer cancel()
547 _, _ = execOut(ctx, docker, "rm", "-f", name)
548 }
549
550 // clearWorkDir maakt de werkmap leeg. Mappen zonder schrijfrecht (uit een
551 // container) worden eerst beschrijfbaar gemaakt. Lukt verwijderen dan nog
552 // niet (bestanden van root), dan gaat de oude map opzij, zodat de clone in
553 // een lege map begint. Alleen als ook dat faalt, is het een fout.
554 func clearWorkDir(work string) error {
555 if err := os.RemoveAll(work); err == nil {
556 return nil
557 }
558 _ = filepath.WalkDir(work, func(p string, d fs.DirEntry, err error) error {
559 if err == nil && d.IsDir() {
560 _ = os.Chmod(p, 0o755)
561 }
562 return nil
563 })
564 if err := os.RemoveAll(work); err == nil {
565 return nil
566 }
567 stale := fmt.Sprintf("%s.stale-%d", work, time.Now().UnixNano())
568 if err := os.Rename(work, stale); err != nil {
569 return err
570 }
571 go func() { _ = os.RemoveAll(stale) }()
572 return nil
573 }
574
529 575 // placeNote zijn de vaste regels in de sectie Preparing environment.
530 576 type placeNote struct {
531 577 Runner string
@@ -883,10 +929,31 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel
883 929 // Na de jobvariabelen, zodat een eigen GIT_CONFIG_COUNT blijft staan
884 930 // en safe.directory er alsnog bij komt.
885 931 markWorkspaceSafe(env)
932 JobGitAuth(env, base+"/"+repo.FullPath(), token)
886 933 mask = append(mask, token)
887 934 return env, mask, nil
888 935 }
889 936
937 // JobGitAuth geeft git in de job leestoegang tot de eigen repo met het
938 // job-token. De header geldt alleen voor de URL van dit project (met en
939 // zonder .git) en het token vervalt als de job stopt. Via GIT_CONFIG_* werkt
940 // het in elk image, zonder bestanden in de container.
941 func JobGitAuth(env map[string]string, projectURL, token string) {
942 if projectURL == "" || token == "" || !strings.Contains(projectURL, "://") {
943 return
944 }
945 n := 0
946 if v, err := strconv.Atoi(strings.TrimSpace(env["GIT_CONFIG_COUNT"])); err == nil && v > 0 {
947 n = v
948 }
949 for _, u := range []string{projectURL, projectURL + ".git"} {
950 env[fmt.Sprintf("GIT_CONFIG_KEY_%d", n)] = "http." + u + ".extraHeader"
951 env[fmt.Sprintf("GIT_CONFIG_VALUE_%d", n)] = "Authorization: Bearer " + token
952 n++
953 }
954 env["GIT_CONFIG_COUNT"] = strconv.Itoa(n)
955 }
956
890 957 // markWorkspaceSafe zet safe.directory voor elke job.
891 958 // De checkout is van de host-uid; de container-user is dat niet.
892 959 // Git 2.35+ weigert die repo anders. Een job die safe.directory al op
@@ -7,6 +7,7 @@ import (
7 "errors"
7 "errors"
8 "fmt"
8 "fmt"
9 "io"
9 "io"
10 "io/fs"
10 "log/slog"
11 "log/slog"
11 "os"
12 "os"
12 "os/exec"
13 "os/exec"
@@ -406,7 +407,10 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([
406 sink := &logSink{store: r.Store, jobID: job.ID}
407 sink := &logSink{store: r.Store, jobID: job.ID}
407 sink.section("prepare", "Preparing the docker executor")
408 sink.section("prepare", "Preparing the docker executor")
408 work := filepath.Join(r.storage(), "work", fmt.Sprint(p.ID), safeSegment(job.Name))
409 work := filepath.Join(r.storage(), "work", fmt.Sprint(p.ID), safeSegment(job.Name))
409 _ = os.RemoveAll(work)
410 if err := clearWorkDir(work); err != nil {
411 sink.closeSection()
412 return nil, fmt.Errorf("runner_system_failure: work dir: %w", err)
413 }
410 if err := os.MkdirAll(work, 0o755); err != nil {
414 if err := os.MkdirAll(work, 0o755); err != nil {
411 sink.closeSection()
415 sink.closeSection()
412 return nil, err
416 return nil, err
@@ -416,6 +420,11 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([
416 sink.closeSection()
420 sink.closeSection()
417 return nil, fmt.Errorf("clone: %w", err)
421 return nil, fmt.Errorf("clone: %w", err)
418 }
422 }
423 // origin wijst naar de echte repo-URL, niet naar het pad van de bare repo
424 // op de host. In de container kan de job zo met CI_JOB_TOKEN fetchen.
425 if r.BaseURL != "" {
426 _, _ = execOut(ctx, r.GitBin, "-C", work, "remote", "set-url", "origin", strings.TrimRight(r.BaseURL, "/")+"/"+repo.FullPath()+".git")
427 }
419 if _, err := execOut(ctx, r.GitBin, "-C", work, "checkout", "--detach", p.CommitSHA); err != nil {
428 if _, err := execOut(ctx, r.GitBin, "-C", work, "checkout", "--detach", p.CommitSHA); err != nil {
420 sink.closeSection()
429 sink.closeSection()
421 return nil, fmt.Errorf("checkout %s: %w", p.CommitSHA, err)
430 return nil, fmt.Errorf("checkout %s: %w", p.CommitSHA, err)
@@ -502,7 +511,13 @@ func (r *Runner) execContainer(ctx context.Context, sink *logSink, job store.Job
502 // -e NAAM zonder waarde laat Docker de variabele uit de omgeving van
511 // -e NAAM zonder waarde laat Docker de variabele uit de omgeving van
503 // deze client overnemen. Zo blijft een meerregelige sleutel heel en
512 // deze client overnemen. Zo blijft een meerregelige sleutel heel en
504 // staat de waarde niet in de proceslijst.
513 // staat de waarde niet in de proceslijst.
505 args := []string{"run", "--rm", "--network", network, "-v", work + ":/workspace", "-w", "/workspace"}
514 // Een vaste naam per job: een geannuleerde of afgebroken container
515 // (de docker-client stopt dan, de container niet) wordt voor de start en
516 // na afloop opgeruimd.
517 cname := fmt.Sprintf("bluegit-job-%d", job.ID)
518 removeContainer(r.Docker, cname)
519 defer removeContainer(r.Docker, cname)
520 args := []string{"run", "--rm", "--name", cname, "--network", network, "-v", work + ":/workspace", "-w", "/workspace"}
506 ctl := r.controls()
521 ctl := r.controls()
507 args = append(args, ctl.runArgs...)
522 args = append(args, ctl.runArgs...)
508 if ctl.pull == runnercfg.PullNever {
523 if ctl.pull == runnercfg.PullNever {
@@ -526,6 +541,37 @@ func (r *Runner) execContainer(ctx context.Context, sink *logSink, job store.Job
526 return nil
541 return nil
527}
542}
528
543
544func removeContainer(docker, name string) {
545 ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
546 defer cancel()
547 _, _ = execOut(ctx, docker, "rm", "-f", name)
548}
549
550// clearWorkDir maakt de werkmap leeg. Mappen zonder schrijfrecht (uit een
551// container) worden eerst beschrijfbaar gemaakt. Lukt verwijderen dan nog
552// niet (bestanden van root), dan gaat de oude map opzij, zodat de clone in
553// een lege map begint. Alleen als ook dat faalt, is het een fout.
554func clearWorkDir(work string) error {
555 if err := os.RemoveAll(work); err == nil {
556 return nil
557 }
558 _ = filepath.WalkDir(work, func(p string, d fs.DirEntry, err error) error {
559 if err == nil && d.IsDir() {
560 _ = os.Chmod(p, 0o755)
561 }
562 return nil
563 })
564 if err := os.RemoveAll(work); err == nil {
565 return nil
566 }
567 stale := fmt.Sprintf("%s.stale-%d", work, time.Now().UnixNano())
568 if err := os.Rename(work, stale); err != nil {
569 return err
570 }
571 go func() { _ = os.RemoveAll(stale) }()
572 return nil
573}
574
529// placeNote zijn de vaste regels in de sectie Preparing environment.
575// placeNote zijn de vaste regels in de sectie Preparing environment.
530type placeNote struct {
576type placeNote struct {
531 Runner string
577 Runner string
@@ -883,10 +929,31 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel
883 // Na de jobvariabelen, zodat een eigen GIT_CONFIG_COUNT blijft staan
929 // Na de jobvariabelen, zodat een eigen GIT_CONFIG_COUNT blijft staan
884 // en safe.directory er alsnog bij komt.
930 // en safe.directory er alsnog bij komt.
885 markWorkspaceSafe(env)
931 markWorkspaceSafe(env)
932 JobGitAuth(env, base+"/"+repo.FullPath(), token)
886 mask = append(mask, token)
933 mask = append(mask, token)
887 return env, mask, nil
934 return env, mask, nil
888}
935}
889
936
937// JobGitAuth geeft git in de job leestoegang tot de eigen repo met het
938// job-token. De header geldt alleen voor de URL van dit project (met en
939// zonder .git) en het token vervalt als de job stopt. Via GIT_CONFIG_* werkt
940// het in elk image, zonder bestanden in de container.
941func JobGitAuth(env map[string]string, projectURL, token string) {
942 if projectURL == "" || token == "" || !strings.Contains(projectURL, "://") {
943 return
944 }
945 n := 0
946 if v, err := strconv.Atoi(strings.TrimSpace(env["GIT_CONFIG_COUNT"])); err == nil && v > 0 {
947 n = v
948 }
949 for _, u := range []string{projectURL, projectURL + ".git"} {
950 env[fmt.Sprintf("GIT_CONFIG_KEY_%d", n)] = "http." + u + ".extraHeader"
951 env[fmt.Sprintf("GIT_CONFIG_VALUE_%d", n)] = "Authorization: Bearer " + token
952 n++
953 }
954 env["GIT_CONFIG_COUNT"] = strconv.Itoa(n)
955}
956
890// markWorkspaceSafe zet safe.directory voor elke job.
957// markWorkspaceSafe zet safe.directory voor elke job.
891// De checkout is van de host-uid; de container-user is dat niet.
958// De checkout is van de host-uid; de container-user is dat niet.
892// Git 2.35+ weigert die repo anders. Een job die safe.directory al op
959// Git 2.35+ weigert die repo anders. Een job die safe.directory al op
internal/runner/workdir_test.go added +38 −0
@@ -0,0 +1,38 @@
1 package runner
2
3 import (
4 "os"
5 "path/filepath"
6 "testing"
7 )
8
9 // Een werkmap met mappen zonder schrijfrecht (zoals na een container) moet
10 // leeg kunnen voor een herstarte job.
11 func TestClearWorkDirReadOnly(t *testing.T) {
12 if os.Geteuid() == 0 {
13 t.Skip("root mag alles verwijderen")
14 }
15 work := filepath.Join(t.TempDir(), "work", "1", "build")
16 ro := filepath.Join(work, "target", "deep")
17 if err := os.MkdirAll(ro, 0o755); err != nil {
18 t.Fatal(err)
19 }
20 _ = os.WriteFile(filepath.Join(ro, "f"), []byte("x"), 0o444)
21 _ = os.Chmod(ro, 0o555)
22 _ = os.Chmod(filepath.Dir(ro), 0o555)
23 if err := os.RemoveAll(work); err == nil {
24 t.Skip("filesystem negeert rechten")
25 }
26 if err := clearWorkDir(work); err != nil {
27 t.Fatal(err)
28 }
29 if _, err := os.Stat(work); !os.IsNotExist(err) {
30 t.Fatalf("work still there: %v", err)
31 }
32 }
33
34 func TestClearWorkDirMissing(t *testing.T) {
35 if err := clearWorkDir(filepath.Join(t.TempDir(), "nope")); err != nil {
36 t.Fatal(err)
37 }
38 }
@@ -0,0 +1,38 @@
1package runner
2
3import (
4 "os"
5 "path/filepath"
6 "testing"
7)
8
9// Een werkmap met mappen zonder schrijfrecht (zoals na een container) moet
10// leeg kunnen voor een herstarte job.
11func TestClearWorkDirReadOnly(t *testing.T) {
12 if os.Geteuid() == 0 {
13 t.Skip("root mag alles verwijderen")
14 }
15 work := filepath.Join(t.TempDir(), "work", "1", "build")
16 ro := filepath.Join(work, "target", "deep")
17 if err := os.MkdirAll(ro, 0o755); err != nil {
18 t.Fatal(err)
19 }
20 _ = os.WriteFile(filepath.Join(ro, "f"), []byte("x"), 0o444)
21 _ = os.Chmod(ro, 0o555)
22 _ = os.Chmod(filepath.Dir(ro), 0o555)
23 if err := os.RemoveAll(work); err == nil {
24 t.Skip("filesystem negeert rechten")
25 }
26 if err := clearWorkDir(work); err != nil {
27 t.Fatal(err)
28 }
29 if _, err := os.Stat(work); !os.IsNotExist(err) {
30 t.Fatalf("work still there: %v", err)
31 }
32}
33
34func TestClearWorkDirMissing(t *testing.T) {
35 if err := clearWorkDir(filepath.Join(t.TempDir(), "nope")); err != nil {
36 t.Fatal(err)
37 }
38}
internal/server/api.go +9 −1
@@ -126,7 +126,15 @@ func (s *Server) authorizeRepoRead(w http.ResponseWriter, r *http.Request, repo
126 126 http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
127 127 return false
128 128 }
129 if strings.HasPrefix(token, "bgj_") || !strings.HasPrefix(token, "bg_") {
129 if strings.HasPrefix(token, "bgj_") {
130 job, err := s.Store.JobByToken(r.Context(), token)
131 if err == nil && job.Status == "running" && job.RepoID == repo.ID {
132 return true
133 }
134 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
135 return false
136 }
137 if !strings.HasPrefix(token, "bg_") {
130 138 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
131 139 return false
132 140 }
@@ -126,7 +126,15 @@ func (s *Server) authorizeRepoRead(w http.ResponseWriter, r *http.Request, repo
126 http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
126 http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
127 return false
127 return false
128 }
128 }
129 if strings.HasPrefix(token, "bgj_") || !strings.HasPrefix(token, "bg_") {
129 if strings.HasPrefix(token, "bgj_") {
130 job, err := s.Store.JobByToken(r.Context(), token)
131 if err == nil && job.Status == "running" && job.RepoID == repo.ID {
132 return true
133 }
134 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
135 return false
136 }
137 if !strings.HasPrefix(token, "bg_") {
130 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
138 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
131 return false
139 return false
132 }
140 }
internal/server/api_collab.go +3 −0
@@ -196,6 +196,9 @@ func (s *Server) apiRepo(w http.ResponseWriter, r *http.Request, min access.Role
196 196 s.writeAPIErr(w, r, fail(500, err))
197 197 return store.Repo{}, "", false
198 198 }
199 if jr := jobRole(r, repo.ID); jr != access.RoleNone && !role.CanRead() {
200 role = jr
201 }
199 202 readable := role.CanRead() || repo.Visibility == "public"
200 203 if !readable {
201 204 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
@@ -196,6 +196,9 @@ func (s *Server) apiRepo(w http.ResponseWriter, r *http.Request, min access.Role
196 s.writeAPIErr(w, r, fail(500, err))
196 s.writeAPIErr(w, r, fail(500, err))
197 return store.Repo{}, "", false
197 return store.Repo{}, "", false
198 }
198 }
199 if jr := jobRole(r, repo.ID); jr != access.RoleNone && !role.CanRead() {
200 role = jr
201 }
199 readable := role.CanRead() || repo.Visibility == "public"
202 readable := role.CanRead() || repo.Visibility == "public"
200 if !readable {
203 if !readable {
201 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
204 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
internal/server/api_http.go +42 −0
@@ -21,6 +21,8 @@ type apiActor struct {
21 21 User store.User
22 22 Scopes access.Scopes
23 23 Via string
24 // JobRepo is de repo van een lopende job (Via "job"); alleen die mag hij lezen.
25 JobRepo int64
24 26 }
25 27
26 28 type apiAuth int
@@ -92,6 +94,10 @@ func (s *Server) serveAPI(w http.ResponseWriter, r *http.Request, rt apiRoute) {
92 94 return
93 95 }
94 96 }
97 if tok := tokenFrom(r); strings.HasPrefix(tok, "bgj_") {
98 s.serveJobAPI(w, r, rt, tok)
99 return
100 }
95 101 actor, ok := r.Context().Value(actorKey{}).(apiActor)
96 102 if !ok {
97 103 tok := tokenFrom(r)
@@ -356,3 +362,39 @@ func apiIndex() []byte {
356 362 })
357 363 return raw
358 364 }
365
366 // serveJobAPI laat een job-token alleen GET-routes van de eigen repo lezen,
367 // met de rechten van een leesrol. Al het andere is 401.
368 func (s *Server) serveJobAPI(w http.ResponseWriter, r *http.Request, rt apiRoute, tok string) {
369 deny := func() { s.writeAPIErr(w, r, fail(http.StatusUnauthorized, i18n.E("err.jobToken"))) }
370 if r.Method != http.MethodGet || !strings.Contains(rt.Path, "{owner}/{repo}") {
371 deny()
372 return
373 }
374 job, err := s.Store.JobByToken(r.Context(), tok)
375 if err != nil || job.Status != "running" {
376 deny()
377 return
378 }
379 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
380 if err != nil || repo.ID != job.RepoID {
381 deny()
382 return
383 }
384 actor := apiActor{Scopes: access.StoredScopes(access.ScopeReadAPI + "," + access.ScopeReadRepo), Via: "job", JobRepo: job.RepoID}
385 if !actor.Scopes.Allows(rt.Class) {
386 s.writeAPIErr(w, r, fail(http.StatusForbidden, i18n.E("err.apiScope")))
387 return
388 }
389 ctx := context.WithValue(r.Context(), ctxKey{}, principal{OK: false})
390 ctx = context.WithValue(ctx, actorKey{}, actor)
391 rt.Handler(s, w, r.WithContext(ctx))
392 }
393
394 // jobRole geeft een leesrol als de API-aanroep van een job voor de eigen repo is.
395 func jobRole(r *http.Request, repoID int64) access.Role {
396 if a, ok := r.Context().Value(actorKey{}).(apiActor); ok && a.Via == "job" && a.JobRepo == repoID {
397 return access.RoleReadonly
398 }
399 return access.RoleNone
400 }
@@ -21,6 +21,8 @@ type apiActor struct {
21 User store.User
21 User store.User
22 Scopes access.Scopes
22 Scopes access.Scopes
23 Via string
23 Via string
24 // JobRepo is de repo van een lopende job (Via "job"); alleen die mag hij lezen.
25 JobRepo int64
24}
26}
25
27
26type apiAuth int
28type apiAuth int
@@ -92,6 +94,10 @@ func (s *Server) serveAPI(w http.ResponseWriter, r *http.Request, rt apiRoute) {
92 return
94 return
93 }
95 }
94 }
96 }
97 if tok := tokenFrom(r); strings.HasPrefix(tok, "bgj_") {
98 s.serveJobAPI(w, r, rt, tok)
99 return
100 }
95 actor, ok := r.Context().Value(actorKey{}).(apiActor)
101 actor, ok := r.Context().Value(actorKey{}).(apiActor)
96 if !ok {
102 if !ok {
97 tok := tokenFrom(r)
103 tok := tokenFrom(r)
@@ -356,3 +362,39 @@ func apiIndex() []byte {
356 })
362 })
357 return raw
363 return raw
358}
364}
365
366// serveJobAPI laat een job-token alleen GET-routes van de eigen repo lezen,
367// met de rechten van een leesrol. Al het andere is 401.
368func (s *Server) serveJobAPI(w http.ResponseWriter, r *http.Request, rt apiRoute, tok string) {
369 deny := func() { s.writeAPIErr(w, r, fail(http.StatusUnauthorized, i18n.E("err.jobToken"))) }
370 if r.Method != http.MethodGet || !strings.Contains(rt.Path, "{owner}/{repo}") {
371 deny()
372 return
373 }
374 job, err := s.Store.JobByToken(r.Context(), tok)
375 if err != nil || job.Status != "running" {
376 deny()
377 return
378 }
379 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
380 if err != nil || repo.ID != job.RepoID {
381 deny()
382 return
383 }
384 actor := apiActor{Scopes: access.StoredScopes(access.ScopeReadAPI + "," + access.ScopeReadRepo), Via: "job", JobRepo: job.RepoID}
385 if !actor.Scopes.Allows(rt.Class) {
386 s.writeAPIErr(w, r, fail(http.StatusForbidden, i18n.E("err.apiScope")))
387 return
388 }
389 ctx := context.WithValue(r.Context(), ctxKey{}, principal{OK: false})
390 ctx = context.WithValue(ctx, actorKey{}, actor)
391 rt.Handler(s, w, r.WithContext(ctx))
392}
393
394// jobRole geeft een leesrol als de API-aanroep van een job voor de eigen repo is.
395func jobRole(r *http.Request, repoID int64) access.Role {
396 if a, ok := r.Context().Value(actorKey{}).(apiActor); ok && a.Via == "job" && a.JobRepo == repoID {
397 return access.RoleReadonly
398 }
399 return access.RoleNone
400}
internal/server/api_routes.go +2 −0
@@ -153,6 +153,8 @@ var apiCatalog = []apiRoute{
153 153 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeRead, authOptional, "List releases", (*Server).apiReleases},
154 154 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeWrite, authUser, "Publish release", (*Server).createRelease},
155 155 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases/{tag}/assets/{name}", access.ScopeRead, authOptional, "Download release asset", (*Server).apiReleaseAsset},
156 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/releases/{tag}", access.ScopeWrite, authUser, "Delete release (assets included). Query delete_tag=true also deletes the git tag.", (*Server).apiDeleteRelease},
157 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/releases/{tag}/assets/{name}", access.ScopeWrite, authUser, "Delete one release asset (tag and source stay)", (*Server).apiDeleteReleaseAsset},
156 158 {http.MethodPost, "/api/v1/repos/{owner}/{repo}/releases", access.ScopeWrite, authRelease, "Publish release from a job or user token", (*Server).createRelease},
157 159
158 160 {http.MethodGet, "/api/v1/admin/storage", access.ScopeAdmin, authUser, "Read instance storage", (*Server).apiAdminStorage},
@@ -153,6 +153,8 @@ var apiCatalog = []apiRoute{
153 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeRead, authOptional, "List releases", (*Server).apiReleases},
153 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeRead, authOptional, "List releases", (*Server).apiReleases},
154 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeWrite, authUser, "Publish release", (*Server).createRelease},
154 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/releases", access.ScopeWrite, authUser, "Publish release", (*Server).createRelease},
155 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases/{tag}/assets/{name}", access.ScopeRead, authOptional, "Download release asset", (*Server).apiReleaseAsset},
155 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/releases/{tag}/assets/{name}", access.ScopeRead, authOptional, "Download release asset", (*Server).apiReleaseAsset},
156 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/releases/{tag}", access.ScopeWrite, authUser, "Delete release (assets included). Query delete_tag=true also deletes the git tag.", (*Server).apiDeleteRelease},
157 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/releases/{tag}/assets/{name}", access.ScopeWrite, authUser, "Delete one release asset (tag and source stay)", (*Server).apiDeleteReleaseAsset},
156 {http.MethodPost, "/api/v1/repos/{owner}/{repo}/releases", access.ScopeWrite, authRelease, "Publish release from a job or user token", (*Server).createRelease},
158 {http.MethodPost, "/api/v1/repos/{owner}/{repo}/releases", access.ScopeWrite, authRelease, "Publish release from a job or user token", (*Server).createRelease},
157
159
158 {http.MethodGet, "/api/v1/admin/storage", access.ScopeAdmin, authUser, "Read instance storage", (*Server).apiAdminStorage},
160 {http.MethodGet, "/api/v1/admin/storage", access.ScopeAdmin, authUser, "Read instance storage", (*Server).apiAdminStorage},
internal/server/git_http.go +12 −1
@@ -28,7 +28,7 @@ func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
28 28 }
29 29 service := r.URL.Query().Get("service")
30 30 write := service == "git-receive-pack" || strings.HasSuffix(r.URL.Path, "/git-receive-pack")
31 if !write && s.runnerMayClone(r, repo.ID) {
31 if !write && (s.runnerMayClone(r, repo.ID) || s.jobMayRead(r, repo.ID)) {
32 32 rest := strings.TrimPrefix(r.URL.Path, "/"+owner+"/"+repoSeg)
33 33 if err := gitrepo.ServeSmartHTTP(w, r, s.Git, gitrepo.ProjectRoot(s.StoragePath()), gitrepo.PathInfo(owner, repoSeg, rest), nil); err != nil && s.Log != nil {
34 34 s.Log.Error("git http", "err", err, "path", r.URL.Path)
@@ -124,6 +124,17 @@ func (s *Server) runnerMayClone(r *http.Request, repoID int64) bool {
124 124 return err == nil && s.Store.RunnerRunsRepo(r.Context(), rn.ID, repoID)
125 125 }
126 126
127 // jobMayRead: een lopende job (bgj_-token, als Bearer of als wachtwoord) mag
128 // alleen de eigen repo lezen. Schrijven of andere repo's lezen kan niet.
129 func (s *Server) jobMayRead(r *http.Request, repoID int64) bool {
130 tok := tokenFrom(r)
131 if !strings.HasPrefix(tok, "bgj_") {
132 return false
133 }
134 job, err := s.Store.JobByToken(r.Context(), tok)
135 return err == nil && job.Status == "running" && job.RepoID == repoID
136 }
137
127 138 func (s *Server) askAuth(w http.ResponseWriter) {
128 139 w.Header().Set("WWW-Authenticate", `Basic realm="BlueGit"`)
129 140 http.Error(w, "aanmelden met een toegangstoken als wachtwoord", http.StatusUnauthorized)
@@ -28,7 +28,7 @@ func (s *Server) gitHTTP(w http.ResponseWriter, r *http.Request) {
28 }
28 }
29 service := r.URL.Query().Get("service")
29 service := r.URL.Query().Get("service")
30 write := service == "git-receive-pack" || strings.HasSuffix(r.URL.Path, "/git-receive-pack")
30 write := service == "git-receive-pack" || strings.HasSuffix(r.URL.Path, "/git-receive-pack")
31 if !write && s.runnerMayClone(r, repo.ID) {
31 if !write && (s.runnerMayClone(r, repo.ID) || s.jobMayRead(r, repo.ID)) {
32 rest := strings.TrimPrefix(r.URL.Path, "/"+owner+"/"+repoSeg)
32 rest := strings.TrimPrefix(r.URL.Path, "/"+owner+"/"+repoSeg)
33 if err := gitrepo.ServeSmartHTTP(w, r, s.Git, gitrepo.ProjectRoot(s.StoragePath()), gitrepo.PathInfo(owner, repoSeg, rest), nil); err != nil && s.Log != nil {
33 if err := gitrepo.ServeSmartHTTP(w, r, s.Git, gitrepo.ProjectRoot(s.StoragePath()), gitrepo.PathInfo(owner, repoSeg, rest), nil); err != nil && s.Log != nil {
34 s.Log.Error("git http", "err", err, "path", r.URL.Path)
34 s.Log.Error("git http", "err", err, "path", r.URL.Path)
@@ -124,6 +124,17 @@ func (s *Server) runnerMayClone(r *http.Request, repoID int64) bool {
124 return err == nil && s.Store.RunnerRunsRepo(r.Context(), rn.ID, repoID)
124 return err == nil && s.Store.RunnerRunsRepo(r.Context(), rn.ID, repoID)
125}
125}
126
126
127// jobMayRead: een lopende job (bgj_-token, als Bearer of als wachtwoord) mag
128// alleen de eigen repo lezen. Schrijven of andere repo's lezen kan niet.
129func (s *Server) jobMayRead(r *http.Request, repoID int64) bool {
130 tok := tokenFrom(r)
131 if !strings.HasPrefix(tok, "bgj_") {
132 return false
133 }
134 job, err := s.Store.JobByToken(r.Context(), tok)
135 return err == nil && job.Status == "running" && job.RepoID == repoID
136}
137
127func (s *Server) askAuth(w http.ResponseWriter) {
138func (s *Server) askAuth(w http.ResponseWriter) {
128 w.Header().Set("WWW-Authenticate", `Basic realm="BlueGit"`)
139 w.Header().Set("WWW-Authenticate", `Basic realm="BlueGit"`)
129 http.Error(w, "aanmelden met een toegangstoken als wachtwoord", http.StatusUnauthorized)
140 http.Error(w, "aanmelden met een toegangstoken als wachtwoord", http.StatusUnauthorized)
internal/server/job_git_access_test.go added +100 −0
@@ -0,0 +1,100 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "os"
7 "os/exec"
8 "path/filepath"
9 "strings"
10 "testing"
11
12 "gitlab.com/Timfa/bluegit/internal/gitrepo"
13 "gitlab.com/Timfa/bluegit/internal/runner"
14 )
15
16 // Een lopende job leest de eigen privérepo met CI_JOB_TOKEN (git en API),
17 // maar geen andere repo, niet schrijven, en niet meer na afloop.
18 func TestJobTokenReadsOwnRepo(t *testing.T) {
19 e := newCIEnv(t)
20 ctx := context.Background()
21 st, base := e.st, e.ts.URL
22 other, err := st.CreateRepo(ctx, "user", e.user.ID, "other", "", "master", "private")
23 if err != nil {
24 t.Fatal(err)
25 }
26 if err := gitrepo.Init("git", gitrepo.Dir(e.srv.StoragePath(), other.OwnerPath, other.Name), "master", "/bin/true"); err != nil {
27 t.Fatal(err)
28 }
29 pid := e.pipeline()
30 jobs, _ := st.JobsByPipeline(ctx, pid)
31 tok, err := st.CreateJobToken(ctx, jobs[0].ID)
32 if err != nil {
33 t.Fatal(err)
34 }
35 if _, err := st.MarkJobRunning(ctx, jobs[0].ID); err != nil {
36 t.Fatal(err)
37 }
38 own := base + "/tim/app"
39 // Precies de config die de runner de job meegeeft (GIT_CONFIG_*).
40 env := map[string]string{}
41 runner.JobGitAuth(env, own, tok)
42 git := func(args ...string) (string, error) {
43 cmd := exec.Command("git", args...)
44 cmd.Env = append(os.Environ(), "GIT_TERMINAL_PROMPT=0", "GIT_ASKPASS=/bin/false")
45 for k, v := range env {
46 cmd.Env = append(cmd.Env, k+"="+v)
47 }
48 out, err := cmd.CombinedOutput()
49 return string(out), err
50 }
51 for _, u := range []string{own + ".git"} {
52 if out, err := git("ls-remote", u); err != nil || !strings.Contains(out, e.sha) {
53 t.Fatalf("ls-remote %s: %v %s", u, err, out)
54 }
55 }
56 dir := filepath.Join(t.TempDir(), "c")
57 if out, err := git("clone", "-q", own+".git", dir); err != nil {
58 t.Fatalf("clone: %v %s", err, out)
59 }
60 if out, err := git("-C", dir, "fetch", "-q", "origin"); err != nil {
61 t.Fatalf("fetch: %v %s", err, out)
62 }
63 if out, err := git("-C", dir, "push", "-q", "origin", "HEAD:refs/heads/x"); err == nil {
64 t.Fatalf("push with job token must fail: %s", out)
65 }
66 // De header geldt alleen voor de eigen URL; met het token expliciet
67 // erbij kan een andere repo ook niet.
68 if out, err := git("-c", "http.extraHeader=Authorization: Bearer "+tok, "ls-remote", base+"/tim/other.git"); err == nil {
69 t.Fatalf("other repo readable: %s", out)
70 }
71 api := func(path string) int {
72 req, _ := http.NewRequest("GET", base+"/api/v1"+path, nil)
73 req.Header.Set("Authorization", "Bearer "+tok)
74 resp, err := http.DefaultClient.Do(req)
75 if err != nil {
76 t.Fatal(err)
77 }
78 resp.Body.Close()
79 return resp.StatusCode
80 }
81 if c := api("/projects/tim/app"); c != 200 {
82 t.Fatalf("api own: %d", c)
83 }
84 if c := api("/projects/tim/other"); c == 200 {
85 t.Fatalf("api other: %d", c)
86 }
87 if c := api("/user"); c == 200 {
88 t.Fatalf("api user: %d", c)
89 }
90 // Na afloop vervalt alles.
91 if err := st.FinishJob(ctx, jobs[0].ID, "success", ""); err != nil {
92 t.Fatal(err)
93 }
94 if out, err := git("ls-remote", own+".git"); err == nil {
95 t.Fatalf("ls-remote after job: %s", out)
96 }
97 if c := api("/projects/tim/app"); c == 200 {
98 t.Fatalf("api after job: %d", c)
99 }
100 }
@@ -0,0 +1,100 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "os"
7 "os/exec"
8 "path/filepath"
9 "strings"
10 "testing"
11
12 "gitlab.com/Timfa/bluegit/internal/gitrepo"
13 "gitlab.com/Timfa/bluegit/internal/runner"
14)
15
16// Een lopende job leest de eigen privérepo met CI_JOB_TOKEN (git en API),
17// maar geen andere repo, niet schrijven, en niet meer na afloop.
18func TestJobTokenReadsOwnRepo(t *testing.T) {
19 e := newCIEnv(t)
20 ctx := context.Background()
21 st, base := e.st, e.ts.URL
22 other, err := st.CreateRepo(ctx, "user", e.user.ID, "other", "", "master", "private")
23 if err != nil {
24 t.Fatal(err)
25 }
26 if err := gitrepo.Init("git", gitrepo.Dir(e.srv.StoragePath(), other.OwnerPath, other.Name), "master", "/bin/true"); err != nil {
27 t.Fatal(err)
28 }
29 pid := e.pipeline()
30 jobs, _ := st.JobsByPipeline(ctx, pid)
31 tok, err := st.CreateJobToken(ctx, jobs[0].ID)
32 if err != nil {
33 t.Fatal(err)
34 }
35 if _, err := st.MarkJobRunning(ctx, jobs[0].ID); err != nil {
36 t.Fatal(err)
37 }
38 own := base + "/tim/app"
39 // Precies de config die de runner de job meegeeft (GIT_CONFIG_*).
40 env := map[string]string{}
41 runner.JobGitAuth(env, own, tok)
42 git := func(args ...string) (string, error) {
43 cmd := exec.Command("git", args...)
44 cmd.Env = append(os.Environ(), "GIT_TERMINAL_PROMPT=0", "GIT_ASKPASS=/bin/false")
45 for k, v := range env {
46 cmd.Env = append(cmd.Env, k+"="+v)
47 }
48 out, err := cmd.CombinedOutput()
49 return string(out), err
50 }
51 for _, u := range []string{own + ".git"} {
52 if out, err := git("ls-remote", u); err != nil || !strings.Contains(out, e.sha) {
53 t.Fatalf("ls-remote %s: %v %s", u, err, out)
54 }
55 }
56 dir := filepath.Join(t.TempDir(), "c")
57 if out, err := git("clone", "-q", own+".git", dir); err != nil {
58 t.Fatalf("clone: %v %s", err, out)
59 }
60 if out, err := git("-C", dir, "fetch", "-q", "origin"); err != nil {
61 t.Fatalf("fetch: %v %s", err, out)
62 }
63 if out, err := git("-C", dir, "push", "-q", "origin", "HEAD:refs/heads/x"); err == nil {
64 t.Fatalf("push with job token must fail: %s", out)
65 }
66 // De header geldt alleen voor de eigen URL; met het token expliciet
67 // erbij kan een andere repo ook niet.
68 if out, err := git("-c", "http.extraHeader=Authorization: Bearer "+tok, "ls-remote", base+"/tim/other.git"); err == nil {
69 t.Fatalf("other repo readable: %s", out)
70 }
71 api := func(path string) int {
72 req, _ := http.NewRequest("GET", base+"/api/v1"+path, nil)
73 req.Header.Set("Authorization", "Bearer "+tok)
74 resp, err := http.DefaultClient.Do(req)
75 if err != nil {
76 t.Fatal(err)
77 }
78 resp.Body.Close()
79 return resp.StatusCode
80 }
81 if c := api("/projects/tim/app"); c != 200 {
82 t.Fatalf("api own: %d", c)
83 }
84 if c := api("/projects/tim/other"); c == 200 {
85 t.Fatalf("api other: %d", c)
86 }
87 if c := api("/user"); c == 200 {
88 t.Fatalf("api user: %d", c)
89 }
90 // Na afloop vervalt alles.
91 if err := st.FinishJob(ctx, jobs[0].ID, "success", ""); err != nil {
92 t.Fatal(err)
93 }
94 if out, err := git("ls-remote", own+".git"); err == nil {
95 t.Fatalf("ls-remote after job: %s", out)
96 }
97 if c := api("/projects/tim/app"); c == 200 {
98 t.Fatalf("api after job: %d", c)
99 }
100}
internal/server/release_delete.go added +149 −0
@@ -0,0 +1,149 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "net/url"
7 "os"
8 "path/filepath"
9 "strings"
10
11 "gitlab.com/Timfa/bluegit/internal/access"
12 "gitlab.com/Timfa/bluegit/internal/i18n"
13 "gitlab.com/Timfa/bluegit/internal/store"
14 )
15
16 // releaseAdmin: alleen eigenaar/maintainer van de repo of een instance-admin
17 // mag releases en assets verwijderen.
18 func (s *Server) releaseAdmin(ctx context.Context, user store.User, repo store.Repo) error {
19 if user.ID == 0 {
20 return fail(401, i18n.E("err.apiAuth"))
21 }
22 if user.InstanceAdmin {
23 return nil
24 }
25 role, err := s.repoRole(ctx, user, repo)
26 if err != nil {
27 return err
28 }
29 if !canSeeReleases(repo, role) {
30 return fail(404, i18n.E("err.notFound"))
31 }
32 if !role.AtLeast(access.RoleMaintainer) {
33 return fail(403, i18n.E("err.forbidden"))
34 }
35 return nil
36 }
37
38 // removeAssetFile ruimt een assetbestand op, alleen binnen de opslag, en
39 // daarna de lege map erboven.
40 func (s *Server) removeAssetFile(path string) {
41 root := s.StoragePath()
42 if path == "" || root == "" {
43 return
44 }
45 abs, err := filepath.Abs(path)
46 if err != nil {
47 return
48 }
49 rootAbs, _ := filepath.Abs(root)
50 if !strings.HasPrefix(abs, rootAbs+string(os.PathSeparator)) {
51 return
52 }
53 _ = os.Remove(abs)
54 _ = os.Remove(filepath.Dir(abs)) // alleen als leeg
55 }
56
57 func (s *Server) opDeleteReleaseAsset(ctx context.Context, user store.User, repo store.Repo, tag, name string) error {
58 if err := s.releaseAdmin(ctx, user, repo); err != nil {
59 return err
60 }
61 rel, err := s.Store.ReleaseByTag(ctx, repo.ID, tag)
62 if err != nil {
63 return notFound(err)
64 }
65 path, err := s.Store.DeleteReleaseAsset(ctx, rel.ID, name)
66 if err != nil {
67 return notFound(err)
68 }
69 s.removeAssetFile(path)
70 return nil
71 }
72
73 func (s *Server) opDeleteRelease(ctx context.Context, user store.User, repo store.Repo, tag string, deleteTag bool) error {
74 if err := s.releaseAdmin(ctx, user, repo); err != nil {
75 return err
76 }
77 rel, err := s.Store.ReleaseByTag(ctx, repo.ID, tag)
78 if err != nil {
79 return notFound(err)
80 }
81 paths, err := s.Store.DeleteRelease(ctx, rel.ID)
82 if err != nil {
83 return fail(500, err)
84 }
85 for _, p := range paths {
86 s.removeAssetFile(p)
87 }
88 if deleteTag {
89 return s.opDeleteTag(ctx, user, repo, tag)
90 }
91 return nil
92 }
93
94 func (s *Server) apiRepoForDelete(w http.ResponseWriter, r *http.Request) (store.Repo, bool) {
95 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
96 if err != nil {
97 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
98 return store.Repo{}, false
99 }
100 return repo, true
101 }
102
103 func (s *Server) apiDeleteReleaseAsset(w http.ResponseWriter, r *http.Request) {
104 repo, ok := s.apiRepoForDelete(w, r)
105 if !ok {
106 return
107 }
108 if !s.apiOK(w, r, s.opDeleteReleaseAsset(r.Context(), apiUser(r), repo, r.PathValue("tag"), r.PathValue("name"))) {
109 return
110 }
111 writeJSON(w, http.StatusNoContent, nil)
112 }
113
114 func (s *Server) apiDeleteRelease(w http.ResponseWriter, r *http.Request) {
115 repo, ok := s.apiRepoForDelete(w, r)
116 if !ok {
117 return
118 }
119 del := r.URL.Query().Get("delete_tag") == "true"
120 if !s.apiOK(w, r, s.opDeleteRelease(r.Context(), apiUser(r), repo, r.PathValue("tag"), del)) {
121 return
122 }
123 writeJSON(w, http.StatusNoContent, nil)
124 }
125
126 // UI: POST-formulieren met eigen bevestigingsmodal (data-confirm).
127 func (s *Server) uiDeleteReleaseAsset(w http.ResponseWriter, r *http.Request) {
128 u, repo, _, ok := s.guardReleases(w, r)
129 if !ok || !s.csrfOK(w, r) {
130 return
131 }
132 back := repoURL(repo) + "/-/releases"
133 if !s.uiOK(w, r, back, s.opDeleteReleaseAsset(r.Context(), u, repo, r.PathValue("tag"), r.PathValue("name"))) {
134 return
135 }
136 s.redirect(w, r, back+"#"+url.PathEscape(r.PathValue("tag")), s.tr(r, "rel.assetDeleted"), "")
137 }
138
139 func (s *Server) uiDeleteRelease(w http.ResponseWriter, r *http.Request) {
140 u, repo, _, ok := s.guardReleases(w, r)
141 if !ok || !s.csrfOK(w, r) {
142 return
143 }
144 back := repoURL(repo) + "/-/releases"
145 if !s.uiOK(w, r, back, s.opDeleteRelease(r.Context(), u, repo, r.PathValue("tag"), r.FormValue("delete_tag") == "1")) {
146 return
147 }
148 s.redirect(w, r, back, s.tr(r, "rel.deleted"), "")
149 }
@@ -0,0 +1,149 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "net/url"
7 "os"
8 "path/filepath"
9 "strings"
10
11 "gitlab.com/Timfa/bluegit/internal/access"
12 "gitlab.com/Timfa/bluegit/internal/i18n"
13 "gitlab.com/Timfa/bluegit/internal/store"
14)
15
16// releaseAdmin: alleen eigenaar/maintainer van de repo of een instance-admin
17// mag releases en assets verwijderen.
18func (s *Server) releaseAdmin(ctx context.Context, user store.User, repo store.Repo) error {
19 if user.ID == 0 {
20 return fail(401, i18n.E("err.apiAuth"))
21 }
22 if user.InstanceAdmin {
23 return nil
24 }
25 role, err := s.repoRole(ctx, user, repo)
26 if err != nil {
27 return err
28 }
29 if !canSeeReleases(repo, role) {
30 return fail(404, i18n.E("err.notFound"))
31 }
32 if !role.AtLeast(access.RoleMaintainer) {
33 return fail(403, i18n.E("err.forbidden"))
34 }
35 return nil
36}
37
38// removeAssetFile ruimt een assetbestand op, alleen binnen de opslag, en
39// daarna de lege map erboven.
40func (s *Server) removeAssetFile(path string) {
41 root := s.StoragePath()
42 if path == "" || root == "" {
43 return
44 }
45 abs, err := filepath.Abs(path)
46 if err != nil {
47 return
48 }
49 rootAbs, _ := filepath.Abs(root)
50 if !strings.HasPrefix(abs, rootAbs+string(os.PathSeparator)) {
51 return
52 }
53 _ = os.Remove(abs)
54 _ = os.Remove(filepath.Dir(abs)) // alleen als leeg
55}
56
57func (s *Server) opDeleteReleaseAsset(ctx context.Context, user store.User, repo store.Repo, tag, name string) error {
58 if err := s.releaseAdmin(ctx, user, repo); err != nil {
59 return err
60 }
61 rel, err := s.Store.ReleaseByTag(ctx, repo.ID, tag)
62 if err != nil {
63 return notFound(err)
64 }
65 path, err := s.Store.DeleteReleaseAsset(ctx, rel.ID, name)
66 if err != nil {
67 return notFound(err)
68 }
69 s.removeAssetFile(path)
70 return nil
71}
72
73func (s *Server) opDeleteRelease(ctx context.Context, user store.User, repo store.Repo, tag string, deleteTag bool) error {
74 if err := s.releaseAdmin(ctx, user, repo); err != nil {
75 return err
76 }
77 rel, err := s.Store.ReleaseByTag(ctx, repo.ID, tag)
78 if err != nil {
79 return notFound(err)
80 }
81 paths, err := s.Store.DeleteRelease(ctx, rel.ID)
82 if err != nil {
83 return fail(500, err)
84 }
85 for _, p := range paths {
86 s.removeAssetFile(p)
87 }
88 if deleteTag {
89 return s.opDeleteTag(ctx, user, repo, tag)
90 }
91 return nil
92}
93
94func (s *Server) apiRepoForDelete(w http.ResponseWriter, r *http.Request) (store.Repo, bool) {
95 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
96 if err != nil {
97 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
98 return store.Repo{}, false
99 }
100 return repo, true
101}
102
103func (s *Server) apiDeleteReleaseAsset(w http.ResponseWriter, r *http.Request) {
104 repo, ok := s.apiRepoForDelete(w, r)
105 if !ok {
106 return
107 }
108 if !s.apiOK(w, r, s.opDeleteReleaseAsset(r.Context(), apiUser(r), repo, r.PathValue("tag"), r.PathValue("name"))) {
109 return
110 }
111 writeJSON(w, http.StatusNoContent, nil)
112}
113
114func (s *Server) apiDeleteRelease(w http.ResponseWriter, r *http.Request) {
115 repo, ok := s.apiRepoForDelete(w, r)
116 if !ok {
117 return
118 }
119 del := r.URL.Query().Get("delete_tag") == "true"
120 if !s.apiOK(w, r, s.opDeleteRelease(r.Context(), apiUser(r), repo, r.PathValue("tag"), del)) {
121 return
122 }
123 writeJSON(w, http.StatusNoContent, nil)
124}
125
126// UI: POST-formulieren met eigen bevestigingsmodal (data-confirm).
127func (s *Server) uiDeleteReleaseAsset(w http.ResponseWriter, r *http.Request) {
128 u, repo, _, ok := s.guardReleases(w, r)
129 if !ok || !s.csrfOK(w, r) {
130 return
131 }
132 back := repoURL(repo) + "/-/releases"
133 if !s.uiOK(w, r, back, s.opDeleteReleaseAsset(r.Context(), u, repo, r.PathValue("tag"), r.PathValue("name"))) {
134 return
135 }
136 s.redirect(w, r, back+"#"+url.PathEscape(r.PathValue("tag")), s.tr(r, "rel.assetDeleted"), "")
137}
138
139func (s *Server) uiDeleteRelease(w http.ResponseWriter, r *http.Request) {
140 u, repo, _, ok := s.guardReleases(w, r)
141 if !ok || !s.csrfOK(w, r) {
142 return
143 }
144 back := repoURL(repo) + "/-/releases"
145 if !s.uiOK(w, r, back, s.opDeleteRelease(r.Context(), u, repo, r.PathValue("tag"), r.FormValue("delete_tag") == "1")) {
146 return
147 }
148 s.redirect(w, r, back, s.tr(r, "rel.deleted"), "")
149}
internal/server/release_delete_test.go added +103 −0
@@ -0,0 +1,103 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "os"
7 "path/filepath"
8 "testing"
9
10 "gitlab.com/Timfa/bluegit/internal/access"
11 "gitlab.com/Timfa/bluegit/internal/gitrepo"
12 "gitlab.com/Timfa/bluegit/internal/store"
13 )
14
15 func TestReleaseDelete(t *testing.T) {
16 e := newCIEnv(t)
17 ctx := context.Background()
18 st, base := e.st, e.ts.URL
19 dir := filepath.Join(e.srv.StoragePath(), "releases", "app", "v1")
20 _ = os.MkdirAll(dir, 0o755)
21 mk := func(n string) store.ReleaseAsset {
22 p := filepath.Join(dir, n)
23 _ = os.WriteFile(p, []byte("x"), 0o644)
24 return store.ReleaseAsset{Name: n, StoragePath: p, Size: 1}
25 }
26 a, b := mk("a.tar.gz"), mk("b.zip")
27 if _, err := st.CreateRelease(ctx, e.repo.ID, "v1", e.sha, "v1", "", e.user.ID, 0, []store.ReleaseAsset{a, b}); err != nil {
28 t.Fatal(err)
29 }
30 bare := gitrepo.Dir(e.srv.StoragePath(), e.repo.OwnerPath, e.repo.Name)
31 if err := gitrepo.CreateTag(ctx, "git", bare, "v1", e.sha, "", "t", "t@x"); err != nil {
32 t.Skip("tag: ", err)
33 }
34 dev, _ := st.UpsertUser(ctx, 20, "dev", "", false)
35 _ = st.SetMember(ctx, "repo", e.repo.ID, "dev", access.RoleDeveloper)
36 out, _ := st.UpsertUser(ctx, 21, "out", "", false)
37 tim := issue(t, st, e.user.ID, "api")
38 devTok := issue(t, st, dev.ID, "api")
39 outTok := issue(t, st, out.ID, "api")
40 del := func(tok, path string) int {
41 req, _ := http.NewRequest("DELETE", base+"/api/v1/projects/tim/app/releases"+path, nil)
42 if tok != "" {
43 req.Header.Set("Authorization", "Bearer "+tok)
44 }
45 res, err := http.DefaultClient.Do(req)
46 if err != nil {
47 t.Fatal(err)
48 }
49 res.Body.Close()
50 return res.StatusCode
51 }
52 for _, c := range []struct {
53 tok string
54 want int
55 }{{"", 401}, {outTok, 404}, {devTok, 403}} {
56 if got := del(c.tok, "/v1/assets/a.tar.gz"); got != c.want {
57 t.Fatalf("asset delete %q: %d want %d", c.tok, got, c.want)
58 }
59 }
60 if got := del(tim, "/v1/assets/nope"); got != 404 {
61 t.Fatalf("missing asset: %d", got)
62 }
63 if got := del(tim, "/v9/assets/a.tar.gz"); got != 404 {
64 t.Fatalf("missing release: %d", got)
65 }
66 if got := del(tim, "/v1/assets/a.tar.gz"); got != 204 {
67 t.Fatalf("asset delete: %d", got)
68 }
69 if _, err := os.Stat(a.StoragePath); !os.IsNotExist(err) {
70 t.Fatal("asset file still on disk")
71 }
72 rel, err := st.ReleaseByTag(ctx, e.repo.ID, "v1")
73 if err != nil || len(rel.Assets) != 1 || rel.Assets[0].Name != "b.zip" {
74 t.Fatalf("after asset delete: %+v %v", rel, err)
75 }
76 if got := del(devTok, "/v1"); got != 403 {
77 t.Fatalf("dev release delete: %d", got)
78 }
79 if got := del(tim, "/v1"); got != 204 {
80 t.Fatalf("release delete: %d", got)
81 }
82 if _, err := st.ReleaseByTag(ctx, e.repo.ID, "v1"); err == nil {
83 t.Fatal("release still there")
84 }
85 if _, err := os.Stat(dir); !os.IsNotExist(err) {
86 t.Fatal("asset dir still on disk")
87 }
88 refs, _ := gitrepo.Refs(ctx, "git", bare)
89 if _, ok := refs["refs/tags/v1"]; !ok {
90 t.Fatalf("tag must stay: %v", refs)
91 }
92 // Met delete_tag=true gaat de tag ook weg.
93 if _, err := st.CreateRelease(ctx, e.repo.ID, "v1", e.sha, "v1", "", e.user.ID, 0, nil); err != nil {
94 t.Fatal(err)
95 }
96 if got := del(tim, "/v1?delete_tag=true"); got != 204 {
97 t.Fatalf("release+tag delete: %d", got)
98 }
99 refs, _ = gitrepo.Refs(ctx, "git", bare)
100 if _, ok := refs["refs/tags/v1"]; ok {
101 t.Fatal("tag should be gone")
102 }
103 }
@@ -0,0 +1,103 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "os"
7 "path/filepath"
8 "testing"
9
10 "gitlab.com/Timfa/bluegit/internal/access"
11 "gitlab.com/Timfa/bluegit/internal/gitrepo"
12 "gitlab.com/Timfa/bluegit/internal/store"
13)
14
15func TestReleaseDelete(t *testing.T) {
16 e := newCIEnv(t)
17 ctx := context.Background()
18 st, base := e.st, e.ts.URL
19 dir := filepath.Join(e.srv.StoragePath(), "releases", "app", "v1")
20 _ = os.MkdirAll(dir, 0o755)
21 mk := func(n string) store.ReleaseAsset {
22 p := filepath.Join(dir, n)
23 _ = os.WriteFile(p, []byte("x"), 0o644)
24 return store.ReleaseAsset{Name: n, StoragePath: p, Size: 1}
25 }
26 a, b := mk("a.tar.gz"), mk("b.zip")
27 if _, err := st.CreateRelease(ctx, e.repo.ID, "v1", e.sha, "v1", "", e.user.ID, 0, []store.ReleaseAsset{a, b}); err != nil {
28 t.Fatal(err)
29 }
30 bare := gitrepo.Dir(e.srv.StoragePath(), e.repo.OwnerPath, e.repo.Name)
31 if err := gitrepo.CreateTag(ctx, "git", bare, "v1", e.sha, "", "t", "t@x"); err != nil {
32 t.Skip("tag: ", err)
33 }
34 dev, _ := st.UpsertUser(ctx, 20, "dev", "", false)
35 _ = st.SetMember(ctx, "repo", e.repo.ID, "dev", access.RoleDeveloper)
36 out, _ := st.UpsertUser(ctx, 21, "out", "", false)
37 tim := issue(t, st, e.user.ID, "api")
38 devTok := issue(t, st, dev.ID, "api")
39 outTok := issue(t, st, out.ID, "api")
40 del := func(tok, path string) int {
41 req, _ := http.NewRequest("DELETE", base+"/api/v1/projects/tim/app/releases"+path, nil)
42 if tok != "" {
43 req.Header.Set("Authorization", "Bearer "+tok)
44 }
45 res, err := http.DefaultClient.Do(req)
46 if err != nil {
47 t.Fatal(err)
48 }
49 res.Body.Close()
50 return res.StatusCode
51 }
52 for _, c := range []struct {
53 tok string
54 want int
55 }{{"", 401}, {outTok, 404}, {devTok, 403}} {
56 if got := del(c.tok, "/v1/assets/a.tar.gz"); got != c.want {
57 t.Fatalf("asset delete %q: %d want %d", c.tok, got, c.want)
58 }
59 }
60 if got := del(tim, "/v1/assets/nope"); got != 404 {
61 t.Fatalf("missing asset: %d", got)
62 }
63 if got := del(tim, "/v9/assets/a.tar.gz"); got != 404 {
64 t.Fatalf("missing release: %d", got)
65 }
66 if got := del(tim, "/v1/assets/a.tar.gz"); got != 204 {
67 t.Fatalf("asset delete: %d", got)
68 }
69 if _, err := os.Stat(a.StoragePath); !os.IsNotExist(err) {
70 t.Fatal("asset file still on disk")
71 }
72 rel, err := st.ReleaseByTag(ctx, e.repo.ID, "v1")
73 if err != nil || len(rel.Assets) != 1 || rel.Assets[0].Name != "b.zip" {
74 t.Fatalf("after asset delete: %+v %v", rel, err)
75 }
76 if got := del(devTok, "/v1"); got != 403 {
77 t.Fatalf("dev release delete: %d", got)
78 }
79 if got := del(tim, "/v1"); got != 204 {
80 t.Fatalf("release delete: %d", got)
81 }
82 if _, err := st.ReleaseByTag(ctx, e.repo.ID, "v1"); err == nil {
83 t.Fatal("release still there")
84 }
85 if _, err := os.Stat(dir); !os.IsNotExist(err) {
86 t.Fatal("asset dir still on disk")
87 }
88 refs, _ := gitrepo.Refs(ctx, "git", bare)
89 if _, ok := refs["refs/tags/v1"]; !ok {
90 t.Fatalf("tag must stay: %v", refs)
91 }
92 // Met delete_tag=true gaat de tag ook weg.
93 if _, err := st.CreateRelease(ctx, e.repo.ID, "v1", e.sha, "v1", "", e.user.ID, 0, nil); err != nil {
94 t.Fatal(err)
95 }
96 if got := del(tim, "/v1?delete_tag=true"); got != 204 {
97 t.Fatalf("release+tag delete: %d", got)
98 }
99 refs, _ = gitrepo.Refs(ctx, "git", bare)
100 if _, ok := refs["refs/tags/v1"]; ok {
101 t.Fatal("tag should be gone")
102 }
103}
internal/server/server.go +2 −0
@@ -224,6 +224,8 @@ func (s *Server) Handler() http.Handler {
224 224 mux.HandleFunc("POST /{owner}/{repo}/-/ci/lint", s.lintCI)
225 225 mux.HandleFunc("GET /{owner}/{repo}/-/releases", s.releases)
226 226 mux.HandleFunc("GET /{owner}/{repo}/-/releases/{tag}/assets/{name}", s.releaseAsset)
227 mux.HandleFunc("POST /{owner}/{repo}/-/releases/{tag}/assets/{name}/delete", s.uiDeleteReleaseAsset)
228 mux.HandleFunc("POST /{owner}/{repo}/-/releases/{tag}/delete", s.uiDeleteRelease)
227 229 mux.HandleFunc("GET /{owner}/{repo}/-/logo", s.repoLogo)
228 230 mux.HandleFunc("POST /{owner}/{repo}/-/logo", s.uploadRepoLogo)
229 231 mux.HandleFunc("POST /{owner}/{repo}/-/star", s.toggleStar)
@@ -224,6 +224,8 @@ func (s *Server) Handler() http.Handler {
224 mux.HandleFunc("POST /{owner}/{repo}/-/ci/lint", s.lintCI)
224 mux.HandleFunc("POST /{owner}/{repo}/-/ci/lint", s.lintCI)
225 mux.HandleFunc("GET /{owner}/{repo}/-/releases", s.releases)
225 mux.HandleFunc("GET /{owner}/{repo}/-/releases", s.releases)
226 mux.HandleFunc("GET /{owner}/{repo}/-/releases/{tag}/assets/{name}", s.releaseAsset)
226 mux.HandleFunc("GET /{owner}/{repo}/-/releases/{tag}/assets/{name}", s.releaseAsset)
227 mux.HandleFunc("POST /{owner}/{repo}/-/releases/{tag}/assets/{name}/delete", s.uiDeleteReleaseAsset)
228 mux.HandleFunc("POST /{owner}/{repo}/-/releases/{tag}/delete", s.uiDeleteRelease)
227 mux.HandleFunc("GET /{owner}/{repo}/-/logo", s.repoLogo)
229 mux.HandleFunc("GET /{owner}/{repo}/-/logo", s.repoLogo)
228 mux.HandleFunc("POST /{owner}/{repo}/-/logo", s.uploadRepoLogo)
230 mux.HandleFunc("POST /{owner}/{repo}/-/logo", s.uploadRepoLogo)
229 mux.HandleFunc("POST /{owner}/{repo}/-/star", s.toggleStar)
231 mux.HandleFunc("POST /{owner}/{repo}/-/star", s.toggleStar)
internal/server/templates/collab.html +2 −1
@@ -545,8 +545,9 @@
545 545 {{if .Body}}<pre>{{.Body}}</pre>{{end}}
546 546 <ul>
547 547 {{$tag := .Tag}}{{$path := $.Repo.FullPath}}
548 {{range .Assets}}<li><a href="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}">{{.Name}}</a> <span class="muted">{{.Size}} {{t "rel.bytes"}}</span></li>{{end}}
548 {{range .Assets}}<li><a href="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}">{{.Name}}</a> <span class="muted">{{.Size}} {{t "rel.bytes"}}</span>{{if $.CanAdmin}} <form class="inline tiphost" method="post" action="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}/delete" data-confirm="{{t "rel.deleteAssetAsk" .Name}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit" class="ghost danger small">{{t "rel.deleteAsset"}}</button> {{tip "rel.tip.deleteAsset"}}</form>{{end}}</li>{{end}}
549 549 </ul>
550 {{if $.CanAdmin}}<form class="tiphost" method="post" action="/{{$path}}/-/releases/{{.Tag}}/delete" data-confirm="{{t "rel.deleteAsk" .Tag}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><label class="row"><input type="checkbox" name="delete_tag" value="1"> {{t "rel.deleteTag"}}</label> <button type="submit" class="danger">{{t "rel.delete"}}</button> {{tip "rel.tip.delete"}}</form>{{end}}
550 551 </article>
551 552 {{else}}<p class="muted">{{t "rel.none"}}</p>{{end}}
552 553 {{template "layout-end" .}}
@@ -545,8 +545,9 @@
545 {{if .Body}}<pre>{{.Body}}</pre>{{end}}
545 {{if .Body}}<pre>{{.Body}}</pre>{{end}}
546 <ul>
546 <ul>
547 {{$tag := .Tag}}{{$path := $.Repo.FullPath}}
547 {{$tag := .Tag}}{{$path := $.Repo.FullPath}}
548 {{range .Assets}}<li><a href="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}">{{.Name}}</a> <span class="muted">{{.Size}} {{t "rel.bytes"}}</span></li>{{end}}
548 {{range .Assets}}<li><a href="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}">{{.Name}}</a> <span class="muted">{{.Size}} {{t "rel.bytes"}}</span>{{if $.CanAdmin}} <form class="inline tiphost" method="post" action="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}/delete" data-confirm="{{t "rel.deleteAssetAsk" .Name}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit" class="ghost danger small">{{t "rel.deleteAsset"}}</button> {{tip "rel.tip.deleteAsset"}}</form>{{end}}</li>{{end}}
549 </ul>
549 </ul>
550 {{if $.CanAdmin}}<form class="tiphost" method="post" action="/{{$path}}/-/releases/{{.Tag}}/delete" data-confirm="{{t "rel.deleteAsk" .Tag}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><label class="row"><input type="checkbox" name="delete_tag" value="1"> {{t "rel.deleteTag"}}</label> <button type="submit" class="danger">{{t "rel.delete"}}</button> {{tip "rel.tip.delete"}}</form>{{end}}
550</article>
551</article>
551{{else}}<p class="muted">{{t "rel.none"}}</p>{{end}}
552{{else}}<p class="muted">{{t "rel.none"}}</p>{{end}}
552{{template "layout-end" .}}
553{{template "layout-end" .}}
internal/store/flow.go +43 −0
@@ -1446,3 +1446,46 @@ func indexOf(s, sub string) int {
1446 1446 }
1447 1447 return -1
1448 1448 }
1449
1450 // DeleteReleaseAsset haalt één asset van een release weg en geeft het pad
1451 // op schijf terug (om op te ruimen). errNotFound als de naam niet bestaat.
1452 func (s *Store) DeleteReleaseAsset(ctx context.Context, releaseID int64, name string) (string, error) {
1453 var path string
1454 err := s.db.QueryRowContext(ctx, `SELECT storage_path FROM release_assets WHERE release_id = ? AND name = ?`, releaseID, name).Scan(&path)
1455 if errors.Is(err, sql.ErrNoRows) {
1456 return "", errNotFound
1457 }
1458 if err != nil {
1459 return "", err
1460 }
1461 _, err = s.db.ExecContext(ctx, `DELETE FROM release_assets WHERE release_id = ? AND name = ?`, releaseID, name)
1462 return path, err
1463 }
1464
1465 // DeleteRelease verwijdert de release met zijn assets en geeft de paden op
1466 // schijf terug. De git-tag blijft staan.
1467 func (s *Store) DeleteRelease(ctx context.Context, releaseID int64) ([]string, error) {
1468 assets, err := s.releaseAssets(ctx, releaseID)
1469 if err != nil {
1470 return nil, err
1471 }
1472 tx, err := s.db.BeginTx(ctx, nil)
1473 if err != nil {
1474 return nil, err
1475 }
1476 defer func() { _ = tx.Rollback() }()
1477 if _, err := tx.ExecContext(ctx, `DELETE FROM release_assets WHERE release_id = ?`, releaseID); err != nil {
1478 return nil, err
1479 }
1480 if _, err := tx.ExecContext(ctx, `DELETE FROM releases WHERE id = ?`, releaseID); err != nil {
1481 return nil, err
1482 }
1483 if err := tx.Commit(); err != nil {
1484 return nil, err
1485 }
1486 var paths []string
1487 for _, a := range assets {
1488 paths = append(paths, a.StoragePath)
1489 }
1490 return paths, nil
1491 }
@@ -1446,3 +1446,46 @@ func indexOf(s, sub string) int {
1446 }
1446 }
1447 return -1
1447 return -1
1448}
1448}
1449
1450// DeleteReleaseAsset haalt één asset van een release weg en geeft het pad
1451// op schijf terug (om op te ruimen). errNotFound als de naam niet bestaat.
1452func (s *Store) DeleteReleaseAsset(ctx context.Context, releaseID int64, name string) (string, error) {
1453 var path string
1454 err := s.db.QueryRowContext(ctx, `SELECT storage_path FROM release_assets WHERE release_id = ? AND name = ?`, releaseID, name).Scan(&path)
1455 if errors.Is(err, sql.ErrNoRows) {
1456 return "", errNotFound
1457 }
1458 if err != nil {
1459 return "", err
1460 }
1461 _, err = s.db.ExecContext(ctx, `DELETE FROM release_assets WHERE release_id = ? AND name = ?`, releaseID, name)
1462 return path, err
1463}
1464
1465// DeleteRelease verwijdert de release met zijn assets en geeft de paden op
1466// schijf terug. De git-tag blijft staan.
1467func (s *Store) DeleteRelease(ctx context.Context, releaseID int64) ([]string, error) {
1468 assets, err := s.releaseAssets(ctx, releaseID)
1469 if err != nil {
1470 return nil, err
1471 }
1472 tx, err := s.db.BeginTx(ctx, nil)
1473 if err != nil {
1474 return nil, err
1475 }
1476 defer func() { _ = tx.Rollback() }()
1477 if _, err := tx.ExecContext(ctx, `DELETE FROM release_assets WHERE release_id = ?`, releaseID); err != nil {
1478 return nil, err
1479 }
1480 if _, err := tx.ExecContext(ctx, `DELETE FROM releases WHERE id = ?`, releaseID); err != nil {
1481 return nil, err
1482 }
1483 if err := tx.Commit(); err != nil {
1484 return nil, err
1485 }
1486 var paths []string
1487 for _, a := range assets {
1488 paths = append(paths, a.StoragePath)
1489 }
1490 return paths, nil
1491}
scripts/bg +13 −0
@@ -241,6 +241,17 @@ cmd_release() {
241 241 req PUT "$(proj "$p")" "$(json --arg v "$v" '{release_visibility:$v}')" | jq -r '"\(.path) releases=\(.release_visibility) repo=\(.visibility)"'
242 242 return
243 243 fi
244 if [[ ${1:-} == delete-asset ]]; then
245 local p=${2:?project} tag=${3:?tag} name=${4:?naam}
246 req DELETE "$(proj "$p")/releases/$(enc "$tag")/assets/$(enc "$name")" >/dev/null && echo "verwijderd: $tag/$name"
247 return
248 fi
249 if [[ ${1:-} == delete ]]; then
250 local p=${2:?project} tag=${3:?tag} q=""
251 [[ ${4:-} == --delete-tag ]] && q="?delete_tag=true"
252 req DELETE "$(proj "$p")/releases/$(enc "$tag")$q" >/dev/null && echo "verwijderd: release $tag${q:+ (met tag)}"
253 return
254 fi
244 255 [[ ${1:-} == create ]] || die "release create PROJECT TAG [--commit SHA] [--name N] [--body B] [--asset JOB:PAD[:NAAM]]... | release visibility PROJECT [inherit|private|public]"
245 256 local p=${2:?project} tag=${3:?tag}; shift 3
246 257 local commit="" name="" body="" assets="[]"
@@ -273,6 +284,8 @@ usage() {
273 284 bg issue list|show|create|comment|close|reopen ...
274 285 bg branch create PROJECT NAAM [--from REF]
275 286 bg release create PROJECT TAG [--commit SHA] [--asset JOB:PAD[:NAAM]]
287 bg release delete-asset PROJECT TAG NAAM één asset verwijderen (tag en broncode blijven)
288 bg release delete PROJECT TAG [--delete-tag] release met assets verwijderen
276 289 bg release visibility PROJECT [inherit|private|public] zichtbaarheid releases tonen of zetten
277 290 bg file get PROJECT PAD [--ref REF]
278 291 bg runner list|show ID|jobs ID [N] [--group PAD] (account-runners zonder --group)
@@ -241,6 +241,17 @@ cmd_release() {
241 req PUT "$(proj "$p")" "$(json --arg v "$v" '{release_visibility:$v}')" | jq -r '"\(.path) releases=\(.release_visibility) repo=\(.visibility)"'
241 req PUT "$(proj "$p")" "$(json --arg v "$v" '{release_visibility:$v}')" | jq -r '"\(.path) releases=\(.release_visibility) repo=\(.visibility)"'
242 return
242 return
243 fi
243 fi
244 if [[ ${1:-} == delete-asset ]]; then
245 local p=${2:?project} tag=${3:?tag} name=${4:?naam}
246 req DELETE "$(proj "$p")/releases/$(enc "$tag")/assets/$(enc "$name")" >/dev/null && echo "verwijderd: $tag/$name"
247 return
248 fi
249 if [[ ${1:-} == delete ]]; then
250 local p=${2:?project} tag=${3:?tag} q=""
251 [[ ${4:-} == --delete-tag ]] && q="?delete_tag=true"
252 req DELETE "$(proj "$p")/releases/$(enc "$tag")$q" >/dev/null && echo "verwijderd: release $tag${q:+ (met tag)}"
253 return
254 fi
244 [[ ${1:-} == create ]] || die "release create PROJECT TAG [--commit SHA] [--name N] [--body B] [--asset JOB:PAD[:NAAM]]... | release visibility PROJECT [inherit|private|public]"
255 [[ ${1:-} == create ]] || die "release create PROJECT TAG [--commit SHA] [--name N] [--body B] [--asset JOB:PAD[:NAAM]]... | release visibility PROJECT [inherit|private|public]"
245 local p=${2:?project} tag=${3:?tag}; shift 3
256 local p=${2:?project} tag=${3:?tag}; shift 3
246 local commit="" name="" body="" assets="[]"
257 local commit="" name="" body="" assets="[]"
@@ -273,6 +284,8 @@ usage() {
273 bg issue list|show|create|comment|close|reopen ...
284 bg issue list|show|create|comment|close|reopen ...
274 bg branch create PROJECT NAAM [--from REF]
285 bg branch create PROJECT NAAM [--from REF]
275 bg release create PROJECT TAG [--commit SHA] [--asset JOB:PAD[:NAAM]]
286 bg release create PROJECT TAG [--commit SHA] [--asset JOB:PAD[:NAAM]]
287 bg release delete-asset PROJECT TAG NAAM één asset verwijderen (tag en broncode blijven)
288 bg release delete PROJECT TAG [--delete-tag] release met assets verwijderen
276 bg release visibility PROJECT [inherit|private|public] zichtbaarheid releases tonen of zetten
289 bg release visibility PROJECT [inherit|private|public] zichtbaarheid releases tonen of zetten
277 bg file get PROJECT PAD [--ref REF]
290 bg file get PROJECT PAD [--ref REF]
278 bg runner list|show ID|jobs ID [N] [--group PAD] (account-runners zonder --group)
291 bg runner list|show ID|jobs ID [N] [--group PAD] (account-runners zonder --group)