BlueGit

timfa bluegit

feat: publiceer de AUR lokaal en start de service bij installatie

Het lokale script deelt de PKGBUILD-logica met de CI-publicatie en
gebruikt de SSH-sleutel van de gebruiker. De install-hook zet
bluegit.service aan als de config en het clientgeheim er al zijn.

Co-authored-by: tim <tim@timfalken.com>

timfa project_87923614_bot_3aff574f6f98414b945a8799374f9092 · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
f02dd066f7c2661634df682e4aa339571d371753
Parent
558f4dff
Pipeline
Failed
7 files changed +775 −53
docs/AUR.md +10 −2
@@ -10,7 +10,7 @@ Er is één source-package, `bluegit`. Geen `-bin`. De PKGBUILD haalt de GitLab-
10 10 https://gitlab.com/Timfa/bluegit/-/archive/<commit>/bluegit-<commit>.tar.gz
11 11 ```
12 12
13 Die map heet `bluegit-<commit>`. `pkgver` is `YYYYMMDDHHMMSS` van `CI_COMMIT_TIMESTAMP` (of de klok van de job) en stijgt per push. `pkgrel` gaat terug naar 1. `_commit` is de volledige sha. Het script vult `sha256sums` met de hash van dat archief en maakt `.SRCINFO` opnieuw met `makepkg --printsrcinfo`. Draait de job als root, dan doet gebruiker `aurbuild` dat (`AUR_MAKEPKG_USER` overschrijft de naam).
13 Die map heet `bluegit-<commit>`. `pkgver` is `YYYYMMDDHHMMSS`. De CI-job neemt `CI_COMMIT_TIMESTAMP`, of anders de klok van de job. Het lokale script neemt de UTC-committertijd van de commit, zodat dezelfde sha dezelfde `pkgver` houdt. `pkgrel` gaat terug naar 1. `_commit` is de volledige sha. Het CI-script vult `sha256sums` met de hash van dat archief. Het lokale script doet hetzelfde met `updpkgsums`. Beide maken `.SRCINFO` opnieuw met `makepkg --printsrcinfo`. Draait de CI-job als root, dan doet gebruiker `aurbuild` dat (`AUR_MAKEPKG_USER` overschrijft de naam). De gedeelde functies staan in `scripts/aur-common.sh`.
14 14
15 15 De lokale `packaging/arch/PKGBUILD` blijft voor een build uit de werkboom. Die gaat niet naar de AUR.
16 16
@@ -18,7 +18,7 @@ De lokale `packaging/arch/PKGBUILD` blijft voor een build uit de werkboom. Die g
18 18
19 19 De unit is de bestaande system-unit: `User=bluegit`, `ExecStart` met `/etc/bluegit/config.yml`, `StateDirectory=bluegit` voor `/var/lib/bluegit`. Geen `systemd --user`-unit.
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` maakt bij installatie en upgrade de systeemgebruiker en de state-map aan. `post_install` doet `systemctl daemon-reload` en daarna `systemctl enable --now bluegit.service`, maar alleen als `/etc/bluegit/config.yml` er al is én het clientgeheim in `/etc/bluegit/client_secret` of als `BLUEGIT_AUTH_CLIENT_SECRET` in `/etc/bluegit/secret.env` staat. Een lege `client_secret: ""` telt niet. Ontbreekt een van beide, dan print de hook de vervolgstappen en start hij niets. `post_upgrade` herlaadt systemd en doet `systemctl try-restart bluegit.service`. `pre_remove` doet `systemctl disable --now bluegit.service`. Draait systemd niet (chroot of container), dan slaat de hook die stappen over zonder fout. `backup=('etc/bluegit/config.yml')` laat een aangepaste config staan.
22 22
23 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
@@ -37,6 +37,14 @@ Eén van de twee sleutelvariabelen is genoeg. `scripts/aur-ssh-setup.sh` haalt C
37 37
38 38 De job heet `publish:aur` in `.gitlab-ci.yml` en `publish_aur` in `blue-ci-cd.yml`. Beide draaien alleen op `master` (BlueGit ook op `main`) en hebben `allow_failure: true`, zodat een storing bij de AUR de rest van de pipeline niet rood maakt.
39 39
40 ## Lokaal publiceren
41
42 Zolang de CI-runner er niet is, publiceert `scripts/aur-publish-local.sh` met de hand vanuit een lokale checkout. Het gebruikt de AUR-sleutel in `~/.ssh` of ssh-agent, en geen CI-variabelen.
43
44 De checkout moet op `master` staan, schoon zijn en gelijk aan `origin/master`. Het script publiceert de sha van `origin/master`. Staat die sha al als `_commit` in de AUR-PKGBUILD, dan stopt het zonder iets te wijzigen.
45
46 Het clonet of werkt `ssh://aur@aur.archlinux.org/bluegit.git` bij in `~/.cache/bluegit-aur` (`BLUEGIT_AUR_CACHE` wijzigt die map), kopieert `packaging/aur/*`, zet `_commit` en `pkgver`, en draait `updpkgsums` en `makepkg --printsrcinfo`. Daarna commit het `upstream <pkgver>` en pusht het naar `master`. `updpkgsums` komt uit `pacman-contrib`.
47
40 48 ## Archief
41 49
42 50 Het archief is anoniem te downloaden:
@@ -10,7 +10,7 @@ Er is één source-package, `bluegit`. Geen `-bin`. De PKGBUILD haalt de GitLab-
10https://gitlab.com/Timfa/bluegit/-/archive/<commit>/bluegit-<commit>.tar.gz
10https://gitlab.com/Timfa/bluegit/-/archive/<commit>/bluegit-<commit>.tar.gz
11```
11```
12
12
13Die map heet `bluegit-<commit>`. `pkgver` is `YYYYMMDDHHMMSS` van `CI_COMMIT_TIMESTAMP` (of de klok van de job) en stijgt per push. `pkgrel` gaat terug naar 1. `_commit` is de volledige sha. Het script vult `sha256sums` met de hash van dat archief en maakt `.SRCINFO` opnieuw met `makepkg --printsrcinfo`. Draait de job als root, dan doet gebruiker `aurbuild` dat (`AUR_MAKEPKG_USER` overschrijft de naam).
13Die map heet `bluegit-<commit>`. `pkgver` is `YYYYMMDDHHMMSS`. De CI-job neemt `CI_COMMIT_TIMESTAMP`, of anders de klok van de job. Het lokale script neemt de UTC-committertijd van de commit, zodat dezelfde sha dezelfde `pkgver` houdt. `pkgrel` gaat terug naar 1. `_commit` is de volledige sha. Het CI-script vult `sha256sums` met de hash van dat archief. Het lokale script doet hetzelfde met `updpkgsums`. Beide maken `.SRCINFO` opnieuw met `makepkg --printsrcinfo`. Draait de CI-job als root, dan doet gebruiker `aurbuild` dat (`AUR_MAKEPKG_USER` overschrijft de naam). De gedeelde functies staan in `scripts/aur-common.sh`.
14
14
15De lokale `packaging/arch/PKGBUILD` blijft voor een build uit de werkboom. Die gaat niet naar de AUR.
15De lokale `packaging/arch/PKGBUILD` blijft voor een build uit de werkboom. Die gaat niet naar de AUR.
16
16
@@ -18,7 +18,7 @@ De lokale `packaging/arch/PKGBUILD` blijft voor een build uit de werkboom. Die g
18
18
19De unit is de bestaande system-unit: `User=bluegit`, `ExecStart` met `/etc/bluegit/config.yml`, `StateDirectory=bluegit` voor `/var/lib/bluegit`. Geen `systemd --user`-unit.
19De unit is de bestaande system-unit: `User=bluegit`, `ExecStart` met `/etc/bluegit/config.yml`, `StateDirectory=bluegit` voor `/var/lib/bluegit`. Geen `systemd --user`-unit.
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` maakt bij installatie en upgrade de systeemgebruiker en de state-map aan. `post_install` doet `systemctl daemon-reload` en daarna `systemctl enable --now bluegit.service`, maar alleen als `/etc/bluegit/config.yml` er al is én het clientgeheim in `/etc/bluegit/client_secret` of als `BLUEGIT_AUTH_CLIENT_SECRET` in `/etc/bluegit/secret.env` staat. Een lege `client_secret: ""` telt niet. Ontbreekt een van beide, dan print de hook de vervolgstappen en start hij niets. `post_upgrade` herlaadt systemd en doet `systemctl try-restart bluegit.service`. `pre_remove` doet `systemctl disable --now bluegit.service`. Draait systemd niet (chroot of container), dan slaat de hook die stappen over zonder fout. `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 verhuist naar `/srv/bluegit`; een pad onder `/home` blijft met `ProtectHome=true` onbereikbaar.
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
@@ -37,6 +37,14 @@ Eén van de twee sleutelvariabelen is genoeg. `scripts/aur-ssh-setup.sh` haalt C
37
37
38De job heet `publish:aur` in `.gitlab-ci.yml` en `publish_aur` in `blue-ci-cd.yml`. Beide draaien alleen op `master` (BlueGit ook op `main`) en hebben `allow_failure: true`, zodat een storing bij de AUR de rest van de pipeline niet rood maakt.
38De job heet `publish:aur` in `.gitlab-ci.yml` en `publish_aur` in `blue-ci-cd.yml`. Beide draaien alleen op `master` (BlueGit ook op `main`) en hebben `allow_failure: true`, zodat een storing bij de AUR de rest van de pipeline niet rood maakt.
39
39
40## Lokaal publiceren
41
42Zolang de CI-runner er niet is, publiceert `scripts/aur-publish-local.sh` met de hand vanuit een lokale checkout. Het gebruikt de AUR-sleutel in `~/.ssh` of ssh-agent, en geen CI-variabelen.
43
44De checkout moet op `master` staan, schoon zijn en gelijk aan `origin/master`. Het script publiceert de sha van `origin/master`. Staat die sha al als `_commit` in de AUR-PKGBUILD, dan stopt het zonder iets te wijzigen.
45
46Het clonet of werkt `ssh://aur@aur.archlinux.org/bluegit.git` bij in `~/.cache/bluegit-aur` (`BLUEGIT_AUR_CACHE` wijzigt die map), kopieert `packaging/aur/*`, zet `_commit` en `pkgver`, en draait `updpkgsums` en `makepkg --printsrcinfo`. Daarna commit het `upstream <pkgver>` en pusht het naar `master`. `updpkgsums` komt uit `pacman-contrib`.
47
40## Archief
48## Archief
41
49
42Het archief is anoniem te downloaden:
50Het archief is anoniem te downloaden:
docs/MIGRATIE.md +1 −1
@@ -13,7 +13,7 @@ systemctl --user disable bluegit
13 13
14 14 Staat de unit onder een andere naam, stop dan de unit waarvan `ExecStart` `bluegit serve --config /home/timfa/bluegit/config.yml` is.
15 15
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.
16 Installeer daarna het package. `bluegit.install` maakt de systeemgebruiker `bluegit` en de state-map aan en herlaadt systemd. De service start alleen als `/etc/bluegit/config.yml` en het clientgeheim er al zijn. Bij deze migratie ontbreekt het geheim nog, dus de hook print de vervolgstappen en zet de service niet aan. Een bestaande `/etc/bluegit/config.yml` blijft staan.
17 17
18 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.
19 19
@@ -13,7 +13,7 @@ systemctl --user disable bluegit
13
13
14Staat de unit onder een andere naam, stop dan de unit waarvan `ExecStart` `bluegit serve --config /home/timfa/bluegit/config.yml` is.
14Staat de unit onder een andere naam, stop dan de unit waarvan `ExecStart` `bluegit serve --config /home/timfa/bluegit/config.yml` is.
15
15
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.
16Installeer daarna het package. `bluegit.install` maakt de systeemgebruiker `bluegit` en de state-map aan en herlaadt systemd. De service start alleen als `/etc/bluegit/config.yml` en het clientgeheim er al zijn. Bij deze migratie ontbreekt het geheim nog, dus de hook print de vervolgstappen en zet de service niet aan. Een bestaande `/etc/bluegit/config.yml` blijft staan.
17
17
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.
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.
19
19
packaging/aur/bluegit.install +92 −3
@@ -1,17 +1,106 @@
1 1 # System-unit met User=bluegit, config in /etc/bluegit/config.yml en
2 2 # state in /var/lib/bluegit. Dit is geen systemd --user-unit.
3 3 # backup= in de PKGBUILD laat een bestaande config.yml staan.
4 # Zonder draaiende systemd (chroot of container) faalt de transactie niet.
5
6 _bluegit_have_systemd() {
7 if [[ "${_BLUEGIT_SYSTEMD_CHECKED:-}" == 1 ]]; then
8 [[ "${_BLUEGIT_SYSTEMD_OK}" == 1 ]]
9 return
10 fi
11 _BLUEGIT_SYSTEMD_CHECKED=1
12 if ! command -v systemctl >/dev/null 2>&1 || [[ ! -d /run/systemd/system ]]; then
13 _BLUEGIT_SYSTEMD_OK=0
14 echo "bluegit: systemd draait niet (chroot of container). De service is niet aangepast."
15 return 1
16 fi
17 _BLUEGIT_SYSTEMD_OK=1
18 return 0
19 }
20
21 _bluegit_run() {
22 _bluegit_have_systemd || return 0
23 local out rc
24 out="$(systemctl "$@" 2>&1)" && return 0
25 rc=$?
26 if printf '%s\n' "$out" | grep -Eq 'not been booted with systemd|Failed to connect to bus|Host is down'; then
27 echo "bluegit: systemd is niet bereikbaar. De service is niet aangepast."
28 return 0
29 fi
30 printf '%s\n' "$out" >&2
31 return "$rc"
32 }
33
34 _bluegit_unquote() {
35 local val="$1" n first last
36 val="${val#"${val%%[![:space:]]*}"}"
37 val="${val%"${val##*[![:space:]]}"}"
38 n=${#val}
39 if (( n >= 2 )); then
40 first="${val:0:1}"
41 last="${val:n-1:1}"
42 if [[ "$first" == "$last" && ( "$first" == '"' || "$first" == "'" ) ]]; then
43 val="${val:1:n-2}"
44 val="${val#"${val%%[![:space:]]*}"}"
45 val="${val%"${val##*[![:space:]]}"}"
46 fi
47 fi
48 printf '%s' "$val"
49 }
50
51 # Config én een niet-leeg clientgeheim. Een lege client_secret: "" telt niet.
52 _bluegit_secret_ready() {
53 [[ -f /etc/bluegit/config.yml ]] || return 1
54 if [[ -f /etc/bluegit/client_secret ]]; then
55 local body
56 body="$(tr -d '[:space:]' < /etc/bluegit/client_secret || true)"
57 [[ -n "$body" ]] && return 0
58 fi
59 [[ -f /etc/bluegit/secret.env ]] || return 1
60 local line val
61 line="$(grep -E '^[[:space:]]*BLUEGIT_AUTH_CLIENT_SECRET=' /etc/bluegit/secret.env | tail -n 1 || true)"
62 [[ -n "$line" ]] || return 1
63 val="$(_bluegit_unquote "${line#*=}")"
64 [[ -n "$val" ]]
65 }
66
67 _bluegit_print_next_steps() {
68 cat <<'EOF'
69 bluegit: de service is niet gestart. /etc/bluegit/config.yml en het clientgeheim moeten er allebei zijn.
70
71 Vervolg:
72 1. Zorg dat /etc/bluegit/config.yml bestaat. Het package levert een voorbeeld.
73 2. Schrijf het clientgeheim naar /etc/bluegit/client_secret (mode 0600),
74 of zet BLUEGIT_AUTH_CLIENT_SECRET in /etc/bluegit/secret.env.
75 Een lege client_secret: "" in de config telt niet.
76 3. Kopieer /usr/share/bluegit/storage.conf.example naar
77 /etc/systemd/system/bluegit.service.d/storage.conf en zet ReadWritePaths.
78 4. systemctl daemon-reload && systemctl enable --now bluegit.service
79 EOF
80 }
4 81
5 82 post_install() {
6 83 systemd-sysusers bluegit.conf || true
7 84 systemd-tmpfiles --create bluegit.conf || true
8 systemctl daemon-reload || true
85 _bluegit_run daemon-reload || return
86 if _bluegit_secret_ready; then
87 _bluegit_run enable --now bluegit.service || return
88 else
89 _bluegit_print_next_steps
90 fi
9 91 }
10 92
11 93 post_upgrade() {
12 post_install
94 systemd-sysusers bluegit.conf || true
95 systemd-tmpfiles --create bluegit.conf || true
96 _bluegit_run daemon-reload || return
97 _bluegit_run try-restart bluegit.service
98 }
99
100 pre_remove() {
101 _bluegit_run disable --now bluegit.service
13 102 }
14 103
15 104 post_remove() {
16 systemctl daemon-reload || true
105 _bluegit_run daemon-reload
17 106 }
@@ -1,17 +1,106 @@
1# System-unit met User=bluegit, config in /etc/bluegit/config.yml en
1# System-unit met User=bluegit, config in /etc/bluegit/config.yml en
2# state in /var/lib/bluegit. Dit is geen systemd --user-unit.
2# state in /var/lib/bluegit. Dit is geen systemd --user-unit.
3# backup= in de PKGBUILD laat een bestaande config.yml staan.
3# backup= in de PKGBUILD laat een bestaande config.yml staan.
4# Zonder draaiende systemd (chroot of container) faalt de transactie niet.
5
6_bluegit_have_systemd() {
7 if [[ "${_BLUEGIT_SYSTEMD_CHECKED:-}" == 1 ]]; then
8 [[ "${_BLUEGIT_SYSTEMD_OK}" == 1 ]]
9 return
10 fi
11 _BLUEGIT_SYSTEMD_CHECKED=1
12 if ! command -v systemctl >/dev/null 2>&1 || [[ ! -d /run/systemd/system ]]; then
13 _BLUEGIT_SYSTEMD_OK=0
14 echo "bluegit: systemd draait niet (chroot of container). De service is niet aangepast."
15 return 1
16 fi
17 _BLUEGIT_SYSTEMD_OK=1
18 return 0
19}
20
21_bluegit_run() {
22 _bluegit_have_systemd || return 0
23 local out rc
24 out="$(systemctl "$@" 2>&1)" && return 0
25 rc=$?
26 if printf '%s\n' "$out" | grep -Eq 'not been booted with systemd|Failed to connect to bus|Host is down'; then
27 echo "bluegit: systemd is niet bereikbaar. De service is niet aangepast."
28 return 0
29 fi
30 printf '%s\n' "$out" >&2
31 return "$rc"
32}
33
34_bluegit_unquote() {
35 local val="$1" n first last
36 val="${val#"${val%%[![:space:]]*}"}"
37 val="${val%"${val##*[![:space:]]}"}"
38 n=${#val}
39 if (( n >= 2 )); then
40 first="${val:0:1}"
41 last="${val:n-1:1}"
42 if [[ "$first" == "$last" && ( "$first" == '"' || "$first" == "'" ) ]]; then
43 val="${val:1:n-2}"
44 val="${val#"${val%%[![:space:]]*}"}"
45 val="${val%"${val##*[![:space:]]}"}"
46 fi
47 fi
48 printf '%s' "$val"
49}
50
51# Config én een niet-leeg clientgeheim. Een lege client_secret: "" telt niet.
52_bluegit_secret_ready() {
53 [[ -f /etc/bluegit/config.yml ]] || return 1
54 if [[ -f /etc/bluegit/client_secret ]]; then
55 local body
56 body="$(tr -d '[:space:]' < /etc/bluegit/client_secret || true)"
57 [[ -n "$body" ]] && return 0
58 fi
59 [[ -f /etc/bluegit/secret.env ]] || return 1
60 local line val
61 line="$(grep -E '^[[:space:]]*BLUEGIT_AUTH_CLIENT_SECRET=' /etc/bluegit/secret.env | tail -n 1 || true)"
62 [[ -n "$line" ]] || return 1
63 val="$(_bluegit_unquote "${line#*=}")"
64 [[ -n "$val" ]]
65}
66
67_bluegit_print_next_steps() {
68 cat <<'EOF'
69bluegit: de service is niet gestart. /etc/bluegit/config.yml en het clientgeheim moeten er allebei zijn.
70
71Vervolg:
721. Zorg dat /etc/bluegit/config.yml bestaat. Het package levert een voorbeeld.
732. Schrijf het clientgeheim naar /etc/bluegit/client_secret (mode 0600),
74 of zet BLUEGIT_AUTH_CLIENT_SECRET in /etc/bluegit/secret.env.
75 Een lege client_secret: "" in de config telt niet.
763. Kopieer /usr/share/bluegit/storage.conf.example naar
77 /etc/systemd/system/bluegit.service.d/storage.conf en zet ReadWritePaths.
784. systemctl daemon-reload && systemctl enable --now bluegit.service
79EOF
80}
4
81
5post_install() {
82post_install() {
6 systemd-sysusers bluegit.conf || true
83 systemd-sysusers bluegit.conf || true
7 systemd-tmpfiles --create bluegit.conf || true
84 systemd-tmpfiles --create bluegit.conf || true
8 systemctl daemon-reload || true
85 _bluegit_run daemon-reload || return
86 if _bluegit_secret_ready; then
87 _bluegit_run enable --now bluegit.service || return
88 else
89 _bluegit_print_next_steps
90 fi
9}
91}
10
92
11post_upgrade() {
93post_upgrade() {
12 post_install
94 systemd-sysusers bluegit.conf || true
95 systemd-tmpfiles --create bluegit.conf || true
96 _bluegit_run daemon-reload || return
97 _bluegit_run try-restart bluegit.service
98}
99
100pre_remove() {
101 _bluegit_run disable --now bluegit.service
13}
102}
14
103
15post_remove() {
104post_remove() {
16 systemctl daemon-reload || true
105 _bluegit_run daemon-reload
17}
106}
scripts/aur-common.sh added +70 −0
@@ -0,0 +1,70 @@
1 #!/usr/bin/env bash
2 # Gedeelde AUR-hulp voor scripts/publish-aur.sh en scripts/aur-publish-local.sh.
3 # Dit bestand definieert alleen functies.
4 set -euo pipefail
5
6 set_pkgver_commit() {
7 local dest="$1" version="$2" commit="$3"
8 [[ "$version" =~ ^[0-9]+$ ]] || { echo "pkgver must be digits: $version" >&2; exit 1; }
9 [[ "$commit" =~ ^[0-9a-f]{40}$ ]] || { echo "commit must be a full sha" >&2; exit 1; }
10 sed -i "s/^pkgver=.*/pkgver=${version}/" "$dest"
11 sed -i "s/^pkgrel=.*/pkgrel=1/" "$dest"
12 sed -i "s/^_commit=.*/_commit=${commit}/" "$dest"
13 }
14
15 set_sha256sums() {
16 local dest="$1" archive_sha="$2"
17 [[ "$archive_sha" =~ ^[0-9a-f]{64}$ ]] || { echo "sha256 must be 64 hex chars" >&2; exit 1; }
18 sed -i "s|^sha256sums=.*|sha256sums=('${archive_sha}')|" "$dest"
19 }
20
21 rewrite_pkgbuild() {
22 local version="$1" commit="$2" archive_sha="$3" dest="$4"
23 set_pkgver_commit "$dest" "$version" "$commit"
24 set_sha256sums "$dest" "$archive_sha"
25 }
26
27 # 0 als de AUR-PKGBUILD deze upstream-sha al als _commit heeft.
28 aur_commit_published() {
29 local pkgbuild="$1" commit="$2"
30 [[ -f "$pkgbuild" ]] || return 1
31 local current
32 current="$(sed -n 's/^_commit=//p' "$pkgbuild" | head -n 1 | tr -d '[:space:]')"
33 [[ -n "$current" && "$current" == "$commit" ]]
34 }
35
36 # Aanroepen vanuit de map van de AUR-checkout. Als root: WORKDIR moet gezet zijn
37 # zodat de buildgebruiker die map mag doorlopen.
38 generate_srcinfo() {
39 if [[ "$(id -u)" -eq 0 ]]; then
40 command -v runuser >/dev/null || { echo "Missing command: runuser" >&2; exit 1; }
41 command -v useradd >/dev/null || { echo "Missing command: useradd" >&2; exit 1; }
42 local makepkg_user="${AUR_MAKEPKG_USER:-aurbuild}"
43 local build_tmp
44 if ! id "$makepkg_user" >/dev/null 2>&1; then
45 useradd --system --create-home --shell /bin/bash "$makepkg_user"
46 fi
47 chmod 755 "$WORKDIR"
48 chown -R "$makepkg_user:$makepkg_user" "$PWD"
49 build_tmp="$(runuser -u "$makepkg_user" -- mktemp -d)"
50 runuser -u "$makepkg_user" -- env BUILDDIR="$build_tmp" makepkg --printsrcinfo > .SRCINFO
51 rm -rf "$build_tmp"
52 chown -R root:root "$PWD"
53 else
54 makepkg --printsrcinfo > .SRCINFO
55 fi
56 }
57
58 clone_or_init_aur_repo() {
59 local pkgbase="$1" dest="$2"
60 local remote="ssh://aur@aur.archlinux.org/${pkgbase}.git"
61 echo "Cloning AUR repo: $remote"
62 if git clone "$remote" "$dest"; then
63 return 0
64 fi
65 echo "AUR repo ${pkgbase} does not exist yet; creating on first push"
66 mkdir -p "$dest"
67 git -C "$dest" init
68 git -C "$dest" checkout -b master
69 git -C "$dest" remote add origin "$remote"
70 }
@@ -0,0 +1,70 @@
1#!/usr/bin/env bash
2# Gedeelde AUR-hulp voor scripts/publish-aur.sh en scripts/aur-publish-local.sh.
3# Dit bestand definieert alleen functies.
4set -euo pipefail
5
6set_pkgver_commit() {
7 local dest="$1" version="$2" commit="$3"
8 [[ "$version" =~ ^[0-9]+$ ]] || { echo "pkgver must be digits: $version" >&2; exit 1; }
9 [[ "$commit" =~ ^[0-9a-f]{40}$ ]] || { echo "commit must be a full sha" >&2; exit 1; }
10 sed -i "s/^pkgver=.*/pkgver=${version}/" "$dest"
11 sed -i "s/^pkgrel=.*/pkgrel=1/" "$dest"
12 sed -i "s/^_commit=.*/_commit=${commit}/" "$dest"
13}
14
15set_sha256sums() {
16 local dest="$1" archive_sha="$2"
17 [[ "$archive_sha" =~ ^[0-9a-f]{64}$ ]] || { echo "sha256 must be 64 hex chars" >&2; exit 1; }
18 sed -i "s|^sha256sums=.*|sha256sums=('${archive_sha}')|" "$dest"
19}
20
21rewrite_pkgbuild() {
22 local version="$1" commit="$2" archive_sha="$3" dest="$4"
23 set_pkgver_commit "$dest" "$version" "$commit"
24 set_sha256sums "$dest" "$archive_sha"
25}
26
27# 0 als de AUR-PKGBUILD deze upstream-sha al als _commit heeft.
28aur_commit_published() {
29 local pkgbuild="$1" commit="$2"
30 [[ -f "$pkgbuild" ]] || return 1
31 local current
32 current="$(sed -n 's/^_commit=//p' "$pkgbuild" | head -n 1 | tr -d '[:space:]')"
33 [[ -n "$current" && "$current" == "$commit" ]]
34}
35
36# Aanroepen vanuit de map van de AUR-checkout. Als root: WORKDIR moet gezet zijn
37# zodat de buildgebruiker die map mag doorlopen.
38generate_srcinfo() {
39 if [[ "$(id -u)" -eq 0 ]]; then
40 command -v runuser >/dev/null || { echo "Missing command: runuser" >&2; exit 1; }
41 command -v useradd >/dev/null || { echo "Missing command: useradd" >&2; exit 1; }
42 local makepkg_user="${AUR_MAKEPKG_USER:-aurbuild}"
43 local build_tmp
44 if ! id "$makepkg_user" >/dev/null 2>&1; then
45 useradd --system --create-home --shell /bin/bash "$makepkg_user"
46 fi
47 chmod 755 "$WORKDIR"
48 chown -R "$makepkg_user:$makepkg_user" "$PWD"
49 build_tmp="$(runuser -u "$makepkg_user" -- mktemp -d)"
50 runuser -u "$makepkg_user" -- env BUILDDIR="$build_tmp" makepkg --printsrcinfo > .SRCINFO
51 rm -rf "$build_tmp"
52 chown -R root:root "$PWD"
53 else
54 makepkg --printsrcinfo > .SRCINFO
55 fi
56}
57
58clone_or_init_aur_repo() {
59 local pkgbase="$1" dest="$2"
60 local remote="ssh://aur@aur.archlinux.org/${pkgbase}.git"
61 echo "Cloning AUR repo: $remote"
62 if git clone "$remote" "$dest"; then
63 return 0
64 fi
65 echo "AUR repo ${pkgbase} does not exist yet; creating on first push"
66 mkdir -p "$dest"
67 git -C "$dest" init
68 git -C "$dest" checkout -b master
69 git -C "$dest" remote add origin "$remote"
70}
scripts/aur-publish-local.sh added +187 −0
@@ -0,0 +1,187 @@
1 #!/usr/bin/env bash
2 # Publiceer bluegit naar de AUR vanuit een lokale checkout.
3 # Gebruikt de sleutel in ~/.ssh of ssh-agent. Geen CI-variabelen.
4 #
5 # De checkout moet op master staan, schoon zijn en gelijk aan origin/master.
6 # De gepubliceerde sha is die van origin/master. Staat die al als _commit
7 # in de AUR-PKGBUILD, dan stopt het script zonder push.
8 #
9 # Werkmap: ~/.cache/bluegit-aur, of BLUEGIT_AUR_CACHE.
10 # --check-only [repo] controleert de checkout en print de sha. Geen clone, geen push.
11 set -euo pipefail
12
13 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
14 # shellcheck source=aur-common.sh
15 source "$(dirname "${BASH_SOURCE[0]}")/aur-common.sh"
16
17 require_publishable_checkout() {
18 local repo="$1"
19 local branch head origin
20 branch="$(git -C "$repo" symbolic-ref --short HEAD 2>/dev/null || true)"
21 if [[ "$branch" != "master" ]]; then
22 echo "De checkout staat niet op master." >&2
23 exit 1
24 fi
25 if [[ -n "$(git -C "$repo" status --porcelain)" ]]; then
26 echo "De checkout is niet schoon." >&2
27 exit 1
28 fi
29 git -C "$repo" fetch origin master
30 head="$(git -C "$repo" rev-parse HEAD)"
31 origin="$(git -C "$repo" rev-parse origin/master)"
32 if [[ "$head" != "$origin" ]]; then
33 echo "De checkout wijkt af van origin/master." >&2
34 exit 1
35 fi
36 [[ "$origin" =~ ^[0-9a-f]{40}$ ]] || { echo "origin/master is geen volledige sha." >&2; exit 1; }
37 printf '%s\n' "$origin"
38 }
39
40 have_local_ssh() {
41 if command -v ssh-add >/dev/null 2>&1 && ssh-add -l >/dev/null 2>&1; then
42 return 0
43 fi
44 local f base
45 [[ -d "$HOME/.ssh" ]] || return 1
46 shopt -s nullglob
47 for f in "$HOME"/.ssh/*; do
48 [[ -f "$f" ]] || continue
49 base="$(basename "$f")"
50 case "$base" in
51 *.pub|known_hosts|known_hosts.old|config|authorized_keys|authorized_keys2) continue ;;
52 esac
53 if grep -q 'PRIVATE KEY' "$f" 2>/dev/null; then
54 shopt -u nullglob
55 return 0
56 fi
57 done
58 shopt -u nullglob
59 return 1
60 }
61
62 copy_packaging_aur() {
63 local src="$1" dest="$2"
64 local dotglob=0 nullglob=0
65 if shopt -q dotglob; then
66 dotglob=1
67 fi
68 if shopt -q nullglob; then
69 nullglob=1
70 fi
71 shopt -s dotglob nullglob
72 local files=("$src"/*)
73 if [[ "$nullglob" -eq 0 ]]; then
74 shopt -u nullglob
75 fi
76 if [[ "$dotglob" -eq 0 ]]; then
77 shopt -u dotglob
78 fi
79 if [[ ${#files[@]} -eq 0 ]]; then
80 echo "Geen bestanden in $src" >&2
81 exit 1
82 fi
83 local f
84 for f in "${files[@]}"; do
85 cp -a "$f" "$dest/"
86 done
87 }
88
89 sync_aur_workdir() {
90 local dest="$1"
91 local remote="ssh://aur@aur.archlinux.org/bluegit.git"
92 if [[ -d "$dest/.git" ]]; then
93 echo "Werk AUR-checkout bij: $dest"
94 git -C "$dest" remote set-url origin "$remote"
95 git -C "$dest" fetch origin master
96 git -C "$dest" checkout -f -B master origin/master
97 return 0
98 fi
99 if [[ -d "$dest" ]] && [[ -n "$(ls -A "$dest" 2>/dev/null || true)" ]]; then
100 echo "Werkmap $dest bestaat al en is geen git-checkout." >&2
101 exit 1
102 fi
103 mkdir -p "$(dirname "$dest")"
104 clone_or_init_aur_repo bluegit "$dest"
105 }
106
107 main() {
108 local CHECK_ONLY=0
109 local REPO="$ROOT"
110 if [[ "${1:-}" == "--check-only" ]]; then
111 CHECK_ONLY=1
112 shift
113 fi
114 if [[ $# -gt 0 ]]; then
115 if [[ "$CHECK_ONLY" -ne 1 || $# -ne 1 ]]; then
116 echo "Gebruik: $0 [--check-only [repo]]" >&2
117 exit 1
118 fi
119 REPO="$(cd "$1" && pwd)"
120 fi
121
122 local COMMIT
123 COMMIT="$(require_publishable_checkout "$REPO")"
124 echo "Publiceren: $COMMIT"
125 if [[ "$CHECK_ONLY" -eq 1 ]]; then
126 exit 0
127 fi
128
129 if [[ "$(id -u)" -eq 0 ]]; then
130 echo "Draai dit script als de gebruiker met de AUR-sleutel, niet als root." >&2
131 exit 1
132 fi
133 : "${HOME:?HOME is niet gezet}"
134 if ! have_local_ssh; then
135 echo "Geen AUR-sleutel: start ssh-agent en doe ssh-add, of zet een private sleutel in ~/.ssh." >&2
136 exit 1
137 fi
138
139 local cmd
140 for cmd in git sed updpkgsums makepkg; do
141 command -v "$cmd" >/dev/null || {
142 echo "Ontbrekend commando: $cmd. updpkgsums zit in pacman-contrib (pacman -S pacman-contrib)." >&2
143 exit 1
144 }
145 done
146
147 local CACHE="${BLUEGIT_AUR_CACHE:-$HOME/.cache/bluegit-aur}"
148 sync_aur_workdir "$CACHE"
149 if aur_commit_published "$CACHE/PKGBUILD" "$COMMIT"; then
150 echo "Deze sha staat al op de AUR ($COMMIT). Niets te doen."
151 exit 0
152 fi
153
154 copy_packaging_aur "$ROOT/packaging/aur" "$CACHE"
155 local VERSION
156 VERSION="$(TZ=UTC git -C "$REPO" show -s --date=format-local:%Y%m%d%H%M%S --format=%cd "$COMMIT")"
157 [[ "$VERSION" =~ ^[0-9]{14}$ ]] || { echo "pkgver uit de commit is geen tijdstempel: $VERSION" >&2; exit 1; }
158 set_pkgver_commit "$CACHE/PKGBUILD" "$VERSION" "$COMMIT"
159
160 mkdir -p "$CACHE/.makepkg/src" "$CACHE/.makepkg/build"
161 (
162 cd "$CACHE"
163 export SRCDEST="$CACHE/.makepkg/src"
164 export BUILDDIR="$CACHE/.makepkg/build"
165 export WORKDIR="$CACHE"
166 updpkgsums PKGBUILD
167 generate_srcinfo
168 )
169
170 cd "$CACHE"
171 git add PKGBUILD .SRCINFO bluegit.install
172 if git diff --cached --quiet; then
173 echo "AUR-checkout is al gelijk. Niets te doen."
174 exit 0
175 fi
176 if git rev-parse --verify HEAD >/dev/null 2>&1; then
177 git commit -m "upstream ${VERSION}"
178 else
179 git commit -m "initial import ${VERSION}"
180 fi
181 git push -u origin master
182 echo "AUR bijgewerkt: bluegit ${VERSION} (${COMMIT})"
183 }
184
185 if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
186 main "$@"
187 fi
@@ -0,0 +1,187 @@
1#!/usr/bin/env bash
2# Publiceer bluegit naar de AUR vanuit een lokale checkout.
3# Gebruikt de sleutel in ~/.ssh of ssh-agent. Geen CI-variabelen.
4#
5# De checkout moet op master staan, schoon zijn en gelijk aan origin/master.
6# De gepubliceerde sha is die van origin/master. Staat die al als _commit
7# in de AUR-PKGBUILD, dan stopt het script zonder push.
8#
9# Werkmap: ~/.cache/bluegit-aur, of BLUEGIT_AUR_CACHE.
10# --check-only [repo] controleert de checkout en print de sha. Geen clone, geen push.
11set -euo pipefail
12
13ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
14# shellcheck source=aur-common.sh
15source "$(dirname "${BASH_SOURCE[0]}")/aur-common.sh"
16
17require_publishable_checkout() {
18 local repo="$1"
19 local branch head origin
20 branch="$(git -C "$repo" symbolic-ref --short HEAD 2>/dev/null || true)"
21 if [[ "$branch" != "master" ]]; then
22 echo "De checkout staat niet op master." >&2
23 exit 1
24 fi
25 if [[ -n "$(git -C "$repo" status --porcelain)" ]]; then
26 echo "De checkout is niet schoon." >&2
27 exit 1
28 fi
29 git -C "$repo" fetch origin master
30 head="$(git -C "$repo" rev-parse HEAD)"
31 origin="$(git -C "$repo" rev-parse origin/master)"
32 if [[ "$head" != "$origin" ]]; then
33 echo "De checkout wijkt af van origin/master." >&2
34 exit 1
35 fi
36 [[ "$origin" =~ ^[0-9a-f]{40}$ ]] || { echo "origin/master is geen volledige sha." >&2; exit 1; }
37 printf '%s\n' "$origin"
38}
39
40have_local_ssh() {
41 if command -v ssh-add >/dev/null 2>&1 && ssh-add -l >/dev/null 2>&1; then
42 return 0
43 fi
44 local f base
45 [[ -d "$HOME/.ssh" ]] || return 1
46 shopt -s nullglob
47 for f in "$HOME"/.ssh/*; do
48 [[ -f "$f" ]] || continue
49 base="$(basename "$f")"
50 case "$base" in
51 *.pub|known_hosts|known_hosts.old|config|authorized_keys|authorized_keys2) continue ;;
52 esac
53 if grep -q 'PRIVATE KEY' "$f" 2>/dev/null; then
54 shopt -u nullglob
55 return 0
56 fi
57 done
58 shopt -u nullglob
59 return 1
60}
61
62copy_packaging_aur() {
63 local src="$1" dest="$2"
64 local dotglob=0 nullglob=0
65 if shopt -q dotglob; then
66 dotglob=1
67 fi
68 if shopt -q nullglob; then
69 nullglob=1
70 fi
71 shopt -s dotglob nullglob
72 local files=("$src"/*)
73 if [[ "$nullglob" -eq 0 ]]; then
74 shopt -u nullglob
75 fi
76 if [[ "$dotglob" -eq 0 ]]; then
77 shopt -u dotglob
78 fi
79 if [[ ${#files[@]} -eq 0 ]]; then
80 echo "Geen bestanden in $src" >&2
81 exit 1
82 fi
83 local f
84 for f in "${files[@]}"; do
85 cp -a "$f" "$dest/"
86 done
87}
88
89sync_aur_workdir() {
90 local dest="$1"
91 local remote="ssh://aur@aur.archlinux.org/bluegit.git"
92 if [[ -d "$dest/.git" ]]; then
93 echo "Werk AUR-checkout bij: $dest"
94 git -C "$dest" remote set-url origin "$remote"
95 git -C "$dest" fetch origin master
96 git -C "$dest" checkout -f -B master origin/master
97 return 0
98 fi
99 if [[ -d "$dest" ]] && [[ -n "$(ls -A "$dest" 2>/dev/null || true)" ]]; then
100 echo "Werkmap $dest bestaat al en is geen git-checkout." >&2
101 exit 1
102 fi
103 mkdir -p "$(dirname "$dest")"
104 clone_or_init_aur_repo bluegit "$dest"
105}
106
107main() {
108 local CHECK_ONLY=0
109 local REPO="$ROOT"
110 if [[ "${1:-}" == "--check-only" ]]; then
111 CHECK_ONLY=1
112 shift
113 fi
114 if [[ $# -gt 0 ]]; then
115 if [[ "$CHECK_ONLY" -ne 1 || $# -ne 1 ]]; then
116 echo "Gebruik: $0 [--check-only [repo]]" >&2
117 exit 1
118 fi
119 REPO="$(cd "$1" && pwd)"
120 fi
121
122 local COMMIT
123 COMMIT="$(require_publishable_checkout "$REPO")"
124 echo "Publiceren: $COMMIT"
125 if [[ "$CHECK_ONLY" -eq 1 ]]; then
126 exit 0
127 fi
128
129 if [[ "$(id -u)" -eq 0 ]]; then
130 echo "Draai dit script als de gebruiker met de AUR-sleutel, niet als root." >&2
131 exit 1
132 fi
133 : "${HOME:?HOME is niet gezet}"
134 if ! have_local_ssh; then
135 echo "Geen AUR-sleutel: start ssh-agent en doe ssh-add, of zet een private sleutel in ~/.ssh." >&2
136 exit 1
137 fi
138
139 local cmd
140 for cmd in git sed updpkgsums makepkg; do
141 command -v "$cmd" >/dev/null || {
142 echo "Ontbrekend commando: $cmd. updpkgsums zit in pacman-contrib (pacman -S pacman-contrib)." >&2
143 exit 1
144 }
145 done
146
147 local CACHE="${BLUEGIT_AUR_CACHE:-$HOME/.cache/bluegit-aur}"
148 sync_aur_workdir "$CACHE"
149 if aur_commit_published "$CACHE/PKGBUILD" "$COMMIT"; then
150 echo "Deze sha staat al op de AUR ($COMMIT). Niets te doen."
151 exit 0
152 fi
153
154 copy_packaging_aur "$ROOT/packaging/aur" "$CACHE"
155 local VERSION
156 VERSION="$(TZ=UTC git -C "$REPO" show -s --date=format-local:%Y%m%d%H%M%S --format=%cd "$COMMIT")"
157 [[ "$VERSION" =~ ^[0-9]{14}$ ]] || { echo "pkgver uit de commit is geen tijdstempel: $VERSION" >&2; exit 1; }
158 set_pkgver_commit "$CACHE/PKGBUILD" "$VERSION" "$COMMIT"
159
160 mkdir -p "$CACHE/.makepkg/src" "$CACHE/.makepkg/build"
161 (
162 cd "$CACHE"
163 export SRCDEST="$CACHE/.makepkg/src"
164 export BUILDDIR="$CACHE/.makepkg/build"
165 export WORKDIR="$CACHE"
166 updpkgsums PKGBUILD
167 generate_srcinfo
168 )
169
170 cd "$CACHE"
171 git add PKGBUILD .SRCINFO bluegit.install
172 if git diff --cached --quiet; then
173 echo "AUR-checkout is al gelijk. Niets te doen."
174 exit 0
175 fi
176 if git rev-parse --verify HEAD >/dev/null 2>&1; then
177 git commit -m "upstream ${VERSION}"
178 else
179 git commit -m "initial import ${VERSION}"
180 fi
181 git push -u origin master
182 echo "AUR bijgewerkt: bluegit ${VERSION} (${COMMIT})"
183}
184
185if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
186 main "$@"
187fi
scripts/aur_test.go +413 −2
@@ -10,7 +10,7 @@ import (
10 10
11 11 func TestRewritePkgbuild(t *testing.T) {
12 12 root := filepath.Join("..")
13 for _, name := range []string{"publish-aur.sh", "aur-ssh-setup.sh"} {
13 for _, name := range []string{"publish-aur.sh", "aur-ssh-setup.sh", "aur-common.sh", "aur-publish-local.sh"} {
14 14 cmd := exec.Command("bash", "-n", filepath.Join(root, "scripts", name))
15 15 if out, err := cmd.CombinedOutput(); err != nil {
16 16 t.Fatalf("%s: %v %s", name, err, out)
@@ -58,7 +58,20 @@ func TestRewritePkgbuild(t *testing.T) {
58 58 t.Fatal(err)
59 59 }
60 60 hookText := string(hook)
61 for _, want := range []string{"systemd-sysusers bluegit.conf", "systemd-tmpfiles --create", "systemctl daemon-reload", "User=bluegit"} {
61 for _, want := range []string{
62 "systemd-sysusers bluegit.conf",
63 "systemd-tmpfiles --create",
64 "systemctl daemon-reload",
65 "enable --now bluegit.service",
66 "try-restart bluegit.service",
67 "disable --now bluegit.service",
68 "pre_remove",
69 "/etc/bluegit/config.yml",
70 "/etc/bluegit/client_secret",
71 "BLUEGIT_AUTH_CLIENT_SECRET",
72 "/run/systemd/system",
73 "User=bluegit",
74 } {
62 75 if !strings.Contains(hookText, want) {
63 76 t.Fatalf("hook mist %q", want)
64 77 }
@@ -66,4 +79,402 @@ func TestRewritePkgbuild(t *testing.T) {
66 79 if strings.Contains(hookText, "rm ") {
67 80 t.Fatal("hook hoort geen bestanden te verwijderen")
68 81 }
82 installBody, ok := shellFunc(hookText, "post_install")
83 if !ok || !strings.Contains(installBody, "enable --now bluegit.service") {
84 t.Fatal("post_install start de service niet")
85 }
86 upgradeBody, ok := shellFunc(hookText, "post_upgrade")
87 if !ok || strings.Contains(upgradeBody, "post_install") || !strings.Contains(upgradeBody, "try-restart bluegit.service") {
88 t.Fatalf("post_upgrade hoort alleen te herstarten:\n%s", upgradeBody)
89 }
90 removeBody, ok := shellFunc(hookText, "pre_remove")
91 if !ok || !strings.Contains(removeBody, "disable --now bluegit.service") {
92 t.Fatal("pre_remove zet de service niet uit")
93 }
94 local, err := os.ReadFile(filepath.Join(root, "scripts", "aur-publish-local.sh"))
95 if err != nil {
96 t.Fatal(err)
97 }
98 for _, bad := range []string{"CI_COMMIT_SHA", "CI_JOB_TOKEN", "JOB-TOKEN", "AUR_SSH_PRIVATE_KEY", "AUR_GIT_AUTHOR", "GIT_SSH_COMMAND", "aur-ssh-setup"} {
99 if strings.Contains(string(local), bad) {
100 t.Fatalf("lokaal script noemt %s", bad)
101 }
102 }
103 }
104
105 func shellFunc(script, name string) (string, bool) {
106 marker := name + "() {"
107 i := strings.Index(script, marker)
108 if i < 0 {
109 return "", false
110 }
111 rest := script[i+len(marker):]
112 depth := 1
113 for j, r := range rest {
114 switch r {
115 case '{':
116 depth++
117 case '}':
118 depth--
119 if depth == 0 {
120 return rest[:j], true
121 }
122 }
123 }
124 return "", false
125 }
126
127 func scriptEnv(extra ...string) []string {
128 skip := []string{
129 "GIT_AUTHOR_", "GIT_COMMITTER_", "GIT_DIR=", "GIT_WORK_TREE=",
130 "GIT_CONFIG_COUNT=", "GIT_CONFIG_KEY_", "GIT_CONFIG_VALUE_",
131 "GIT_CONFIG_GLOBAL=", "GIT_CONFIG_SYSTEM=",
132 }
133 out := make([]string, 0, len(os.Environ())+len(extra))
134 for _, e := range os.Environ() {
135 drop := false
136 for _, p := range skip {
137 if strings.HasPrefix(e, p) {
138 drop = true
139 break
140 }
141 }
142 if !drop {
143 out = append(out, e)
144 }
145 }
146 return append(out, extra...)
147 }
148
149 func runCmd(t *testing.T, dir string, env []string, name string, args ...string) string {
150 t.Helper()
151 cmd := exec.Command(name, args...)
152 if dir != "" {
153 cmd.Dir = dir
154 }
155 cmd.Env = env
156 out, err := cmd.CombinedOutput()
157 if err != nil {
158 t.Fatalf("%s %v: %v\n%s", name, args, err, out)
159 }
160 return string(out)
161 }
162
163 func initPublishedMaster(t *testing.T, env []string) string {
164 t.Helper()
165 root := t.TempDir()
166 repo := filepath.Join(root, "repo")
167 bare := filepath.Join(root, "origin.git")
168 if err := os.MkdirAll(repo, 0o755); err != nil {
169 t.Fatal(err)
170 }
171 runCmd(t, repo, env, "git", "init", "-b", "master")
172 runCmd(t, repo, env, "git", "config", "user.name", "Test")
173 runCmd(t, repo, env, "git", "config", "user.email", "test@example.com")
174 if err := os.WriteFile(filepath.Join(repo, "README"), []byte("x\n"), 0o644); err != nil {
175 t.Fatal(err)
176 }
177 runCmd(t, repo, env, "git", "add", "README")
178 runCmd(t, repo, env, "git", "commit", "-m", "init")
179 runCmd(t, root, env, "git", "init", "--bare", "-b", "master", bare)
180 runCmd(t, repo, env, "git", "remote", "add", "origin", bare)
181 runCmd(t, repo, env, "git", "push", "-u", "origin", "master")
182 return repo
183 }
184
185 func TestAurCommitPublished(t *testing.T) {
186 dir := t.TempDir()
187 pkg := filepath.Join(dir, "PKGBUILD")
188 sha := "0123456789abcdef0123456789abcdef01234567"
189 if err := os.WriteFile(pkg, []byte("pkgver=1\npkgrel=1\n_commit="+sha+"\n"), 0o644); err != nil {
190 t.Fatal(err)
191 }
192 common := filepath.Join("..", "scripts", "aur-common.sh")
193 ask := func(commit, file string) string {
194 t.Helper()
195 cmd := exec.Command("bash", "-c", `source "$1"; if aur_commit_published "$2" "$3"; then echo yes; else echo no; fi`, "bash", common, file, commit)
196 out, err := cmd.CombinedOutput()
197 if err != nil {
198 t.Fatalf("aur_commit_published: %v %s", err, out)
199 }
200 return strings.TrimSpace(string(out))
201 }
202 if ask(sha, pkg) != "yes" {
203 t.Fatal("bekende sha hoort al gepubliceerd te zijn")
204 }
205 if ask("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", pkg) != "no" {
206 t.Fatal("andere sha hoort nog niet gepubliceerd te zijn")
207 }
208 if ask(sha, filepath.Join(dir, "missing")) != "no" {
209 t.Fatal("ontbrekende PKGBUILD is niet gepubliceerd")
210 }
211 }
212
213 func TestCopyPackagingAur(t *testing.T) {
214 src := t.TempDir()
215 dest := t.TempDir()
216 for _, name := range []string{"PKGBUILD", "bluegit.install", ".SRCINFO"} {
217 if err := os.WriteFile(filepath.Join(src, name), []byte(name+"\n"), 0o644); err != nil {
218 t.Fatal(err)
219 }
220 }
221 script := filepath.Join("..", "scripts", "aur-publish-local.sh")
222 cmd := exec.Command("bash", "-c", `source "$1"; copy_packaging_aur "$2" "$3"`, "bash", script, src, dest)
223 if out, err := cmd.CombinedOutput(); err != nil {
224 t.Fatalf("kopie: %v %s", err, out)
225 }
226 for _, name := range []string{"PKGBUILD", "bluegit.install", ".SRCINFO"} {
227 got, err := os.ReadFile(filepath.Join(dest, name))
228 if err != nil {
229 t.Fatalf("mist %s: %v", name, err)
230 }
231 if string(got) != name+"\n" {
232 t.Fatalf("%s = %q", name, got)
233 }
234 }
69 235 }
236
237 func TestLocalAurCheckOnly(t *testing.T) {
238 env := scriptEnv(
239 "GIT_AUTHOR_NAME=Test",
240 "GIT_AUTHOR_EMAIL=test@example.com",
241 "GIT_COMMITTER_NAME=Test",
242 "GIT_COMMITTER_EMAIL=test@example.com",
243 )
244 script := filepath.Join("..", "scripts", "aur-publish-local.sh")
245 check := func(t *testing.T, repo string) (string, error) {
246 t.Helper()
247 cache := filepath.Join(t.TempDir(), "cache")
248 cmd := exec.Command("bash", script, "--check-only", repo)
249 cmd.Env = append(append([]string{}, env...), "BLUEGIT_AUR_CACHE="+cache)
250 out, err := cmd.CombinedOutput()
251 if _, statErr := os.Stat(cache); !os.IsNotExist(statErr) {
252 t.Fatal("check-only raakte de AUR-werkmap")
253 }
254 return string(out), err
255 }
256
257 t.Run("gelijk", func(t *testing.T) {
258 repo := initPublishedMaster(t, env)
259 sha := strings.TrimSpace(runCmd(t, repo, env, "git", "rev-parse", "origin/master"))
260 out, err := check(t, repo)
261 if err != nil {
262 t.Fatalf("check-only: %v\n%s", err, out)
263 }
264 if !strings.Contains(out, "Publiceren: "+sha) {
265 t.Fatalf("sha van origin/master ontbreekt:\n%s", out)
266 }
267 })
268 t.Run("niet schoon", func(t *testing.T) {
269 repo := initPublishedMaster(t, env)
270 if err := os.WriteFile(filepath.Join(repo, "dirty"), []byte("z\n"), 0o644); err != nil {
271 t.Fatal(err)
272 }
273 out, err := check(t, repo)
274 if err == nil || !strings.Contains(out, "niet schoon") {
275 t.Fatalf("vuile checkout hoorde te falen:\n%s", out)
276 }
277 })
278 t.Run("niet master", func(t *testing.T) {
279 repo := initPublishedMaster(t, env)
280 runCmd(t, repo, env, "git", "checkout", "-b", "other")
281 out, err := check(t, repo)
282 if err == nil || !strings.Contains(out, "niet op master") {
283 t.Fatalf("andere branch hoorde te falen:\n%s", out)
284 }
285 })
286 t.Run("wijkt af", func(t *testing.T) {
287 repo := initPublishedMaster(t, env)
288 if err := os.WriteFile(filepath.Join(repo, "README"), []byte("y\n"), 0o644); err != nil {
289 t.Fatal(err)
290 }
291 runCmd(t, repo, env, "git", "add", "README")
292 runCmd(t, repo, env, "git", "commit", "-m", "lokaal")
293 out, err := check(t, repo)
294 if err == nil || !strings.Contains(out, "wijkt af van origin/master") {
295 t.Fatalf("lokale commit hoorde te falen:\n%s", out)
296 }
297 })
298 }
299
300 func TestInstallHookService(t *testing.T) {
301 if _, err := exec.LookPath("unshare"); err != nil {
302 t.Skip("unshare ontbreekt")
303 }
304 work := t.TempDir()
305 hook, err := filepath.Abs(filepath.Join("..", "packaging", "aur", "bluegit.install"))
306 if err != nil {
307 t.Fatal(err)
308 }
309 script := filepath.Join(work, "hooktest.sh")
310 if err := os.WriteFile(script, []byte(installHookTest), 0o755); err != nil {
311 t.Fatal(err)
312 }
313 cmd := exec.Command("unshare", "-U", "-r", "-m", "bash", script, hook, work)
314 out, err := cmd.CombinedOutput()
315 if err != nil || !strings.Contains(string(out), "hook-ok") {
316 t.Fatalf("install-hook: %v\n%s", err, out)
317 }
318 }
319
320 const installHookTest = `#!/usr/bin/env bash
321 set -euo pipefail
322 hook="$1"
323 work="$2"
324 bin="$work/bin"
325 log="$work/log"
326 mode="$work/mode"
327 etc="$work/etc"
328 mkdir -p "$bin" "$etc/bluegit"
329
330 cat > "$bin/systemctl" <<'EOF'
331 #!/bin/sh
332 printf '%s\n' "$*" >> "$BLUEGIT_TEST_LOG"
333 mode=$(cat "$BLUEGIT_TEST_MODE" 2>/dev/null || true)
334 case "$mode" in
335 bus)
336 echo "System has not been booted with systemd." >&2
337 exit 1
338 ;;
339 other)
340 echo "Failed to enable unit: Unit bluegit.service not found." >&2
341 exit 1
342 ;;
343 esac
344 exit 0
345 EOF
346 printf '#!/bin/sh\nexit 0\n' > "$bin/systemd-sysusers"
347 printf '#!/bin/sh\nexit 0\n' > "$bin/systemd-tmpfiles"
348 chmod +x "$bin/systemctl" "$bin/systemd-sysusers" "$bin/systemd-tmpfiles"
349
350 export BLUEGIT_TEST_LOG="$log"
351 export BLUEGIT_TEST_MODE="$mode"
352 export PATH="$bin:/usr/bin:/bin"
353
354 mount --bind "$etc" /etc
355 mount -t tmpfs tmpfs /run
356 # shellcheck disable=SC1090
357 source "$hook"
358
359 reset() {
360 : > "$log"
361 unset _BLUEGIT_SYSTEMD_CHECKED _BLUEGIT_SYSTEMD_OK
362 rm -rf /etc/bluegit /run/systemd
363 mkdir -p /etc/bluegit
364 }
365
366 echo ok > "$mode"
367
368 echo "case geen-systemd" >&2
369 reset
370 out=$(post_install)
371 post_upgrade
372 pre_remove
373 post_remove
374 printf '%s\n' "$out" | grep -q 'systemd draait niet'
375 printf '%s\n' "$out" | grep -q 'clientgeheim'
376 if [[ -s "$log" ]]; then
377 echo "systemctl liep zonder systemd: $(cat "$log")" >&2
378 exit 1
379 fi
380
381 echo "case zonder-geheim" >&2
382 reset
383 mkdir -p /run/systemd/system
384 printf 'client_secret: ""\n' > /etc/bluegit/config.yml
385 out=$(post_install)
386 printf '%s\n' "$out" | grep -q 'niet gestart'
387 printf '%s\n' "$out" | grep -q '/usr/share/bluegit/storage.conf.example'
388 if printf '%s\n' "$out" | grep -q 'systemd draait niet'; then
389 echo "onterecht chroot" >&2
390 exit 1
391 fi
392 grep -qx 'daemon-reload' "$log"
393 if grep -q 'enable' "$log"; then
394 echo "enable zonder geheim" >&2
395 exit 1
396 fi
397
398 echo "case client_secret" >&2
399 reset
400 mkdir -p /run/systemd/system
401 printf 'base_url: https://git.example\n' > /etc/bluegit/config.yml
402 printf 'geheim\n' > /etc/bluegit/client_secret
403 out=$(post_install)
404 if printf '%s\n' "$out" | grep -q 'niet gestart'; then
405 echo "onverwachte melding: $out" >&2
406 exit 1
407 fi
408 grep -qx 'daemon-reload' "$log"
409 grep -qx 'enable --now bluegit.service' "$log"
410
411 echo "case secret.env" >&2
412 reset
413 mkdir -p /run/systemd/system
414 printf 'x: y\n' > /etc/bluegit/config.yml
415 printf ' \n' > /etc/bluegit/client_secret
416 printf '%s\n' "BLUEGIT_AUTH_CLIENT_SECRET='geheim'" > /etc/bluegit/secret.env
417 post_install >/dev/null
418 grep -qx 'enable --now bluegit.service' "$log"
419
420 echo "case lege-quotes" >&2
421 reset
422 mkdir -p /run/systemd/system
423 printf 'x: y\n' > /etc/bluegit/config.yml
424 printf '%s\n' '# BLUEGIT_AUTH_CLIENT_SECRET=nope' 'BLUEGIT_AUTH_CLIENT_SECRET=""' > /etc/bluegit/secret.env
425 post_install >/dev/null
426 if grep -q enable "$log"; then
427 echo "lege quotes telden als geheim" >&2
428 exit 1
429 fi
430
431 echo "case zonder-config" >&2
432 reset
433 mkdir -p /run/systemd/system
434 printf 'geheim\n' > /etc/bluegit/client_secret
435 post_install >/dev/null
436 if grep -q enable "$log"; then
437 echo "enable zonder config" >&2
438 exit 1
439 fi
440
441 echo "case upgrade" >&2
442 reset
443 mkdir -p /run/systemd/system
444 post_upgrade >/dev/null
445 grep -qx 'daemon-reload' "$log"
446 grep -qx 'try-restart bluegit.service' "$log"
447 if grep -q enable "$log"; then
448 echo "upgrade zette de service aan" >&2
449 exit 1
450 fi
451
452 echo "case verwijderen" >&2
453 reset
454 mkdir -p /run/systemd/system
455 pre_remove >/dev/null
456 grep -qx 'disable --now bluegit.service' "$log"
457 : > "$log"
458 post_remove >/dev/null
459 grep -qx 'daemon-reload' "$log"
460
461 echo "case bus" >&2
462 reset
463 mkdir -p /run/systemd/system
464 echo bus > "$mode"
465 printf 'x: y\n' > /etc/bluegit/config.yml
466 printf 'geheim\n' > /etc/bluegit/client_secret
467 post_install >/dev/null
468 echo ok > "$mode"
469
470 echo "case echte-fout" >&2
471 reset
472 mkdir -p /run/systemd/system
473 echo other > "$mode"
474 if post_install >/dev/null; then
475 echo "echte systemctl-fout werd genegeerd" >&2
476 exit 1
477 fi
478
479 echo hook-ok
480 `
@@ -10,7 +10,7 @@ import (
10
10
11func TestRewritePkgbuild(t *testing.T) {
11func TestRewritePkgbuild(t *testing.T) {
12 root := filepath.Join("..")
12 root := filepath.Join("..")
13 for _, name := range []string{"publish-aur.sh", "aur-ssh-setup.sh"} {
13 for _, name := range []string{"publish-aur.sh", "aur-ssh-setup.sh", "aur-common.sh", "aur-publish-local.sh"} {
14 cmd := exec.Command("bash", "-n", filepath.Join(root, "scripts", name))
14 cmd := exec.Command("bash", "-n", filepath.Join(root, "scripts", name))
15 if out, err := cmd.CombinedOutput(); err != nil {
15 if out, err := cmd.CombinedOutput(); err != nil {
16 t.Fatalf("%s: %v %s", name, err, out)
16 t.Fatalf("%s: %v %s", name, err, out)
@@ -58,7 +58,20 @@ func TestRewritePkgbuild(t *testing.T) {
58 t.Fatal(err)
58 t.Fatal(err)
59 }
59 }
60 hookText := string(hook)
60 hookText := string(hook)
61 for _, want := range []string{"systemd-sysusers bluegit.conf", "systemd-tmpfiles --create", "systemctl daemon-reload", "User=bluegit"} {
61 for _, want := range []string{
62 "systemd-sysusers bluegit.conf",
63 "systemd-tmpfiles --create",
64 "systemctl daemon-reload",
65 "enable --now bluegit.service",
66 "try-restart bluegit.service",
67 "disable --now bluegit.service",
68 "pre_remove",
69 "/etc/bluegit/config.yml",
70 "/etc/bluegit/client_secret",
71 "BLUEGIT_AUTH_CLIENT_SECRET",
72 "/run/systemd/system",
73 "User=bluegit",
74 } {
62 if !strings.Contains(hookText, want) {
75 if !strings.Contains(hookText, want) {
63 t.Fatalf("hook mist %q", want)
76 t.Fatalf("hook mist %q", want)
64 }
77 }
@@ -66,4 +79,402 @@ func TestRewritePkgbuild(t *testing.T) {
66 if strings.Contains(hookText, "rm ") {
79 if strings.Contains(hookText, "rm ") {
67 t.Fatal("hook hoort geen bestanden te verwijderen")
80 t.Fatal("hook hoort geen bestanden te verwijderen")
68 }
81 }
82 installBody, ok := shellFunc(hookText, "post_install")
83 if !ok || !strings.Contains(installBody, "enable --now bluegit.service") {
84 t.Fatal("post_install start de service niet")
85 }
86 upgradeBody, ok := shellFunc(hookText, "post_upgrade")
87 if !ok || strings.Contains(upgradeBody, "post_install") || !strings.Contains(upgradeBody, "try-restart bluegit.service") {
88 t.Fatalf("post_upgrade hoort alleen te herstarten:\n%s", upgradeBody)
89 }
90 removeBody, ok := shellFunc(hookText, "pre_remove")
91 if !ok || !strings.Contains(removeBody, "disable --now bluegit.service") {
92 t.Fatal("pre_remove zet de service niet uit")
93 }
94 local, err := os.ReadFile(filepath.Join(root, "scripts", "aur-publish-local.sh"))
95 if err != nil {
96 t.Fatal(err)
97 }
98 for _, bad := range []string{"CI_COMMIT_SHA", "CI_JOB_TOKEN", "JOB-TOKEN", "AUR_SSH_PRIVATE_KEY", "AUR_GIT_AUTHOR", "GIT_SSH_COMMAND", "aur-ssh-setup"} {
99 if strings.Contains(string(local), bad) {
100 t.Fatalf("lokaal script noemt %s", bad)
101 }
102 }
103}
104
105func shellFunc(script, name string) (string, bool) {
106 marker := name + "() {"
107 i := strings.Index(script, marker)
108 if i < 0 {
109 return "", false
110 }
111 rest := script[i+len(marker):]
112 depth := 1
113 for j, r := range rest {
114 switch r {
115 case '{':
116 depth++
117 case '}':
118 depth--
119 if depth == 0 {
120 return rest[:j], true
121 }
122 }
123 }
124 return "", false
125}
126
127func scriptEnv(extra ...string) []string {
128 skip := []string{
129 "GIT_AUTHOR_", "GIT_COMMITTER_", "GIT_DIR=", "GIT_WORK_TREE=",
130 "GIT_CONFIG_COUNT=", "GIT_CONFIG_KEY_", "GIT_CONFIG_VALUE_",
131 "GIT_CONFIG_GLOBAL=", "GIT_CONFIG_SYSTEM=",
132 }
133 out := make([]string, 0, len(os.Environ())+len(extra))
134 for _, e := range os.Environ() {
135 drop := false
136 for _, p := range skip {
137 if strings.HasPrefix(e, p) {
138 drop = true
139 break
140 }
141 }
142 if !drop {
143 out = append(out, e)
144 }
145 }
146 return append(out, extra...)
147}
148
149func runCmd(t *testing.T, dir string, env []string, name string, args ...string) string {
150 t.Helper()
151 cmd := exec.Command(name, args...)
152 if dir != "" {
153 cmd.Dir = dir
154 }
155 cmd.Env = env
156 out, err := cmd.CombinedOutput()
157 if err != nil {
158 t.Fatalf("%s %v: %v\n%s", name, args, err, out)
159 }
160 return string(out)
161}
162
163func initPublishedMaster(t *testing.T, env []string) string {
164 t.Helper()
165 root := t.TempDir()
166 repo := filepath.Join(root, "repo")
167 bare := filepath.Join(root, "origin.git")
168 if err := os.MkdirAll(repo, 0o755); err != nil {
169 t.Fatal(err)
170 }
171 runCmd(t, repo, env, "git", "init", "-b", "master")
172 runCmd(t, repo, env, "git", "config", "user.name", "Test")
173 runCmd(t, repo, env, "git", "config", "user.email", "test@example.com")
174 if err := os.WriteFile(filepath.Join(repo, "README"), []byte("x\n"), 0o644); err != nil {
175 t.Fatal(err)
176 }
177 runCmd(t, repo, env, "git", "add", "README")
178 runCmd(t, repo, env, "git", "commit", "-m", "init")
179 runCmd(t, root, env, "git", "init", "--bare", "-b", "master", bare)
180 runCmd(t, repo, env, "git", "remote", "add", "origin", bare)
181 runCmd(t, repo, env, "git", "push", "-u", "origin", "master")
182 return repo
183}
184
185func TestAurCommitPublished(t *testing.T) {
186 dir := t.TempDir()
187 pkg := filepath.Join(dir, "PKGBUILD")
188 sha := "0123456789abcdef0123456789abcdef01234567"
189 if err := os.WriteFile(pkg, []byte("pkgver=1\npkgrel=1\n_commit="+sha+"\n"), 0o644); err != nil {
190 t.Fatal(err)
191 }
192 common := filepath.Join("..", "scripts", "aur-common.sh")
193 ask := func(commit, file string) string {
194 t.Helper()
195 cmd := exec.Command("bash", "-c", `source "$1"; if aur_commit_published "$2" "$3"; then echo yes; else echo no; fi`, "bash", common, file, commit)
196 out, err := cmd.CombinedOutput()
197 if err != nil {
198 t.Fatalf("aur_commit_published: %v %s", err, out)
199 }
200 return strings.TrimSpace(string(out))
201 }
202 if ask(sha, pkg) != "yes" {
203 t.Fatal("bekende sha hoort al gepubliceerd te zijn")
204 }
205 if ask("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", pkg) != "no" {
206 t.Fatal("andere sha hoort nog niet gepubliceerd te zijn")
207 }
208 if ask(sha, filepath.Join(dir, "missing")) != "no" {
209 t.Fatal("ontbrekende PKGBUILD is niet gepubliceerd")
210 }
211}
212
213func TestCopyPackagingAur(t *testing.T) {
214 src := t.TempDir()
215 dest := t.TempDir()
216 for _, name := range []string{"PKGBUILD", "bluegit.install", ".SRCINFO"} {
217 if err := os.WriteFile(filepath.Join(src, name), []byte(name+"\n"), 0o644); err != nil {
218 t.Fatal(err)
219 }
220 }
221 script := filepath.Join("..", "scripts", "aur-publish-local.sh")
222 cmd := exec.Command("bash", "-c", `source "$1"; copy_packaging_aur "$2" "$3"`, "bash", script, src, dest)
223 if out, err := cmd.CombinedOutput(); err != nil {
224 t.Fatalf("kopie: %v %s", err, out)
225 }
226 for _, name := range []string{"PKGBUILD", "bluegit.install", ".SRCINFO"} {
227 got, err := os.ReadFile(filepath.Join(dest, name))
228 if err != nil {
229 t.Fatalf("mist %s: %v", name, err)
230 }
231 if string(got) != name+"\n" {
232 t.Fatalf("%s = %q", name, got)
233 }
234 }
69}
235}
236
237func TestLocalAurCheckOnly(t *testing.T) {
238 env := scriptEnv(
239 "GIT_AUTHOR_NAME=Test",
240 "GIT_AUTHOR_EMAIL=test@example.com",
241 "GIT_COMMITTER_NAME=Test",
242 "GIT_COMMITTER_EMAIL=test@example.com",
243 )
244 script := filepath.Join("..", "scripts", "aur-publish-local.sh")
245 check := func(t *testing.T, repo string) (string, error) {
246 t.Helper()
247 cache := filepath.Join(t.TempDir(), "cache")
248 cmd := exec.Command("bash", script, "--check-only", repo)
249 cmd.Env = append(append([]string{}, env...), "BLUEGIT_AUR_CACHE="+cache)
250 out, err := cmd.CombinedOutput()
251 if _, statErr := os.Stat(cache); !os.IsNotExist(statErr) {
252 t.Fatal("check-only raakte de AUR-werkmap")
253 }
254 return string(out), err
255 }
256
257 t.Run("gelijk", func(t *testing.T) {
258 repo := initPublishedMaster(t, env)
259 sha := strings.TrimSpace(runCmd(t, repo, env, "git", "rev-parse", "origin/master"))
260 out, err := check(t, repo)
261 if err != nil {
262 t.Fatalf("check-only: %v\n%s", err, out)
263 }
264 if !strings.Contains(out, "Publiceren: "+sha) {
265 t.Fatalf("sha van origin/master ontbreekt:\n%s", out)
266 }
267 })
268 t.Run("niet schoon", func(t *testing.T) {
269 repo := initPublishedMaster(t, env)
270 if err := os.WriteFile(filepath.Join(repo, "dirty"), []byte("z\n"), 0o644); err != nil {
271 t.Fatal(err)
272 }
273 out, err := check(t, repo)
274 if err == nil || !strings.Contains(out, "niet schoon") {
275 t.Fatalf("vuile checkout hoorde te falen:\n%s", out)
276 }
277 })
278 t.Run("niet master", func(t *testing.T) {
279 repo := initPublishedMaster(t, env)
280 runCmd(t, repo, env, "git", "checkout", "-b", "other")
281 out, err := check(t, repo)
282 if err == nil || !strings.Contains(out, "niet op master") {
283 t.Fatalf("andere branch hoorde te falen:\n%s", out)
284 }
285 })
286 t.Run("wijkt af", func(t *testing.T) {
287 repo := initPublishedMaster(t, env)
288 if err := os.WriteFile(filepath.Join(repo, "README"), []byte("y\n"), 0o644); err != nil {
289 t.Fatal(err)
290 }
291 runCmd(t, repo, env, "git", "add", "README")
292 runCmd(t, repo, env, "git", "commit", "-m", "lokaal")
293 out, err := check(t, repo)
294 if err == nil || !strings.Contains(out, "wijkt af van origin/master") {
295 t.Fatalf("lokale commit hoorde te falen:\n%s", out)
296 }
297 })
298}
299
300func TestInstallHookService(t *testing.T) {
301 if _, err := exec.LookPath("unshare"); err != nil {
302 t.Skip("unshare ontbreekt")
303 }
304 work := t.TempDir()
305 hook, err := filepath.Abs(filepath.Join("..", "packaging", "aur", "bluegit.install"))
306 if err != nil {
307 t.Fatal(err)
308 }
309 script := filepath.Join(work, "hooktest.sh")
310 if err := os.WriteFile(script, []byte(installHookTest), 0o755); err != nil {
311 t.Fatal(err)
312 }
313 cmd := exec.Command("unshare", "-U", "-r", "-m", "bash", script, hook, work)
314 out, err := cmd.CombinedOutput()
315 if err != nil || !strings.Contains(string(out), "hook-ok") {
316 t.Fatalf("install-hook: %v\n%s", err, out)
317 }
318}
319
320const installHookTest = `#!/usr/bin/env bash
321set -euo pipefail
322hook="$1"
323work="$2"
324bin="$work/bin"
325log="$work/log"
326mode="$work/mode"
327etc="$work/etc"
328mkdir -p "$bin" "$etc/bluegit"
329
330cat > "$bin/systemctl" <<'EOF'
331#!/bin/sh
332printf '%s\n' "$*" >> "$BLUEGIT_TEST_LOG"
333mode=$(cat "$BLUEGIT_TEST_MODE" 2>/dev/null || true)
334case "$mode" in
335 bus)
336 echo "System has not been booted with systemd." >&2
337 exit 1
338 ;;
339 other)
340 echo "Failed to enable unit: Unit bluegit.service not found." >&2
341 exit 1
342 ;;
343esac
344exit 0
345EOF
346printf '#!/bin/sh\nexit 0\n' > "$bin/systemd-sysusers"
347printf '#!/bin/sh\nexit 0\n' > "$bin/systemd-tmpfiles"
348chmod +x "$bin/systemctl" "$bin/systemd-sysusers" "$bin/systemd-tmpfiles"
349
350export BLUEGIT_TEST_LOG="$log"
351export BLUEGIT_TEST_MODE="$mode"
352export PATH="$bin:/usr/bin:/bin"
353
354mount --bind "$etc" /etc
355mount -t tmpfs tmpfs /run
356# shellcheck disable=SC1090
357source "$hook"
358
359reset() {
360 : > "$log"
361 unset _BLUEGIT_SYSTEMD_CHECKED _BLUEGIT_SYSTEMD_OK
362 rm -rf /etc/bluegit /run/systemd
363 mkdir -p /etc/bluegit
364}
365
366echo ok > "$mode"
367
368echo "case geen-systemd" >&2
369reset
370out=$(post_install)
371post_upgrade
372pre_remove
373post_remove
374printf '%s\n' "$out" | grep -q 'systemd draait niet'
375printf '%s\n' "$out" | grep -q 'clientgeheim'
376if [[ -s "$log" ]]; then
377 echo "systemctl liep zonder systemd: $(cat "$log")" >&2
378 exit 1
379fi
380
381echo "case zonder-geheim" >&2
382reset
383mkdir -p /run/systemd/system
384printf 'client_secret: ""\n' > /etc/bluegit/config.yml
385out=$(post_install)
386printf '%s\n' "$out" | grep -q 'niet gestart'
387printf '%s\n' "$out" | grep -q '/usr/share/bluegit/storage.conf.example'
388if printf '%s\n' "$out" | grep -q 'systemd draait niet'; then
389 echo "onterecht chroot" >&2
390 exit 1
391fi
392grep -qx 'daemon-reload' "$log"
393if grep -q 'enable' "$log"; then
394 echo "enable zonder geheim" >&2
395 exit 1
396fi
397
398echo "case client_secret" >&2
399reset
400mkdir -p /run/systemd/system
401printf 'base_url: https://git.example\n' > /etc/bluegit/config.yml
402printf 'geheim\n' > /etc/bluegit/client_secret
403out=$(post_install)
404if printf '%s\n' "$out" | grep -q 'niet gestart'; then
405 echo "onverwachte melding: $out" >&2
406 exit 1
407fi
408grep -qx 'daemon-reload' "$log"
409grep -qx 'enable --now bluegit.service' "$log"
410
411echo "case secret.env" >&2
412reset
413mkdir -p /run/systemd/system
414printf 'x: y\n' > /etc/bluegit/config.yml
415printf ' \n' > /etc/bluegit/client_secret
416printf '%s\n' "BLUEGIT_AUTH_CLIENT_SECRET='geheim'" > /etc/bluegit/secret.env
417post_install >/dev/null
418grep -qx 'enable --now bluegit.service' "$log"
419
420echo "case lege-quotes" >&2
421reset
422mkdir -p /run/systemd/system
423printf 'x: y\n' > /etc/bluegit/config.yml
424printf '%s\n' '# BLUEGIT_AUTH_CLIENT_SECRET=nope' 'BLUEGIT_AUTH_CLIENT_SECRET=""' > /etc/bluegit/secret.env
425post_install >/dev/null
426if grep -q enable "$log"; then
427 echo "lege quotes telden als geheim" >&2
428 exit 1
429fi
430
431echo "case zonder-config" >&2
432reset
433mkdir -p /run/systemd/system
434printf 'geheim\n' > /etc/bluegit/client_secret
435post_install >/dev/null
436if grep -q enable "$log"; then
437 echo "enable zonder config" >&2
438 exit 1
439fi
440
441echo "case upgrade" >&2
442reset
443mkdir -p /run/systemd/system
444post_upgrade >/dev/null
445grep -qx 'daemon-reload' "$log"
446grep -qx 'try-restart bluegit.service' "$log"
447if grep -q enable "$log"; then
448 echo "upgrade zette de service aan" >&2
449 exit 1
450fi
451
452echo "case verwijderen" >&2
453reset
454mkdir -p /run/systemd/system
455pre_remove >/dev/null
456grep -qx 'disable --now bluegit.service' "$log"
457: > "$log"
458post_remove >/dev/null
459grep -qx 'daemon-reload' "$log"
460
461echo "case bus" >&2
462reset
463mkdir -p /run/systemd/system
464echo bus > "$mode"
465printf 'x: y\n' > /etc/bluegit/config.yml
466printf 'geheim\n' > /etc/bluegit/client_secret
467post_install >/dev/null
468echo ok > "$mode"
469
470echo "case echte-fout" >&2
471reset
472mkdir -p /run/systemd/system
473echo other > "$mode"
474if post_install >/dev/null; then
475 echo "echte systemctl-fout werd genegeerd" >&2
476 exit 1
477fi
478
479echo hook-ok
480`
scripts/publish-aur.sh +2 −45
@@ -4,17 +4,8 @@
4 4 set -euo pipefail
5 5
6 6 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
7
8 rewrite_pkgbuild() {
9 local version="$1" commit="$2" archive_sha="$3" dest="$4"
10 [[ "$version" =~ ^[0-9]+$ ]] || { echo "pkgver must be digits: $version" >&2; exit 1; }
11 [[ "$commit" =~ ^[0-9a-f]{40}$ ]] || { echo "commit must be a full sha" >&2; exit 1; }
12 [[ "$archive_sha" =~ ^[0-9a-f]{64}$ ]] || { echo "sha256 must be 64 hex chars" >&2; exit 1; }
13 sed -i "s/^pkgver=.*/pkgver=${version}/" "$dest"
14 sed -i "s/^pkgrel=.*/pkgrel=1/" "$dest"
15 sed -i "s/^_commit=.*/_commit=${commit}/" "$dest"
16 sed -i "s|^sha256sums=.*|sha256sums=('${archive_sha}')|" "$dest"
17 }
7 # shellcheck source=aur-common.sh
8 source "$(dirname "$0")/aur-common.sh"
18 9
19 10 if [[ "${1:-}" == "--rewrite-only" ]]; then
20 11 rewrite_pkgbuild "$2" "$3" "$4" "$5"
@@ -47,40 +38,6 @@ if ! curl -fsSL "$SOURCE_URL" -o "$TMP_SOURCE"; then
47 38 fi
48 39 SOURCE_SHA="$(sha256sum "$TMP_SOURCE" | awk '{print $1}')"
49 40
50 generate_srcinfo() {
51 if [[ "$(id -u)" -eq 0 ]]; then
52 command -v runuser >/dev/null || { echo "Missing command: runuser" >&2; exit 1; }
53 command -v useradd >/dev/null || { echo "Missing command: useradd" >&2; exit 1; }
54 local makepkg_user="${AUR_MAKEPKG_USER:-aurbuild}"
55 local build_tmp
56 if ! id "$makepkg_user" >/dev/null 2>&1; then
57 useradd --system --create-home --shell /bin/bash "$makepkg_user"
58 fi
59 chmod 755 "$WORKDIR"
60 chown -R "$makepkg_user:$makepkg_user" "$PWD"
61 build_tmp="$(runuser -u "$makepkg_user" -- mktemp -d)"
62 runuser -u "$makepkg_user" -- env BUILDDIR="$build_tmp" makepkg --printsrcinfo > .SRCINFO
63 rm -rf "$build_tmp"
64 chown -R root:root "$PWD"
65 else
66 makepkg --printsrcinfo > .SRCINFO
67 fi
68 }
69
70 clone_or_init_aur_repo() {
71 local pkgbase="$1" dest="$2"
72 local remote="ssh://aur@aur.archlinux.org/${pkgbase}.git"
73 echo "Cloning AUR repo: $remote"
74 if git clone "$remote" "$dest"; then
75 return 0
76 fi
77 echo "AUR repo ${pkgbase} does not exist yet; creating on first push"
78 mkdir -p "$dest"
79 git -C "$dest" init
80 git -C "$dest" checkout -b master
81 git -C "$dest" remote add origin "$remote"
82 }
83
84 41 dest="$WORKDIR/bluegit"
85 42 clone_or_init_aur_repo "bluegit" "$dest"
86 43 cd "$dest"
@@ -4,17 +4,8 @@
4set -euo pipefail
4set -euo pipefail
5
5
6ROOT="$(cd "$(dirname "$0")/.." && pwd)"
6ROOT="$(cd "$(dirname "$0")/.." && pwd)"
7
7# shellcheck source=aur-common.sh
8rewrite_pkgbuild() {
8source "$(dirname "$0")/aur-common.sh"
9 local version="$1" commit="$2" archive_sha="$3" dest="$4"
10 [[ "$version" =~ ^[0-9]+$ ]] || { echo "pkgver must be digits: $version" >&2; exit 1; }
11 [[ "$commit" =~ ^[0-9a-f]{40}$ ]] || { echo "commit must be a full sha" >&2; exit 1; }
12 [[ "$archive_sha" =~ ^[0-9a-f]{64}$ ]] || { echo "sha256 must be 64 hex chars" >&2; exit 1; }
13 sed -i "s/^pkgver=.*/pkgver=${version}/" "$dest"
14 sed -i "s/^pkgrel=.*/pkgrel=1/" "$dest"
15 sed -i "s/^_commit=.*/_commit=${commit}/" "$dest"
16 sed -i "s|^sha256sums=.*|sha256sums=('${archive_sha}')|" "$dest"
17}
18
9
19if [[ "${1:-}" == "--rewrite-only" ]]; then
10if [[ "${1:-}" == "--rewrite-only" ]]; then
20 rewrite_pkgbuild "$2" "$3" "$4" "$5"
11 rewrite_pkgbuild "$2" "$3" "$4" "$5"
@@ -47,40 +38,6 @@ if ! curl -fsSL "$SOURCE_URL" -o "$TMP_SOURCE"; then
47fi
38fi
48SOURCE_SHA="$(sha256sum "$TMP_SOURCE" | awk '{print $1}')"
39SOURCE_SHA="$(sha256sum "$TMP_SOURCE" | awk '{print $1}')"
49
40
50generate_srcinfo() {
51 if [[ "$(id -u)" -eq 0 ]]; then
52 command -v runuser >/dev/null || { echo "Missing command: runuser" >&2; exit 1; }
53 command -v useradd >/dev/null || { echo "Missing command: useradd" >&2; exit 1; }
54 local makepkg_user="${AUR_MAKEPKG_USER:-aurbuild}"
55 local build_tmp
56 if ! id "$makepkg_user" >/dev/null 2>&1; then
57 useradd --system --create-home --shell /bin/bash "$makepkg_user"
58 fi
59 chmod 755 "$WORKDIR"
60 chown -R "$makepkg_user:$makepkg_user" "$PWD"
61 build_tmp="$(runuser -u "$makepkg_user" -- mktemp -d)"
62 runuser -u "$makepkg_user" -- env BUILDDIR="$build_tmp" makepkg --printsrcinfo > .SRCINFO
63 rm -rf "$build_tmp"
64 chown -R root:root "$PWD"
65 else
66 makepkg --printsrcinfo > .SRCINFO
67 fi
68}
69
70clone_or_init_aur_repo() {
71 local pkgbase="$1" dest="$2"
72 local remote="ssh://aur@aur.archlinux.org/${pkgbase}.git"
73 echo "Cloning AUR repo: $remote"
74 if git clone "$remote" "$dest"; then
75 return 0
76 fi
77 echo "AUR repo ${pkgbase} does not exist yet; creating on first push"
78 mkdir -p "$dest"
79 git -C "$dest" init
80 git -C "$dest" checkout -b master
81 git -C "$dest" remote add origin "$remote"
82}
83
84dest="$WORKDIR/bluegit"
41dest="$WORKDIR/bluegit"
85clone_or_init_aur_repo "bluegit" "$dest"
42clone_or_init_aur_repo "bluegit" "$dest"
86cd "$dest"
43cd "$dest"