BlueGit

timfa bluegit

Merge branch 'cursor/commit-lege-repo-65da' into 'master'

fix: commit de pipeline-editor in een lege repository

See merge request Timfa/bluegit!22

timfa Tim Falken · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
558f4dff211adcb0d3985061d7618f223a798e91
17 files changed +841 −91
docs/AUR.md +1 −1
@@ -20,7 +20,7 @@ De unit is de bestaande system-unit: `User=bluegit`, `ExecStart` met `/etc/blueg
20 20
21 21 `packaging/aur/bluegit.install` draait na installatie en upgrade `systemd-sysusers`, `systemd-tmpfiles --create` en `systemctl daemon-reload`. Hij zet de service niet aan en schrijft `config.yml` niet over. `backup=('etc/bluegit/config.yml')` laat een aangepaste config staan.
22 22
23 De huidige user-unit (`/home/timfa/bluegit/config.yml`, `/home/timfa/bluegit/state`, datadisk `/home/timfa/temp-bluegit`) gaat over naar deze system-service volgens [MIGRATIE.md](MIGRATIE.md). De datadisk blijft waar hij staat.
23 De huidige user-unit (`/home/timfa/bluegit/config.yml`, `/home/timfa/bluegit/state`, datadisk `/home/timfa/temp-bluegit`) gaat over naar deze system-service volgens [MIGRATIE.md](MIGRATIE.md). De datadisk verhuist naar `/srv/bluegit`; een pad onder `/home` blijft met `ProtectHome=true` onbereikbaar.
24 24
25 25 ## Geheimen
26 26
@@ -20,7 +20,7 @@ De unit is de bestaande system-unit: `User=bluegit`, `ExecStart` met `/etc/blueg
20
20
21`packaging/aur/bluegit.install` draait na installatie en upgrade `systemd-sysusers`, `systemd-tmpfiles --create` en `systemctl daemon-reload`. Hij zet de service niet aan en schrijft `config.yml` niet over. `backup=('etc/bluegit/config.yml')` laat een aangepaste config staan.
21`packaging/aur/bluegit.install` draait na installatie en upgrade `systemd-sysusers`, `systemd-tmpfiles --create` en `systemctl daemon-reload`. Hij zet de service niet aan en schrijft `config.yml` niet over. `backup=('etc/bluegit/config.yml')` laat een aangepaste config staan.
22
22
23De huidige user-unit (`/home/timfa/bluegit/config.yml`, `/home/timfa/bluegit/state`, datadisk `/home/timfa/temp-bluegit`) gaat over naar deze system-service volgens [MIGRATIE.md](MIGRATIE.md). De datadisk blijft waar hij staat.
23De huidige user-unit (`/home/timfa/bluegit/config.yml`, `/home/timfa/bluegit/state`, datadisk `/home/timfa/temp-bluegit`) gaat over naar deze system-service volgens [MIGRATIE.md](MIGRATIE.md). De datadisk verhuist naar `/srv/bluegit`; een pad onder `/home` blijft met `ProtectHome=true` onbereikbaar.
24
24
25## Geheimen
25## Geheimen
26
26
docs/CI.md +1 −1
@@ -84,7 +84,7 @@ Een merge-request-pipeline start bij het openen van de merge request, bij elke p
84 84
85 85 ## Editor
86 86
87 `/-/ci/editor` opent `blue-ci-cd.yml` van een branch. De pagina kleurt YAML en zet fouten en waarschuwingen op het regelnummer. Opslaan maakt één commit op de gekozen branch. Bestaat die branch nog niet, dan wordt hij vanaf de geopende branch gemaakt. Een beschermde branch accepteert alleen een beheerder, dezelfde regel als een gewone push.
87 `/-/ci/editor` opent `blue-ci-cd.yml` van een branch. De pagina kleurt YAML en zet fouten en waarschuwingen op het regelnummer. Ontbreekt het bestand, dan opent de editor een uitgecommentarieerd voorbeeld. Opslaan maakt het bestand aan met één commit op de gekozen branch. Bestaat die branch nog niet, dan wordt hij vanaf de geopende branch gemaakt. Een beschermde branch accepteert alleen een beheerder voor een directe commit, dezelfde regel als een gewone push. Een ontwikkelaar krijgt dan de keuze om op een nieuwe branch te committen en een merge request te openen.
88 88
89 89 ## Mail bij een mislukte pipeline
90 90
@@ -84,7 +84,7 @@ Een merge-request-pipeline start bij het openen van de merge request, bij elke p
84
84
85## Editor
85## Editor
86
86
87`/-/ci/editor` opent `blue-ci-cd.yml` van een branch. De pagina kleurt YAML en zet fouten en waarschuwingen op het regelnummer. Opslaan maakt één commit op de gekozen branch. Bestaat die branch nog niet, dan wordt hij vanaf de geopende branch gemaakt. Een beschermde branch accepteert alleen een beheerder, dezelfde regel als een gewone push.
87`/-/ci/editor` opent `blue-ci-cd.yml` van een branch. De pagina kleurt YAML en zet fouten en waarschuwingen op het regelnummer. Ontbreekt het bestand, dan opent de editor een uitgecommentarieerd voorbeeld. Opslaan maakt het bestand aan met één commit op de gekozen branch. Bestaat die branch nog niet, dan wordt hij vanaf de geopende branch gemaakt. Een beschermde branch accepteert alleen een beheerder voor een directe commit, dezelfde regel als een gewone push. Een ontwikkelaar krijgt dan de keuze om op een nieuwe branch te committen en een merge request te openen.
88
88
89## Mail bij een mislukte pipeline
89## Mail bij een mislukte pipeline
90
90
docs/MIGRATIE.md +34 −7
@@ -1,6 +1,8 @@
1 1 # Van de user-unit naar de system-service
2 2
3 De AUR-package installeert een system-service: `User=bluegit`, config in `/etc/bluegit/config.yml`, state in `/var/lib/bluegit`. De installatie die nu draait is een user-unit, met config `/home/timfa/bluegit/config.yml`, state `/home/timfa/bluegit/state` en de datadisk `/home/timfa/temp-bluegit`. Die datadisk blijft op die plek. Alleen de service, de config en de state verhuizen.
3 De AUR-package installeert een system-service: `User=bluegit`, config in `/etc/bluegit/config.yml`, state in `/var/lib/bluegit`. De installatie die nu draait is een user-unit, met config `/home/timfa/bluegit/config.yml`, state `/home/timfa/bluegit/state` en de datadisk `/home/timfa/temp-bluegit`.
4
5 Die datadisk kan niet op die plek blijven. `ProtectHome=true` maakt `/home` ontoegankelijk voor de service, en `ReadWritePaths` opent daar geen gat in. De gebruiker `bluegit` kan `/home/timfa` bovendien niet in. Verhuis de datadisk naar `/srv/bluegit`. Daar wordt straks de 4 TB-schijf gemount. Het pad in `storage_path` blijft dan hetzelfde.
4 6
5 7 Stop de user-unit eerst. SQLite en de poorten mogen niet door twee processen gedeeld worden.
6 8
@@ -13,7 +15,7 @@ Staat de unit onder een andere naam, stop dan de unit waarvan `ExecStart` `blueg
13 15
14 16 Installeer daarna het package. `bluegit.install` maakt de systeemgebruiker `bluegit` en de state-map aan, en herlaadt systemd. Hij zet de service niet aan en overschrijft een bestaande `/etc/bluegit/config.yml` niet.
15 17
16 Kopieer de state terwijl de user-unit uit staat. `secret.key` hoort bij `bluegit.db`; zonder die sleutel is de database onleesbaar. De SSH-hostkey mee kopiëren houdt `known_hosts` geldig. Het bestand `storage_path` wijst al naar `/home/timfa/temp-bluegit` en blijft zo.
18 Kopieer de state terwijl de user-unit uit staat. `secret.key` hoort bij `bluegit.db`; zonder die sleutel is de database onleesbaar. De SSH-hostkey mee kopiëren houdt `known_hosts` geldig. Het bestand `storage_path` wijst nog naar `/home/timfa/temp-bluegit`; dat pad wordt hieronder vervangen.
17 19
18 20 ```shell
19 21 install -d -o bluegit -g bluegit -m 750 /var/lib/bluegit
@@ -27,17 +29,36 @@ Zet de config op de system-plek en verander alleen `state_path`:
27 29 install -o root -g bluegit -m 640 /home/timfa/bluegit/config.yml /etc/bluegit/config.yml
28 30 ```
29 31
30 In `/etc/bluegit/config.yml` wordt `state_path` `/var/lib/bluegit`. Een `storage_path` in dat bestand is niet nodig: het bestand `/var/lib/bluegit/storage_path` wint. Wijst `client_secret_file` nog naar een bestand onder `/home/timfa`, kopieer dat dan naar `/etc/bluegit/client_secret` (mode `0600`, eigenaar `bluegit`) en pas het pad aan. `ProtectHome=true` verbergt de rest van `/home` voor de service.
32 In `/etc/bluegit/config.yml` wordt `state_path` `/var/lib/bluegit`. Een `storage_path` in dat bestand is niet nodig: het bestand `/var/lib/bluegit/storage_path` wint. Wijst `client_secret_file` nog naar een bestand onder `/home/timfa`, kopieer dat dan naar `/etc/bluegit/client_secret` (mode `0600`, eigenaar `bluegit`) en pas het pad aan.
33
34 Verhuis de datadisk terwijl beide services uit staan. `rsync -aHAX` houdt hardlinks, permissies, xattrs en ACLs. De kopie erft de eigenaar `timfa`; `chown` zet ze daarna op `bluegit`. Hangt de 4 TB-schijf er al, mount die dan eerst op `/srv/bluegit`, zodat de kopie op die schijf landt.
35
36 ```shell
37 install -d -o bluegit -g bluegit -m 750 /srv/bluegit
38 rsync -aHAX /home/timfa/temp-bluegit/ /srv/bluegit/
39 chown -R bluegit:bluegit /srv/bluegit
40 printf '%s\n' /srv/bluegit > /var/lib/bluegit/storage_path
41 chown bluegit:bluegit /var/lib/bluegit/storage_path
42 chmod 640 /var/lib/bluegit/storage_path
43 ```
31 44
32 De datadisk blijft `/home/timfa/temp-bluegit`. `ProtectSystem=strict` schrijft alleen naar `/var/lib/bluegit`, en `ProtectHome=true` maakt `/home` onbereikbaar. Een drop-in zet die ene map terug:
45 `ProtectSystem=strict` schrijft alleen naar `/var/lib/bluegit`. Een drop-in zet `/srv/bluegit` open. Een pad onder `/home` hoort hier niet.
33 46
34 47 ```shell
35 48 install -d /etc/systemd/system/bluegit.service.d
36 49 cat > /etc/systemd/system/bluegit.service.d/storage.conf <<'EOF'
37 50 [Service]
38 ReadWritePaths=/home/timfa/temp-bluegit
51 ReadWritePaths=/srv/bluegit
52 EOF
53 ```
54
55 De runner Steve start Docker. De socket hoort bij de groep `docker`. De unit in het package zet daarom `SupplementaryGroups=docker`; de gebruiker `bluegit` hoeft zelf niet in die groep. Zonder die regel kan Steve geen job draaien. `systemctl cat bluegit` hoort de regel te tonen. Ontbreekt hij op een oudere unit, zet hem dan in een drop-in:
56
57 ```shell
58 cat > /etc/systemd/system/bluegit.service.d/docker.conf <<'EOF'
59 [Service]
60 SupplementaryGroups=docker
39 61 EOF
40 chown -R bluegit:bluegit /home/timfa/temp-bluegit
41 62 ```
42 63
43 64 Daarna:
@@ -48,4 +69,10 @@ systemctl enable --now bluegit
48 69 systemctl status bluegit
49 70 ```
50 71
51 Controleer dat de site de bestaande repositories toont en dat een clone van een repo op `/home/timfa/temp-bluegit` slaagt. Laat `/home/timfa/bluegit` staan tot dat klopt. De user-unit blijft uit.
72 Controleer dat de site de bestaande repositories toont en dat een clone van een repo op `/srv/bluegit` slaagt. Laat `/home/timfa/bluegit` en `/home/timfa/temp-bluegit` staan tot dat klopt. De user-unit blijft uit.
73
74 Linger stond aan zodat die user-unit bleef draaien na het uitloggen. De system-service heeft dat niet nodig. Zet linger uit zodra er geen andere user-service van timfa meer moet blijven draaien:
75
76 ```shell
77 loginctl disable-linger timfa
78 ```
@@ -1,6 +1,8 @@
1# Van de user-unit naar de system-service
1# Van de user-unit naar de system-service
2
2
3De AUR-package installeert een system-service: `User=bluegit`, config in `/etc/bluegit/config.yml`, state in `/var/lib/bluegit`. De installatie die nu draait is een user-unit, met config `/home/timfa/bluegit/config.yml`, state `/home/timfa/bluegit/state` en de datadisk `/home/timfa/temp-bluegit`. Die datadisk blijft op die plek. Alleen de service, de config en de state verhuizen.
3De AUR-package installeert een system-service: `User=bluegit`, config in `/etc/bluegit/config.yml`, state in `/var/lib/bluegit`. De installatie die nu draait is een user-unit, met config `/home/timfa/bluegit/config.yml`, state `/home/timfa/bluegit/state` en de datadisk `/home/timfa/temp-bluegit`.
4
5Die datadisk kan niet op die plek blijven. `ProtectHome=true` maakt `/home` ontoegankelijk voor de service, en `ReadWritePaths` opent daar geen gat in. De gebruiker `bluegit` kan `/home/timfa` bovendien niet in. Verhuis de datadisk naar `/srv/bluegit`. Daar wordt straks de 4 TB-schijf gemount. Het pad in `storage_path` blijft dan hetzelfde.
4
6
5Stop de user-unit eerst. SQLite en de poorten mogen niet door twee processen gedeeld worden.
7Stop de user-unit eerst. SQLite en de poorten mogen niet door twee processen gedeeld worden.
6
8
@@ -13,7 +15,7 @@ Staat de unit onder een andere naam, stop dan de unit waarvan `ExecStart` `blueg
13
15
14Installeer daarna het package. `bluegit.install` maakt de systeemgebruiker `bluegit` en de state-map aan, en herlaadt systemd. Hij zet de service niet aan en overschrijft een bestaande `/etc/bluegit/config.yml` niet.
16Installeer daarna het package. `bluegit.install` maakt de systeemgebruiker `bluegit` en de state-map aan, en herlaadt systemd. Hij zet de service niet aan en overschrijft een bestaande `/etc/bluegit/config.yml` niet.
15
17
16Kopieer de state terwijl de user-unit uit staat. `secret.key` hoort bij `bluegit.db`; zonder die sleutel is de database onleesbaar. De SSH-hostkey mee kopiëren houdt `known_hosts` geldig. Het bestand `storage_path` wijst al naar `/home/timfa/temp-bluegit` en blijft zo.
18Kopieer de state terwijl de user-unit uit staat. `secret.key` hoort bij `bluegit.db`; zonder die sleutel is de database onleesbaar. De SSH-hostkey mee kopiëren houdt `known_hosts` geldig. Het bestand `storage_path` wijst nog naar `/home/timfa/temp-bluegit`; dat pad wordt hieronder vervangen.
17
19
18```shell
20```shell
19install -d -o bluegit -g bluegit -m 750 /var/lib/bluegit
21install -d -o bluegit -g bluegit -m 750 /var/lib/bluegit
@@ -27,17 +29,36 @@ Zet de config op de system-plek en verander alleen `state_path`:
27install -o root -g bluegit -m 640 /home/timfa/bluegit/config.yml /etc/bluegit/config.yml
29install -o root -g bluegit -m 640 /home/timfa/bluegit/config.yml /etc/bluegit/config.yml
28```
30```
29
31
30In `/etc/bluegit/config.yml` wordt `state_path` `/var/lib/bluegit`. Een `storage_path` in dat bestand is niet nodig: het bestand `/var/lib/bluegit/storage_path` wint. Wijst `client_secret_file` nog naar een bestand onder `/home/timfa`, kopieer dat dan naar `/etc/bluegit/client_secret` (mode `0600`, eigenaar `bluegit`) en pas het pad aan. `ProtectHome=true` verbergt de rest van `/home` voor de service.
32In `/etc/bluegit/config.yml` wordt `state_path` `/var/lib/bluegit`. Een `storage_path` in dat bestand is niet nodig: het bestand `/var/lib/bluegit/storage_path` wint. Wijst `client_secret_file` nog naar een bestand onder `/home/timfa`, kopieer dat dan naar `/etc/bluegit/client_secret` (mode `0600`, eigenaar `bluegit`) en pas het pad aan.
33
34Verhuis de datadisk terwijl beide services uit staan. `rsync -aHAX` houdt hardlinks, permissies, xattrs en ACLs. De kopie erft de eigenaar `timfa`; `chown` zet ze daarna op `bluegit`. Hangt de 4 TB-schijf er al, mount die dan eerst op `/srv/bluegit`, zodat de kopie op die schijf landt.
35
36```shell
37install -d -o bluegit -g bluegit -m 750 /srv/bluegit
38rsync -aHAX /home/timfa/temp-bluegit/ /srv/bluegit/
39chown -R bluegit:bluegit /srv/bluegit
40printf '%s\n' /srv/bluegit > /var/lib/bluegit/storage_path
41chown bluegit:bluegit /var/lib/bluegit/storage_path
42chmod 640 /var/lib/bluegit/storage_path
43```
31
44
32De datadisk blijft `/home/timfa/temp-bluegit`. `ProtectSystem=strict` schrijft alleen naar `/var/lib/bluegit`, en `ProtectHome=true` maakt `/home` onbereikbaar. Een drop-in zet die ene map terug:
45`ProtectSystem=strict` schrijft alleen naar `/var/lib/bluegit`. Een drop-in zet `/srv/bluegit` open. Een pad onder `/home` hoort hier niet.
33
46
34```shell
47```shell
35install -d /etc/systemd/system/bluegit.service.d
48install -d /etc/systemd/system/bluegit.service.d
36cat > /etc/systemd/system/bluegit.service.d/storage.conf <<'EOF'
49cat > /etc/systemd/system/bluegit.service.d/storage.conf <<'EOF'
37[Service]
50[Service]
38ReadWritePaths=/home/timfa/temp-bluegit
51ReadWritePaths=/srv/bluegit
52EOF
53```
54
55De runner Steve start Docker. De socket hoort bij de groep `docker`. De unit in het package zet daarom `SupplementaryGroups=docker`; de gebruiker `bluegit` hoeft zelf niet in die groep. Zonder die regel kan Steve geen job draaien. `systemctl cat bluegit` hoort de regel te tonen. Ontbreekt hij op een oudere unit, zet hem dan in een drop-in:
56
57```shell
58cat > /etc/systemd/system/bluegit.service.d/docker.conf <<'EOF'
59[Service]
60SupplementaryGroups=docker
39EOF
61EOF
40chown -R bluegit:bluegit /home/timfa/temp-bluegit
41```
62```
42
63
43Daarna:
64Daarna:
@@ -48,4 +69,10 @@ systemctl enable --now bluegit
48systemctl status bluegit
69systemctl status bluegit
49```
70```
50
71
51Controleer dat de site de bestaande repositories toont en dat een clone van een repo op `/home/timfa/temp-bluegit` slaagt. Laat `/home/timfa/bluegit` staan tot dat klopt. De user-unit blijft uit.
72Controleer dat de site de bestaande repositories toont en dat een clone van een repo op `/srv/bluegit` slaagt. Laat `/home/timfa/bluegit` en `/home/timfa/temp-bluegit` staan tot dat klopt. De user-unit blijft uit.
73
74Linger stond aan zodat die user-unit bleef draaien na het uitloggen. De system-service heeft dat niet nodig. Zet linger uit zodra er geen andere user-service van timfa meer moet blijven draaien:
75
76```shell
77loginctl disable-linger timfa
78```
internal/ci/parse.go +5 −0
@@ -80,6 +80,11 @@ func parseBytes(data []byte, read func(string) ([]byte, error), stack []string)
80 80 if err := yaml.Unmarshal(data, &root); err != nil {
81 81 return Pipeline{}, nil, i18n.E("ci.err.yaml", err.Error())
82 82 }
83 // Een leeg document of alleen commentaar is een pipeline zonder jobs.
84 // Een echte mapping, ook een lege zoals {}, blijft door validate gaan.
85 if root.Kind == 0 || len(root.Content) == 0 {
86 return Pipeline{Variables: map[string]string{}}, nil, nil
87 }
83 88 if root.Kind != yaml.DocumentNode || len(root.Content) != 1 || root.Content[0].Kind != yaml.MappingNode {
84 89 return Pipeline{}, []Issue{{Line: 1, Key: "ci.err.mapping"}}, nil
85 90 }
@@ -80,6 +80,11 @@ func parseBytes(data []byte, read func(string) ([]byte, error), stack []string)
80 if err := yaml.Unmarshal(data, &root); err != nil {
80 if err := yaml.Unmarshal(data, &root); err != nil {
81 return Pipeline{}, nil, i18n.E("ci.err.yaml", err.Error())
81 return Pipeline{}, nil, i18n.E("ci.err.yaml", err.Error())
82 }
82 }
83 // Een leeg document of alleen commentaar is een pipeline zonder jobs.
84 // Een echte mapping, ook een lege zoals {}, blijft door validate gaan.
85 if root.Kind == 0 || len(root.Content) == 0 {
86 return Pipeline{Variables: map[string]string{}}, nil, nil
87 }
83 if root.Kind != yaml.DocumentNode || len(root.Content) != 1 || root.Content[0].Kind != yaml.MappingNode {
88 if root.Kind != yaml.DocumentNode || len(root.Content) != 1 || root.Content[0].Kind != yaml.MappingNode {
84 return Pipeline{}, []Issue{{Line: 1, Key: "ci.err.mapping"}}, nil
89 return Pipeline{}, []Issue{{Line: 1, Key: "ci.err.mapping"}}, nil
85 }
90 }
internal/ci/parse_test.go +19 −0
@@ -35,6 +35,25 @@ jobs:
35 35 - echo release
36 36 `
37 37
38 func TestParseCommentOnly(t *testing.T) {
39 for _, raw := range []string{"", "\n", "# only\n# comments\n"} {
40 p, issues := Lint([]byte(raw), nil)
41 if len(issues) != 0 || len(p.Jobs) != 0 {
42 t.Fatalf("%q issues=%v jobs=%d", raw, issues, len(p.Jobs))
43 }
44 if _, err := Parse([]byte(raw)); err != nil {
45 t.Fatalf("parse %q: %v", raw, err)
46 }
47 }
48 if _, err := Parse([]byte("{}\n")); err == nil {
49 t.Fatal("lege mapping hoort een fout te zijn")
50 }
51 _, issues := Lint([]byte("stages:\n - test\n"), nil)
52 if len(issues) == 0 || issues[0].Key != "ci.err.noJobs" {
53 t.Fatalf("stages zonder jobs: %+v", issues)
54 }
55 }
56
38 57 func TestParseSample(t *testing.T) {
39 58 p, err := Parse([]byte(sample))
40 59 if err != nil {
@@ -35,6 +35,25 @@ jobs:
35 - echo release
35 - echo release
36`
36`
37
37
38func TestParseCommentOnly(t *testing.T) {
39 for _, raw := range []string{"", "\n", "# only\n# comments\n"} {
40 p, issues := Lint([]byte(raw), nil)
41 if len(issues) != 0 || len(p.Jobs) != 0 {
42 t.Fatalf("%q issues=%v jobs=%d", raw, issues, len(p.Jobs))
43 }
44 if _, err := Parse([]byte(raw)); err != nil {
45 t.Fatalf("parse %q: %v", raw, err)
46 }
47 }
48 if _, err := Parse([]byte("{}\n")); err == nil {
49 t.Fatal("lege mapping hoort een fout te zijn")
50 }
51 _, issues := Lint([]byte("stages:\n - test\n"), nil)
52 if len(issues) == 0 || issues[0].Key != "ci.err.noJobs" {
53 t.Fatalf("stages zonder jobs: %+v", issues)
54 }
55}
56
38func TestParseSample(t *testing.T) {
57func TestParseSample(t *testing.T) {
39 p, err := Parse([]byte(sample))
58 p, err := Parse([]byte(sample))
40 if err != nil {
59 if err != nil {
internal/gitrepo/commit_test.go added +169 −0
@@ -0,0 +1,169 @@
1 package gitrepo
2
3 import (
4 "context"
5 "errors"
6 "os"
7 "os/exec"
8 "path/filepath"
9 "strings"
10 "testing"
11
12 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/i18n"
14 )
15
16 // TestCommitOnBranchHardened bootst de system-service na: een andere uid
17 // via een user-namespace, een alleen-lezen homedirectory, geen git-identiteit
18 // in de omgeving, en een lege repository zonder master.
19 func TestCommitOnBranchHardened(t *testing.T) {
20 if os.Getenv("BLUEGIT_SANDBOX") == "inner" {
21 commitSandboxInner(t)
22 return
23 }
24 if _, err := exec.LookPath("git"); err != nil {
25 t.Skip("git ontbreekt")
26 }
27 if _, err := exec.LookPath("unshare"); err != nil {
28 t.Skip("unshare ontbreekt")
29 }
30 base := t.TempDir()
31 home := filepath.Join(base, "home")
32 state := filepath.Join(base, "state", "tmp")
33 bare := filepath.Join(base, "repo.git")
34 if err := os.MkdirAll(home, 0o755); err != nil {
35 t.Fatal(err)
36 }
37 if err := os.MkdirAll(state, 0o755); err != nil {
38 t.Fatal(err)
39 }
40 if err := os.WriteFile(filepath.Join(home, "secret"), []byte("x\n"), 0o644); err != nil {
41 t.Fatal(err)
42 }
43 gitInit(t, bare)
44 hook := "#!/bin/sh\nwhile read old new ref; do\n" +
45 " printf '%s %s\\n' \"$BLUEGIT_ROLE\" \"$ref\" >> " + shellQuote(filepath.Join(base, "roles")) + "\n" +
46 " if [ \"$ref\" = \"refs/heads/master\" ] && [ \"$BLUEGIT_ROLE\" != \"maintainer\" ]; then\n" +
47 " echo \"branch master is protected; only a maintainer may change it\" >&2\n" +
48 " exit 1\n" +
49 " fi\ndone\nexit 0\n"
50 if err := os.WriteFile(filepath.Join(bare, "hooks", "pre-receive"), []byte(hook), 0o755); err != nil {
51 t.Fatal(err)
52 }
53 env := dropEnv(os.Environ(), "HOME=", "TMPDIR=", "GIT_AUTHOR_", "GIT_COMMITTER_")
54 env = append(env,
55 "BLUEGIT_SANDBOX=inner",
56 "BLUEGIT_SANDBOX_BASE="+base,
57 "HOME="+home,
58 "TMPDIR="+home,
59 "GIT_AUTHOR_NAME=hostile",
60 "GIT_AUTHOR_EMAIL=hostile@example.com",
61 "GIT_COMMITTER_NAME=hostile",
62 "GIT_COMMITTER_EMAIL=hostile@example.com",
63 )
64 cmd := exec.Command("unshare", "-U", "-r", "-m", "--", os.Args[0], "-test.run", "^TestCommitOnBranchHardened$", "-test.count=1", "-test.v")
65 cmd.Env = env
66 out, err := cmd.CombinedOutput()
67 if err != nil {
68 t.Fatalf("sandbox: %v\n%s", err, out)
69 }
70 if !strings.Contains(string(out), "sandbox-ok") {
71 t.Fatalf("sandbox zonder bevestiging:\n%s", out)
72 }
73 roles, err := os.ReadFile(filepath.Join(base, "roles"))
74 if err != nil {
75 t.Fatal(err)
76 }
77 if !strings.Contains(string(roles), "maintainer refs/heads/master") {
78 t.Fatalf("hook zag de beheerder niet:\n%s", roles)
79 }
80 if !strings.Contains(string(roles), "developer refs/heads/master") {
81 t.Fatalf("hook zag de ontwikkelaar niet:\n%s", roles)
82 }
83 }
84
85 func commitSandboxInner(t *testing.T) {
86 if os.Getuid() != 0 {
87 t.Fatalf("uid %d, verwacht de namespace-root", os.Getuid())
88 }
89 base := os.Getenv("BLUEGIT_SANDBOX_BASE")
90 home := filepath.Join(base, "home")
91 bare := filepath.Join(base, "repo.git")
92 if out, err := exec.Command("mount", "-o", "bind,ro", home, home).CombinedOutput(); err != nil {
93 t.Fatalf("mount: %v\n%s", err, out)
94 }
95 if f, err := os.OpenFile(filepath.Join(home, "nope"), os.O_CREATE|os.O_WRONLY, 0o644); err == nil {
96 f.Close()
97 t.Fatal("homedirectory was beschrijfbaar")
98 }
99 os.Setenv("HOME", home)
100 os.Setenv("TMPDIR", home)
101 os.Setenv("GIT_AUTHOR_NAME", "hostile")
102 os.Setenv("GIT_AUTHOR_EMAIL", "hostile@example.com")
103 os.Setenv("GIT_COMMITTER_NAME", "hostile")
104 os.Setenv("GIT_COMMITTER_EMAIL", "hostile@example.com")
105
106 work := filepath.Join(base, "state", "tmp", "edit")
107 body := "image: alpine:latest\n"
108 err := CommitOnBranch(context.Background(), "git", bare, work, "master", "timfa", "timfa@users.git.timfalken.com", "Add blue-ci-cd.yml", "", map[string]string{"blue-ci-cd.yml": body}, access.RoleMaintainer, []string{"master"})
109 if err != nil {
110 t.Fatal(err)
111 }
112 got := gitShow(t, bare, "show", "master:blue-ci-cd.yml")
113 if !strings.Contains(got, "alpine:latest") {
114 t.Fatalf("bestand: %s", got)
115 }
116 who := strings.TrimSpace(gitShow(t, bare, "log", "-1", "--format=%an %ae"))
117 if who != "timfa timfa@users.git.timfalken.com" {
118 t.Fatalf("identiteit %q", who)
119 }
120 if out, err := exec.Command("git", "--git-dir", bare, "rev-parse", "--verify", "master^").CombinedOutput(); err == nil {
121 t.Fatalf("eerste commit heeft een parent: %s", out)
122 }
123 err = CommitOnBranch(context.Background(), "git", bare, work, "master", "ada", "ada@users.git.timfalken.com", "ada op master", "", map[string]string{"blue-ci-cd.yml": "image: nope\n"}, access.RoleDeveloper, []string{"master"})
124 if err == nil {
125 t.Fatal("developer committe op beschermde master")
126 }
127 var ie i18n.Error
128 if !errors.As(err, &ie) || ie.Key != "edit.protected" {
129 t.Fatalf("weigering: %v", err)
130 }
131 if strings.Contains(gitShow(t, bare, "show", "master:blue-ci-cd.yml"), "nope") {
132 t.Fatal("master veranderde door de ontwikkelaar")
133 }
134 t.Log("sandbox-ok")
135 }
136
137 func gitInit(t *testing.T, bare string) {
138 t.Helper()
139 if out, err := exec.Command("git", "init", "--bare", "--initial-branch", "master", bare).CombinedOutput(); err != nil {
140 t.Fatalf("init: %v\n%s", err, out)
141 }
142 }
143
144 func gitShow(t *testing.T, bare string, args ...string) string {
145 t.Helper()
146 cmd := append([]string{"--git-dir", bare}, args...)
147 out, err := exec.Command("git", cmd...).CombinedOutput()
148 if err != nil {
149 t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
150 }
151 return string(out)
152 }
153
154 func dropEnv(env []string, prefixes ...string) []string {
155 var out []string
156 for _, e := range env {
157 skip := false
158 for _, p := range prefixes {
159 if strings.HasPrefix(e, p) {
160 skip = true
161 break
162 }
163 }
164 if !skip {
165 out = append(out, e)
166 }
167 }
168 return out
169 }
@@ -0,0 +1,169 @@
1package gitrepo
2
3import (
4 "context"
5 "errors"
6 "os"
7 "os/exec"
8 "path/filepath"
9 "strings"
10 "testing"
11
12 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/i18n"
14)
15
16// TestCommitOnBranchHardened bootst de system-service na: een andere uid
17// via een user-namespace, een alleen-lezen homedirectory, geen git-identiteit
18// in de omgeving, en een lege repository zonder master.
19func TestCommitOnBranchHardened(t *testing.T) {
20 if os.Getenv("BLUEGIT_SANDBOX") == "inner" {
21 commitSandboxInner(t)
22 return
23 }
24 if _, err := exec.LookPath("git"); err != nil {
25 t.Skip("git ontbreekt")
26 }
27 if _, err := exec.LookPath("unshare"); err != nil {
28 t.Skip("unshare ontbreekt")
29 }
30 base := t.TempDir()
31 home := filepath.Join(base, "home")
32 state := filepath.Join(base, "state", "tmp")
33 bare := filepath.Join(base, "repo.git")
34 if err := os.MkdirAll(home, 0o755); err != nil {
35 t.Fatal(err)
36 }
37 if err := os.MkdirAll(state, 0o755); err != nil {
38 t.Fatal(err)
39 }
40 if err := os.WriteFile(filepath.Join(home, "secret"), []byte("x\n"), 0o644); err != nil {
41 t.Fatal(err)
42 }
43 gitInit(t, bare)
44 hook := "#!/bin/sh\nwhile read old new ref; do\n" +
45 " printf '%s %s\\n' \"$BLUEGIT_ROLE\" \"$ref\" >> " + shellQuote(filepath.Join(base, "roles")) + "\n" +
46 " if [ \"$ref\" = \"refs/heads/master\" ] && [ \"$BLUEGIT_ROLE\" != \"maintainer\" ]; then\n" +
47 " echo \"branch master is protected; only a maintainer may change it\" >&2\n" +
48 " exit 1\n" +
49 " fi\ndone\nexit 0\n"
50 if err := os.WriteFile(filepath.Join(bare, "hooks", "pre-receive"), []byte(hook), 0o755); err != nil {
51 t.Fatal(err)
52 }
53 env := dropEnv(os.Environ(), "HOME=", "TMPDIR=", "GIT_AUTHOR_", "GIT_COMMITTER_")
54 env = append(env,
55 "BLUEGIT_SANDBOX=inner",
56 "BLUEGIT_SANDBOX_BASE="+base,
57 "HOME="+home,
58 "TMPDIR="+home,
59 "GIT_AUTHOR_NAME=hostile",
60 "GIT_AUTHOR_EMAIL=hostile@example.com",
61 "GIT_COMMITTER_NAME=hostile",
62 "GIT_COMMITTER_EMAIL=hostile@example.com",
63 )
64 cmd := exec.Command("unshare", "-U", "-r", "-m", "--", os.Args[0], "-test.run", "^TestCommitOnBranchHardened$", "-test.count=1", "-test.v")
65 cmd.Env = env
66 out, err := cmd.CombinedOutput()
67 if err != nil {
68 t.Fatalf("sandbox: %v\n%s", err, out)
69 }
70 if !strings.Contains(string(out), "sandbox-ok") {
71 t.Fatalf("sandbox zonder bevestiging:\n%s", out)
72 }
73 roles, err := os.ReadFile(filepath.Join(base, "roles"))
74 if err != nil {
75 t.Fatal(err)
76 }
77 if !strings.Contains(string(roles), "maintainer refs/heads/master") {
78 t.Fatalf("hook zag de beheerder niet:\n%s", roles)
79 }
80 if !strings.Contains(string(roles), "developer refs/heads/master") {
81 t.Fatalf("hook zag de ontwikkelaar niet:\n%s", roles)
82 }
83}
84
85func commitSandboxInner(t *testing.T) {
86 if os.Getuid() != 0 {
87 t.Fatalf("uid %d, verwacht de namespace-root", os.Getuid())
88 }
89 base := os.Getenv("BLUEGIT_SANDBOX_BASE")
90 home := filepath.Join(base, "home")
91 bare := filepath.Join(base, "repo.git")
92 if out, err := exec.Command("mount", "-o", "bind,ro", home, home).CombinedOutput(); err != nil {
93 t.Fatalf("mount: %v\n%s", err, out)
94 }
95 if f, err := os.OpenFile(filepath.Join(home, "nope"), os.O_CREATE|os.O_WRONLY, 0o644); err == nil {
96 f.Close()
97 t.Fatal("homedirectory was beschrijfbaar")
98 }
99 os.Setenv("HOME", home)
100 os.Setenv("TMPDIR", home)
101 os.Setenv("GIT_AUTHOR_NAME", "hostile")
102 os.Setenv("GIT_AUTHOR_EMAIL", "hostile@example.com")
103 os.Setenv("GIT_COMMITTER_NAME", "hostile")
104 os.Setenv("GIT_COMMITTER_EMAIL", "hostile@example.com")
105
106 work := filepath.Join(base, "state", "tmp", "edit")
107 body := "image: alpine:latest\n"
108 err := CommitOnBranch(context.Background(), "git", bare, work, "master", "timfa", "timfa@users.git.timfalken.com", "Add blue-ci-cd.yml", "", map[string]string{"blue-ci-cd.yml": body}, access.RoleMaintainer, []string{"master"})
109 if err != nil {
110 t.Fatal(err)
111 }
112 got := gitShow(t, bare, "show", "master:blue-ci-cd.yml")
113 if !strings.Contains(got, "alpine:latest") {
114 t.Fatalf("bestand: %s", got)
115 }
116 who := strings.TrimSpace(gitShow(t, bare, "log", "-1", "--format=%an %ae"))
117 if who != "timfa timfa@users.git.timfalken.com" {
118 t.Fatalf("identiteit %q", who)
119 }
120 if out, err := exec.Command("git", "--git-dir", bare, "rev-parse", "--verify", "master^").CombinedOutput(); err == nil {
121 t.Fatalf("eerste commit heeft een parent: %s", out)
122 }
123 err = CommitOnBranch(context.Background(), "git", bare, work, "master", "ada", "ada@users.git.timfalken.com", "ada op master", "", map[string]string{"blue-ci-cd.yml": "image: nope\n"}, access.RoleDeveloper, []string{"master"})
124 if err == nil {
125 t.Fatal("developer committe op beschermde master")
126 }
127 var ie i18n.Error
128 if !errors.As(err, &ie) || ie.Key != "edit.protected" {
129 t.Fatalf("weigering: %v", err)
130 }
131 if strings.Contains(gitShow(t, bare, "show", "master:blue-ci-cd.yml"), "nope") {
132 t.Fatal("master veranderde door de ontwikkelaar")
133 }
134 t.Log("sandbox-ok")
135}
136
137func gitInit(t *testing.T, bare string) {
138 t.Helper()
139 if out, err := exec.Command("git", "init", "--bare", "--initial-branch", "master", bare).CombinedOutput(); err != nil {
140 t.Fatalf("init: %v\n%s", err, out)
141 }
142}
143
144func gitShow(t *testing.T, bare string, args ...string) string {
145 t.Helper()
146 cmd := append([]string{"--git-dir", bare}, args...)
147 out, err := exec.Command("git", cmd...).CombinedOutput()
148 if err != nil {
149 t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
150 }
151 return string(out)
152}
153
154func dropEnv(env []string, prefixes ...string) []string {
155 var out []string
156 for _, e := range env {
157 skip := false
158 for _, p := range prefixes {
159 if strings.HasPrefix(e, p) {
160 skip = true
161 break
162 }
163 }
164 if !skip {
165 out = append(out, e)
166 }
167 }
168 return out
169}
internal/gitrepo/repo.go +18 −21
@@ -435,7 +435,12 @@ func CreateTag(ctx context.Context, gitBin, dir, name, rev, message, author, ema
435 435 if len(message) > 5000 {
436 436 return i18n.E("err.tagLong")
437 437 }
438 env := identityEnv(author, email)
438 home, err := os.MkdirTemp(dir, "home-")
439 if err != nil {
440 return classifyGit(err)
441 }
442 defer os.RemoveAll(home)
443 env := CommandEnv(author, email, home, home)
439 444 if message == "" {
440 445 _, err = run(ctx, gitBin, env, "-C", dir, "tag", name, sha)
441 446 return err
@@ -646,30 +651,22 @@ func BranchOfRef(ref string) (string, bool) {
646 651 // Merge voegt source samen in target en pusht het resultaat.
647 652 // De push gaat door de hook, dus role en patterns moeten kloppen.
648 653 func Merge(ctx context.Context, gitBin, bare, work, source, target, author, email, message string, role access.Role, patterns []string) error {
649 if err := os.RemoveAll(work); err != nil {
650 return err
651 }
652 if err := os.MkdirAll(filepath.Dir(work), 0o755); err != nil {
653 return err
654 repo, env, err := prepareWork(work, author, email)
655 if err != nil {
656 return classifyGit(err)
654 657 }
655 if _, err := run(ctx, gitBin, nil, "clone", bare, work); err != nil {
656 return err
658 if _, err := run(ctx, gitBin, env, "clone", bare, repo); err != nil {
659 return classifyGit(err)
657 660 }
658 env := append(os.Environ(),
659 "GIT_AUTHOR_NAME="+author,
660 "GIT_AUTHOR_EMAIL="+email,
661 "GIT_COMMITTER_NAME="+author,
662 "GIT_COMMITTER_EMAIL="+email,
663 )
664 if _, err := run(ctx, gitBin, env, "-C", work, "checkout", target); err != nil {
665 return fmt.Errorf("doelbranch %s: %w", target, err)
661 if _, err := run(ctx, gitBin, env, "-C", repo, "checkout", target); err != nil {
662 return classifyGit(fmt.Errorf("doelbranch %s: %w", target, err))
666 663 }
667 if _, err := run(ctx, gitBin, env, "-C", work, "merge", "--no-ff", "--no-edit", "-m", message, source); err != nil {
668 return fmt.Errorf("samenvoegen lukt niet, er is een conflict of de branch ontbreekt")
664 if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, source); err != nil {
665 return i18n.E("err.mergeConflict")
669 666 }
670 pushEnv := append(env, PushEnv(role, patterns, nil)...)
671 if _, err := run(ctx, gitBin, pushEnv, "-C", work, "push", "origin", target); err != nil {
672 return err
667 pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)
668 if _, err := run(ctx, gitBin, pushEnv, "-C", repo, "push", "origin", target); err != nil {
669 return classifyGit(err)
673 670 }
674 671 return nil
675 672 }
@@ -435,7 +435,12 @@ func CreateTag(ctx context.Context, gitBin, dir, name, rev, message, author, ema
435 if len(message) > 5000 {
435 if len(message) > 5000 {
436 return i18n.E("err.tagLong")
436 return i18n.E("err.tagLong")
437 }
437 }
438 env := identityEnv(author, email)
438 home, err := os.MkdirTemp(dir, "home-")
439 if err != nil {
440 return classifyGit(err)
441 }
442 defer os.RemoveAll(home)
443 env := CommandEnv(author, email, home, home)
439 if message == "" {
444 if message == "" {
440 _, err = run(ctx, gitBin, env, "-C", dir, "tag", name, sha)
445 _, err = run(ctx, gitBin, env, "-C", dir, "tag", name, sha)
441 return err
446 return err
@@ -646,30 +651,22 @@ func BranchOfRef(ref string) (string, bool) {
646// Merge voegt source samen in target en pusht het resultaat.
651// Merge voegt source samen in target en pusht het resultaat.
647// De push gaat door de hook, dus role en patterns moeten kloppen.
652// De push gaat door de hook, dus role en patterns moeten kloppen.
648func Merge(ctx context.Context, gitBin, bare, work, source, target, author, email, message string, role access.Role, patterns []string) error {
653func Merge(ctx context.Context, gitBin, bare, work, source, target, author, email, message string, role access.Role, patterns []string) error {
649 if err := os.RemoveAll(work); err != nil {
654 repo, env, err := prepareWork(work, author, email)
650 return err
655 if err != nil {
651 }
656 return classifyGit(err)
652 if err := os.MkdirAll(filepath.Dir(work), 0o755); err != nil {
653 return err
654 }
657 }
655 if _, err := run(ctx, gitBin, nil, "clone", bare, work); err != nil {
658 if _, err := run(ctx, gitBin, env, "clone", bare, repo); err != nil {
656 return err
659 return classifyGit(err)
657 }
660 }
658 env := append(os.Environ(),
661 if _, err := run(ctx, gitBin, env, "-C", repo, "checkout", target); err != nil {
659 "GIT_AUTHOR_NAME="+author,
662 return classifyGit(fmt.Errorf("doelbranch %s: %w", target, err))
660 "GIT_AUTHOR_EMAIL="+email,
661 "GIT_COMMITTER_NAME="+author,
662 "GIT_COMMITTER_EMAIL="+email,
663 )
664 if _, err := run(ctx, gitBin, env, "-C", work, "checkout", target); err != nil {
665 return fmt.Errorf("doelbranch %s: %w", target, err)
666 }
663 }
667 if _, err := run(ctx, gitBin, env, "-C", work, "merge", "--no-ff", "--no-edit", "-m", message, source); err != nil {
664 if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, source); err != nil {
668 return fmt.Errorf("samenvoegen lukt niet, er is een conflict of de branch ontbreekt")
665 return i18n.E("err.mergeConflict")
669 }
666 }
670 pushEnv := append(env, PushEnv(role, patterns, nil)...)
667 pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)
671 if _, err := run(ctx, gitBin, pushEnv, "-C", work, "push", "origin", target); err != nil {
668 if _, err := run(ctx, gitBin, pushEnv, "-C", repo, "push", "origin", target); err != nil {
672 return err
669 return classifyGit(err)
673 }
670 }
674 return nil
671 return nil
675}
672}
internal/gitrepo/suggest.go +96 −24
@@ -2,6 +2,7 @@ package gitrepo
2 2
3 3 import (
4 4 "context"
5 "errors"
5 6 "os"
6 7 "path/filepath"
7 8 "sort"
@@ -108,62 +109,76 @@ func ApplySuggestions(files map[string]string, edits []SuggestionEdit) (map[stri
108 109
109 110 // CommitOnBranch schrijft files op branch en pusht één commit.
110 111 // De push loopt door de hook, met role en de beschermde patronen.
112 // Een repository zonder commits krijgt deze branch als eerste commit, zonder parent.
113 // Git draait met een eigen HOME en TMPDIR onder work, niet met die van het proces:
114 // ProtectHome maakt de homedirectory onleesbaar en /tmp is niet de werkmap.
111 115 func CommitOnBranch(ctx context.Context, gitBin, bare, work, branch, author, email, title, description string, files map[string]string, role access.Role, patterns []string) error {
112 if err := os.RemoveAll(work); err != nil {
113 return err
114 }
115 if err := os.MkdirAll(filepath.Dir(work), 0o755); err != nil {
116 return err
116 repo, env, err := prepareWork(work, author, email)
117 if err != nil {
118 return classifyGit(err)
117 119 }
118 if _, err := run(ctx, gitBin, nil, "clone", bare, work); err != nil {
119 return err
120 if _, err := run(ctx, gitBin, env, "clone", bare, repo); err != nil {
121 return classifyGit(err)
120 122 }
121 if _, err := run(ctx, gitBin, nil, "-C", work, "checkout", branch); err != nil {
122 return err
123 if _, err := run(ctx, gitBin, env, "-C", repo, "rev-parse", "--verify", "--quiet", "HEAD"); err != nil {
124 if _, err := run(ctx, gitBin, env, "-C", repo, "symbolic-ref", "HEAD", "refs/heads/"+branch); err != nil {
125 return classifyGit(err)
126 }
127 } else if _, err := run(ctx, gitBin, env, "-C", repo, "checkout", branch); err != nil {
128 return classifyGit(err)
123 129 }
124 130 var paths []string
125 131 for path, body := range files {
126 132 if !safeWorkPath(path) {
127 133 return i18n.E("err.sugFile")
128 134 }
129 dst := filepath.Join(work, filepath.FromSlash(path))
135 dst := filepath.Join(repo, filepath.FromSlash(path))
130 136 if err := os.MkdirAll(filepath.Dir(dst), 0o755); err != nil {
131 return err
137 return classifyGit(err)
132 138 }
133 139 if err := os.WriteFile(dst, []byte(body), 0o644); err != nil {
134 return err
140 return classifyGit(err)
135 141 }
136 142 paths = append(paths, path)
137 143 }
138 144 sort.Strings(paths)
139 args := append([]string{"-C", work, "add", "--"}, paths...)
140 if _, err := run(ctx, gitBin, nil, args...); err != nil {
141 return err
145 args := append([]string{"-C", repo, "add", "--"}, paths...)
146 if _, err := run(ctx, gitBin, env, args...); err != nil {
147 return classifyGit(err)
142 148 }
143 env := identityEnv(author, email)
144 commit := []string{"-C", work, "-c", "commit.gpgsign=false", "commit", "-m", title}
149 commit := []string{"-C", repo, "-c", "commit.gpgsign=false", "commit", "-m", title}
145 150 if strings.TrimSpace(description) != "" {
146 151 commit = append(commit, "-m", description)
147 152 }
148 153 if _, err := run(ctx, gitBin, env, commit...); err != nil {
149 return err
154 return classifyGit(err)
150 155 }
151 pushEnv := append(env, PushEnv(role, patterns, nil)...)
152 if _, err := run(ctx, gitBin, pushEnv, "-C", work, "push", "origin", "HEAD:"+branch); err != nil {
153 return err
156 pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)
157 if _, err := run(ctx, gitBin, pushEnv, "-C", repo, "push", "origin", "HEAD:"+branch); err != nil {
158 return classifyGit(err)
154 159 }
155 160 return nil
156 161 }
157 162
158 func identityEnv(author, email string) []string {
159 env := make([]string, 0, len(os.Environ())+4)
163 // CommandEnv is de omgeving voor elke git-aanroep die een commit maakt.
164 // HOME en TMPDIR wijzen naar mappen die het proces zelf mag schrijven.
165 // Naam en e-mail staan expliciet, zodat een lege of afgeschermde identiteit niet meetelt.
166 func CommandEnv(author, email, home, tmp string) []string {
167 env := make([]string, 0, len(os.Environ())+8)
160 168 for _, e := range os.Environ() {
161 if strings.HasPrefix(e, "GIT_AUTHOR_") || strings.HasPrefix(e, "GIT_COMMITTER_") {
169 if strings.HasPrefix(e, "GIT_AUTHOR_") || strings.HasPrefix(e, "GIT_COMMITTER_") || strings.HasPrefix(e, "GIT_CONFIG") {
170 continue
171 }
172 if strings.HasPrefix(e, "HOME=") || strings.HasPrefix(e, "TMPDIR=") {
162 173 continue
163 174 }
164 175 env = append(env, e)
165 176 }
166 177 return append(env,
178 "HOME="+home,
179 "TMPDIR="+tmp,
180 "GIT_CONFIG_GLOBAL=/dev/null",
181 "GIT_CONFIG_SYSTEM=/dev/null",
167 182 "GIT_AUTHOR_NAME="+author,
168 183 "GIT_AUTHOR_EMAIL="+email,
169 184 "GIT_COMMITTER_NAME="+author,
@@ -171,6 +186,63 @@ func identityEnv(author, email string) []string {
171 186 )
172 187 }
173 188
189 // prepareWork maakt work leeg en zet er een eigen home en tmp in.
190 // De kloon komt in work/repo, zodat die mappen geen deel van de tree zijn.
191 func prepareWork(work, author, email string) (string, []string, error) {
192 if err := os.RemoveAll(work); err != nil {
193 return "", nil, err
194 }
195 if err := os.MkdirAll(work, 0o755); err != nil {
196 return "", nil, err
197 }
198 home := filepath.Join(work, "home")
199 tmp := filepath.Join(work, "tmp")
200 if err := os.MkdirAll(home, 0o700); err != nil {
201 return "", nil, err
202 }
203 if err := os.MkdirAll(tmp, 0o700); err != nil {
204 return "", nil, err
205 }
206 return filepath.Join(work, "repo"), CommandEnv(author, email, home, tmp), nil
207 }
208
209 // Cause koppelt een vertaalbare melding aan de ruwe git-tekst.
210 // Error() is de git-tekst voor het journal. Unwrap levert de vertaling.
211 func Cause(key, git string, args ...any) error {
212 return gitCause{git: git, err: i18n.E(key, args...)}
213 }
214
215 type gitCause struct {
216 git string
217 err error
218 }
219
220 func (g gitCause) Error() string { return g.git }
221 func (g gitCause) Unwrap() error { return g.err }
222
223 func classifyGit(err error) error {
224 if err == nil {
225 return nil
226 }
227 var ie i18n.Error
228 if errors.As(err, &ie) {
229 return err
230 }
231 low := strings.ToLower(err.Error())
232 switch {
233 case strings.Contains(low, "nothing to commit") || strings.Contains(low, "nothing added"):
234 return Cause("edit.same", err.Error())
235 case strings.Contains(low, "protected") || strings.Contains(low, "beschermd") || strings.Contains(low, "geschützt") || strings.Contains(low, "protégée"):
236 return Cause("edit.protected", err.Error())
237 case strings.Contains(low, "author identity") || strings.Contains(low, "user.email") || strings.Contains(low, "user.name") || strings.Contains(low, "tell me who you are"):
238 return Cause("edit.failIdentity", err.Error())
239 case strings.Contains(low, "permission denied") || strings.Contains(low, "read-only") || strings.Contains(low, "unable to access") || strings.Contains(low, "operation not permitted"):
240 return Cause("edit.failWrite", err.Error())
241 default:
242 return Cause("edit.failGit", err.Error())
243 }
244 }
245
174 246 func safeWorkPath(p string) bool {
175 247 if p == "" || strings.HasPrefix(p, "/") || strings.Contains(p, `\`) || strings.Contains(p, "..") {
176 248 return false
@@ -2,6 +2,7 @@ package gitrepo
2
2
3import (
3import (
4 "context"
4 "context"
5 "errors"
5 "os"
6 "os"
6 "path/filepath"
7 "path/filepath"
7 "sort"
8 "sort"
@@ -108,62 +109,76 @@ func ApplySuggestions(files map[string]string, edits []SuggestionEdit) (map[stri
108
109
109// CommitOnBranch schrijft files op branch en pusht één commit.
110// CommitOnBranch schrijft files op branch en pusht één commit.
110// De push loopt door de hook, met role en de beschermde patronen.
111// De push loopt door de hook, met role en de beschermde patronen.
112// Een repository zonder commits krijgt deze branch als eerste commit, zonder parent.
113// Git draait met een eigen HOME en TMPDIR onder work, niet met die van het proces:
114// ProtectHome maakt de homedirectory onleesbaar en /tmp is niet de werkmap.
111func CommitOnBranch(ctx context.Context, gitBin, bare, work, branch, author, email, title, description string, files map[string]string, role access.Role, patterns []string) error {
115func CommitOnBranch(ctx context.Context, gitBin, bare, work, branch, author, email, title, description string, files map[string]string, role access.Role, patterns []string) error {
112 if err := os.RemoveAll(work); err != nil {
116 repo, env, err := prepareWork(work, author, email)
113 return err
117 if err != nil {
114 }
118 return classifyGit(err)
115 if err := os.MkdirAll(filepath.Dir(work), 0o755); err != nil {
116 return err
117 }
119 }
118 if _, err := run(ctx, gitBin, nil, "clone", bare, work); err != nil {
120 if _, err := run(ctx, gitBin, env, "clone", bare, repo); err != nil {
119 return err
121 return classifyGit(err)
120 }
122 }
121 if _, err := run(ctx, gitBin, nil, "-C", work, "checkout", branch); err != nil {
123 if _, err := run(ctx, gitBin, env, "-C", repo, "rev-parse", "--verify", "--quiet", "HEAD"); err != nil {
122 return err
124 if _, err := run(ctx, gitBin, env, "-C", repo, "symbolic-ref", "HEAD", "refs/heads/"+branch); err != nil {
125 return classifyGit(err)
126 }
127 } else if _, err := run(ctx, gitBin, env, "-C", repo, "checkout", branch); err != nil {
128 return classifyGit(err)
123 }
129 }
124 var paths []string
130 var paths []string
125 for path, body := range files {
131 for path, body := range files {
126 if !safeWorkPath(path) {
132 if !safeWorkPath(path) {
127 return i18n.E("err.sugFile")
133 return i18n.E("err.sugFile")
128 }
134 }
129 dst := filepath.Join(work, filepath.FromSlash(path))
135 dst := filepath.Join(repo, filepath.FromSlash(path))
130 if err := os.MkdirAll(filepath.Dir(dst), 0o755); err != nil {
136 if err := os.MkdirAll(filepath.Dir(dst), 0o755); err != nil {
131 return err
137 return classifyGit(err)
132 }
138 }
133 if err := os.WriteFile(dst, []byte(body), 0o644); err != nil {
139 if err := os.WriteFile(dst, []byte(body), 0o644); err != nil {
134 return err
140 return classifyGit(err)
135 }
141 }
136 paths = append(paths, path)
142 paths = append(paths, path)
137 }
143 }
138 sort.Strings(paths)
144 sort.Strings(paths)
139 args := append([]string{"-C", work, "add", "--"}, paths...)
145 args := append([]string{"-C", repo, "add", "--"}, paths...)
140 if _, err := run(ctx, gitBin, nil, args...); err != nil {
146 if _, err := run(ctx, gitBin, env, args...); err != nil {
141 return err
147 return classifyGit(err)
142 }
148 }
143 env := identityEnv(author, email)
149 commit := []string{"-C", repo, "-c", "commit.gpgsign=false", "commit", "-m", title}
144 commit := []string{"-C", work, "-c", "commit.gpgsign=false", "commit", "-m", title}
145 if strings.TrimSpace(description) != "" {
150 if strings.TrimSpace(description) != "" {
146 commit = append(commit, "-m", description)
151 commit = append(commit, "-m", description)
147 }
152 }
148 if _, err := run(ctx, gitBin, env, commit...); err != nil {
153 if _, err := run(ctx, gitBin, env, commit...); err != nil {
149 return err
154 return classifyGit(err)
150 }
155 }
151 pushEnv := append(env, PushEnv(role, patterns, nil)...)
156 pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)
152 if _, err := run(ctx, gitBin, pushEnv, "-C", work, "push", "origin", "HEAD:"+branch); err != nil {
157 if _, err := run(ctx, gitBin, pushEnv, "-C", repo, "push", "origin", "HEAD:"+branch); err != nil {
153 return err
158 return classifyGit(err)
154 }
159 }
155 return nil
160 return nil
156}
161}
157
162
158func identityEnv(author, email string) []string {
163// CommandEnv is de omgeving voor elke git-aanroep die een commit maakt.
159 env := make([]string, 0, len(os.Environ())+4)
164// HOME en TMPDIR wijzen naar mappen die het proces zelf mag schrijven.
165// Naam en e-mail staan expliciet, zodat een lege of afgeschermde identiteit niet meetelt.
166func CommandEnv(author, email, home, tmp string) []string {
167 env := make([]string, 0, len(os.Environ())+8)
160 for _, e := range os.Environ() {
168 for _, e := range os.Environ() {
161 if strings.HasPrefix(e, "GIT_AUTHOR_") || strings.HasPrefix(e, "GIT_COMMITTER_") {
169 if strings.HasPrefix(e, "GIT_AUTHOR_") || strings.HasPrefix(e, "GIT_COMMITTER_") || strings.HasPrefix(e, "GIT_CONFIG") {
170 continue
171 }
172 if strings.HasPrefix(e, "HOME=") || strings.HasPrefix(e, "TMPDIR=") {
162 continue
173 continue
163 }
174 }
164 env = append(env, e)
175 env = append(env, e)
165 }
176 }
166 return append(env,
177 return append(env,
178 "HOME="+home,
179 "TMPDIR="+tmp,
180 "GIT_CONFIG_GLOBAL=/dev/null",
181 "GIT_CONFIG_SYSTEM=/dev/null",
167 "GIT_AUTHOR_NAME="+author,
182 "GIT_AUTHOR_NAME="+author,
168 "GIT_AUTHOR_EMAIL="+email,
183 "GIT_AUTHOR_EMAIL="+email,
169 "GIT_COMMITTER_NAME="+author,
184 "GIT_COMMITTER_NAME="+author,
@@ -171,6 +186,63 @@ func identityEnv(author, email string) []string {
171 )
186 )
172}
187}
173
188
189// prepareWork maakt work leeg en zet er een eigen home en tmp in.
190// De kloon komt in work/repo, zodat die mappen geen deel van de tree zijn.
191func prepareWork(work, author, email string) (string, []string, error) {
192 if err := os.RemoveAll(work); err != nil {
193 return "", nil, err
194 }
195 if err := os.MkdirAll(work, 0o755); err != nil {
196 return "", nil, err
197 }
198 home := filepath.Join(work, "home")
199 tmp := filepath.Join(work, "tmp")
200 if err := os.MkdirAll(home, 0o700); err != nil {
201 return "", nil, err
202 }
203 if err := os.MkdirAll(tmp, 0o700); err != nil {
204 return "", nil, err
205 }
206 return filepath.Join(work, "repo"), CommandEnv(author, email, home, tmp), nil
207}
208
209// Cause koppelt een vertaalbare melding aan de ruwe git-tekst.
210// Error() is de git-tekst voor het journal. Unwrap levert de vertaling.
211func Cause(key, git string, args ...any) error {
212 return gitCause{git: git, err: i18n.E(key, args...)}
213}
214
215type gitCause struct {
216 git string
217 err error
218}
219
220func (g gitCause) Error() string { return g.git }
221func (g gitCause) Unwrap() error { return g.err }
222
223func classifyGit(err error) error {
224 if err == nil {
225 return nil
226 }
227 var ie i18n.Error
228 if errors.As(err, &ie) {
229 return err
230 }
231 low := strings.ToLower(err.Error())
232 switch {
233 case strings.Contains(low, "nothing to commit") || strings.Contains(low, "nothing added"):
234 return Cause("edit.same", err.Error())
235 case strings.Contains(low, "protected") || strings.Contains(low, "beschermd") || strings.Contains(low, "geschützt") || strings.Contains(low, "protégée"):
236 return Cause("edit.protected", err.Error())
237 case strings.Contains(low, "author identity") || strings.Contains(low, "user.email") || strings.Contains(low, "user.name") || strings.Contains(low, "tell me who you are"):
238 return Cause("edit.failIdentity", err.Error())
239 case strings.Contains(low, "permission denied") || strings.Contains(low, "read-only") || strings.Contains(low, "unable to access") || strings.Contains(low, "operation not permitted"):
240 return Cause("edit.failWrite", err.Error())
241 default:
242 return Cause("edit.failGit", err.Error())
243 }
244}
245
174func safeWorkPath(p string) bool {
246func safeWorkPath(p string) bool {
175 if p == "" || strings.HasPrefix(p, "/") || strings.Contains(p, `\`) || strings.Contains(p, "..") {
247 if p == "" || strings.HasPrefix(p, "/") || strings.Contains(p, `\`) || strings.Contains(p, "..") {
176 return false
248 return false
internal/i18n/catalog.go +8 −0
@@ -266,9 +266,17 @@ var en = map[string]string{
266 266 "edit.same": "Nothing changed.",
267 267 "edit.saved": "Committed.",
268 268 "edit.fail": "The file could not be committed.",
269 "edit.failGit": "The file could not be committed. Git rejected the change.",
270 "edit.failWrite": "The file could not be committed. The server could not write its temporary files.",
271 "edit.failIdentity": "The file could not be committed. Git has no name or email for the author.",
272 "edit.failBranch": "The file could not be committed. That branch cannot be created from here.",
269 273 "edit.protected": "This branch is protected.",
270 274 "edit.badBranch": "That branch name cannot be used.",
271 275 "edit.needMessage": "A commit message is required.",
276 "edit.missing": "There is no blue-ci-cd.yml on this branch yet.",
277 "edit.protectedHint": "You cannot commit to this protected branch. Commit to a new branch and open a merge request.",
278 "edit.openMR": "Open a merge request",
279 "edit.configureMsg": "Add blue-ci-cd.yml",
272 280 "mail.fail.subject": "Pipeline #%d in %s failed",
273 281 "mail.fail.intro": "Pipeline #%d in %s on %s failed.",
274 282 "mail.fail.jobs": "Failed jobs",
@@ -266,9 +266,17 @@ var en = map[string]string{
266 "edit.same": "Nothing changed.",
266 "edit.same": "Nothing changed.",
267 "edit.saved": "Committed.",
267 "edit.saved": "Committed.",
268 "edit.fail": "The file could not be committed.",
268 "edit.fail": "The file could not be committed.",
269 "edit.failGit": "The file could not be committed. Git rejected the change.",
270 "edit.failWrite": "The file could not be committed. The server could not write its temporary files.",
271 "edit.failIdentity": "The file could not be committed. Git has no name or email for the author.",
272 "edit.failBranch": "The file could not be committed. That branch cannot be created from here.",
269 "edit.protected": "This branch is protected.",
273 "edit.protected": "This branch is protected.",
270 "edit.badBranch": "That branch name cannot be used.",
274 "edit.badBranch": "That branch name cannot be used.",
271 "edit.needMessage": "A commit message is required.",
275 "edit.needMessage": "A commit message is required.",
276 "edit.missing": "There is no blue-ci-cd.yml on this branch yet.",
277 "edit.protectedHint": "You cannot commit to this protected branch. Commit to a new branch and open a merge request.",
278 "edit.openMR": "Open a merge request",
279 "edit.configureMsg": "Add blue-ci-cd.yml",
272 "mail.fail.subject": "Pipeline #%d in %s failed",
280 "mail.fail.subject": "Pipeline #%d in %s failed",
273 "mail.fail.intro": "Pipeline #%d in %s on %s failed.",
281 "mail.fail.intro": "Pipeline #%d in %s on %s failed.",
274 "mail.fail.jobs": "Failed jobs",
282 "mail.fail.jobs": "Failed jobs",
internal/i18n/catalog_lang.go +24 −0
@@ -272,9 +272,17 @@ var nl = map[string]string{
272 272 "edit.same": "Er is niets gewijzigd.",
273 273 "edit.saved": "Gecommit.",
274 274 "edit.fail": "Het bestand kon niet worden gecommit.",
275 "edit.failGit": "Het bestand kon niet worden gecommit. Git weigerde de wijziging.",
276 "edit.failWrite": "Het bestand kon niet worden gecommit. De server kon zijn tijdelijke bestanden niet schrijven.",
277 "edit.failIdentity": "Het bestand kon niet worden gecommit. Git heeft geen naam of e-mail voor de auteur.",
278 "edit.failBranch": "Het bestand kon niet worden gecommit. Die branch kan vanaf hier niet worden gemaakt.",
275 279 "edit.protected": "Deze branch is beschermd.",
276 280 "edit.badBranch": "Die branchnaam kan niet.",
277 281 "edit.needMessage": "Een commitbericht is verplicht.",
282 "edit.missing": "Op deze branch staat nog geen blue-ci-cd.yml.",
283 "edit.protectedHint": "Je kunt niet naar deze beschermde branch committen. Kies een nieuwe branch en open een merge request.",
284 "edit.openMR": "Open een merge request",
285 "edit.configureMsg": "Voeg blue-ci-cd.yml toe",
278 286 "mail.fail.subject": "Pipeline #%d in %s is mislukt",
279 287 "mail.fail.intro": "Pipeline #%d in %s op %s is mislukt.",
280 288 "mail.fail.jobs": "Mislukte jobs",
@@ -874,9 +882,17 @@ var de = map[string]string{
874 882 "edit.same": "Nichts geändert.",
875 883 "edit.saved": "Committet.",
876 884 "edit.fail": "Die Datei konnte nicht committet werden.",
885 "edit.failGit": "Die Datei konnte nicht committet werden. Git hat die Änderung abgelehnt.",
886 "edit.failWrite": "Die Datei konnte nicht committet werden. Der Server konnte seine temporären Dateien nicht schreiben.",
887 "edit.failIdentity": "Die Datei konnte nicht committet werden. Git hat keinen Namen oder keine E-Mail für den Autor.",
888 "edit.failBranch": "Die Datei konnte nicht committet werden. Dieser Branch kann von hier aus nicht erstellt werden.",
877 889 "edit.protected": "Dieser Branch ist geschützt.",
878 890 "edit.badBranch": "Dieser Branchname geht nicht.",
879 891 "edit.needMessage": "Eine Commit-Nachricht ist nötig.",
892 "edit.missing": "Auf diesem Branch gibt es noch keine blue-ci-cd.yml.",
893 "edit.protectedHint": "Du kannst nicht auf diesen geschützten Branch committen. Wähle einen neuen Branch und öffne einen Merge Request.",
894 "edit.openMR": "Merge Request öffnen",
895 "edit.configureMsg": "blue-ci-cd.yml hinzufügen",
880 896 "mail.fail.subject": "Pipeline #%d in %s ist fehlgeschlagen",
881 897 "mail.fail.intro": "Pipeline #%d in %s auf %s ist fehlgeschlagen.",
882 898 "mail.fail.jobs": "Fehlgeschlagene Jobs",
@@ -1476,9 +1492,17 @@ var fr = map[string]string{
1476 1492 "edit.same": "Rien n'a changé.",
1477 1493 "edit.saved": "Commit créé.",
1478 1494 "edit.fail": "Le fichier n'a pas pu être commité.",
1495 "edit.failGit": "Le fichier n'a pas pu être commité. Git a refusé la modification.",
1496 "edit.failWrite": "Le fichier n'a pas pu être commité. Le serveur n'a pas pu écrire ses fichiers temporaires.",
1497 "edit.failIdentity": "Le fichier n'a pas pu être commité. Git n'a pas de nom ni d'adresse pour l'auteur.",
1498 "edit.failBranch": "Le fichier n'a pas pu être commité. Cette branche ne peut pas être créée d'ici.",
1479 1499 "edit.protected": "Cette branche est protégée.",
1480 1500 "edit.badBranch": "Ce nom de branche est inutilisable.",
1481 1501 "edit.needMessage": "Un message de commit est requis.",
1502 "edit.missing": "Cette branche n'a pas encore de blue-ci-cd.yml.",
1503 "edit.protectedHint": "Tu ne peux pas committer sur cette branche protégée. Choisis une nouvelle branche et ouvre une merge request.",
1504 "edit.openMR": "Ouvrir une merge request",
1505 "edit.configureMsg": "Ajouter blue-ci-cd.yml",
1482 1506 "mail.fail.subject": "Le pipeline #%d dans %s a échoué",
1483 1507 "mail.fail.intro": "Le pipeline #%d dans %s sur %s a échoué.",
1484 1508 "mail.fail.jobs": "Jobs échoués",
@@ -272,9 +272,17 @@ var nl = map[string]string{
272 "edit.same": "Er is niets gewijzigd.",
272 "edit.same": "Er is niets gewijzigd.",
273 "edit.saved": "Gecommit.",
273 "edit.saved": "Gecommit.",
274 "edit.fail": "Het bestand kon niet worden gecommit.",
274 "edit.fail": "Het bestand kon niet worden gecommit.",
275 "edit.failGit": "Het bestand kon niet worden gecommit. Git weigerde de wijziging.",
276 "edit.failWrite": "Het bestand kon niet worden gecommit. De server kon zijn tijdelijke bestanden niet schrijven.",
277 "edit.failIdentity": "Het bestand kon niet worden gecommit. Git heeft geen naam of e-mail voor de auteur.",
278 "edit.failBranch": "Het bestand kon niet worden gecommit. Die branch kan vanaf hier niet worden gemaakt.",
275 "edit.protected": "Deze branch is beschermd.",
279 "edit.protected": "Deze branch is beschermd.",
276 "edit.badBranch": "Die branchnaam kan niet.",
280 "edit.badBranch": "Die branchnaam kan niet.",
277 "edit.needMessage": "Een commitbericht is verplicht.",
281 "edit.needMessage": "Een commitbericht is verplicht.",
282 "edit.missing": "Op deze branch staat nog geen blue-ci-cd.yml.",
283 "edit.protectedHint": "Je kunt niet naar deze beschermde branch committen. Kies een nieuwe branch en open een merge request.",
284 "edit.openMR": "Open een merge request",
285 "edit.configureMsg": "Voeg blue-ci-cd.yml toe",
278 "mail.fail.subject": "Pipeline #%d in %s is mislukt",
286 "mail.fail.subject": "Pipeline #%d in %s is mislukt",
279 "mail.fail.intro": "Pipeline #%d in %s op %s is mislukt.",
287 "mail.fail.intro": "Pipeline #%d in %s op %s is mislukt.",
280 "mail.fail.jobs": "Mislukte jobs",
288 "mail.fail.jobs": "Mislukte jobs",
@@ -874,9 +882,17 @@ var de = map[string]string{
874 "edit.same": "Nichts geändert.",
882 "edit.same": "Nichts geändert.",
875 "edit.saved": "Committet.",
883 "edit.saved": "Committet.",
876 "edit.fail": "Die Datei konnte nicht committet werden.",
884 "edit.fail": "Die Datei konnte nicht committet werden.",
885 "edit.failGit": "Die Datei konnte nicht committet werden. Git hat die Änderung abgelehnt.",
886 "edit.failWrite": "Die Datei konnte nicht committet werden. Der Server konnte seine temporären Dateien nicht schreiben.",
887 "edit.failIdentity": "Die Datei konnte nicht committet werden. Git hat keinen Namen oder keine E-Mail für den Autor.",
888 "edit.failBranch": "Die Datei konnte nicht committet werden. Dieser Branch kann von hier aus nicht erstellt werden.",
877 "edit.protected": "Dieser Branch ist geschützt.",
889 "edit.protected": "Dieser Branch ist geschützt.",
878 "edit.badBranch": "Dieser Branchname geht nicht.",
890 "edit.badBranch": "Dieser Branchname geht nicht.",
879 "edit.needMessage": "Eine Commit-Nachricht ist nötig.",
891 "edit.needMessage": "Eine Commit-Nachricht ist nötig.",
892 "edit.missing": "Auf diesem Branch gibt es noch keine blue-ci-cd.yml.",
893 "edit.protectedHint": "Du kannst nicht auf diesen geschützten Branch committen. Wähle einen neuen Branch und öffne einen Merge Request.",
894 "edit.openMR": "Merge Request öffnen",
895 "edit.configureMsg": "blue-ci-cd.yml hinzufügen",
880 "mail.fail.subject": "Pipeline #%d in %s ist fehlgeschlagen",
896 "mail.fail.subject": "Pipeline #%d in %s ist fehlgeschlagen",
881 "mail.fail.intro": "Pipeline #%d in %s auf %s ist fehlgeschlagen.",
897 "mail.fail.intro": "Pipeline #%d in %s auf %s ist fehlgeschlagen.",
882 "mail.fail.jobs": "Fehlgeschlagene Jobs",
898 "mail.fail.jobs": "Fehlgeschlagene Jobs",
@@ -1476,9 +1492,17 @@ var fr = map[string]string{
1476 "edit.same": "Rien n'a changé.",
1492 "edit.same": "Rien n'a changé.",
1477 "edit.saved": "Commit créé.",
1493 "edit.saved": "Commit créé.",
1478 "edit.fail": "Le fichier n'a pas pu être commité.",
1494 "edit.fail": "Le fichier n'a pas pu être commité.",
1495 "edit.failGit": "Le fichier n'a pas pu être commité. Git a refusé la modification.",
1496 "edit.failWrite": "Le fichier n'a pas pu être commité. Le serveur n'a pas pu écrire ses fichiers temporaires.",
1497 "edit.failIdentity": "Le fichier n'a pas pu être commité. Git n'a pas de nom ni d'adresse pour l'auteur.",
1498 "edit.failBranch": "Le fichier n'a pas pu être commité. Cette branche ne peut pas être créée d'ici.",
1479 "edit.protected": "Cette branche est protégée.",
1499 "edit.protected": "Cette branche est protégée.",
1480 "edit.badBranch": "Ce nom de branche est inutilisable.",
1500 "edit.badBranch": "Ce nom de branche est inutilisable.",
1481 "edit.needMessage": "Un message de commit est requis.",
1501 "edit.needMessage": "Un message de commit est requis.",
1502 "edit.missing": "Cette branche n'a pas encore de blue-ci-cd.yml.",
1503 "edit.protectedHint": "Tu ne peux pas committer sur cette branche protégée. Choisis une nouvelle branche et ouvre une merge request.",
1504 "edit.openMR": "Ouvrir une merge request",
1505 "edit.configureMsg": "Ajouter blue-ci-cd.yml",
1482 "mail.fail.subject": "Le pipeline #%d dans %s a échoué",
1506 "mail.fail.subject": "Le pipeline #%d dans %s a échoué",
1483 "mail.fail.intro": "Le pipeline #%d dans %s sur %s a échoué.",
1507 "mail.fail.intro": "Le pipeline #%d dans %s sur %s a échoué.",
1484 "mail.fail.jobs": "Jobs échoués",
1508 "mail.fail.jobs": "Jobs échoués",
internal/server/editor.go +171 −29
@@ -2,22 +2,42 @@ package server
2 2
3 3 import (
4 4 "encoding/json"
5 "errors"
5 6 "html/template"
6 7 "net/http"
7 8 "net/url"
8 9 "os"
9 10 "os/exec"
11 "path/filepath"
12 "strconv"
10 13 "strings"
11 14
12 15 "gitlab.com/Timfa/bluegit/internal/access"
13 16 "gitlab.com/Timfa/bluegit/internal/ci"
14 17 "gitlab.com/Timfa/bluegit/internal/gitrepo"
15 18 "gitlab.com/Timfa/bluegit/internal/highlight"
19 "gitlab.com/Timfa/bluegit/internal/i18n"
20 "gitlab.com/Timfa/bluegit/internal/store"
16 21 )
17 22
18 23 const ciFile = "blue-ci-cd.yml"
19 24 const ciMaxBytes = 200_000
20 25
26 // ciTemplate is het startbestand als blue-ci-cd.yml nog niet bestaat.
27 // Alles staat in commentaar, zodat opslaan geen job en geen mislukte pipeline maakt.
28 const ciTemplate = `# blue-ci-cd.yml
29 # Uncomment the job to run it.
30 #
31 # stages:
32 # - test
33 #
34 # unit:
35 # stage: test
36 # image: alpine:3.20
37 # script:
38 # - echo hello
39 `
40
21 41 // CIEditor is de Pipeline Editor voor blue-ci-cd.yml.
22 42 type CIEditor struct {
23 43 Ref string
@@ -28,6 +48,9 @@ type CIEditor struct {
28 48 Warnings int
29 49 Status string
30 50 Class string
51 Missing bool
52 NeedsMR bool
53 Suggest string
31 54 }
32 55
33 56 // EditorLine is één gekleurde regel, met een markering als de linter daar klaagt.
@@ -60,9 +83,18 @@ func (s *Server) ciEditor(w http.ResponseWriter, r *http.Request) {
60 83 v.Rev = ref
61 84 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
62 85 s.branchList(r, &v, dir)
63 body := s.ciFileAt(r, dir, ref)
86 body, missing := s.ciFileAt(r, dir, ref)
87 if missing {
88 body = ciTemplate
89 }
64 90 model := s.ciEditorModel(r, body, s.includeFrom(r, dir, ref))
65 91 model.Ref = ref
92 model.Missing = missing
93 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
94 model.NeedsMR = access.BranchProtected(patterns, ref) && !role.CanPushBranch(true)
95 if model.NeedsMR {
96 model.Suggest = s.suggestCIBranch(r, dir, patterns)
97 }
66 98 v.Editor = model
67 99 s.render(w, "editor", v)
68 100 }
@@ -122,39 +154,71 @@ func (s *Server) saveCIEditor(w http.ResponseWriter, r *http.Request) {
122 154 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
123 155 return
124 156 }
157 openMR := r.FormValue("open_mr") == "1"
125 158 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
159 if openMR && (branch == base || access.BranchProtected(patterns, branch)) {
160 s.redirect(w, r, back, "", s.tr(r, "edit.badBranch"))
161 return
162 }
126 163 if access.BranchProtected(patterns, branch) && !role.CanPushBranch(true) {
127 164 s.redirect(w, r, back, "", s.tr(r, "edit.protected"))
128 165 return
129 166 }
130 167 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
131 if err := s.ensureBranch(r, dir, branch, base); err != nil {
132 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
133 return
134 }
135 work, err := os.MkdirTemp("", "bluegit-edit-")
168 work, err := s.scratchDir("ci-edit")
136 169 if err != nil {
137 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
170 s.redirect(w, r, back, "", s.commitProblem(r, err))
138 171 return
139 172 }
140 173 defer os.RemoveAll(work)
174 if err := s.ensureBranch(r, dir, branch, base, work); err != nil {
175 s.redirect(w, r, back, "", s.commitProblem(r, err))
176 return
177 }
141 178 email := u.Username + "@users.git.timfalken.com"
142 179 err = gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, message, "", map[string]string{ciFile: body}, role, patterns)
143 180 if err != nil {
144 low := strings.ToLower(err.Error())
145 if strings.Contains(low, "nothing to commit") || strings.Contains(low, "nothing added") {
146 s.redirect(w, r, back, "", s.tr(r, "edit.same"))
181 s.redirect(w, r, back, "", s.commitProblem(r, err))
182 return
183 }
184 if openMR {
185 number, mrErr := s.openCIMergeRequest(r, repo, u, dir, branch, base, message)
186 if mrErr != nil {
187 if s.Log != nil {
188 s.Log.Error("ci-editor-mr", "err", mrErr)
189 }
190 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
147 191 return
148 192 }
149 if s.Log != nil {
150 s.Log.Error("ci-editor", "err", err)
151 }
152 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
193 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(number, 10), s.tr(r, "flash.mrOpened"), "")
153 194 return
154 195 }
155 196 s.redirect(w, r, back, s.tr(r, "edit.saved"), "")
156 197 }
157 198
199 // openCIMergeRequest opent een merge request van branch naar target.
200 // Een open verzoek met dezelfde bronbranch wordt hergebruikt.
201 func (s *Server) openCIMergeRequest(r *http.Request, repo store.Repo, author store.User, dir, branch, target, title string) (int64, error) {
202 existing, err := s.Store.OpenMergeRequestsBySource(r.Context(), repo.ID, branch)
203 if err != nil {
204 return 0, err
205 }
206 if len(existing) > 0 {
207 return existing[0].Number, nil
208 }
209 mr, err := s.Store.CreateMergeRequest(r.Context(), repo.ID, author.ID, title, "", branch, target)
210 if err != nil {
211 return 0, err
212 }
213 num := strconv.FormatInt(mr.Number, 10)
214 if sha := gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "refs/heads/"+branch); sha != "" {
215 s.startOneMergePipeline(r.Context(), repo, sha, author.Username, "", mr)
216 }
217 s.Dispatch(repo.ID, pushEvent(repo, "merge_request", target, "", author.Username, s.tr(r, "hook.mr", num, mr.Title), repoURL(repo)+"/-/merge-requests/"+num))
218 s.recordContribution(author.ID, repo.ID, "merge_request", mrRef(mr.ID), mr.CreatedAt)
219 return mr.Number, nil
220 }
221
158 222 func (s *Server) ciEditorModel(r *http.Request, body string, read func(string) ([]byte, error)) *CIEditor {
159 223 _, issues := ci.Lint([]byte(body), read)
160 224 bad := map[int]bool{}
@@ -209,12 +273,32 @@ func (s *Server) ciEditorModel(r *http.Request, body string, read func(string) (
209 273 }
210 274 }
211 275
212 func (s *Server) ciFileAt(r *http.Request, dir, ref string) string {
276 func (s *Server) ciFileAt(r *http.Request, dir, ref string) (string, bool) {
213 277 out, err := exec.CommandContext(r.Context(), s.Git, "-C", dir, "show", ref+":"+ciFile).Output()
214 if err != nil || len(out) > ciMaxBytes {
215 return ""
278 if err != nil {
279 return "", true
216 280 }
217 return string(out)
281 if len(out) > ciMaxBytes {
282 return "", false
283 }
284 return string(out), false
285 }
286
287 func (s *Server) suggestCIBranch(r *http.Request, dir string, patterns []string) string {
288 const base = "add-blue-ci-cd"
289 for n := 1; n < 100; n++ {
290 name := base
291 if n > 1 {
292 name = base + "-" + strconv.Itoa(n)
293 }
294 if access.BranchProtected(patterns, name) {
295 continue
296 }
297 if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+name) == "" {
298 return name
299 }
300 }
301 return base
218 302 }
219 303
220 304 func (s *Server) includeFrom(r *http.Request, dir, ref string) func(string) ([]byte, error) {
@@ -226,21 +310,79 @@ func (s *Server) includeFrom(r *http.Request, dir, ref string) func(string) ([]b
226 310 }
227 311 }
228 312
229 func (s *Server) ensureBranch(r *http.Request, dir, branch, base string) error {
230 if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+branch) != "" {
231 return nil
313 func (s *Server) ensureBranch(r *http.Request, dir, branch, base, work string) error {
314 home := filepath.Join(work, "home")
315 if err := os.MkdirAll(home, 0o700); err != nil {
316 return gitrepo.Cause("edit.failWrite", err.Error())
232 317 }
233 if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+base) == "" {
234 return os.ErrNotExist
318 env := gitrepo.CommandEnv("bluegit", "bluegit@users.git.timfalken.com", home, home)
319 if s.gitEnv(r, dir, env, "rev-parse", "--verify", "--quiet", "refs/heads/"+branch) != "" {
320 return nil
235 321 }
236 cmd := exec.CommandContext(r.Context(), s.Git, "-C", dir, "branch", branch, base)
237 if out, err := cmd.CombinedOutput(); err != nil {
238 if s.Log != nil {
239 s.Log.Error("ci-branch", "err", err, "out", string(out))
322 if s.gitEnv(r, dir, env, "rev-parse", "--verify", "--quiet", "refs/heads/"+base) != "" {
323 cmd := exec.CommandContext(r.Context(), s.Git, "-C", dir, "branch", branch, base)
324 cmd.Env = env
325 if out, err := cmd.CombinedOutput(); err != nil {
326 return gitrepo.Cause("edit.failBranch", strings.TrimSpace(string(out)))
240 327 }
241 return err
328 return nil
329 }
330 // Nog geen enkele commit. De gekozen branch wordt de eerste, zonder parent.
331 // Een beheerder, ook de eigenaar, mag dat ook op een beschermde branch.
332 if s.gitEnv(r, dir, env, "rev-parse", "--verify", "--quiet", "HEAD") == "" {
333 return nil
334 }
335 return i18n.E("edit.failBranch")
336 }
337
338 func (s *Server) gitEnv(r *http.Request, dir string, env []string, args ...string) string {
339 bin := s.Git
340 if bin == "" {
341 bin = "git"
342 }
343 cmd := exec.CommandContext(r.Context(), bin, append([]string{"-C", dir}, args...)...)
344 cmd.Env = env
345 out, err := cmd.Output()
346 if err != nil {
347 return ""
348 }
349 return strings.TrimSpace(string(out))
350 }
351
352 // scratchDir is een werkmap onder de state (/var/lib/bluegit/tmp of STATE_DIRECTORY).
353 // /tmp en de homedirectory van de service zijn dat niet: ProtectSystem en ProtectHome sluiten die.
354 func (s *Server) scratchDir(prefix string) (string, error) {
355 root := strings.TrimSpace(s.StateDir)
356 if root == "" {
357 root = strings.TrimSpace(os.Getenv("STATE_DIRECTORY"))
358 }
359 if root == "" {
360 root = strings.TrimSpace(s.StoragePath())
361 }
362 if root == "" {
363 return "", i18n.E("edit.failWrite")
364 }
365 dir := filepath.Join(root, "tmp")
366 if err := os.MkdirAll(dir, 0o750); err != nil {
367 return "", gitrepo.Cause("edit.failWrite", err.Error())
368 }
369 d, err := os.MkdirTemp(dir, prefix+"-")
370 if err != nil {
371 return "", gitrepo.Cause("edit.failWrite", err.Error())
372 }
373 return d, nil
374 }
375
376 // commitProblem logt de ruwe git-fout en geeft de vertaalde reden voor de pagina.
377 func (s *Server) commitProblem(r *http.Request, err error) string {
378 if err != nil && s.Log != nil {
379 s.Log.Error("git-commit", "err", err)
380 }
381 var ie i18n.Error
382 if errors.As(err, &ie) {
383 return s.trErr(r, err)
242 384 }
243 return nil
385 return s.tr(r, "edit.failGit")
244 386 }
245 387
246 388 func validBranchName(s string) bool {
@@ -2,22 +2,42 @@ package server
2
2
3import (
3import (
4 "encoding/json"
4 "encoding/json"
5 "errors"
5 "html/template"
6 "html/template"
6 "net/http"
7 "net/http"
7 "net/url"
8 "net/url"
8 "os"
9 "os"
9 "os/exec"
10 "os/exec"
11 "path/filepath"
12 "strconv"
10 "strings"
13 "strings"
11
14
12 "gitlab.com/Timfa/bluegit/internal/access"
15 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/ci"
16 "gitlab.com/Timfa/bluegit/internal/ci"
14 "gitlab.com/Timfa/bluegit/internal/gitrepo"
17 "gitlab.com/Timfa/bluegit/internal/gitrepo"
15 "gitlab.com/Timfa/bluegit/internal/highlight"
18 "gitlab.com/Timfa/bluegit/internal/highlight"
19 "gitlab.com/Timfa/bluegit/internal/i18n"
20 "gitlab.com/Timfa/bluegit/internal/store"
16)
21)
17
22
18const ciFile = "blue-ci-cd.yml"
23const ciFile = "blue-ci-cd.yml"
19const ciMaxBytes = 200_000
24const ciMaxBytes = 200_000
20
25
26// ciTemplate is het startbestand als blue-ci-cd.yml nog niet bestaat.
27// Alles staat in commentaar, zodat opslaan geen job en geen mislukte pipeline maakt.
28const ciTemplate = `# blue-ci-cd.yml
29# Uncomment the job to run it.
30#
31# stages:
32# - test
33#
34# unit:
35# stage: test
36# image: alpine:3.20
37# script:
38# - echo hello
39`
40
21// CIEditor is de Pipeline Editor voor blue-ci-cd.yml.
41// CIEditor is de Pipeline Editor voor blue-ci-cd.yml.
22type CIEditor struct {
42type CIEditor struct {
23 Ref string
43 Ref string
@@ -28,6 +48,9 @@ type CIEditor struct {
28 Warnings int
48 Warnings int
29 Status string
49 Status string
30 Class string
50 Class string
51 Missing bool
52 NeedsMR bool
53 Suggest string
31}
54}
32
55
33// EditorLine is één gekleurde regel, met een markering als de linter daar klaagt.
56// EditorLine is één gekleurde regel, met een markering als de linter daar klaagt.
@@ -60,9 +83,18 @@ func (s *Server) ciEditor(w http.ResponseWriter, r *http.Request) {
60 v.Rev = ref
83 v.Rev = ref
61 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
84 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
62 s.branchList(r, &v, dir)
85 s.branchList(r, &v, dir)
63 body := s.ciFileAt(r, dir, ref)
86 body, missing := s.ciFileAt(r, dir, ref)
87 if missing {
88 body = ciTemplate
89 }
64 model := s.ciEditorModel(r, body, s.includeFrom(r, dir, ref))
90 model := s.ciEditorModel(r, body, s.includeFrom(r, dir, ref))
65 model.Ref = ref
91 model.Ref = ref
92 model.Missing = missing
93 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
94 model.NeedsMR = access.BranchProtected(patterns, ref) && !role.CanPushBranch(true)
95 if model.NeedsMR {
96 model.Suggest = s.suggestCIBranch(r, dir, patterns)
97 }
66 v.Editor = model
98 v.Editor = model
67 s.render(w, "editor", v)
99 s.render(w, "editor", v)
68}
100}
@@ -122,39 +154,71 @@ func (s *Server) saveCIEditor(w http.ResponseWriter, r *http.Request) {
122 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
154 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
123 return
155 return
124 }
156 }
157 openMR := r.FormValue("open_mr") == "1"
125 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
158 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
159 if openMR && (branch == base || access.BranchProtected(patterns, branch)) {
160 s.redirect(w, r, back, "", s.tr(r, "edit.badBranch"))
161 return
162 }
126 if access.BranchProtected(patterns, branch) && !role.CanPushBranch(true) {
163 if access.BranchProtected(patterns, branch) && !role.CanPushBranch(true) {
127 s.redirect(w, r, back, "", s.tr(r, "edit.protected"))
164 s.redirect(w, r, back, "", s.tr(r, "edit.protected"))
128 return
165 return
129 }
166 }
130 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
167 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
131 if err := s.ensureBranch(r, dir, branch, base); err != nil {
168 work, err := s.scratchDir("ci-edit")
132 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
133 return
134 }
135 work, err := os.MkdirTemp("", "bluegit-edit-")
136 if err != nil {
169 if err != nil {
137 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
170 s.redirect(w, r, back, "", s.commitProblem(r, err))
138 return
171 return
139 }
172 }
140 defer os.RemoveAll(work)
173 defer os.RemoveAll(work)
174 if err := s.ensureBranch(r, dir, branch, base, work); err != nil {
175 s.redirect(w, r, back, "", s.commitProblem(r, err))
176 return
177 }
141 email := u.Username + "@users.git.timfalken.com"
178 email := u.Username + "@users.git.timfalken.com"
142 err = gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, message, "", map[string]string{ciFile: body}, role, patterns)
179 err = gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, message, "", map[string]string{ciFile: body}, role, patterns)
143 if err != nil {
180 if err != nil {
144 low := strings.ToLower(err.Error())
181 s.redirect(w, r, back, "", s.commitProblem(r, err))
145 if strings.Contains(low, "nothing to commit") || strings.Contains(low, "nothing added") {
182 return
146 s.redirect(w, r, back, "", s.tr(r, "edit.same"))
183 }
184 if openMR {
185 number, mrErr := s.openCIMergeRequest(r, repo, u, dir, branch, base, message)
186 if mrErr != nil {
187 if s.Log != nil {
188 s.Log.Error("ci-editor-mr", "err", mrErr)
189 }
190 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
147 return
191 return
148 }
192 }
149 if s.Log != nil {
193 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(number, 10), s.tr(r, "flash.mrOpened"), "")
150 s.Log.Error("ci-editor", "err", err)
151 }
152 s.redirect(w, r, back, "", s.tr(r, "edit.fail"))
153 return
194 return
154 }
195 }
155 s.redirect(w, r, back, s.tr(r, "edit.saved"), "")
196 s.redirect(w, r, back, s.tr(r, "edit.saved"), "")
156}
197}
157
198
199// openCIMergeRequest opent een merge request van branch naar target.
200// Een open verzoek met dezelfde bronbranch wordt hergebruikt.
201func (s *Server) openCIMergeRequest(r *http.Request, repo store.Repo, author store.User, dir, branch, target, title string) (int64, error) {
202 existing, err := s.Store.OpenMergeRequestsBySource(r.Context(), repo.ID, branch)
203 if err != nil {
204 return 0, err
205 }
206 if len(existing) > 0 {
207 return existing[0].Number, nil
208 }
209 mr, err := s.Store.CreateMergeRequest(r.Context(), repo.ID, author.ID, title, "", branch, target)
210 if err != nil {
211 return 0, err
212 }
213 num := strconv.FormatInt(mr.Number, 10)
214 if sha := gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "refs/heads/"+branch); sha != "" {
215 s.startOneMergePipeline(r.Context(), repo, sha, author.Username, "", mr)
216 }
217 s.Dispatch(repo.ID, pushEvent(repo, "merge_request", target, "", author.Username, s.tr(r, "hook.mr", num, mr.Title), repoURL(repo)+"/-/merge-requests/"+num))
218 s.recordContribution(author.ID, repo.ID, "merge_request", mrRef(mr.ID), mr.CreatedAt)
219 return mr.Number, nil
220}
221
158func (s *Server) ciEditorModel(r *http.Request, body string, read func(string) ([]byte, error)) *CIEditor {
222func (s *Server) ciEditorModel(r *http.Request, body string, read func(string) ([]byte, error)) *CIEditor {
159 _, issues := ci.Lint([]byte(body), read)
223 _, issues := ci.Lint([]byte(body), read)
160 bad := map[int]bool{}
224 bad := map[int]bool{}
@@ -209,12 +273,32 @@ func (s *Server) ciEditorModel(r *http.Request, body string, read func(string) (
209 }
273 }
210}
274}
211
275
212func (s *Server) ciFileAt(r *http.Request, dir, ref string) string {
276func (s *Server) ciFileAt(r *http.Request, dir, ref string) (string, bool) {
213 out, err := exec.CommandContext(r.Context(), s.Git, "-C", dir, "show", ref+":"+ciFile).Output()
277 out, err := exec.CommandContext(r.Context(), s.Git, "-C", dir, "show", ref+":"+ciFile).Output()
214 if err != nil || len(out) > ciMaxBytes {
278 if err != nil {
215 return ""
279 return "", true
216 }
280 }
217 return string(out)
281 if len(out) > ciMaxBytes {
282 return "", false
283 }
284 return string(out), false
285}
286
287func (s *Server) suggestCIBranch(r *http.Request, dir string, patterns []string) string {
288 const base = "add-blue-ci-cd"
289 for n := 1; n < 100; n++ {
290 name := base
291 if n > 1 {
292 name = base + "-" + strconv.Itoa(n)
293 }
294 if access.BranchProtected(patterns, name) {
295 continue
296 }
297 if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+name) == "" {
298 return name
299 }
300 }
301 return base
218}
302}
219
303
220func (s *Server) includeFrom(r *http.Request, dir, ref string) func(string) ([]byte, error) {
304func (s *Server) includeFrom(r *http.Request, dir, ref string) func(string) ([]byte, error) {
@@ -226,21 +310,79 @@ func (s *Server) includeFrom(r *http.Request, dir, ref string) func(string) ([]b
226 }
310 }
227}
311}
228
312
229func (s *Server) ensureBranch(r *http.Request, dir, branch, base string) error {
313func (s *Server) ensureBranch(r *http.Request, dir, branch, base, work string) error {
230 if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+branch) != "" {
314 home := filepath.Join(work, "home")
231 return nil
315 if err := os.MkdirAll(home, 0o700); err != nil {
316 return gitrepo.Cause("edit.failWrite", err.Error())
232 }
317 }
233 if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+base) == "" {
318 env := gitrepo.CommandEnv("bluegit", "bluegit@users.git.timfalken.com", home, home)
234 return os.ErrNotExist
319 if s.gitEnv(r, dir, env, "rev-parse", "--verify", "--quiet", "refs/heads/"+branch) != "" {
320 return nil
235 }
321 }
236 cmd := exec.CommandContext(r.Context(), s.Git, "-C", dir, "branch", branch, base)
322 if s.gitEnv(r, dir, env, "rev-parse", "--verify", "--quiet", "refs/heads/"+base) != "" {
237 if out, err := cmd.CombinedOutput(); err != nil {
323 cmd := exec.CommandContext(r.Context(), s.Git, "-C", dir, "branch", branch, base)
238 if s.Log != nil {
324 cmd.Env = env
239 s.Log.Error("ci-branch", "err", err, "out", string(out))
325 if out, err := cmd.CombinedOutput(); err != nil {
326 return gitrepo.Cause("edit.failBranch", strings.TrimSpace(string(out)))
240 }
327 }
241 return err
328 return nil
329 }
330 // Nog geen enkele commit. De gekozen branch wordt de eerste, zonder parent.
331 // Een beheerder, ook de eigenaar, mag dat ook op een beschermde branch.
332 if s.gitEnv(r, dir, env, "rev-parse", "--verify", "--quiet", "HEAD") == "" {
333 return nil
334 }
335 return i18n.E("edit.failBranch")
336}
337
338func (s *Server) gitEnv(r *http.Request, dir string, env []string, args ...string) string {
339 bin := s.Git
340 if bin == "" {
341 bin = "git"
342 }
343 cmd := exec.CommandContext(r.Context(), bin, append([]string{"-C", dir}, args...)...)
344 cmd.Env = env
345 out, err := cmd.Output()
346 if err != nil {
347 return ""
348 }
349 return strings.TrimSpace(string(out))
350}
351
352// scratchDir is een werkmap onder de state (/var/lib/bluegit/tmp of STATE_DIRECTORY).
353// /tmp en de homedirectory van de service zijn dat niet: ProtectSystem en ProtectHome sluiten die.
354func (s *Server) scratchDir(prefix string) (string, error) {
355 root := strings.TrimSpace(s.StateDir)
356 if root == "" {
357 root = strings.TrimSpace(os.Getenv("STATE_DIRECTORY"))
358 }
359 if root == "" {
360 root = strings.TrimSpace(s.StoragePath())
361 }
362 if root == "" {
363 return "", i18n.E("edit.failWrite")
364 }
365 dir := filepath.Join(root, "tmp")
366 if err := os.MkdirAll(dir, 0o750); err != nil {
367 return "", gitrepo.Cause("edit.failWrite", err.Error())
368 }
369 d, err := os.MkdirTemp(dir, prefix+"-")
370 if err != nil {
371 return "", gitrepo.Cause("edit.failWrite", err.Error())
372 }
373 return d, nil
374}
375
376// commitProblem logt de ruwe git-fout en geeft de vertaalde reden voor de pagina.
377func (s *Server) commitProblem(r *http.Request, err error) string {
378 if err != nil && s.Log != nil {
379 s.Log.Error("git-commit", "err", err)
380 }
381 var ie i18n.Error
382 if errors.As(err, &ie) {
383 return s.trErr(r, err)
242 }
384 }
243 return nil
385 return s.tr(r, "edit.failGit")
244}
386}
245
387
246func validBranchName(s string) bool {
388func validBranchName(s string) bool {
internal/server/editor_test.go +272 −0
@@ -6,6 +6,7 @@ import (
6 6 "net/http/cookiejar"
7 7 "net/http/httptest"
8 8 "net/url"
9 "os"
9 10 "os/exec"
10 11 "path/filepath"
11 12 "strings"
@@ -163,3 +164,274 @@ func TestPipelineEditorAndProtectedBranch(t *testing.T) {
163 164 t.Fatalf("master veranderde:\n%s", got)
164 165 }
165 166 }
167
168 func TestPipelineEditorMissingFile(t *testing.T) {
169 if _, err := exec.LookPath("git"); err != nil {
170 t.Skip("git ontbreekt")
171 }
172 storage := t.TempDir()
173 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
174 if err != nil {
175 t.Fatal(err)
176 }
177 t.Cleanup(func() { _ = st.Close() })
178 cfg := config.Config{
179 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
180 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
181 Git: config.Git{Binary: "git", DefaultBranch: "master"},
182 }
183 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
184 ts := httptest.NewServer(srv.Handler())
185 t.Cleanup(ts.Close)
186 jar, _ := cookiejar.New(nil)
187 tim := &http.Client{Jar: jar}
188 res, err := tim.Get(ts.URL + "/login")
189 if err != nil {
190 t.Fatal(err)
191 }
192 page := read(t, res)
193 res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{
194 "csrf": {csrfOf(t, page)}, "name": {"leeg"}, "visibility": {"public"},
195 })
196 if err != nil {
197 t.Fatal(err)
198 }
199 page = read(t, res)
200 res, err = tim.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
201 if err != nil {
202 t.Fatal(err)
203 }
204 token := between(read(t, res), `<p class="code">`, "</p>")
205 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/leeg.git"
206 work := t.TempDir()
207 git(t, work, "init", "-b", "master")
208 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
209 git(t, work, "config", "user.name", "tim")
210 writeFile(t, filepath.Join(work, "README.md"), "leeg\n")
211 git(t, work, "add", "README.md")
212 git(t, work, "commit", "-m", "leesmij")
213 git(t, work, "remote", "add", "origin", remote)
214 git(t, work, "push", "-u", "origin", "master")
215
216 res, err = tim.Get(ts.URL + "/tim/leeg/-/ci/editor")
217 if err != nil {
218 t.Fatal(err)
219 }
220 editor := read(t, res)
221 for _, want := range []string{"echo hello", "No issues found", "There is no blue-ci-cd.yml on this branch yet.", `value="Add blue-ci-cd.yml"`, `name="branch" value="master"`} {
222 if !strings.Contains(editor, want) {
223 t.Errorf("editor mist %q", want)
224 }
225 }
226 if strings.Contains(editor, "must be a mapping") || strings.Contains(editor, `name="open_mr"`) {
227 t.Fatalf("beheerder ziet een fout of een merge-request:\n%s", editor)
228 }
229
230 ctx := res.Request.Context()
231 repo, err := st.RepoByPath(ctx, "tim", "leeg")
232 if err != nil {
233 t.Fatal(err)
234 }
235 ada, err := st.UpsertUser(ctx, 3, "ada", "", false)
236 if err != nil {
237 t.Fatal(err)
238 }
239 if err := st.SetMember(ctx, "repo", repo.ID, "ada", "developer"); err != nil {
240 t.Fatal(err)
241 }
242 adaC := clientAs(t, ts.URL, st, ada.ID)
243 res, err = adaC.Get(ts.URL + "/tim/leeg/-/ci/editor?ref=master")
244 if err != nil {
245 t.Fatal(err)
246 }
247 adaPage := read(t, res)
248 for _, want := range []string{`name="open_mr" value="1" checked`, `name="branch" value="add-blue-ci-cd"`, "You cannot commit to this protected branch."} {
249 if !strings.Contains(adaPage, want) {
250 t.Errorf("ada mist %q\n%s", want, adaPage)
251 }
252 }
253
254 dir := gitrepo.Dir(storage, "tim", "leeg")
255 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
256 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"master"}, "message": {"ada op master"}, "body": {ciTemplate},
257 })
258 if err != nil {
259 t.Fatal(err)
260 }
261 denied := read(t, res)
262 if !strings.Contains(denied, "This branch is protected.") {
263 t.Fatalf("beschermd:\n%s", denied)
264 }
265 if _, err := gitOut(dir, "cat-file", "-e", "master:blue-ci-cd.yml"); err == nil {
266 t.Fatal("master kreeg toch een ci-bestand")
267 }
268
269 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
270 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"master"}, "open_mr": {"1"}, "message": {"ada op master"}, "body": {ciTemplate},
271 })
272 if err != nil {
273 t.Fatal(err)
274 }
275 bad := read(t, res)
276 if !strings.Contains(bad, "That branch name cannot be used.") {
277 t.Fatalf("zelfde branch:\n%s", bad)
278 }
279
280 job := "stages:\n - test\nunit:\n stage: test\n image: alpine:3.20\n script:\n - echo from-ada\n"
281 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
282 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"add-blue-ci-cd"}, "open_mr": {"1"}, "message": {"ada voegt ci toe"}, "body": {job},
283 })
284 if err != nil {
285 t.Fatal(err)
286 }
287 opened := read(t, res)
288 if !strings.Contains(opened, "Merge request opened") || !strings.Contains(opened, "ada voegt ci toe") {
289 t.Fatalf("merge request:\n%s", opened)
290 }
291 if got := mustGit(t, dir, "show", "add-blue-ci-cd:blue-ci-cd.yml"); !strings.Contains(got, "echo from-ada") {
292 t.Fatalf("nieuwe branch: %s", got)
293 }
294 if _, err := gitOut(dir, "cat-file", "-e", "master:blue-ci-cd.yml"); err == nil {
295 t.Fatal("master kreeg het bestand via de merge request")
296 }
297
298 res, err = tim.Get(ts.URL + "/tim/leeg/-/ci/editor?ref=master")
299 if err != nil {
300 t.Fatal(err)
301 }
302 again := read(t, res)
303 res, err = tim.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
304 "csrf": {csrfOf(t, again)}, "base": {"master"}, "branch": {"master"}, "message": {"Add blue-ci-cd.yml"}, "body": {ciTemplate},
305 })
306 if err != nil {
307 t.Fatal(err)
308 }
309 saved := read(t, res)
310 if !strings.Contains(saved, "Committed.") {
311 t.Fatalf("opslaan:\n%s", saved)
312 }
313 if got := mustGit(t, dir, "show", "master:blue-ci-cd.yml"); !strings.Contains(got, "echo hello") {
314 t.Fatalf("master: %s", got)
315 }
316 }
317
318 func TestPipelineEditorEmptyRepo(t *testing.T) {
319 if _, err := exec.LookPath("git"); err != nil {
320 t.Skip("git ontbreekt")
321 }
322 storage := t.TempDir()
323 state := t.TempDir()
324 home := t.TempDir()
325 if err := os.WriteFile(filepath.Join(home, "secret"), []byte("x\n"), 0o644); err != nil {
326 t.Fatal(err)
327 }
328 if err := os.Chmod(home, 0o555); err != nil {
329 t.Fatal(err)
330 }
331 t.Cleanup(func() { _ = os.Chmod(home, 0o755) })
332 t.Setenv("HOME", home)
333 t.Setenv("TMPDIR", home)
334 t.Setenv("GIT_AUTHOR_NAME", "hostile")
335 t.Setenv("GIT_AUTHOR_EMAIL", "hostile@example.com")
336 t.Setenv("GIT_COMMITTER_NAME", "hostile")
337 t.Setenv("GIT_COMMITTER_EMAIL", "hostile@example.com")
338
339 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
340 if err != nil {
341 t.Fatal(err)
342 }
343 t.Cleanup(func() { _ = st.Close() })
344 cfg := config.Config{
345 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
346 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
347 Git: config.Git{Binary: "git", DefaultBranch: "master"},
348 }
349 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: state}
350 ts := httptest.NewServer(srv.Handler())
351 t.Cleanup(ts.Close)
352 jar, _ := cookiejar.New(nil)
353 tim := &http.Client{Jar: jar}
354 res, err := tim.Get(ts.URL + "/login")
355 if err != nil {
356 t.Fatal(err)
357 }
358 page := read(t, res)
359 res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{
360 "csrf": {csrfOf(t, page)}, "name": {"leeg"}, "visibility": {"public"},
361 })
362 if err != nil {
363 t.Fatal(err)
364 }
365 _ = read(t, res)
366
367 res, err = tim.Get(ts.URL + "/tim/leeg/-/ci/editor")
368 if err != nil {
369 t.Fatal(err)
370 }
371 editor := read(t, res)
372 for _, want := range []string{"There is no blue-ci-cd.yml on this branch yet.", "No issues found", `name="branch" value="master"`} {
373 if !strings.Contains(editor, want) {
374 t.Errorf("editor mist %q", want)
375 }
376 }
377 if strings.Contains(editor, `name="open_mr"`) {
378 t.Fatal("eigenaar ziet een merge-request op master")
379 }
380 job := "image: alpine:latest\nbuild:\n stage: build\n script:\n - echo from-owner\n"
381 res, err = tim.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
382 "csrf": {csrfOf(t, editor)}, "base": {"master"}, "branch": {"master"}, "message": {"Add blue-ci-cd.yml"}, "body": {job},
383 })
384 if err != nil {
385 t.Fatal(err)
386 }
387 saved := read(t, res)
388 if !strings.Contains(saved, "Committed.") || strings.Contains(saved, "could not be committed") {
389 t.Fatalf("lege repo:\n%s", saved)
390 }
391 dir := gitrepo.Dir(storage, "tim", "leeg")
392 if got := mustGit(t, dir, "show", "master:blue-ci-cd.yml"); !strings.Contains(got, "echo from-owner") {
393 t.Fatalf("bestand: %s", got)
394 }
395 if who := strings.TrimSpace(mustGit(t, dir, "log", "-1", "--format=%an %ae", "master")); who != "tim tim@users.git.timfalken.com" {
396 t.Fatalf("identiteit %q", who)
397 }
398 if _, err := exec.Command("git", "--git-dir", dir, "rev-parse", "--verify", "master^").CombinedOutput(); err == nil {
399 t.Fatal("eerste commit heeft een parent")
400 }
401 scratch := filepath.Join(state, "tmp")
402 if _, err := os.Stat(scratch); err != nil {
403 t.Fatalf("werkmap niet onder de state: %v", err)
404 }
405
406 ctx := res.Request.Context()
407 repo, err := st.RepoByPath(ctx, "tim", "leeg")
408 if err != nil {
409 t.Fatal(err)
410 }
411 ada, err := st.UpsertUser(ctx, 3, "ada", "", false)
412 if err != nil {
413 t.Fatal(err)
414 }
415 if err := st.SetMember(ctx, "repo", repo.ID, "ada", "developer"); err != nil {
416 t.Fatal(err)
417 }
418 adaC := clientAs(t, ts.URL, st, ada.ID)
419 res, err = adaC.Get(ts.URL + "/tim/leeg/-/ci/editor?ref=master")
420 if err != nil {
421 t.Fatal(err)
422 }
423 adaPage := read(t, res)
424 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
425 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"master"}, "message": {"ada op master"}, "body": {job + "\n"},
426 })
427 if err != nil {
428 t.Fatal(err)
429 }
430 denied := read(t, res)
431 if !strings.Contains(denied, "This branch is protected.") {
432 t.Fatalf("beschermd:\n%s", denied)
433 }
434 if strings.Contains(mustGit(t, dir, "show", "master:blue-ci-cd.yml"), "ada op master") {
435 t.Fatal("developer veranderde master")
436 }
437 }
@@ -6,6 +6,7 @@ import (
6 "net/http/cookiejar"
6 "net/http/cookiejar"
7 "net/http/httptest"
7 "net/http/httptest"
8 "net/url"
8 "net/url"
9 "os"
9 "os/exec"
10 "os/exec"
10 "path/filepath"
11 "path/filepath"
11 "strings"
12 "strings"
@@ -163,3 +164,274 @@ func TestPipelineEditorAndProtectedBranch(t *testing.T) {
163 t.Fatalf("master veranderde:\n%s", got)
164 t.Fatalf("master veranderde:\n%s", got)
164 }
165 }
165}
166}
167
168func TestPipelineEditorMissingFile(t *testing.T) {
169 if _, err := exec.LookPath("git"); err != nil {
170 t.Skip("git ontbreekt")
171 }
172 storage := t.TempDir()
173 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
174 if err != nil {
175 t.Fatal(err)
176 }
177 t.Cleanup(func() { _ = st.Close() })
178 cfg := config.Config{
179 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
180 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
181 Git: config.Git{Binary: "git", DefaultBranch: "master"},
182 }
183 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
184 ts := httptest.NewServer(srv.Handler())
185 t.Cleanup(ts.Close)
186 jar, _ := cookiejar.New(nil)
187 tim := &http.Client{Jar: jar}
188 res, err := tim.Get(ts.URL + "/login")
189 if err != nil {
190 t.Fatal(err)
191 }
192 page := read(t, res)
193 res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{
194 "csrf": {csrfOf(t, page)}, "name": {"leeg"}, "visibility": {"public"},
195 })
196 if err != nil {
197 t.Fatal(err)
198 }
199 page = read(t, res)
200 res, err = tim.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
201 if err != nil {
202 t.Fatal(err)
203 }
204 token := between(read(t, res), `<p class="code">`, "</p>")
205 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/leeg.git"
206 work := t.TempDir()
207 git(t, work, "init", "-b", "master")
208 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
209 git(t, work, "config", "user.name", "tim")
210 writeFile(t, filepath.Join(work, "README.md"), "leeg\n")
211 git(t, work, "add", "README.md")
212 git(t, work, "commit", "-m", "leesmij")
213 git(t, work, "remote", "add", "origin", remote)
214 git(t, work, "push", "-u", "origin", "master")
215
216 res, err = tim.Get(ts.URL + "/tim/leeg/-/ci/editor")
217 if err != nil {
218 t.Fatal(err)
219 }
220 editor := read(t, res)
221 for _, want := range []string{"echo hello", "No issues found", "There is no blue-ci-cd.yml on this branch yet.", `value="Add blue-ci-cd.yml"`, `name="branch" value="master"`} {
222 if !strings.Contains(editor, want) {
223 t.Errorf("editor mist %q", want)
224 }
225 }
226 if strings.Contains(editor, "must be a mapping") || strings.Contains(editor, `name="open_mr"`) {
227 t.Fatalf("beheerder ziet een fout of een merge-request:\n%s", editor)
228 }
229
230 ctx := res.Request.Context()
231 repo, err := st.RepoByPath(ctx, "tim", "leeg")
232 if err != nil {
233 t.Fatal(err)
234 }
235 ada, err := st.UpsertUser(ctx, 3, "ada", "", false)
236 if err != nil {
237 t.Fatal(err)
238 }
239 if err := st.SetMember(ctx, "repo", repo.ID, "ada", "developer"); err != nil {
240 t.Fatal(err)
241 }
242 adaC := clientAs(t, ts.URL, st, ada.ID)
243 res, err = adaC.Get(ts.URL + "/tim/leeg/-/ci/editor?ref=master")
244 if err != nil {
245 t.Fatal(err)
246 }
247 adaPage := read(t, res)
248 for _, want := range []string{`name="open_mr" value="1" checked`, `name="branch" value="add-blue-ci-cd"`, "You cannot commit to this protected branch."} {
249 if !strings.Contains(adaPage, want) {
250 t.Errorf("ada mist %q\n%s", want, adaPage)
251 }
252 }
253
254 dir := gitrepo.Dir(storage, "tim", "leeg")
255 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
256 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"master"}, "message": {"ada op master"}, "body": {ciTemplate},
257 })
258 if err != nil {
259 t.Fatal(err)
260 }
261 denied := read(t, res)
262 if !strings.Contains(denied, "This branch is protected.") {
263 t.Fatalf("beschermd:\n%s", denied)
264 }
265 if _, err := gitOut(dir, "cat-file", "-e", "master:blue-ci-cd.yml"); err == nil {
266 t.Fatal("master kreeg toch een ci-bestand")
267 }
268
269 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
270 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"master"}, "open_mr": {"1"}, "message": {"ada op master"}, "body": {ciTemplate},
271 })
272 if err != nil {
273 t.Fatal(err)
274 }
275 bad := read(t, res)
276 if !strings.Contains(bad, "That branch name cannot be used.") {
277 t.Fatalf("zelfde branch:\n%s", bad)
278 }
279
280 job := "stages:\n - test\nunit:\n stage: test\n image: alpine:3.20\n script:\n - echo from-ada\n"
281 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
282 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"add-blue-ci-cd"}, "open_mr": {"1"}, "message": {"ada voegt ci toe"}, "body": {job},
283 })
284 if err != nil {
285 t.Fatal(err)
286 }
287 opened := read(t, res)
288 if !strings.Contains(opened, "Merge request opened") || !strings.Contains(opened, "ada voegt ci toe") {
289 t.Fatalf("merge request:\n%s", opened)
290 }
291 if got := mustGit(t, dir, "show", "add-blue-ci-cd:blue-ci-cd.yml"); !strings.Contains(got, "echo from-ada") {
292 t.Fatalf("nieuwe branch: %s", got)
293 }
294 if _, err := gitOut(dir, "cat-file", "-e", "master:blue-ci-cd.yml"); err == nil {
295 t.Fatal("master kreeg het bestand via de merge request")
296 }
297
298 res, err = tim.Get(ts.URL + "/tim/leeg/-/ci/editor?ref=master")
299 if err != nil {
300 t.Fatal(err)
301 }
302 again := read(t, res)
303 res, err = tim.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
304 "csrf": {csrfOf(t, again)}, "base": {"master"}, "branch": {"master"}, "message": {"Add blue-ci-cd.yml"}, "body": {ciTemplate},
305 })
306 if err != nil {
307 t.Fatal(err)
308 }
309 saved := read(t, res)
310 if !strings.Contains(saved, "Committed.") {
311 t.Fatalf("opslaan:\n%s", saved)
312 }
313 if got := mustGit(t, dir, "show", "master:blue-ci-cd.yml"); !strings.Contains(got, "echo hello") {
314 t.Fatalf("master: %s", got)
315 }
316}
317
318func TestPipelineEditorEmptyRepo(t *testing.T) {
319 if _, err := exec.LookPath("git"); err != nil {
320 t.Skip("git ontbreekt")
321 }
322 storage := t.TempDir()
323 state := t.TempDir()
324 home := t.TempDir()
325 if err := os.WriteFile(filepath.Join(home, "secret"), []byte("x\n"), 0o644); err != nil {
326 t.Fatal(err)
327 }
328 if err := os.Chmod(home, 0o555); err != nil {
329 t.Fatal(err)
330 }
331 t.Cleanup(func() { _ = os.Chmod(home, 0o755) })
332 t.Setenv("HOME", home)
333 t.Setenv("TMPDIR", home)
334 t.Setenv("GIT_AUTHOR_NAME", "hostile")
335 t.Setenv("GIT_AUTHOR_EMAIL", "hostile@example.com")
336 t.Setenv("GIT_COMMITTER_NAME", "hostile")
337 t.Setenv("GIT_COMMITTER_EMAIL", "hostile@example.com")
338
339 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
340 if err != nil {
341 t.Fatal(err)
342 }
343 t.Cleanup(func() { _ = st.Close() })
344 cfg := config.Config{
345 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
346 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
347 Git: config.Git{Binary: "git", DefaultBranch: "master"},
348 }
349 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: state}
350 ts := httptest.NewServer(srv.Handler())
351 t.Cleanup(ts.Close)
352 jar, _ := cookiejar.New(nil)
353 tim := &http.Client{Jar: jar}
354 res, err := tim.Get(ts.URL + "/login")
355 if err != nil {
356 t.Fatal(err)
357 }
358 page := read(t, res)
359 res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{
360 "csrf": {csrfOf(t, page)}, "name": {"leeg"}, "visibility": {"public"},
361 })
362 if err != nil {
363 t.Fatal(err)
364 }
365 _ = read(t, res)
366
367 res, err = tim.Get(ts.URL + "/tim/leeg/-/ci/editor")
368 if err != nil {
369 t.Fatal(err)
370 }
371 editor := read(t, res)
372 for _, want := range []string{"There is no blue-ci-cd.yml on this branch yet.", "No issues found", `name="branch" value="master"`} {
373 if !strings.Contains(editor, want) {
374 t.Errorf("editor mist %q", want)
375 }
376 }
377 if strings.Contains(editor, `name="open_mr"`) {
378 t.Fatal("eigenaar ziet een merge-request op master")
379 }
380 job := "image: alpine:latest\nbuild:\n stage: build\n script:\n - echo from-owner\n"
381 res, err = tim.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
382 "csrf": {csrfOf(t, editor)}, "base": {"master"}, "branch": {"master"}, "message": {"Add blue-ci-cd.yml"}, "body": {job},
383 })
384 if err != nil {
385 t.Fatal(err)
386 }
387 saved := read(t, res)
388 if !strings.Contains(saved, "Committed.") || strings.Contains(saved, "could not be committed") {
389 t.Fatalf("lege repo:\n%s", saved)
390 }
391 dir := gitrepo.Dir(storage, "tim", "leeg")
392 if got := mustGit(t, dir, "show", "master:blue-ci-cd.yml"); !strings.Contains(got, "echo from-owner") {
393 t.Fatalf("bestand: %s", got)
394 }
395 if who := strings.TrimSpace(mustGit(t, dir, "log", "-1", "--format=%an %ae", "master")); who != "tim tim@users.git.timfalken.com" {
396 t.Fatalf("identiteit %q", who)
397 }
398 if _, err := exec.Command("git", "--git-dir", dir, "rev-parse", "--verify", "master^").CombinedOutput(); err == nil {
399 t.Fatal("eerste commit heeft een parent")
400 }
401 scratch := filepath.Join(state, "tmp")
402 if _, err := os.Stat(scratch); err != nil {
403 t.Fatalf("werkmap niet onder de state: %v", err)
404 }
405
406 ctx := res.Request.Context()
407 repo, err := st.RepoByPath(ctx, "tim", "leeg")
408 if err != nil {
409 t.Fatal(err)
410 }
411 ada, err := st.UpsertUser(ctx, 3, "ada", "", false)
412 if err != nil {
413 t.Fatal(err)
414 }
415 if err := st.SetMember(ctx, "repo", repo.ID, "ada", "developer"); err != nil {
416 t.Fatal(err)
417 }
418 adaC := clientAs(t, ts.URL, st, ada.ID)
419 res, err = adaC.Get(ts.URL + "/tim/leeg/-/ci/editor?ref=master")
420 if err != nil {
421 t.Fatal(err)
422 }
423 adaPage := read(t, res)
424 res, err = adaC.PostForm(ts.URL+"/tim/leeg/-/ci/editor", url.Values{
425 "csrf": {csrfOf(t, adaPage)}, "base": {"master"}, "branch": {"master"}, "message": {"ada op master"}, "body": {job + "\n"},
426 })
427 if err != nil {
428 t.Fatal(err)
429 }
430 denied := read(t, res)
431 if !strings.Contains(denied, "This branch is protected.") {
432 t.Fatalf("beschermd:\n%s", denied)
433 }
434 if strings.Contains(mustGit(t, dir, "show", "master:blue-ci-cd.yml"), "ada op master") {
435 t.Fatal("developer veranderde master")
436 }
437}
internal/server/repo_handlers.go +8 −2
@@ -2,6 +2,7 @@ package server
2 2
3 3 import (
4 4 "net/http"
5 "os"
5 6 "strconv"
6 7 "strings"
7 8
@@ -328,11 +329,16 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
328 329 }
329 330 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
330 331 before, _ := gitrepo.Refs(r.Context(), s.Git, dir)
331 work := s.StoragePath() + "/tmp/merge-" + strconv.FormatInt(mr.ID, 10)
332 work, err := s.scratchDir("merge")
333 if err != nil {
334 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))
335 return
336 }
337 defer os.RemoveAll(work)
332 338 email := u.Username + "@users.git.timfalken.com"
333 339 msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"
334 340 if err := gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns); err != nil {
335 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.trErr(r, err))
341 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))
336 342 return
337 343 }
338 344 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")
@@ -2,6 +2,7 @@ package server
2
2
3import (
3import (
4 "net/http"
4 "net/http"
5 "os"
5 "strconv"
6 "strconv"
6 "strings"
7 "strings"
7
8
@@ -328,11 +329,16 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
328 }
329 }
329 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
330 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
330 before, _ := gitrepo.Refs(r.Context(), s.Git, dir)
331 before, _ := gitrepo.Refs(r.Context(), s.Git, dir)
331 work := s.StoragePath() + "/tmp/merge-" + strconv.FormatInt(mr.ID, 10)
332 work, err := s.scratchDir("merge")
333 if err != nil {
334 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))
335 return
336 }
337 defer os.RemoveAll(work)
332 email := u.Username + "@users.git.timfalken.com"
338 email := u.Username + "@users.git.timfalken.com"
333 msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"
339 msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"
334 if err := gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns); err != nil {
340 if err := gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns); err != nil {
335 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.trErr(r, err))
341 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))
336 return
342 return
337 }
343 }
338 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")
344 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")
internal/server/suggest.go +7 −4
@@ -144,14 +144,17 @@ func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {
144 144 return
145 145 }
146 146 before, _ := gitrepo.Refs(r.Context(), s.Git, dir)
147 work := s.StoragePath() + "/tmp/suggest-" + strconv.FormatInt(mr.ID, 10)
147 work, err := s.scratchDir("suggest")
148 if err != nil {
149 s.redirect(w, r, back, "", s.commitProblem(r, err))
150 return
151 }
152 defer os.RemoveAll(work)
148 153 email := u.Username + "@users.git.timfalken.com"
149 154 if err := gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns); err != nil {
150 _ = os.RemoveAll(work)
151 s.redirect(w, r, back, "", s.trErr(r, err))
155 s.redirect(w, r, back, "", s.commitProblem(r, err))
152 156 return
153 157 }
154 _ = os.RemoveAll(work)
155 158 after, _ := gitrepo.Refs(r.Context(), s.Git, dir)
156 159 s.AfterPush(repo, u, before, after)
157 160 s.redirect(w, r, back, s.tr(r, "flash.suggestions"), "")
@@ -144,14 +144,17 @@ func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {
144 return
144 return
145 }
145 }
146 before, _ := gitrepo.Refs(r.Context(), s.Git, dir)
146 before, _ := gitrepo.Refs(r.Context(), s.Git, dir)
147 work := s.StoragePath() + "/tmp/suggest-" + strconv.FormatInt(mr.ID, 10)
147 work, err := s.scratchDir("suggest")
148 if err != nil {
149 s.redirect(w, r, back, "", s.commitProblem(r, err))
150 return
151 }
152 defer os.RemoveAll(work)
148 email := u.Username + "@users.git.timfalken.com"
153 email := u.Username + "@users.git.timfalken.com"
149 if err := gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns); err != nil {
154 if err := gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns); err != nil {
150 _ = os.RemoveAll(work)
155 s.redirect(w, r, back, "", s.commitProblem(r, err))
151 s.redirect(w, r, back, "", s.trErr(r, err))
152 return
156 return
153 }
157 }
154 _ = os.RemoveAll(work)
155 after, _ := gitrepo.Refs(r.Context(), s.Git, dir)
158 after, _ := gitrepo.Refs(r.Context(), s.Git, dir)
156 s.AfterPush(repo, u, before, after)
159 s.AfterPush(repo, u, before, after)
157 s.redirect(w, r, back, s.tr(r, "flash.suggestions"), "")
160 s.redirect(w, r, back, s.tr(r, "flash.suggestions"), "")
internal/server/templates/collab.html +5 −2
@@ -329,6 +329,7 @@
329 329 <h2>{{t "edit.title"}}</h2>
330 330 <p data-lint-status class="status {{.Editor.Class}}">{{.Editor.Status}}</p>
331 331 </div>
332 {{if .Editor.Missing}}<p class="muted">{{t "edit.missing"}}</p>{{end}}
332 333 <div class="ciedit">
333 334 <div class="ci-gutter" data-gutter>{{range .Editor.Rows}}<span{{if .Bad}} class="bad"{{end}}>{{.N}}</span>{{end}}</div>
334 335 <div class="ci-stage">
@@ -341,10 +342,12 @@
341 342 </ul>
342 343 </section>
343 344 {{if .CanWrite}}
344 <label>{{t "edit.message"}} <input name="message" required></label>
345 <label>{{t "edit.message"}} <input name="message" required{{if .Editor.Missing}} value="{{t "edit.configureMsg"}}"{{end}}></label>
346 {{if .Editor.NeedsMR}}<p class="muted">{{t "edit.protectedHint"}}</p>{{end}}
345 347 <label>{{t "edit.branch"}}
346 <input name="branch" value="{{.Editor.Ref}}" list="ci-branches" required>
348 <input name="branch" value="{{if .Editor.NeedsMR}}{{.Editor.Suggest}}{{else}}{{.Editor.Ref}}{{end}}" list="ci-branches" required>
347 349 </label>
350 {{if .Editor.NeedsMR}}<label class="row"><input type="checkbox" name="open_mr" value="1" checked> {{t "edit.openMR"}}</label>{{end}}
348 351 <datalist id="ci-branches">{{range .Branches}}<option value="{{.Name}}"></option>{{end}}</datalist>
349 352 <button type="submit">{{t "edit.save"}}</button>
350 353 {{end}}
@@ -329,6 +329,7 @@
329 <h2>{{t "edit.title"}}</h2>
329 <h2>{{t "edit.title"}}</h2>
330 <p data-lint-status class="status {{.Editor.Class}}">{{.Editor.Status}}</p>
330 <p data-lint-status class="status {{.Editor.Class}}">{{.Editor.Status}}</p>
331 </div>
331 </div>
332 {{if .Editor.Missing}}<p class="muted">{{t "edit.missing"}}</p>{{end}}
332 <div class="ciedit">
333 <div class="ciedit">
333 <div class="ci-gutter" data-gutter>{{range .Editor.Rows}}<span{{if .Bad}} class="bad"{{end}}>{{.N}}</span>{{end}}</div>
334 <div class="ci-gutter" data-gutter>{{range .Editor.Rows}}<span{{if .Bad}} class="bad"{{end}}>{{.N}}</span>{{end}}</div>
334 <div class="ci-stage">
335 <div class="ci-stage">
@@ -341,10 +342,12 @@
341 </ul>
342 </ul>
342 </section>
343 </section>
343 {{if .CanWrite}}
344 {{if .CanWrite}}
344 <label>{{t "edit.message"}} <input name="message" required></label>
345 <label>{{t "edit.message"}} <input name="message" required{{if .Editor.Missing}} value="{{t "edit.configureMsg"}}"{{end}}></label>
346 {{if .Editor.NeedsMR}}<p class="muted">{{t "edit.protectedHint"}}</p>{{end}}
345 <label>{{t "edit.branch"}}
347 <label>{{t "edit.branch"}}
346 <input name="branch" value="{{.Editor.Ref}}" list="ci-branches" required>
348 <input name="branch" value="{{if .Editor.NeedsMR}}{{.Editor.Suggest}}{{else}}{{.Editor.Ref}}{{end}}" list="ci-branches" required>
347 </label>
349 </label>
350 {{if .Editor.NeedsMR}}<label class="row"><input type="checkbox" name="open_mr" value="1" checked> {{t "edit.openMR"}}</label>{{end}}
348 <datalist id="ci-branches">{{range .Branches}}<option value="{{.Name}}"></option>{{end}}</datalist>
351 <datalist id="ci-branches">{{range .Branches}}<option value="{{.Name}}"></option>{{end}}</datalist>
349 <button type="submit">{{t "edit.save"}}</button>
352 <button type="submit">{{t "edit.save"}}</button>
350 {{end}}
353 {{end}}
packaging/bluegit.service +1 −0
@@ -7,6 +7,7 @@ Wants=network-online.target
7 7 Type=simple
8 8 User=bluegit
9 9 Group=bluegit
10 # Steve praat met de Docker-socket (root:docker). Zonder deze groep start geen job.
10 11 SupplementaryGroups=docker
11 12 EnvironmentFile=-/etc/bluegit/secret.env
12 13 ExecStart=/usr/bin/bluegit serve --config /etc/bluegit/config.yml
@@ -7,6 +7,7 @@ Wants=network-online.target
7Type=simple
7Type=simple
8User=bluegit
8User=bluegit
9Group=bluegit
9Group=bluegit
10# Steve praat met de Docker-socket (root:docker). Zonder deze groep start geen job.
10SupplementaryGroups=docker
11SupplementaryGroups=docker
11EnvironmentFile=-/etc/bluegit/secret.env
12EnvironmentFile=-/etc/bluegit/secret.env
12ExecStart=/usr/bin/bluegit serve --config /etc/bluegit/config.yml
13ExecStart=/usr/bin/bluegit serve --config /etc/bluegit/config.yml
packaging/storage.conf +2 −0
@@ -1,6 +1,8 @@
1 1 # Zet dit neer als /etc/systemd/system/bluegit.service.d/storage.conf
2 2 # vóórdat de beheerder het pad in de webinterface opslaat.
3 3 # Vervang het pad door de datadisk. Er is geen standaardpad.
4 # Geen pad onder /home of /root: ProtectHome=true houdt die bomen dicht,
5 # en ReadWritePaths zet ze niet terug. /srv/bluegit is een bruikbaar pad.
4 6 # Daarna: systemctl daemon-reload && systemctl restart bluegit
5 7 [Service]
6 8 ReadWritePaths=/pad/van/de/datadisk
@@ -1,6 +1,8 @@
1# Zet dit neer als /etc/systemd/system/bluegit.service.d/storage.conf
1# Zet dit neer als /etc/systemd/system/bluegit.service.d/storage.conf
2# vóórdat de beheerder het pad in de webinterface opslaat.
2# vóórdat de beheerder het pad in de webinterface opslaat.
3# Vervang het pad door de datadisk. Er is geen standaardpad.
3# Vervang het pad door de datadisk. Er is geen standaardpad.
4# Geen pad onder /home of /root: ProtectHome=true houdt die bomen dicht,
5# en ReadWritePaths zet ze niet terug. /srv/bluegit is een bruikbaar pad.
4# Daarna: systemctl daemon-reload && systemctl restart bluegit
6# Daarna: systemctl daemon-reload && systemctl restart bluegit
5[Service]
7[Service]
6ReadWritePaths=/pad/van/de/datadisk
8ReadWritePaths=/pad/van/de/datadisk