Merged
Release: releasezichtbaarheid
timfa
wants to merge
2 commits
from
stage
into
master
Overview Commits 2 Pipelines 2 Changes 22
Activity
- timfa Pipeline #227 is Passed 24 October 2026
- timfa opened this merge request 25 October 2026
- timfa Pipeline #235 is Passed 25 October 2026
-
timfa
pushed
25 October 2026
Merge branch 'cursor/release-visibility' into 'stage' Aparte zichtbaarheid voor releases (zelfde als repo / privé / publiek)
- timfa merged this merge request 25 October 2026
Commits
Pipelines
Changes
@@ -57,3 +57,7 @@ Sitebeheerders zien in de bovenbalk één tab **Beheer**. Daaronder staan de sub
57
57
- **Taal**: rechtsboven zit een vlaggetje voor NL/EN/DE/FR. Ingelogd wordt de keuze bij je account bewaard, anders in een cookie.
58
58
- **Bevestigingen** gebruiken nooit browserpopups (`alert`, `confirm`, `prompt`), maar een eigen venster in de huisstijl. De test `TestNoBrowserPopups` laat CI falen bij nieuwe popups.
59
59
- **Tooltips**: het (i)-icoon bij een instelling geeft uitleg bij hover, bij focus en bij tikken.
60
61
## Releases publiek bij een privé repo
62
63
Zet in de instellingen van de repo **Zichtbaarheid releases** op *Publiek*. Iedereen kan dan de Releases-pagina zien en de assets downloaden, ook zonder login. De code, de bron-archieven, de pipelines en de rest blijven alleen voor leden. In het overzicht op de startpagina staan zulke repo's onder "Publieke releases", met alleen hun naam en de eerste regel van de beschrijving. Details staan in [agents.md](agents.md#zichtbaarheid-van-releases).
@@ -57,3 +57,7 @@ Sitebeheerders zien in de bovenbalk één tab **Beheer**. Daaronder staan de sub57
- **Taal**: rechtsboven zit een vlaggetje voor NL/EN/DE/FR. Ingelogd wordt de keuze bij je account bewaard, anders in een cookie.57
- **Taal**: rechtsboven zit een vlaggetje voor NL/EN/DE/FR. Ingelogd wordt de keuze bij je account bewaard, anders in een cookie.58
- **Bevestigingen** gebruiken nooit browserpopups (`alert`, `confirm`, `prompt`), maar een eigen venster in de huisstijl. De test `TestNoBrowserPopups` laat CI falen bij nieuwe popups.58
- **Bevestigingen** gebruiken nooit browserpopups (`alert`, `confirm`, `prompt`), maar een eigen venster in de huisstijl. De test `TestNoBrowserPopups` laat CI falen bij nieuwe popups.59
- **Tooltips**: het (i)-icoon bij een instelling geeft uitleg bij hover, bij focus en bij tikken.59
- **Tooltips**: het (i)-icoon bij een instelling geeft uitleg bij hover, bij focus en bij tikken.60
61
## Releases publiek bij een privé repo62
63
Zet in de instellingen van de repo **Zichtbaarheid releases** op *Publiek*. Iedereen kan dan de Releases-pagina zien en de assets downloaden, ook zonder login. De code, de bron-archieven, de pipelines en de rest blijven alleen voor leden. In het overzicht op de startpagina staan zulke repo's onder "Publieke releases", met alleen hun naam en de eerste regel van de beschrijving. Details staan in [agents.md](agents.md#zichtbaarheid-van-releases).@@ -145,3 +145,34 @@ bg admin list
145
145
bg admin grant bob
146
146
bg admin revoke bob
147
147
```
148
149
## Zichtbaarheid van releases
150
151
Releases hebben een eigen zichtbaarheid naast die van de repo: `inherit` (zelfde als de repo, standaard), `private` of `public`. Instellen kan via Instellingen van de repo, of via:
152
153
```sh
154
bg release visibility timfa/app # tonen
155
bg release visibility timfa/app public # zetten (alleen maintainers)
156
curl -fsS -X PUT -H "Authorization: Bearer $BLUEGIT_TOKEN" -H 'Content-Type: application/json' \
157
-d '{"release_visibility":"public"}' $BLUEGIT_URL/api/v1/projects/timfa/app
158
```
159
160
`PUT /api/v1/projects/{owner}/{repo}` laat velden die ontbreken ongewijzigd. Een ongeldige waarde geeft 400, een niet-maintainer krijgt 403. `GET` geeft het veld `release_visibility` terug.
161
162
| repo | releases | niet-leden zien |
163
|---|---|---|
164
| privé | `inherit` / `private` | niets (404/403) |
165
| privé | `public` | naam, korte beschrijving en alleen de Releases-pagina: notities en assets. Het project linkt door naar `/-/releases`. |
166
| publiek | `inherit` / `public` | alles |
167
| publiek | `private` | de code wel, maar geen Releases-pagina, geen release-assets, geen release-API, geen Releases-tab en geen release-markering bij tags |
168
169
Voor niet-leden blijven altijd privé: code, commits, branches, tags, issues, MR's, pipelines, joblogs, artefacten, instellingen, bron-archieven (zip/tar.gz van tag, branch of commit), `git clone` over HTTP en SSH, en raw/blob. Leden houden hun rechten, ook via de groep. Dat geldt ook voor tokens en SSH-sleutels, met hun scopes.
170
171
Openbaar werken zonder login:
172
173
- `/{owner}/{repo}/-/releases`
174
- `/{owner}/{repo}/-/releases/{tag}/assets/{naam}` (bijv. voor een AUR-PKGBUILD)
175
- `GET /api/v1/projects/{owner}/{repo}/releases`
176
- `.../releases/{tag}/assets/{naam}`
177
178
Voor niet-leden van een privé repo bevat de release-API geen commit. Releases bevatten alleen assets uit jobs, nooit automatische bron-archieven.
@@ -145,3 +145,34 @@ bg admin list145
bg admin grant bob145
bg admin grant bob146
bg admin revoke bob146
bg admin revoke bob147
```147
```148
149
## Zichtbaarheid van releases150
151
Releases hebben een eigen zichtbaarheid naast die van de repo: `inherit` (zelfde als de repo, standaard), `private` of `public`. Instellen kan via Instellingen van de repo, of via:152
153
```sh154
bg release visibility timfa/app # tonen155
bg release visibility timfa/app public # zetten (alleen maintainers)156
curl -fsS -X PUT -H "Authorization: Bearer $BLUEGIT_TOKEN" -H 'Content-Type: application/json' \157
-d '{"release_visibility":"public"}' $BLUEGIT_URL/api/v1/projects/timfa/app158
```159
160
`PUT /api/v1/projects/{owner}/{repo}` laat velden die ontbreken ongewijzigd. Een ongeldige waarde geeft 400, een niet-maintainer krijgt 403. `GET` geeft het veld `release_visibility` terug.161
162
| repo | releases | niet-leden zien |163
|---|---|---|164
| privé | `inherit` / `private` | niets (404/403) |165
| privé | `public` | naam, korte beschrijving en alleen de Releases-pagina: notities en assets. Het project linkt door naar `/-/releases`. |166
| publiek | `inherit` / `public` | alles |167
| publiek | `private` | de code wel, maar geen Releases-pagina, geen release-assets, geen release-API, geen Releases-tab en geen release-markering bij tags |168
169
Voor niet-leden blijven altijd privé: code, commits, branches, tags, issues, MR's, pipelines, joblogs, artefacten, instellingen, bron-archieven (zip/tar.gz van tag, branch of commit), `git clone` over HTTP en SSH, en raw/blob. Leden houden hun rechten, ook via de groep. Dat geldt ook voor tokens en SSH-sleutels, met hun scopes.170
171
Openbaar werken zonder login:172
173
- `/{owner}/{repo}/-/releases`174
- `/{owner}/{repo}/-/releases/{tag}/assets/{naam}` (bijv. voor een AUR-PKGBUILD)175
- `GET /api/v1/projects/{owner}/{repo}/releases`176
- `.../releases/{tag}/assets/{naam}`177
178
Voor niet-leden van een privé repo bevat de release-API geen commit. Releases bevatten alleen assets uit jobs, nooit automatische bron-archieven.@@ -221,6 +221,15 @@ var ruiEN = map[string]string{
221
221
"runner.tip.token": "Creates a one-time code (valid 24 hours) to connect a computer as a runner. Run the shown command on that computer.",
222
222
"runner.tip.builtinFirst": "When on, the BlueGit server tries the group's jobs first, before group and member runners.",
223
223
"runner.tip.optin": "Allows your own account runners to also run jobs of this group. You can stop this at any time.",
224
"err.releaseVisibility": "Release visibility must be inherit, private or public.",
225
"rel.vis.label": "Release visibility",
226
"rel.vis.inherit": "Same as repo",
227
"rel.vis.private": "Private",
228
"rel.vis.public": "Public",
229
"rel.vis.tip": "Who may see the Releases page and download release files. “Public” on a private repo lets everyone download releases, while code, issues, pipelines and source archives stay for members only. “Private” keeps releases for members even if the code is public. Usually: Same as repo.",
230
"rel.vis.onlyPill": "releases only",
231
"rel.onlyNote": "Only the releases of this project are public.",
232
"home.releaseOnly": "Public releases",
224
233
}
225
234
226
235
var ruiNL = map[string]string{
@@ -435,6 +444,15 @@ var ruiNL = map[string]string{
435
444
"runner.tip.token": "Maakt een eenmalige code (24 uur geldig) om een computer als runner te koppelen. Voer het getoonde commando op die computer uit.",
436
445
"runner.tip.builtinFirst": "Als dit aan staat, probeert de BlueGit-server jobs van de groep eerst, vóór groeps- en ledenrunners.",
437
446
"runner.tip.optin": "Staat toe dat je eigen account-runners ook jobs van deze groep draaien. Je kunt dit altijd weer stoppen.",
447
"err.releaseVisibility": "Zichtbaarheid van releases moet inherit, private of public zijn.",
448
"rel.vis.label": "Zichtbaarheid releases",
449
"rel.vis.inherit": "Zelfde als repo",
450
"rel.vis.private": "Privé",
451
"rel.vis.public": "Publiek",
452
"rel.vis.tip": "Wie de Releases-pagina mag zien en releasebestanden mag downloaden. “Publiek” bij een privé repo laat iedereen releases downloaden, terwijl code, issues, pipelines en bron-archieven alleen voor leden blijven. “Privé” houdt releases voor leden, ook als de code publiek is. Meestal: Zelfde als repo.",
453
"rel.vis.onlyPill": "alleen releases",
454
"rel.onlyNote": "Alleen de releases van dit project zijn publiek.",
455
"home.releaseOnly": "Publieke releases",
438
456
}
439
457
440
458
var ruiDE = map[string]string{
@@ -649,6 +667,15 @@ var ruiDE = map[string]string{
649
667
"runner.tip.token": "Erstellt einen einmaligen Code (24 Stunden gültig), um einen Rechner als Runner zu verbinden. Den angezeigten Befehl dort ausführen.",
650
668
"runner.tip.builtinFirst": "Wenn an, versucht der BlueGit-Server die Jobs der Gruppe zuerst, vor Gruppen- und Mitglieder-Runnern.",
651
669
"runner.tip.optin": "Erlaubt deinen eigenen Konto-Runnern, auch Jobs dieser Gruppe auszuführen. Jederzeit widerrufbar.",
670
"err.releaseVisibility": "Die Sichtbarkeit der Releases muss inherit, private oder public sein.",
671
"rel.vis.label": "Sichtbarkeit der Releases",
672
"rel.vis.inherit": "Wie das Repository",
673
"rel.vis.private": "Privat",
674
"rel.vis.public": "Öffentlich",
675
"rel.vis.tip": "Wer die Releases-Seite sehen und Release-Dateien laden darf. „Öffentlich“ bei einem privaten Repo lässt alle Releases laden; Code, Issues, Pipelines und Quellarchive bleiben nur für Mitglieder. „Privat“ hält Releases für Mitglieder, auch wenn der Code öffentlich ist. Meist: Wie das Repository.",
676
"rel.vis.onlyPill": "nur Releases",
677
"rel.onlyNote": "Nur die Releases dieses Projekts sind öffentlich.",
678
"home.releaseOnly": "Öffentliche Releases",
652
679
}
653
680
654
681
var ruiFR = map[string]string{
@@ -863,4 +890,13 @@ var ruiFR = map[string]string{
863
890
"runner.tip.token": "Crée un code à usage unique (valable 24 h) pour connecter un ordinateur comme runner. Lance la commande affichée sur cet ordinateur.",
864
891
"runner.tip.builtinFirst": "Si activé, le serveur BlueGit essaie d’abord les jobs du groupe, avant les runners du groupe et des membres.",
865
892
"runner.tip.optin": "Autorise tes runners de compte à exécuter aussi les jobs de ce groupe. Tu peux arrêter à tout moment.",
893
"err.releaseVisibility": "La visibilité des releases doit être inherit, private ou public.",
894
"rel.vis.label": "Visibilité des releases",
895
"rel.vis.inherit": "Comme le dépôt",
896
"rel.vis.private": "Privé",
897
"rel.vis.public": "Public",
898
"rel.vis.tip": "Qui peut voir la page Releases et télécharger les fichiers. « Public » sur un dépôt privé permet à tous de télécharger les releases ; code, tickets, pipelines et archives source restent réservés aux membres. « Privé » réserve les releases aux membres même si le code est public. En général : Comme le dépôt.",
899
"rel.vis.onlyPill": "releases uniquement",
900
"rel.onlyNote": "Seules les releases de ce projet sont publiques.",
901
"home.releaseOnly": "Releases publiques",
866
902
}
@@ -221,6 +221,15 @@ var ruiEN = map[string]string{221
"runner.tip.token": "Creates a one-time code (valid 24 hours) to connect a computer as a runner. Run the shown command on that computer.",221
"runner.tip.token": "Creates a one-time code (valid 24 hours) to connect a computer as a runner. Run the shown command on that computer.",222
"runner.tip.builtinFirst": "When on, the BlueGit server tries the group's jobs first, before group and member runners.",222
"runner.tip.builtinFirst": "When on, the BlueGit server tries the group's jobs first, before group and member runners.",223
"runner.tip.optin": "Allows your own account runners to also run jobs of this group. You can stop this at any time.",223
"runner.tip.optin": "Allows your own account runners to also run jobs of this group. You can stop this at any time.",224
"err.releaseVisibility": "Release visibility must be inherit, private or public.",225
"rel.vis.label": "Release visibility",226
"rel.vis.inherit": "Same as repo",227
"rel.vis.private": "Private",228
"rel.vis.public": "Public",229
"rel.vis.tip": "Who may see the Releases page and download release files. “Public” on a private repo lets everyone download releases, while code, issues, pipelines and source archives stay for members only. “Private” keeps releases for members even if the code is public. Usually: Same as repo.",230
"rel.vis.onlyPill": "releases only",231
"rel.onlyNote": "Only the releases of this project are public.",232
"home.releaseOnly": "Public releases",224
}233
}225
234
226
var ruiNL = map[string]string{235
var ruiNL = map[string]string{@@ -435,6 +444,15 @@ var ruiNL = map[string]string{435
"runner.tip.token": "Maakt een eenmalige code (24 uur geldig) om een computer als runner te koppelen. Voer het getoonde commando op die computer uit.",444
"runner.tip.token": "Maakt een eenmalige code (24 uur geldig) om een computer als runner te koppelen. Voer het getoonde commando op die computer uit.",436
"runner.tip.builtinFirst": "Als dit aan staat, probeert de BlueGit-server jobs van de groep eerst, vóór groeps- en ledenrunners.",445
"runner.tip.builtinFirst": "Als dit aan staat, probeert de BlueGit-server jobs van de groep eerst, vóór groeps- en ledenrunners.",437
"runner.tip.optin": "Staat toe dat je eigen account-runners ook jobs van deze groep draaien. Je kunt dit altijd weer stoppen.",446
"runner.tip.optin": "Staat toe dat je eigen account-runners ook jobs van deze groep draaien. Je kunt dit altijd weer stoppen.",447
"err.releaseVisibility": "Zichtbaarheid van releases moet inherit, private of public zijn.",448
"rel.vis.label": "Zichtbaarheid releases",449
"rel.vis.inherit": "Zelfde als repo",450
"rel.vis.private": "Privé",451
"rel.vis.public": "Publiek",452
"rel.vis.tip": "Wie de Releases-pagina mag zien en releasebestanden mag downloaden. “Publiek” bij een privé repo laat iedereen releases downloaden, terwijl code, issues, pipelines en bron-archieven alleen voor leden blijven. “Privé” houdt releases voor leden, ook als de code publiek is. Meestal: Zelfde als repo.",453
"rel.vis.onlyPill": "alleen releases",454
"rel.onlyNote": "Alleen de releases van dit project zijn publiek.",455
"home.releaseOnly": "Publieke releases",438
}456
}439
457
440
var ruiDE = map[string]string{458
var ruiDE = map[string]string{@@ -649,6 +667,15 @@ var ruiDE = map[string]string{649
"runner.tip.token": "Erstellt einen einmaligen Code (24 Stunden gültig), um einen Rechner als Runner zu verbinden. Den angezeigten Befehl dort ausführen.",667
"runner.tip.token": "Erstellt einen einmaligen Code (24 Stunden gültig), um einen Rechner als Runner zu verbinden. Den angezeigten Befehl dort ausführen.",650
"runner.tip.builtinFirst": "Wenn an, versucht der BlueGit-Server die Jobs der Gruppe zuerst, vor Gruppen- und Mitglieder-Runnern.",668
"runner.tip.builtinFirst": "Wenn an, versucht der BlueGit-Server die Jobs der Gruppe zuerst, vor Gruppen- und Mitglieder-Runnern.",651
"runner.tip.optin": "Erlaubt deinen eigenen Konto-Runnern, auch Jobs dieser Gruppe auszuführen. Jederzeit widerrufbar.",669
"runner.tip.optin": "Erlaubt deinen eigenen Konto-Runnern, auch Jobs dieser Gruppe auszuführen. Jederzeit widerrufbar.",670
"err.releaseVisibility": "Die Sichtbarkeit der Releases muss inherit, private oder public sein.",671
"rel.vis.label": "Sichtbarkeit der Releases",672
"rel.vis.inherit": "Wie das Repository",673
"rel.vis.private": "Privat",674
"rel.vis.public": "Öffentlich",675
"rel.vis.tip": "Wer die Releases-Seite sehen und Release-Dateien laden darf. „Öffentlich“ bei einem privaten Repo lässt alle Releases laden; Code, Issues, Pipelines und Quellarchive bleiben nur für Mitglieder. „Privat“ hält Releases für Mitglieder, auch wenn der Code öffentlich ist. Meist: Wie das Repository.",676
"rel.vis.onlyPill": "nur Releases",677
"rel.onlyNote": "Nur die Releases dieses Projekts sind öffentlich.",678
"home.releaseOnly": "Öffentliche Releases",652
}679
}653
680
654
var ruiFR = map[string]string{681
var ruiFR = map[string]string{@@ -863,4 +890,13 @@ var ruiFR = map[string]string{863
"runner.tip.token": "Crée un code à usage unique (valable 24 h) pour connecter un ordinateur comme runner. Lance la commande affichée sur cet ordinateur.",890
"runner.tip.token": "Crée un code à usage unique (valable 24 h) pour connecter un ordinateur comme runner. Lance la commande affichée sur cet ordinateur.",864
"runner.tip.builtinFirst": "Si activé, le serveur BlueGit essaie d’abord les jobs du groupe, avant les runners du groupe et des membres.",891
"runner.tip.builtinFirst": "Si activé, le serveur BlueGit essaie d’abord les jobs du groupe, avant les runners du groupe et des membres.",865
"runner.tip.optin": "Autorise tes runners de compte à exécuter aussi les jobs de ce groupe. Tu peux arrêter à tout moment.",892
"runner.tip.optin": "Autorise tes runners de compte à exécuter aussi les jobs de ce groupe. Tu peux arrêter à tout moment.",893
"err.releaseVisibility": "La visibilité des releases doit être inherit, private ou public.",894
"rel.vis.label": "Visibilité des releases",895
"rel.vis.inherit": "Comme le dépôt",896
"rel.vis.private": "Privé",897
"rel.vis.public": "Public",898
"rel.vis.tip": "Qui peut voir la page Releases et télécharger les fichiers. « Public » sur un dépôt privé permet à tous de télécharger les releases ; code, tickets, pipelines et archives source restent réservés aux membres. « Privé » réserve les releases aux membres même si le code est public. En général : Comme le dépôt.",899
"rel.vis.onlyPill": "releases uniquement",900
"rel.onlyNote": "Seules les releases de ce projet sont publiques.",901
"home.releaseOnly": "Releases publiques",866
}902
}@@ -71,7 +71,7 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
71
71
}
72
72
73
73
func (s *Server) releaseAsset(w http.ResponseWriter, r *http.Request) {
74
_, repo, _, ok := s.guard(w, r, access.RoleReadonly)
74
_, repo, _, ok := s.guardReleases(w, r)
75
75
if !ok {
76
76
return
77
77
}
@@ -71,7 +71,7 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {71
}71
}72
72
73
func (s *Server) releaseAsset(w http.ResponseWriter, r *http.Request) {73
func (s *Server) releaseAsset(w http.ResponseWriter, r *http.Request) {74
_, repo, _, ok := s.guard(w, r, access.RoleReadonly)74
_, repo, _, ok := s.guardReleases(w, r)75
if !ok {75
if !ok {76
return76
return77
}77
}@@ -21,6 +21,7 @@ func projectJSON(repo store.Repo) map[string]any {
21
21
return map[string]any{
22
22
"id": repo.ID, "path": repo.FullPath(), "name": repo.Name, "owner": repo.OwnerPath,
23
23
"description": repo.Description, "visibility": repo.Visibility, "default_branch": repo.DefaultBranch,
24
"release_visibility": repo.ReleaseVisibility,
24
25
}
25
26
}
26
27
@@ -221,16 +222,34 @@ func (s *Server) apiPutProject(w http.ResponseWriter, r *http.Request) {
221
222
return
222
223
}
223
224
var body struct {
224
Description string `json:"description"`
225
Visibility string `json:"visibility"`
225
Description *string `json:"description"`
226
Visibility *string `json:"visibility"`
227
ReleaseVisibility *string `json:"release_visibility"`
226
228
}
227
229
if err := readJSON(r, &body); err != nil {
228
230
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
229
231
return
230
232
}
231
if !s.apiOK(w, r, s.opUpdateRepo(r.Context(), apiUser(r), repo, body.Description, body.Visibility)) {
233
// Velden die ontbreken blijven zoals ze zijn.
234
desc, vis := repo.Description, repo.Visibility
235
if body.Description != nil {
236
desc = *body.Description
237
}
238
if body.Visibility != nil {
239
vis = *body.Visibility
240
}
241
if body.ReleaseVisibility != nil && !store.ValidReleaseVisibility(*body.ReleaseVisibility) {
242
s.writeAPIErr(w, r, fail(400, i18n.E("err.releaseVisibility")))
232
243
return
233
244
}
245
if !s.apiOK(w, r, s.opUpdateRepo(r.Context(), apiUser(r), repo, desc, vis)) {
246
return
247
}
248
if body.ReleaseVisibility != nil {
249
if !s.apiOK(w, r, s.opSetReleaseVisibility(r.Context(), apiUser(r), repo, *body.ReleaseVisibility)) {
250
return
251
}
252
}
234
253
repo, _ = s.Store.RepoByPath(r.Context(), repo.OwnerPath, repo.Name)
235
254
writeJSON(w, http.StatusOK, projectJSON(repo))
236
255
}
@@ -21,6 +21,7 @@ func projectJSON(repo store.Repo) map[string]any {21
return map[string]any{21
return map[string]any{22
"id": repo.ID, "path": repo.FullPath(), "name": repo.Name, "owner": repo.OwnerPath,22
"id": repo.ID, "path": repo.FullPath(), "name": repo.Name, "owner": repo.OwnerPath,23
"description": repo.Description, "visibility": repo.Visibility, "default_branch": repo.DefaultBranch,23
"description": repo.Description, "visibility": repo.Visibility, "default_branch": repo.DefaultBranch,24
"release_visibility": repo.ReleaseVisibility,24
}25
}25
}26
}26
27
@@ -221,16 +222,34 @@ func (s *Server) apiPutProject(w http.ResponseWriter, r *http.Request) {221
return222
return222
}223
}223
var body struct {224
var body struct {224
Description string `json:"description"`225
Description *string `json:"description"`225
Visibility string `json:"visibility"`226
Visibility *string `json:"visibility"`227
ReleaseVisibility *string `json:"release_visibility"`226
}228
}227
if err := readJSON(r, &body); err != nil {229
if err := readJSON(r, &body); err != nil {228
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))230
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))229
return231
return230
}232
}231
if !s.apiOK(w, r, s.opUpdateRepo(r.Context(), apiUser(r), repo, body.Description, body.Visibility)) {233
// Velden die ontbreken blijven zoals ze zijn.234
desc, vis := repo.Description, repo.Visibility235
if body.Description != nil {236
desc = *body.Description237
}238
if body.Visibility != nil {239
vis = *body.Visibility240
}241
if body.ReleaseVisibility != nil && !store.ValidReleaseVisibility(*body.ReleaseVisibility) {242
s.writeAPIErr(w, r, fail(400, i18n.E("err.releaseVisibility")))232
return243
return233
}244
}245
if !s.apiOK(w, r, s.opUpdateRepo(r.Context(), apiUser(r), repo, desc, vis)) {246
return247
}248
if body.ReleaseVisibility != nil {249
if !s.apiOK(w, r, s.opSetReleaseVisibility(r.Context(), apiUser(r), repo, *body.ReleaseVisibility)) {250
return251
}252
}234
repo, _ = s.Store.RepoByPath(r.Context(), repo.OwnerPath, repo.Name)253
repo, _ = s.Store.RepoByPath(r.Context(), repo.OwnerPath, repo.Name)235
writeJSON(w, http.StatusOK, projectJSON(repo))254
writeJSON(w, http.StatusOK, projectJSON(repo))236
}255
}@@ -682,7 +682,7 @@ func (s *Server) apiPresets(w http.ResponseWriter, r *http.Request) {
682
682
}
683
683
684
684
func (s *Server) apiReleases(w http.ResponseWriter, r *http.Request) {
685
repo, _, ok := s.apiRepo(w, r, access.RoleReadonly)
685
repo, role, ok := s.apiRepoReleases(w, r)
686
686
if !ok {
687
687
return
688
688
}
@@ -697,16 +697,20 @@ func (s *Server) apiReleases(w http.ResponseWriter, r *http.Request) {
697
697
for _, a := range rel.Assets {
698
698
assets = append(assets, map[string]any{"name": a.Name, "size": a.Size})
699
699
}
700
rows = append(rows, map[string]any{
700
row := map[string]any{
701
701
"id": rel.ID, "tag": rel.Tag, "commit": rel.CommitSHA, "name": rel.Name, "body": rel.Body,
702
702
"created_at": rfcTime(rel.CreatedAt), "assets": assets,
703
})
703
}
704
if releaseOnly(repo, role) {
705
delete(row, "commit") // geen verwijzing naar broncode voor niet-leden
706
}
707
rows = append(rows, row)
704
708
}
705
709
writePage(w, r, slicePage(rows, page, per), len(rows), page, per)
706
710
}
707
711
708
712
func (s *Server) apiReleaseAsset(w http.ResponseWriter, r *http.Request) {
709
repo, _, ok := s.apiRepo(w, r, access.RoleReadonly)
713
repo, _, ok := s.apiRepoReleases(w, r)
710
714
if !ok {
711
715
return
712
716
}
@@ -682,7 +682,7 @@ func (s *Server) apiPresets(w http.ResponseWriter, r *http.Request) {682
}682
}683
683
684
func (s *Server) apiReleases(w http.ResponseWriter, r *http.Request) {684
func (s *Server) apiReleases(w http.ResponseWriter, r *http.Request) {685
repo, _, ok := s.apiRepo(w, r, access.RoleReadonly)685
repo, role, ok := s.apiRepoReleases(w, r)686
if !ok {686
if !ok {687
return687
return688
}688
}@@ -697,16 +697,20 @@ func (s *Server) apiReleases(w http.ResponseWriter, r *http.Request) {697
for _, a := range rel.Assets {697
for _, a := range rel.Assets {698
assets = append(assets, map[string]any{"name": a.Name, "size": a.Size})698
assets = append(assets, map[string]any{"name": a.Name, "size": a.Size})699
}699
}700
rows = append(rows, map[string]any{700
row := map[string]any{701
"id": rel.ID, "tag": rel.Tag, "commit": rel.CommitSHA, "name": rel.Name, "body": rel.Body,701
"id": rel.ID, "tag": rel.Tag, "commit": rel.CommitSHA, "name": rel.Name, "body": rel.Body,702
"created_at": rfcTime(rel.CreatedAt), "assets": assets,702
"created_at": rfcTime(rel.CreatedAt), "assets": assets,703
})703
}704
if releaseOnly(repo, role) {705
delete(row, "commit") // geen verwijzing naar broncode voor niet-leden706
}707
rows = append(rows, row)704
}708
}705
writePage(w, r, slicePage(rows, page, per), len(rows), page, per)709
writePage(w, r, slicePage(rows, page, per), len(rows), page, per)706
}710
}707
711
708
func (s *Server) apiReleaseAsset(w http.ResponseWriter, r *http.Request) {712
func (s *Server) apiReleaseAsset(w http.ResponseWriter, r *http.Request) {709
repo, _, ok := s.apiRepo(w, r, access.RoleReadonly)713
repo, _, ok := s.apiRepoReleases(w, r)710
if !ok {714
if !ok {711
return715
return712
}716
}@@ -104,6 +104,7 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
104
104
return
105
105
}
106
106
v.Repos = repos
107
v.ReleaseRepos = s.releaseOnlyRepos(r, v.User.ID)
107
108
groups, err := s.Store.ListGroups(r.Context(), v.User.ID)
108
109
if err != nil {
109
110
http.Error(w, s.tr(r, "err.overview"), http.StatusInternalServerError)
@@ -127,6 +128,7 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
127
128
if err == nil {
128
129
v.Repos, _ = s.Store.ReposByIDs(r.Context(), ids)
129
130
}
131
v.ReleaseRepos = s.releaseOnlyRepos(r, 0)
130
132
v.Title = ""
131
133
s.render(w, "home", v)
132
134
}
@@ -104,6 +104,7 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {104
return104
return105
}105
}106
v.Repos = repos106
v.Repos = repos107
v.ReleaseRepos = s.releaseOnlyRepos(r, v.User.ID)107
groups, err := s.Store.ListGroups(r.Context(), v.User.ID)108
groups, err := s.Store.ListGroups(r.Context(), v.User.ID)108
if err != nil {109
if err != nil {109
http.Error(w, s.tr(r, "err.overview"), http.StatusInternalServerError)110
http.Error(w, s.tr(r, "err.overview"), http.StatusInternalServerError)@@ -127,6 +128,7 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {127
if err == nil {128
if err == nil {128
v.Repos, _ = s.Store.ReposByIDs(r.Context(), ids)129
v.Repos, _ = s.Store.ReposByIDs(r.Context(), ids)129
}130
}131
v.ReleaseRepos = s.releaseOnlyRepos(r, 0)130
v.Title = ""132
v.Title = ""131
s.render(w, "home", v)133
s.render(w, "home", v)132
}134
}@@ -144,6 +144,18 @@ func (s *Server) opUpdateRepo(ctx context.Context, user store.User, repo store.R
144
144
return nil
145
145
}
146
146
147
// opSetReleaseVisibility zet inherit, private of public (alleen beheerders).
148
func (s *Server) opSetReleaseVisibility(ctx context.Context, user store.User, repo store.Repo, v string) error {
149
role, err := s.Store.EffectiveRole(ctx, user.ID, repo.ID)
150
if err != nil || !role.CanManageSettings() {
151
return fail(403, i18n.E("err.forbidden"))
152
}
153
if err := s.Store.SetReleaseVisibility(ctx, repo.ID, v); err != nil {
154
return fail(400, err)
155
}
156
return nil
157
}
158
147
159
func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.Repo, confirm string) error {
148
160
role, err := s.Store.EffectiveRole(ctx, user.ID, repo.ID)
149
161
if err != nil || !role.CanManageSettings() {
@@ -144,6 +144,18 @@ func (s *Server) opUpdateRepo(ctx context.Context, user store.User, repo store.R144
return nil144
return nil145
}145
}146
146
147
// opSetReleaseVisibility zet inherit, private of public (alleen beheerders).148
func (s *Server) opSetReleaseVisibility(ctx context.Context, user store.User, repo store.Repo, v string) error {149
role, err := s.Store.EffectiveRole(ctx, user.ID, repo.ID)150
if err != nil || !role.CanManageSettings() {151
return fail(403, i18n.E("err.forbidden"))152
}153
if err := s.Store.SetReleaseVisibility(ctx, repo.ID, v); err != nil {154
return fail(400, err)155
}156
return nil157
}158
147
func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.Repo, confirm string) error {159
func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.Repo, confirm string) error {148
role, err := s.Store.EffectiveRole(ctx, user.ID, repo.ID)160
role, err := s.Store.EffectiveRole(ctx, user.ID, repo.ID)149
if err != nil || !role.CanManageSettings() {161
if err != nil || !role.CanManageSettings() {@@ -44,7 +44,7 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
44
44
}
45
45
commits, branches, tags, _ := s.cStats(r.Context(), repo, v.Rev)
46
46
v.NCommits, v.NBranches, v.NTags = commits, branches, tags
47
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil {
47
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil && v.ShowReleases {
48
48
v.NReleases = len(rels)
49
49
}
50
50
v.Created = i18n.FormatDate(lang, repo.CreatedAt)
@@ -44,7 +44,7 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {44
}44
}45
commits, branches, tags, _ := s.cStats(r.Context(), repo, v.Rev)45
commits, branches, tags, _ := s.cStats(r.Context(), repo, v.Rev)46
v.NCommits, v.NBranches, v.NTags = commits, branches, tags46
v.NCommits, v.NBranches, v.NTags = commits, branches, tags47
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil {47
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil && v.ShowReleases {48
v.NReleases = len(rels)48
v.NReleases = len(rels)49
}49
}50
v.Created = i18n.FormatDate(lang, repo.CreatedAt)50
v.Created = i18n.FormatDate(lang, repo.CreatedAt)@@ -0,0 +1,125 @@
1
package server
2
3
import (
4
"net/http"
5
"strings"
6
"unicode/utf8"
7
8
"gitlab.com/Timfa/bluegit/internal/access"
9
"gitlab.com/Timfa/bluegit/internal/i18n"
10
"gitlab.com/Timfa/bluegit/internal/store"
11
)
12
13
// Zichtbaarheid van releases staat los van die van de code:
14
//
15
// - inherit: releases volgen de repo.
16
// - private: releases alleen voor leden, ook als de code publiek is.
17
// - public: releases (pagina, notities, assets) voor iedereen, ook als
18
// de code privé is. Niet-leden zien dan alleen naam, korte
19
// beschrijving en de Releases-pagina. Code, archieven, clone, raw,
20
// commits, issues, MR's, pipelines, logs en artefacten blijven privé:
21
// die routes gebruiken guard/apiRepo, die alleen op repo.Visibility
22
// en lidmaatschap letten.
23
24
// canSeeReleases: lid, of releases publiek.
25
func canSeeReleases(repo store.Repo, role access.Role) bool {
26
return role.CanRead() || repo.ReleasesPublic()
27
}
28
29
// releaseOnly: de kijker ziet van deze repo alleen de releases.
30
func releaseOnly(repo store.Repo, role access.Role) bool {
31
return !role.CanRead() && repo.Visibility != "public" && repo.ReleasesPublic()
32
}
33
34
// shortDesc kort de beschrijving in voor overzichten van release-only repo's.
35
func shortDesc(s string) string {
36
s = strings.TrimSpace(strings.SplitN(s, "\n", 2)[0])
37
if utf8.RuneCountInString(s) > 140 {
38
s = string([]rune(s)[:139]) + "…"
39
}
40
return s
41
}
42
43
// releaseOnlyCard is wat een niet-lid van een privé repo met publieke
44
// releases in overzichten ziet: naam, korte beschrijving, verder niets.
45
func releaseOnlyCard(r store.Repo) store.Repo {
46
return store.Repo{ID: r.ID, OwnerKind: r.OwnerKind, OwnerPath: r.OwnerPath, Name: r.Name,
47
Description: shortDesc(r.Description), Visibility: r.Visibility, ReleaseVisibility: r.ReleaseVisibility}
48
}
49
50
func (s *Server) releaseOnlyRepos(r *http.Request, viewer int64) []store.Repo {
51
ids, err := s.Store.ListReleaseOnlyRepoIDs(r.Context(), viewer)
52
if err != nil {
53
return nil
54
}
55
repos, err := s.Store.ReposByIDs(r.Context(), ids)
56
if err != nil {
57
return nil
58
}
59
out := make([]store.Repo, 0, len(repos))
60
for _, repo := range repos {
61
out = append(out, releaseOnlyCard(repo))
62
}
63
return out
64
}
65
66
// repoRoleOf geeft de rol van de kijker (web), met crawlers als anoniem.
67
func (s *Server) webRole(r *http.Request, repo store.Repo) (principal, access.Role, error) {
68
p := s.who(r)
69
var role access.Role
70
if p.OK {
71
var err error
72
role, err = s.Store.EffectiveRole(r.Context(), p.User.ID, repo.ID)
73
if err != nil {
74
return p, role, err
75
}
76
}
77
if isCrawler(r) {
78
return principal{}, access.RoleNone, nil
79
}
80
return p, role, nil
81
}
82
83
// guardReleases is guard voor de Releases-pagina en assets.
84
func (s *Server) guardReleases(w http.ResponseWriter, r *http.Request) (store.User, store.Repo, access.Role, bool) {
85
repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
86
if err != nil {
87
http.NotFound(w, r)
88
return store.User{}, store.Repo{}, "", false
89
}
90
p, role, err := s.webRole(r, repo)
91
if err != nil {
92
http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)
93
return store.User{}, store.Repo{}, "", false
94
}
95
if !canSeeReleases(repo, role) {
96
if isCrawler(r) {
97
s.writeLockedCard(w, r)
98
} else if p.OK {
99
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
100
} else {
101
http.NotFound(w, r)
102
}
103
return store.User{}, store.Repo{}, "", false
104
}
105
return p.User, repo, role, true
106
}
107
108
// apiRepoReleases is apiRepo voor de release-API (lijst en assets).
109
func (s *Server) apiRepoReleases(w http.ResponseWriter, r *http.Request) (store.Repo, access.Role, bool) {
110
repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
111
if err != nil {
112
s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
113
return store.Repo{}, "", false
114
}
115
role, err := s.Store.EffectiveRole(r.Context(), apiUser(r).ID, repo.ID)
116
if err != nil {
117
s.writeAPIErr(w, r, fail(500, err))
118
return store.Repo{}, "", false
119
}
120
if !canSeeReleases(repo, role) {
121
s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
122
return store.Repo{}, "", false
123
}
124
return repo, role, true
125
}
@@ -0,0 +1,125 @@1
package server2
3
import (4
"net/http"5
"strings"6
"unicode/utf8"7
8
"gitlab.com/Timfa/bluegit/internal/access"9
"gitlab.com/Timfa/bluegit/internal/i18n"10
"gitlab.com/Timfa/bluegit/internal/store"11
)12
13
// Zichtbaarheid van releases staat los van die van de code:14
//15
// - inherit: releases volgen de repo.16
// - private: releases alleen voor leden, ook als de code publiek is.17
// - public: releases (pagina, notities, assets) voor iedereen, ook als18
// de code privé is. Niet-leden zien dan alleen naam, korte19
// beschrijving en de Releases-pagina. Code, archieven, clone, raw,20
// commits, issues, MR's, pipelines, logs en artefacten blijven privé:21
// die routes gebruiken guard/apiRepo, die alleen op repo.Visibility22
// en lidmaatschap letten.23
24
// canSeeReleases: lid, of releases publiek.25
func canSeeReleases(repo store.Repo, role access.Role) bool {26
return role.CanRead() || repo.ReleasesPublic()27
}28
29
// releaseOnly: de kijker ziet van deze repo alleen de releases.30
func releaseOnly(repo store.Repo, role access.Role) bool {31
return !role.CanRead() && repo.Visibility != "public" && repo.ReleasesPublic()32
}33
34
// shortDesc kort de beschrijving in voor overzichten van release-only repo's.35
func shortDesc(s string) string {36
s = strings.TrimSpace(strings.SplitN(s, "\n", 2)[0])37
if utf8.RuneCountInString(s) > 140 {38
s = string([]rune(s)[:139]) + "…"39
}40
return s41
}42
43
// releaseOnlyCard is wat een niet-lid van een privé repo met publieke44
// releases in overzichten ziet: naam, korte beschrijving, verder niets.45
func releaseOnlyCard(r store.Repo) store.Repo {46
return store.Repo{ID: r.ID, OwnerKind: r.OwnerKind, OwnerPath: r.OwnerPath, Name: r.Name,47
Description: shortDesc(r.Description), Visibility: r.Visibility, ReleaseVisibility: r.ReleaseVisibility}48
}49
50
func (s *Server) releaseOnlyRepos(r *http.Request, viewer int64) []store.Repo {51
ids, err := s.Store.ListReleaseOnlyRepoIDs(r.Context(), viewer)52
if err != nil {53
return nil54
}55
repos, err := s.Store.ReposByIDs(r.Context(), ids)56
if err != nil {57
return nil58
}59
out := make([]store.Repo, 0, len(repos))60
for _, repo := range repos {61
out = append(out, releaseOnlyCard(repo))62
}63
return out64
}65
66
// repoRoleOf geeft de rol van de kijker (web), met crawlers als anoniem.67
func (s *Server) webRole(r *http.Request, repo store.Repo) (principal, access.Role, error) {68
p := s.who(r)69
var role access.Role70
if p.OK {71
var err error72
role, err = s.Store.EffectiveRole(r.Context(), p.User.ID, repo.ID)73
if err != nil {74
return p, role, err75
}76
}77
if isCrawler(r) {78
return principal{}, access.RoleNone, nil79
}80
return p, role, nil81
}82
83
// guardReleases is guard voor de Releases-pagina en assets.84
func (s *Server) guardReleases(w http.ResponseWriter, r *http.Request) (store.User, store.Repo, access.Role, bool) {85
repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))86
if err != nil {87
http.NotFound(w, r)88
return store.User{}, store.Repo{}, "", false89
}90
p, role, err := s.webRole(r, repo)91
if err != nil {92
http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)93
return store.User{}, store.Repo{}, "", false94
}95
if !canSeeReleases(repo, role) {96
if isCrawler(r) {97
s.writeLockedCard(w, r)98
} else if p.OK {99
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)100
} else {101
http.NotFound(w, r)102
}103
return store.User{}, store.Repo{}, "", false104
}105
return p.User, repo, role, true106
}107
108
// apiRepoReleases is apiRepo voor de release-API (lijst en assets).109
func (s *Server) apiRepoReleases(w http.ResponseWriter, r *http.Request) (store.Repo, access.Role, bool) {110
repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))111
if err != nil {112
s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))113
return store.Repo{}, "", false114
}115
role, err := s.Store.EffectiveRole(r.Context(), apiUser(r).ID, repo.ID)116
if err != nil {117
s.writeAPIErr(w, r, fail(500, err))118
return store.Repo{}, "", false119
}120
if !canSeeReleases(repo, role) {121
s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))122
return store.Repo{}, "", false123
}124
return repo, role, true125
}@@ -0,0 +1,255 @@
1
package server
2
3
import (
4
"context"
5
"io"
6
"net/http"
7
"net/url"
8
"os"
9
"os/exec"
10
"path/filepath"
11
"strings"
12
"testing"
13
14
"gitlab.com/Timfa/bluegit/internal/access"
15
"gitlab.com/Timfa/bluegit/internal/gitrepo"
16
"gitlab.com/Timfa/bluegit/internal/store"
17
)
18
19
type rvActor struct {
20
name string
21
client *http.Client
22
token string
23
member bool
24
logged bool
25
}
26
27
func noRedirect() *http.Client {
28
return &http.Client{CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
29
}
30
31
func rvGet(t *testing.T, c *http.Client, u, tok string) (int, string, http.Header) {
32
t.Helper()
33
req, _ := http.NewRequest("GET", u, nil)
34
if tok != "" {
35
req.Header.Set("Authorization", "Bearer "+tok)
36
}
37
res, err := c.Do(req)
38
if err != nil {
39
t.Fatal(err)
40
}
41
defer res.Body.Close()
42
b, _ := io.ReadAll(res.Body)
43
return res.StatusCode, string(b), res.Header
44
}
45
46
// Releasezichtbaarheid: alle drie de keuzes x beide repo-zichtbaarheden x
47
// anoniem, niet-lid, lid, groepslid, tokens met en zonder rechten.
48
func TestReleaseVisibilityMatrix(t *testing.T) {
49
e := newCIEnv(t)
50
ctx := context.Background()
51
st, base := e.st, e.ts.URL
52
tim := e.user
53
g, err := st.CreateGroup(ctx, tim.ID, "team", "team", "", access.RoleDeveloper)
54
if err != nil {
55
t.Fatal(err)
56
}
57
repo, err := st.CreateRepo(ctx, "group", g.ID, "lib", "Geheime bibliotheek.\nTweede regel met details", "master", "private")
58
if err != nil {
59
t.Fatal(err)
60
}
61
bare := gitrepo.Dir(e.srv.StoragePath(), repo.OwnerPath, repo.Name)
62
if err := gitrepo.Init("git", bare, "master", "/bin/true"); err != nil {
63
t.Fatal(err)
64
}
65
src := gitrepo.Dir(e.srv.StoragePath(), e.repo.OwnerPath, e.repo.Name)
66
if out, err := exec.Command("git", "--git-dir", src, "push", "-q", bare, "master").CombinedOutput(); err != nil {
67
t.Fatalf("push %v %s", err, out)
68
}
69
asset := filepath.Join(t.TempDir(), "app.bin")
70
_ = os.WriteFile(asset, []byte("BINARY-RELEASE"), 0o644)
71
if _, err := st.CreateRelease(ctx, repo.ID, "v1", e.sha, "Eerste", "Release-notes hier", tim.ID, 0, []store.ReleaseAsset{{Name: "app.bin", StoragePath: asset, Size: 14}}); err != nil {
72
t.Fatal(err)
73
}
74
pid, _ := st.CreatePipeline(ctx, repo.ID, e.sha, "refs/heads/master", "push", "tim", "init", []store.NewJob{{Name: "build", Stage: "build", Script: "true"}})
75
76
out, _ := st.UpsertUser(ctx, 10, "outsider", "", false)
77
mem, _ := st.UpsertUser(ctx, 11, "member", "", false)
78
gm, _ := st.UpsertUser(ctx, 12, "groupie", "", false)
79
if err := st.SetMember(ctx, "repo", repo.ID, "member", access.RoleReadonly); err != nil {
80
t.Fatal(err)
81
}
82
if err := st.SetMember(ctx, "group", g.ID, "groupie", access.RoleDeveloper); err != nil {
83
t.Fatal(err)
84
}
85
sc := func(uid int64) *http.Client {
86
c, _ := sessionClient(t, st, base, uid)
87
return c
88
}
89
actors := []rvActor{
90
{name: "anon", client: noRedirect()},
91
{name: "outsider", client: sc(out.ID), token: issue(t, st, out.ID, "api"), logged: true},
92
{name: "member", client: sc(mem.ID), token: issue(t, st, mem.ID, "api"), member: true, logged: true},
93
{name: "groupie", client: sc(gm.ID), token: issue(t, st, gm.ID, "api"), member: true, logged: true},
94
}
95
memberRunnerTok := issue(t, st, mem.ID, "runners") // token zonder lees-API-rechten
96
97
// Warm de leescache als lid, zodat een lek via de cache zou opvallen.
98
e.srv.SetReadCache(nil)
99
100
code := []string{"/-/tree", "/-/blob/README.md", "/-/commits", "/-/branches", "/-/tags", "/-/issues", "/-/merge-requests",
101
"/-/pipelines", "/-/pipelines/" + itoa(pid), "/-/archive/master/lib-master.zip", "/-/archive/master/lib-master.tar.gz",
102
"/-/tags/archive?tag=v1&format=zip", "/-/branches/archive?branch=master&format=tar.gz", "/-/commit/" + e.sha, "/-/logo", "/-/settings"}
103
apiCode := []string{"", "/repository/tree", "/repository/commits", "/repository/files/README.md/raw?ref=master", "/pipelines", "/issues",
104
"/repository/tags/v1/archive"}
105
106
for _, rv := range []string{"private", "public"} {
107
for _, relv := range []string{"inherit", "private", "public"} {
108
if err := st.UpdateRepo(ctx, repo.ID, repo.Description, rv); err != nil {
109
t.Fatal(err)
110
}
111
if err := st.SetReleaseVisibility(ctx, repo.ID, relv); err != nil {
112
t.Fatal(err)
113
}
114
relPublic := relv == "public" || (relv == "inherit" && rv == "public")
115
label := "repo=" + rv + " releases=" + relv
116
for _, a := range actors {
117
canRel := a.member || relPublic
118
canCode := a.member || rv == "public"
119
// Releases-pagina en asset (web, ook zoals een PKGBUILD ze haalt).
120
c, body, _ := rvGet(t, a.client, base+"/team/lib/-/releases", "")
121
if canRel != (c == 200) {
122
t.Errorf("%s %s releases-pagina: %d", label, a.name, c)
123
}
124
if c == 200 && !strings.Contains(body, "Release-notes hier") {
125
t.Errorf("%s %s mist notities", label, a.name)
126
}
127
if c == 200 && !canCode {
128
for _, bad := range []string{"/team/lib/-/tree", "/team/lib/-/pipelines", "/team/lib/-/commits", "/-/archive/", e.sha[:8], "Tweede regel", "lib.git"} {
129
if strings.Contains(body, bad) {
130
t.Errorf("%s %s releases-pagina lekt %q", label, a.name, bad)
131
}
132
}
133
}
134
c, body, _ = rvGet(t, a.client, base+"/team/lib/-/releases/v1/assets/app.bin", "")
135
if canRel != (c == 200 && body == "BINARY-RELEASE") {
136
t.Errorf("%s %s asset: %d", label, a.name, c)
137
}
138
// Release-API, anoniem of met token.
139
c, body, _ = rvGet(t, http.DefaultClient, base+"/api/v1/projects/team/lib/releases", a.token)
140
if canRel != (c == 200) {
141
t.Errorf("%s %s api releases: %d %s", label, a.name, c, body)
142
}
143
if c == 200 && !canCode && (strings.Contains(body, e.sha) || strings.Contains(body, "archive")) {
144
t.Errorf("%s %s api lekt commit/archief: %s", label, a.name, body)
145
}
146
c, body, _ = rvGet(t, http.DefaultClient, base+"/api/v1/projects/team/lib/releases/v1/assets/app.bin", a.token)
147
if canRel != (c == 200 && body == "BINARY-RELEASE") {
148
t.Errorf("%s %s api asset: %d", label, a.name, c)
149
}
150
// Code, archieven, pipelines, instellingen: nooit via releases.
151
for _, p := range code {
152
c, _, _ := rvGet(t, a.client, base+"/team/lib"+p, "")
153
if !canCode && c < 400 {
154
t.Errorf("%s %s ziet %s: %d", label, a.name, p, c)
155
}
156
}
157
for _, p := range apiCode {
158
c, _, _ := rvGet(t, http.DefaultClient, base+"/api/v1/projects/team/lib"+p, a.token)
159
if !canCode && c < 400 {
160
t.Errorf("%s %s api ziet %s: %d", label, a.name, p, c)
161
}
162
}
163
c, _, _ = rvGet(t, http.DefaultClient, base+"/team/lib.git/info/refs?service=git-upload-pack", a.token)
164
if !canCode && c < 400 {
165
t.Errorf("%s %s git clone: %d", label, a.name, c)
166
}
167
if a.member && c != 200 {
168
t.Errorf("%s %s lid kan niet clonen: %d", label, a.name, c)
169
}
170
// Projectpagina: release-only gaat naar Releases.
171
c, _, h := rvGet(t, a.client, base+"/team/lib", "")
172
if !canCode && relPublic {
173
if c != http.StatusSeeOther || h.Get("Location") != "/team/lib/-/releases" {
174
t.Errorf("%s %s projectpagina: %d %s", label, a.name, c, h.Get("Location"))
175
}
176
} else if canCode && c != 200 {
177
t.Errorf("%s %s projectpagina: %d", label, a.name, c)
178
}
179
// Lid: tabbladen; publieke code met privé releases: geen Releases-tab.
180
if canCode {
181
_, body, _ := rvGet(t, a.client, base+"/team/lib/-/tree", "")
182
if has := strings.Contains(body, `href="/team/lib/-/releases"`); has != canRel {
183
t.Errorf("%s %s releases-tab zichtbaar=%v", label, a.name, has)
184
}
185
}
186
}
187
// Token zonder lees-API-rechten krijgt geen privé releases.
188
if !relPublic {
189
if c, _, _ := rvGet(t, http.DefaultClient, base+"/api/v1/projects/team/lib/releases", memberRunnerTok); c == 200 {
190
t.Errorf("%s runners-token leest releases", label)
191
}
192
}
193
// Verkennen: alleen naam en korte beschrijving.
194
_, home, _ := rvGet(t, noRedirect(), base+"/", "")
195
listed := strings.Contains(home, `href="/team/lib/-/releases"`)
196
if listed != (rv == "private" && relv == "public") {
197
t.Errorf("%s verkennen toont release-only=%v", label, listed)
198
}
199
if listed && (strings.Contains(home, "Tweede regel") || !strings.Contains(home, "Geheime bibliotheek.")) {
200
t.Errorf("%s verkennen beschrijving fout", label)
201
}
202
}
203
}
204
}
205
206
// Instelling via UI en API; alleen beheerders; ongeldige waarde geweigerd;
207
// ontbrekende velden blijven ongewijzigd.
208
func TestReleaseVisibilitySetting(t *testing.T) {
209
e := newCIEnv(t)
210
ctx := context.Background()
211
st, base := e.st, e.ts.URL
212
tc, csrf := sessionClient(t, st, base, e.user.ID)
213
_, page, _ := rvGet(t, tc, base+"/tim/app/-/settings", "")
214
if !strings.Contains(page, `name="release_visibility"`) || !strings.Contains(page, `tip "`) && !strings.Contains(page, `class="tip"`) {
215
t.Fatalf("instelling of tooltip ontbreekt")
216
}
217
res, err := tc.PostForm(base+"/tim/app/-/settings", url.Values{"csrf": {csrf}, "description": {"d"}, "visibility": {"private"}, "release_visibility": {"public"}})
218
if err != nil {
219
t.Fatal(err)
220
}
221
res.Body.Close()
222
if r, _ := st.RepoByID(ctx, e.repo.ID); r.ReleaseVisibility != "public" || r.Visibility != "private" {
223
t.Fatalf("ui opslaan: %+v", r)
224
}
225
tok := issue(t, st, e.user.ID, "api")
226
c, b := rapi(t, base, tok, "PUT", "/projects/tim/app", map[string]any{"release_visibility": "private"})
227
if c != 200 || !strings.Contains(string(b), `"release_visibility":"private"`) || !strings.Contains(string(b), `"visibility":"private"`) || !strings.Contains(string(b), `"description":"d"`) {
228
t.Fatalf("api %d %s", c, b)
229
}
230
if c, _ := rapi(t, base, tok, "PUT", "/projects/tim/app", map[string]any{"release_visibility": "wereld"}); c != 400 {
231
t.Fatalf("ongeldig %d", c)
232
}
233
bob, _ := st.UpsertUser(ctx, 5, "bob", "", false)
234
_ = st.SetMember(ctx, "repo", e.repo.ID, "bob", access.RoleDeveloper)
235
if c, _ := rapi(t, base, issue(t, st, bob.ID, "api"), "PUT", "/projects/tim/app", map[string]any{"release_visibility": "public"}); c != 403 {
236
t.Fatalf("developer mag zetten: %d", c)
237
}
238
if r, _ := st.RepoByID(ctx, e.repo.ID); r.ReleaseVisibility != "private" {
239
t.Fatalf("na weigering: %s", r.ReleaseVisibility)
240
}
241
}
242
243
// De sociale kaart van een release-only repo leest nooit code.
244
func TestReleaseOnlyCard(t *testing.T) {
245
e := newCIEnv(t)
246
ctx := context.Background()
247
_ = e.st.SetReleaseVisibility(ctx, e.repo.ID, "public")
248
r := e.srv.cardForPath(ctx, "/tim/app/-/releases", "", "")
249
if r.Meta.Kind != "release" || strings.Contains(r.Meta.Description+strings.Join(r.Meta.Facts, " "), "hello from the repo") {
250
t.Fatalf("kaart: %+v", r.Meta)
251
}
252
if r := e.srv.cardForPath(ctx, "/tim/app/-/tree", "", ""); r.Meta.Kind == "repo" {
253
t.Fatalf("code-kaart voor release-only: %+v", r.Meta)
254
}
255
}
@@ -0,0 +1,255 @@1
package server2
3
import (4
"context"5
"io"6
"net/http"7
"net/url"8
"os"9
"os/exec"10
"path/filepath"11
"strings"12
"testing"13
14
"gitlab.com/Timfa/bluegit/internal/access"15
"gitlab.com/Timfa/bluegit/internal/gitrepo"16
"gitlab.com/Timfa/bluegit/internal/store"17
)18
19
type rvActor struct {20
name string21
client *http.Client22
token string23
member bool24
logged bool25
}26
27
func noRedirect() *http.Client {28
return &http.Client{CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}29
}30
31
func rvGet(t *testing.T, c *http.Client, u, tok string) (int, string, http.Header) {32
t.Helper()33
req, _ := http.NewRequest("GET", u, nil)34
if tok != "" {35
req.Header.Set("Authorization", "Bearer "+tok)36
}37
res, err := c.Do(req)38
if err != nil {39
t.Fatal(err)40
}41
defer res.Body.Close()42
b, _ := io.ReadAll(res.Body)43
return res.StatusCode, string(b), res.Header44
}45
46
// Releasezichtbaarheid: alle drie de keuzes x beide repo-zichtbaarheden x47
// anoniem, niet-lid, lid, groepslid, tokens met en zonder rechten.48
func TestReleaseVisibilityMatrix(t *testing.T) {49
e := newCIEnv(t)50
ctx := context.Background()51
st, base := e.st, e.ts.URL52
tim := e.user53
g, err := st.CreateGroup(ctx, tim.ID, "team", "team", "", access.RoleDeveloper)54
if err != nil {55
t.Fatal(err)56
}57
repo, err := st.CreateRepo(ctx, "group", g.ID, "lib", "Geheime bibliotheek.\nTweede regel met details", "master", "private")58
if err != nil {59
t.Fatal(err)60
}61
bare := gitrepo.Dir(e.srv.StoragePath(), repo.OwnerPath, repo.Name)62
if err := gitrepo.Init("git", bare, "master", "/bin/true"); err != nil {63
t.Fatal(err)64
}65
src := gitrepo.Dir(e.srv.StoragePath(), e.repo.OwnerPath, e.repo.Name)66
if out, err := exec.Command("git", "--git-dir", src, "push", "-q", bare, "master").CombinedOutput(); err != nil {67
t.Fatalf("push %v %s", err, out)68
}69
asset := filepath.Join(t.TempDir(), "app.bin")70
_ = os.WriteFile(asset, []byte("BINARY-RELEASE"), 0o644)71
if _, err := st.CreateRelease(ctx, repo.ID, "v1", e.sha, "Eerste", "Release-notes hier", tim.ID, 0, []store.ReleaseAsset{{Name: "app.bin", StoragePath: asset, Size: 14}}); err != nil {72
t.Fatal(err)73
}74
pid, _ := st.CreatePipeline(ctx, repo.ID, e.sha, "refs/heads/master", "push", "tim", "init", []store.NewJob{{Name: "build", Stage: "build", Script: "true"}})75
76
out, _ := st.UpsertUser(ctx, 10, "outsider", "", false)77
mem, _ := st.UpsertUser(ctx, 11, "member", "", false)78
gm, _ := st.UpsertUser(ctx, 12, "groupie", "", false)79
if err := st.SetMember(ctx, "repo", repo.ID, "member", access.RoleReadonly); err != nil {80
t.Fatal(err)81
}82
if err := st.SetMember(ctx, "group", g.ID, "groupie", access.RoleDeveloper); err != nil {83
t.Fatal(err)84
}85
sc := func(uid int64) *http.Client {86
c, _ := sessionClient(t, st, base, uid)87
return c88
}89
actors := []rvActor{90
{name: "anon", client: noRedirect()},91
{name: "outsider", client: sc(out.ID), token: issue(t, st, out.ID, "api"), logged: true},92
{name: "member", client: sc(mem.ID), token: issue(t, st, mem.ID, "api"), member: true, logged: true},93
{name: "groupie", client: sc(gm.ID), token: issue(t, st, gm.ID, "api"), member: true, logged: true},94
}95
memberRunnerTok := issue(t, st, mem.ID, "runners") // token zonder lees-API-rechten96
97
// Warm de leescache als lid, zodat een lek via de cache zou opvallen.98
e.srv.SetReadCache(nil)99
100
code := []string{"/-/tree", "/-/blob/README.md", "/-/commits", "/-/branches", "/-/tags", "/-/issues", "/-/merge-requests",101
"/-/pipelines", "/-/pipelines/" + itoa(pid), "/-/archive/master/lib-master.zip", "/-/archive/master/lib-master.tar.gz",102
"/-/tags/archive?tag=v1&format=zip", "/-/branches/archive?branch=master&format=tar.gz", "/-/commit/" + e.sha, "/-/logo", "/-/settings"}103
apiCode := []string{"", "/repository/tree", "/repository/commits", "/repository/files/README.md/raw?ref=master", "/pipelines", "/issues",104
"/repository/tags/v1/archive"}105
106
for _, rv := range []string{"private", "public"} {107
for _, relv := range []string{"inherit", "private", "public"} {108
if err := st.UpdateRepo(ctx, repo.ID, repo.Description, rv); err != nil {109
t.Fatal(err)110
}111
if err := st.SetReleaseVisibility(ctx, repo.ID, relv); err != nil {112
t.Fatal(err)113
}114
relPublic := relv == "public" || (relv == "inherit" && rv == "public")115
label := "repo=" + rv + " releases=" + relv116
for _, a := range actors {117
canRel := a.member || relPublic118
canCode := a.member || rv == "public"119
// Releases-pagina en asset (web, ook zoals een PKGBUILD ze haalt).120
c, body, _ := rvGet(t, a.client, base+"/team/lib/-/releases", "")121
if canRel != (c == 200) {122
t.Errorf("%s %s releases-pagina: %d", label, a.name, c)123
}124
if c == 200 && !strings.Contains(body, "Release-notes hier") {125
t.Errorf("%s %s mist notities", label, a.name)126
}127
if c == 200 && !canCode {128
for _, bad := range []string{"/team/lib/-/tree", "/team/lib/-/pipelines", "/team/lib/-/commits", "/-/archive/", e.sha[:8], "Tweede regel", "lib.git"} {129
if strings.Contains(body, bad) {130
t.Errorf("%s %s releases-pagina lekt %q", label, a.name, bad)131
}132
}133
}134
c, body, _ = rvGet(t, a.client, base+"/team/lib/-/releases/v1/assets/app.bin", "")135
if canRel != (c == 200 && body == "BINARY-RELEASE") {136
t.Errorf("%s %s asset: %d", label, a.name, c)137
}138
// Release-API, anoniem of met token.139
c, body, _ = rvGet(t, http.DefaultClient, base+"/api/v1/projects/team/lib/releases", a.token)140
if canRel != (c == 200) {141
t.Errorf("%s %s api releases: %d %s", label, a.name, c, body)142
}143
if c == 200 && !canCode && (strings.Contains(body, e.sha) || strings.Contains(body, "archive")) {144
t.Errorf("%s %s api lekt commit/archief: %s", label, a.name, body)145
}146
c, body, _ = rvGet(t, http.DefaultClient, base+"/api/v1/projects/team/lib/releases/v1/assets/app.bin", a.token)147
if canRel != (c == 200 && body == "BINARY-RELEASE") {148
t.Errorf("%s %s api asset: %d", label, a.name, c)149
}150
// Code, archieven, pipelines, instellingen: nooit via releases.151
for _, p := range code {152
c, _, _ := rvGet(t, a.client, base+"/team/lib"+p, "")153
if !canCode && c < 400 {154
t.Errorf("%s %s ziet %s: %d", label, a.name, p, c)155
}156
}157
for _, p := range apiCode {158
c, _, _ := rvGet(t, http.DefaultClient, base+"/api/v1/projects/team/lib"+p, a.token)159
if !canCode && c < 400 {160
t.Errorf("%s %s api ziet %s: %d", label, a.name, p, c)161
}162
}163
c, _, _ = rvGet(t, http.DefaultClient, base+"/team/lib.git/info/refs?service=git-upload-pack", a.token)164
if !canCode && c < 400 {165
t.Errorf("%s %s git clone: %d", label, a.name, c)166
}167
if a.member && c != 200 {168
t.Errorf("%s %s lid kan niet clonen: %d", label, a.name, c)169
}170
// Projectpagina: release-only gaat naar Releases.171
c, _, h := rvGet(t, a.client, base+"/team/lib", "")172
if !canCode && relPublic {173
if c != http.StatusSeeOther || h.Get("Location") != "/team/lib/-/releases" {174
t.Errorf("%s %s projectpagina: %d %s", label, a.name, c, h.Get("Location"))175
}176
} else if canCode && c != 200 {177
t.Errorf("%s %s projectpagina: %d", label, a.name, c)178
}179
// Lid: tabbladen; publieke code met privé releases: geen Releases-tab.180
if canCode {181
_, body, _ := rvGet(t, a.client, base+"/team/lib/-/tree", "")182
if has := strings.Contains(body, `href="/team/lib/-/releases"`); has != canRel {183
t.Errorf("%s %s releases-tab zichtbaar=%v", label, a.name, has)184
}185
}186
}187
// Token zonder lees-API-rechten krijgt geen privé releases.188
if !relPublic {189
if c, _, _ := rvGet(t, http.DefaultClient, base+"/api/v1/projects/team/lib/releases", memberRunnerTok); c == 200 {190
t.Errorf("%s runners-token leest releases", label)191
}192
}193
// Verkennen: alleen naam en korte beschrijving.194
_, home, _ := rvGet(t, noRedirect(), base+"/", "")195
listed := strings.Contains(home, `href="/team/lib/-/releases"`)196
if listed != (rv == "private" && relv == "public") {197
t.Errorf("%s verkennen toont release-only=%v", label, listed)198
}199
if listed && (strings.Contains(home, "Tweede regel") || !strings.Contains(home, "Geheime bibliotheek.")) {200
t.Errorf("%s verkennen beschrijving fout", label)201
}202
}203
}204
}205
206
// Instelling via UI en API; alleen beheerders; ongeldige waarde geweigerd;207
// ontbrekende velden blijven ongewijzigd.208
func TestReleaseVisibilitySetting(t *testing.T) {209
e := newCIEnv(t)210
ctx := context.Background()211
st, base := e.st, e.ts.URL212
tc, csrf := sessionClient(t, st, base, e.user.ID)213
_, page, _ := rvGet(t, tc, base+"/tim/app/-/settings", "")214
if !strings.Contains(page, `name="release_visibility"`) || !strings.Contains(page, `tip "`) && !strings.Contains(page, `class="tip"`) {215
t.Fatalf("instelling of tooltip ontbreekt")216
}217
res, err := tc.PostForm(base+"/tim/app/-/settings", url.Values{"csrf": {csrf}, "description": {"d"}, "visibility": {"private"}, "release_visibility": {"public"}})218
if err != nil {219
t.Fatal(err)220
}221
res.Body.Close()222
if r, _ := st.RepoByID(ctx, e.repo.ID); r.ReleaseVisibility != "public" || r.Visibility != "private" {223
t.Fatalf("ui opslaan: %+v", r)224
}225
tok := issue(t, st, e.user.ID, "api")226
c, b := rapi(t, base, tok, "PUT", "/projects/tim/app", map[string]any{"release_visibility": "private"})227
if c != 200 || !strings.Contains(string(b), `"release_visibility":"private"`) || !strings.Contains(string(b), `"visibility":"private"`) || !strings.Contains(string(b), `"description":"d"`) {228
t.Fatalf("api %d %s", c, b)229
}230
if c, _ := rapi(t, base, tok, "PUT", "/projects/tim/app", map[string]any{"release_visibility": "wereld"}); c != 400 {231
t.Fatalf("ongeldig %d", c)232
}233
bob, _ := st.UpsertUser(ctx, 5, "bob", "", false)234
_ = st.SetMember(ctx, "repo", e.repo.ID, "bob", access.RoleDeveloper)235
if c, _ := rapi(t, base, issue(t, st, bob.ID, "api"), "PUT", "/projects/tim/app", map[string]any{"release_visibility": "public"}); c != 403 {236
t.Fatalf("developer mag zetten: %d", c)237
}238
if r, _ := st.RepoByID(ctx, e.repo.ID); r.ReleaseVisibility != "private" {239
t.Fatalf("na weigering: %s", r.ReleaseVisibility)240
}241
}242
243
// De sociale kaart van een release-only repo leest nooit code.244
func TestReleaseOnlyCard(t *testing.T) {245
e := newCIEnv(t)246
ctx := context.Background()247
_ = e.st.SetReleaseVisibility(ctx, e.repo.ID, "public")248
r := e.srv.cardForPath(ctx, "/tim/app/-/releases", "", "")249
if r.Meta.Kind != "release" || strings.Contains(r.Meta.Description+strings.Join(r.Meta.Facts, " "), "hello from the repo") {250
t.Fatalf("kaart: %+v", r.Meta)251
}252
if r := e.srv.cardForPath(ctx, "/tim/app/-/tree", "", ""); r.Meta.Kind == "repo" {253
t.Fatalf("code-kaart voor release-only: %+v", r.Meta)254
}255
}@@ -34,6 +34,11 @@ func (s *Server) guard(w http.ResponseWriter, r *http.Request, min access.Role)
34
34
role = access.RoleNone
35
35
}
36
36
readable := role.CanRead() || repo.Visibility == "public"
37
if !readable && releaseOnly(repo, role) && r.Method == http.MethodGet && strings.Trim(r.URL.Path, "/") == repo.FullPath() {
38
// Privé repo met publieke releases: alleen de Releases-pagina.
39
http.Redirect(w, r, "/"+repo.FullPath()+"/-/releases", http.StatusSeeOther)
40
return store.User{}, store.Repo{}, "", false
41
}
37
42
if !readable {
38
43
if isCrawler(r) {
39
44
s.writeLockedCard(w, r)
@@ -60,6 +65,13 @@ func (s *Server) repoView(w http.ResponseWriter, r *http.Request, repo store.Rep
60
65
v.Rev = safeRev(r.URL.Query().Get("rev"), repo.DefaultBranch)
61
66
v.CloneHTTP = strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath() + ".git"
62
67
v.CloneSSH = s.Cfg.CloneSSH(repo.FullPath())
68
v.ShowReleases = canSeeReleases(repo, role)
69
if releaseOnly(repo, role) {
70
card := releaseOnlyCard(repo)
71
v.Repo = &card
72
v.ReleaseOnly = true
73
v.CloneHTTP, v.CloneSSH, v.Rev = "", "", ""
74
}
63
75
return v
64
76
}
65
77
@@ -405,7 +417,7 @@ func (s *Server) runPipeline(w http.ResponseWriter, r *http.Request) {
405
417
}
406
418
407
419
func (s *Server) releases(w http.ResponseWriter, r *http.Request) {
408
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)
420
_, repo, role, ok := s.guardReleases(w, r)
409
421
if !ok {
410
422
return
411
423
}
@@ -34,6 +34,11 @@ func (s *Server) guard(w http.ResponseWriter, r *http.Request, min access.Role)34
role = access.RoleNone34
role = access.RoleNone35
}35
}36
readable := role.CanRead() || repo.Visibility == "public"36
readable := role.CanRead() || repo.Visibility == "public"37
if !readable && releaseOnly(repo, role) && r.Method == http.MethodGet && strings.Trim(r.URL.Path, "/") == repo.FullPath() {38
// Privé repo met publieke releases: alleen de Releases-pagina.39
http.Redirect(w, r, "/"+repo.FullPath()+"/-/releases", http.StatusSeeOther)40
return store.User{}, store.Repo{}, "", false41
}37
if !readable {42
if !readable {38
if isCrawler(r) {43
if isCrawler(r) {39
s.writeLockedCard(w, r)44
s.writeLockedCard(w, r)@@ -60,6 +65,13 @@ func (s *Server) repoView(w http.ResponseWriter, r *http.Request, repo store.Rep60
v.Rev = safeRev(r.URL.Query().Get("rev"), repo.DefaultBranch)65
v.Rev = safeRev(r.URL.Query().Get("rev"), repo.DefaultBranch)61
v.CloneHTTP = strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath() + ".git"66
v.CloneHTTP = strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath() + ".git"62
v.CloneSSH = s.Cfg.CloneSSH(repo.FullPath())67
v.CloneSSH = s.Cfg.CloneSSH(repo.FullPath())68
v.ShowReleases = canSeeReleases(repo, role)69
if releaseOnly(repo, role) {70
card := releaseOnlyCard(repo)71
v.Repo = &card72
v.ReleaseOnly = true73
v.CloneHTTP, v.CloneSSH, v.Rev = "", "", ""74
}63
return v75
return v64
}76
}65
77
@@ -405,7 +417,7 @@ func (s *Server) runPipeline(w http.ResponseWriter, r *http.Request) {405
}417
}406
418
407
func (s *Server) releases(w http.ResponseWriter, r *http.Request) {419
func (s *Server) releases(w http.ResponseWriter, r *http.Request) {408
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)420
_, repo, role, ok := s.guardReleases(w, r)409
if !ok {421
if !ok {410
return422
return411
}423
}@@ -673,6 +673,9 @@ type View struct {
673
673
HelpDoc *HelpDoc
674
674
RunnerUI template.HTML
675
675
AdminUsers []AdminUserRow
676
ReleaseOnly bool
677
ShowReleases bool
678
ReleaseRepos []store.Repo
676
679
LangPick template.HTML
677
680
ShowUpdate bool
678
681
Update *UpdateView
@@ -673,6 +673,9 @@ type View struct {673
HelpDoc *HelpDoc673
HelpDoc *HelpDoc674
RunnerUI template.HTML674
RunnerUI template.HTML675
AdminUsers []AdminUserRow675
AdminUsers []AdminUserRow676
ReleaseOnly bool677
ShowReleases bool678
ReleaseRepos []store.Repo676
LangPick template.HTML679
LangPick template.HTML677
ShowUpdate bool680
ShowUpdate bool678
Update *UpdateView681
Update *UpdateView@@ -194,6 +194,12 @@ func (s *Server) updateRepo(w http.ResponseWriter, r *http.Request) {
194
194
s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.commitProblem(r, err))
195
195
return
196
196
}
197
if rv := r.FormValue("release_visibility"); rv != "" {
198
if err := s.opSetReleaseVisibility(r.Context(), s.who(r).User, repo, rv); err != nil {
199
s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.commitProblem(r, err))
200
return
201
}
202
}
197
203
s.redirect(w, r, repoURL(repo)+"/-/settings", s.tr(r, "flash.saved"), "")
198
204
}
199
205
@@ -194,6 +194,12 @@ func (s *Server) updateRepo(w http.ResponseWriter, r *http.Request) {194
s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.commitProblem(r, err))194
s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.commitProblem(r, err))195
return195
return196
}196
}197
if rv := r.FormValue("release_visibility"); rv != "" {198
if err := s.opSetReleaseVisibility(r.Context(), s.who(r).User, repo, rv); err != nil {199
s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.commitProblem(r, err))200
return201
}202
}197
s.redirect(w, r, repoURL(repo)+"/-/settings", s.tr(r, "flash.saved"), "")203
s.redirect(w, r, repoURL(repo)+"/-/settings", s.tr(r, "flash.saved"), "")198
}204
}199
205
@@ -76,6 +76,16 @@ func (s *Server) cardForPath(ctx context.Context, path, rawQuery, fragment strin
76
76
if err != nil {
77
77
return card.Site(page, img, oem)
78
78
}
79
isRel := len(parts) >= 4 && parts[2] == "-" && parts[3] == "releases"
80
if isRel {
81
// Releases hebben een eigen zichtbaarheid; de kaart toont nooit code.
82
if !repo.ReleasesPublic() {
83
return s.lockedRender()
84
}
85
if repo.Visibility != "public" {
86
return s.releaseCardOnly(ctx, releaseOnlyCard(repo), page, img, oem, nil)
87
}
88
}
79
89
if repo.Visibility != "public" {
80
90
return s.lockedRender()
81
91
}
@@ -346,6 +356,13 @@ func (s *Server) pipeCard(ctx context.Context, repo store.Repo, id int64, page,
346
356
347
357
func (s *Server) releaseCard(ctx context.Context, repo store.Repo, page, img, oem string) card.Render {
348
358
base := s.repoCard(ctx, repo, page, img, oem)
359
return s.releaseCardOnly(ctx, repo, page, img, oem, base.Avatar)
360
}
361
362
// releaseCardOnly leest alleen releases, nooit code (veilig voor
363
// privé repo's met publieke releases).
364
func (s *Server) releaseCardOnly(ctx context.Context, repo store.Repo, page, img, oem string, avatar []byte) card.Render {
365
base := card.Render{Avatar: avatar}
349
366
list, err := s.Store.ListReleases(ctx, repo.ID)
350
367
if err != nil || len(list) == 0 {
351
368
return card.Render{Meta: card.Meta{
@@ -76,6 +76,16 @@ func (s *Server) cardForPath(ctx context.Context, path, rawQuery, fragment strin76
if err != nil {76
if err != nil {77
return card.Site(page, img, oem)77
return card.Site(page, img, oem)78
}78
}79
isRel := len(parts) >= 4 && parts[2] == "-" && parts[3] == "releases"80
if isRel {81
// Releases hebben een eigen zichtbaarheid; de kaart toont nooit code.82
if !repo.ReleasesPublic() {83
return s.lockedRender()84
}85
if repo.Visibility != "public" {86
return s.releaseCardOnly(ctx, releaseOnlyCard(repo), page, img, oem, nil)87
}88
}79
if repo.Visibility != "public" {89
if repo.Visibility != "public" {80
return s.lockedRender()90
return s.lockedRender()81
}91
}@@ -346,6 +356,13 @@ func (s *Server) pipeCard(ctx context.Context, repo store.Repo, id int64, page,346
356
347
func (s *Server) releaseCard(ctx context.Context, repo store.Repo, page, img, oem string) card.Render {357
func (s *Server) releaseCard(ctx context.Context, repo store.Repo, page, img, oem string) card.Render {348
base := s.repoCard(ctx, repo, page, img, oem)358
base := s.repoCard(ctx, repo, page, img, oem)359
return s.releaseCardOnly(ctx, repo, page, img, oem, base.Avatar)360
}361
362
// releaseCardOnly leest alleen releases, nooit code (veilig voor363
// privé repo's met publieke releases).364
func (s *Server) releaseCardOnly(ctx context.Context, repo store.Repo, page, img, oem string, avatar []byte) card.Render {365
base := card.Render{Avatar: avatar}349
list, err := s.Store.ListReleases(ctx, repo.ID)366
list, err := s.Store.ListReleases(ctx, repo.ID)350
if err != nil || len(list) == 0 {367
if err != nil || len(list) == 0 {351
return card.Render{Meta: card.Meta{368
return card.Render{Meta: card.Meta{@@ -25,7 +25,7 @@ func (s *Server) tags(w http.ResponseWriter, r *http.Request) {
25
25
lang := i18n.Parse(v.Lang)
26
26
patterns, _ := s.Store.ProtectedTagPatterns(r.Context(), repo.ID)
27
27
released := map[string]bool{}
28
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil {
28
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil && v.ShowReleases {
29
29
for _, rel := range rels {
30
30
released[rel.Tag] = true
31
31
}
@@ -25,7 +25,7 @@ func (s *Server) tags(w http.ResponseWriter, r *http.Request) {25
lang := i18n.Parse(v.Lang)25
lang := i18n.Parse(v.Lang)26
patterns, _ := s.Store.ProtectedTagPatterns(r.Context(), repo.ID)26
patterns, _ := s.Store.ProtectedTagPatterns(r.Context(), repo.ID)27
released := map[string]bool{}27
released := map[string]bool{}28
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil {28
if rels, err := s.Store.ListReleases(r.Context(), repo.ID); err == nil && v.ShowReleases {29
for _, rel := range rels {29
for _, rel := range rels {30
released[rel.Tag] = true30
released[rel.Tag] = true31
}31
}@@ -537,10 +537,11 @@
537
537
{{define "releases"}}
538
538
{{template "layout-start" .}}
539
539
<header class="pagehead"><h1>{{t "title.releases"}}</h1></header>
540
{{if .ReleaseOnly}}<p class="muted relonly">{{if .Repo.Description}}{{.Repo.Description}} · {{end}}{{t "rel.onlyNote"}}</p>{{end}}
540
541
{{range .Releases}}
541
542
<article class="panel" id="{{.Tag}}">
542
543
<h2>{{.Name}} <span class="pill">{{.Tag}}</span></h2>
543
<p class="muted">{{short .CommitSHA}}</p>
544
{{if not $.ReleaseOnly}}<p class="muted">{{short .CommitSHA}}</p>{{end}}
544
545
{{if .Body}}<pre>{{.Body}}</pre>{{end}}
545
546
<ul>
546
547
{{$tag := .Tag}}{{$path := $.Repo.FullPath}}
@@ -639,6 +640,13 @@
639
640
<input type="hidden" name="csrf" value="{{.CSRF}}">
640
641
<label>{{t "new.description"}} <input name="description" value="{{.Repo.Description}}"></label>
641
642
<label>{{t "new.visibility"}} <select name="visibility"><option value="private" {{if eq .Repo.Visibility "private"}}selected{{end}}>{{t "vis.private"}}</option><option value="public" {{if eq .Repo.Visibility "public"}}selected{{end}}>{{t "vis.public"}}</option></select></label>
643
<label class="tiphost"><span class="rui-lbl">{{t "rel.vis.label"}} {{tip "rel.vis.tip"}}</span>
644
<select name="release_visibility">
645
<option value="inherit" {{if or (eq .Repo.ReleaseVisibility "inherit") (eq .Repo.ReleaseVisibility "")}}selected{{end}}>{{t "rel.vis.inherit"}}</option>
646
<option value="private" {{if eq .Repo.ReleaseVisibility "private"}}selected{{end}}>{{t "rel.vis.private"}}</option>
647
<option value="public" {{if eq .Repo.ReleaseVisibility "public"}}selected{{end}}>{{t "rel.vis.public"}}</option>
648
</select>
649
</label>
642
650
<button type="submit">{{t "action.save"}}</button>
643
651
</form>
644
652
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/logo" enctype="multipart/form-data">
@@ -537,10 +537,11 @@537
{{define "releases"}}537
{{define "releases"}}538
{{template "layout-start" .}}538
{{template "layout-start" .}}539
<header class="pagehead"><h1>{{t "title.releases"}}</h1></header>539
<header class="pagehead"><h1>{{t "title.releases"}}</h1></header>540
{{if .ReleaseOnly}}<p class="muted relonly">{{if .Repo.Description}}{{.Repo.Description}} · {{end}}{{t "rel.onlyNote"}}</p>{{end}}540
{{range .Releases}}541
{{range .Releases}}541
<article class="panel" id="{{.Tag}}">542
<article class="panel" id="{{.Tag}}">542
<h2>{{.Name}} <span class="pill">{{.Tag}}</span></h2>543
<h2>{{.Name}} <span class="pill">{{.Tag}}</span></h2>543
<p class="muted">{{short .CommitSHA}}</p>544
{{if not $.ReleaseOnly}}<p class="muted">{{short .CommitSHA}}</p>{{end}}544
{{if .Body}}<pre>{{.Body}}</pre>{{end}}545
{{if .Body}}<pre>{{.Body}}</pre>{{end}}545
<ul>546
<ul>546
{{$tag := .Tag}}{{$path := $.Repo.FullPath}}547
{{$tag := .Tag}}{{$path := $.Repo.FullPath}}@@ -639,6 +640,13 @@639
<input type="hidden" name="csrf" value="{{.CSRF}}">640
<input type="hidden" name="csrf" value="{{.CSRF}}">640
<label>{{t "new.description"}} <input name="description" value="{{.Repo.Description}}"></label>641
<label>{{t "new.description"}} <input name="description" value="{{.Repo.Description}}"></label>641
<label>{{t "new.visibility"}} <select name="visibility"><option value="private" {{if eq .Repo.Visibility "private"}}selected{{end}}>{{t "vis.private"}}</option><option value="public" {{if eq .Repo.Visibility "public"}}selected{{end}}>{{t "vis.public"}}</option></select></label>642
<label>{{t "new.visibility"}} <select name="visibility"><option value="private" {{if eq .Repo.Visibility "private"}}selected{{end}}>{{t "vis.private"}}</option><option value="public" {{if eq .Repo.Visibility "public"}}selected{{end}}>{{t "vis.public"}}</option></select></label>643
<label class="tiphost"><span class="rui-lbl">{{t "rel.vis.label"}} {{tip "rel.vis.tip"}}</span>644
<select name="release_visibility">645
<option value="inherit" {{if or (eq .Repo.ReleaseVisibility "inherit") (eq .Repo.ReleaseVisibility "")}}selected{{end}}>{{t "rel.vis.inherit"}}</option>646
<option value="private" {{if eq .Repo.ReleaseVisibility "private"}}selected{{end}}>{{t "rel.vis.private"}}</option>647
<option value="public" {{if eq .Repo.ReleaseVisibility "public"}}selected{{end}}>{{t "rel.vis.public"}}</option>648
</select>649
</label>642
<button type="submit">{{t "action.save"}}</button>650
<button type="submit">{{t "action.save"}}</button>643
</form>651
</form>644
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/logo" enctype="multipart/form-data">652
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/logo" enctype="multipart/form-data">@@ -55,7 +55,7 @@
55
55
{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}
56
56
{{if and .User .User.InstanceAdmin (adminpage .Page)}}{{template "adminnav" .}}{{end}}
57
57
{{if .Repo}}
58
<p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<a href="/users/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{end}} <span aria-hidden="true">/</span> <a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}">{{.Repo.Name}}</a></p>
58
<p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<a href="/users/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{end}} <span aria-hidden="true">/</span> <a href="/{{.Repo.FullPath}}{{if .ReleaseOnly}}/-/releases{{else if .Rev}}?rev={{.Rev}}{{end}}">{{.Repo.Name}}</a></p>
59
59
{{else if .Group}}
60
60
<p class="crumbs"><a href="/">{{t "nav.dashboard"}}</a> <span aria-hidden="true">/</span> <span>{{.Group.Name}}</span></p>
61
61
{{else if .Profile}}
@@ -85,12 +85,15 @@
85
85
86
86
{{define "reposide"}}
87
87
<aside class="sidenav">
88
<a class="sidecontext" href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}">
88
<a class="sidecontext" href="/{{.Repo.FullPath}}{{if .ReleaseOnly}}/-/releases{{else if .Rev}}?rev={{.Rev}}{{end}}">
89
89
{{template "namemark" .Repo}}
90
90
<span class="sidename">{{.Repo.Name}}</span>
91
91
{{template "visicon" .Repo.Visibility}}
92
92
</a>
93
93
<nav class="sidenav-links">
94
{{if .ReleaseOnly}}
95
<a href="/{{.Repo.FullPath}}/-/releases" class="on">{{t "tab.releases"}}</a>
96
{{else}}
94
97
<a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "overview"}} class="on"{{end}}>{{t "tab.overview"}}</a>
95
98
<a href="/{{.Repo.FullPath}}/-/tree{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "files"}} class="on"{{end}}>{{t "tab.files"}}</a>
96
99
<a href="/{{.Repo.FullPath}}/-/commits{{if .Rev}}?rev={{.Rev}}{{end}}"{{if or (eq .Page "commits") (eq .Page "commit")}} class="on"{{end}}>{{t "tab.commits"}}</a>
@@ -99,8 +102,9 @@
99
102
<a href="/{{.Repo.FullPath}}/-/merge-requests"{{if or (eq .Page "mrs") (eq .Page "mr")}} class="on"{{end}}>{{t "tab.mrs"}}</a>
100
103
<a href="/{{.Repo.FullPath}}/-/issues"{{if or (eq .Page "issues") (eq .Page "issue") (eq .Page "issuenew")}} class="on"{{end}}>{{t "tab.issues"}}</a>
101
104
<a href="/{{.Repo.FullPath}}/-/pipelines"{{if or (eq .Page "pipelines") (eq .Page "editor")}} class="on"{{end}}>{{t "tab.pipelines"}}</a>
102
<a href="/{{.Repo.FullPath}}/-/releases"{{if eq .Page "releases"}} class="on"{{end}}>{{t "tab.releases"}}</a>
105
{{if .ShowReleases}}<a href="/{{.Repo.FullPath}}/-/releases"{{if eq .Page "releases"}} class="on"{{end}}>{{t "tab.releases"}}</a>{{end}}
103
106
{{if .CanAdmin}}<a href="/{{.Repo.FullPath}}/-/settings"{{if eq .Page "settings"}} class="on"{{end}}>{{t "tab.settings"}}</a>{{end}}
107
{{end}}
104
108
</nav>
105
109
</aside>
106
110
{{end}}
@@ -55,7 +55,7 @@55
{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}55
{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}56
{{if and .User .User.InstanceAdmin (adminpage .Page)}}{{template "adminnav" .}}{{end}}56
{{if and .User .User.InstanceAdmin (adminpage .Page)}}{{template "adminnav" .}}{{end}}57
{{if .Repo}}57
{{if .Repo}}58
<p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<a href="/users/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{end}} <span aria-hidden="true">/</span> <a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}">{{.Repo.Name}}</a></p>58
<p class="crumbs">{{if eq .Repo.OwnerKind "group"}}<a href="/groups/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{else}}<a href="/users/{{.Repo.OwnerPath}}">{{.Repo.OwnerPath}}</a>{{end}} <span aria-hidden="true">/</span> <a href="/{{.Repo.FullPath}}{{if .ReleaseOnly}}/-/releases{{else if .Rev}}?rev={{.Rev}}{{end}}">{{.Repo.Name}}</a></p>59
{{else if .Group}}59
{{else if .Group}}60
<p class="crumbs"><a href="/">{{t "nav.dashboard"}}</a> <span aria-hidden="true">/</span> <span>{{.Group.Name}}</span></p>60
<p class="crumbs"><a href="/">{{t "nav.dashboard"}}</a> <span aria-hidden="true">/</span> <span>{{.Group.Name}}</span></p>61
{{else if .Profile}}61
{{else if .Profile}}@@ -85,12 +85,15 @@85
85
86
{{define "reposide"}}86
{{define "reposide"}}87
<aside class="sidenav">87
<aside class="sidenav">88
<a class="sidecontext" href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}">88
<a class="sidecontext" href="/{{.Repo.FullPath}}{{if .ReleaseOnly}}/-/releases{{else if .Rev}}?rev={{.Rev}}{{end}}">89
{{template "namemark" .Repo}}89
{{template "namemark" .Repo}}90
<span class="sidename">{{.Repo.Name}}</span>90
<span class="sidename">{{.Repo.Name}}</span>91
{{template "visicon" .Repo.Visibility}}91
{{template "visicon" .Repo.Visibility}}92
</a>92
</a>93
<nav class="sidenav-links">93
<nav class="sidenav-links">94
{{if .ReleaseOnly}}95
<a href="/{{.Repo.FullPath}}/-/releases" class="on">{{t "tab.releases"}}</a>96
{{else}}94
<a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "overview"}} class="on"{{end}}>{{t "tab.overview"}}</a>97
<a href="/{{.Repo.FullPath}}{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "overview"}} class="on"{{end}}>{{t "tab.overview"}}</a>95
<a href="/{{.Repo.FullPath}}/-/tree{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "files"}} class="on"{{end}}>{{t "tab.files"}}</a>98
<a href="/{{.Repo.FullPath}}/-/tree{{if .Rev}}?rev={{.Rev}}{{end}}"{{if eq .Page "files"}} class="on"{{end}}>{{t "tab.files"}}</a>96
<a href="/{{.Repo.FullPath}}/-/commits{{if .Rev}}?rev={{.Rev}}{{end}}"{{if or (eq .Page "commits") (eq .Page "commit")}} class="on"{{end}}>{{t "tab.commits"}}</a>99
<a href="/{{.Repo.FullPath}}/-/commits{{if .Rev}}?rev={{.Rev}}{{end}}"{{if or (eq .Page "commits") (eq .Page "commit")}} class="on"{{end}}>{{t "tab.commits"}}</a>@@ -99,8 +102,9 @@99
<a href="/{{.Repo.FullPath}}/-/merge-requests"{{if or (eq .Page "mrs") (eq .Page "mr")}} class="on"{{end}}>{{t "tab.mrs"}}</a>102
<a href="/{{.Repo.FullPath}}/-/merge-requests"{{if or (eq .Page "mrs") (eq .Page "mr")}} class="on"{{end}}>{{t "tab.mrs"}}</a>100
<a href="/{{.Repo.FullPath}}/-/issues"{{if or (eq .Page "issues") (eq .Page "issue") (eq .Page "issuenew")}} class="on"{{end}}>{{t "tab.issues"}}</a>103
<a href="/{{.Repo.FullPath}}/-/issues"{{if or (eq .Page "issues") (eq .Page "issue") (eq .Page "issuenew")}} class="on"{{end}}>{{t "tab.issues"}}</a>101
<a href="/{{.Repo.FullPath}}/-/pipelines"{{if or (eq .Page "pipelines") (eq .Page "editor")}} class="on"{{end}}>{{t "tab.pipelines"}}</a>104
<a href="/{{.Repo.FullPath}}/-/pipelines"{{if or (eq .Page "pipelines") (eq .Page "editor")}} class="on"{{end}}>{{t "tab.pipelines"}}</a>102
<a href="/{{.Repo.FullPath}}/-/releases"{{if eq .Page "releases"}} class="on"{{end}}>{{t "tab.releases"}}</a>105
{{if .ShowReleases}}<a href="/{{.Repo.FullPath}}/-/releases"{{if eq .Page "releases"}} class="on"{{end}}>{{t "tab.releases"}}</a>{{end}}103
{{if .CanAdmin}}<a href="/{{.Repo.FullPath}}/-/settings"{{if eq .Page "settings"}} class="on"{{end}}>{{t "tab.settings"}}</a>{{end}}106
{{if .CanAdmin}}<a href="/{{.Repo.FullPath}}/-/settings"{{if eq .Page "settings"}} class="on"{{end}}>{{t "tab.settings"}}</a>{{end}}107
{{end}}104
</nav>108
</nav>105
</aside>109
</aside>106
{{end}}110
{{end}}@@ -66,9 +66,21 @@
66
66
</ul>
67
67
</section>
68
68
{{end}}
69
{{template "releaserepos" .}}
69
70
{{template "layout-end" .}}
70
71
{{end}}
71
72
73
{{define "releaserepos"}}
74
{{if .ReleaseRepos}}
75
<section class="panel">
76
<h2>{{t "home.releaseOnly"}}</h2>
77
<ul class="repolist">
78
{{range .ReleaseRepos}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/{{.FullPath}}/-/releases">{{.FullPath}}</a> <span class="pill">{{t "rel.vis.onlyPill"}}</span>{{if .Description}} <span class="muted">{{.Description}}</span>{{end}}</div></li>{{end}}
79
</ul>
80
</section>
81
{{end}}
82
{{end}}
83
72
84
{{define "dashboard"}}
73
85
{{template "layout-start" .}}
74
86
<header class="pagehead">
@@ -94,6 +106,7 @@
94
106
</ul>
95
107
</section>
96
108
</div>
109
{{template "releaserepos" .}}
97
110
{{template "layout-end" .}}
98
111
{{end}}
99
112
@@ -66,9 +66,21 @@66
</ul>66
</ul>67
</section>67
</section>68
{{end}}68
{{end}}69
{{template "releaserepos" .}}69
{{template "layout-end" .}}70
{{template "layout-end" .}}70
{{end}}71
{{end}}71
72
73
{{define "releaserepos"}}74
{{if .ReleaseRepos}}75
<section class="panel">76
<h2>{{t "home.releaseOnly"}}</h2>77
<ul class="repolist">78
{{range .ReleaseRepos}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/{{.FullPath}}/-/releases">{{.FullPath}}</a> <span class="pill">{{t "rel.vis.onlyPill"}}</span>{{if .Description}} <span class="muted">{{.Description}}</span>{{end}}</div></li>{{end}}79
</ul>80
</section>81
{{end}}82
{{end}}83
72
{{define "dashboard"}}84
{{define "dashboard"}}73
{{template "layout-start" .}}85
{{template "layout-start" .}}74
<header class="pagehead">86
<header class="pagehead">@@ -94,6 +106,7 @@94
</ul>106
</ul>95
</section>107
</section>96
</div>108
</div>109
{{template "releaserepos" .}}97
{{template "layout-end" .}}110
{{template "layout-end" .}}98
{{end}}111
{{end}}99
112
@@ -49,6 +49,70 @@ type Repo struct {
49
49
Visibility string
50
50
LogoMIME string
51
51
CreatedAt time.Time
52
// ReleaseVisibility is "inherit" (zelfde als de repo), "private" of
53
// "public". Zie ReleasesPublic.
54
ReleaseVisibility string
55
}
56
57
// ReleasesPublic meldt of releases (pagina, notities, assets) voor
58
// niet-leden zichtbaar zijn. Broncode valt hier nooit onder.
59
func (r Repo) ReleasesPublic() bool {
60
switch r.ReleaseVisibility {
61
case "public":
62
return true
63
case "private":
64
return false
65
default:
66
return r.Visibility == "public"
67
}
68
}
69
70
// ValidReleaseVisibility kent inherit, private en public.
71
func ValidReleaseVisibility(v string) bool {
72
return v == "inherit" || v == "private" || v == "public"
73
}
74
75
// SetReleaseVisibility zet de zichtbaarheid van releases.
76
func (s *Store) SetReleaseVisibility(ctx context.Context, id int64, v string) error {
77
if !ValidReleaseVisibility(v) {
78
return i18n.E("err.releaseVisibility")
79
}
80
_, err := s.db.ExecContext(ctx, `UPDATE repos SET release_visibility = ? WHERE id = ?`, v, id)
81
return err
82
}
83
84
// ListReleaseOnlyRepoIDs geeft privé repositories met publieke releases
85
// waar deze gebruiker geen lid van is (0 = anoniem). Alleen naam, korte
86
// beschrijving en de Releases-pagina zijn voor hen zichtbaar.
87
func (s *Store) ListReleaseOnlyRepoIDs(ctx context.Context, userID int64) ([]int64, error) {
88
rows, err := s.db.QueryContext(ctx, `SELECT id FROM repos WHERE visibility = 'private' AND release_visibility = 'public' ORDER BY id DESC`)
89
if err != nil {
90
return nil, err
91
}
92
var ids []int64
93
for rows.Next() {
94
var id int64
95
if err := rows.Scan(&id); err != nil {
96
rows.Close()
97
return nil, err
98
}
99
ids = append(ids, id)
100
}
101
rows.Close()
102
if err := rows.Err(); err != nil {
103
return nil, err
104
}
105
var out []int64
106
for _, id := range ids {
107
role, err := s.EffectiveRole(ctx, userID, id)
108
if err != nil {
109
return nil, err
110
}
111
if !role.CanRead() {
112
out = append(out, id)
113
}
114
}
115
return out, nil
52
116
}
53
117
54
118
// HasLogo meldt of er een geüpload logo is.
@@ -255,14 +319,14 @@ func (s *Store) RepoByPath(ctx context.Context, owner, name string) (Repo, error
255
319
const repoSelect = `
256
320
SELECT r.id, r.owner_kind, r.owner_id,
257
321
CASE r.owner_kind WHEN 'user' THEN (SELECT username FROM users WHERE id = r.owner_id) ELSE (SELECT path FROM groups WHERE id = r.owner_id) END,
258
r.name, r.description, r.default_branch, r.visibility, r.created_at, r.logo_mime
322
r.name, r.description, r.default_branch, r.visibility, r.created_at, r.logo_mime, r.release_visibility
259
323
FROM repos r`
260
324
261
325
func scanRepo(row *sql.Row) (Repo, error) {
262
326
var r Repo
263
327
var created string
264
328
var owner sql.NullString
265
if err := row.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created, &r.LogoMIME); err != nil {
329
if err := row.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created, &r.LogoMIME, &r.ReleaseVisibility); err != nil {
266
330
if errors.Is(err, sql.ErrNoRows) {
267
331
return Repo{}, errNotFound
268
332
}
@@ -369,7 +433,7 @@ func scanRepos(rows *sql.Rows) ([]Repo, error) {
369
433
var r Repo
370
434
var created string
371
435
var owner sql.NullString
372
if err := rows.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created, &r.LogoMIME); err != nil {
436
if err := rows.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created, &r.LogoMIME, &r.ReleaseVisibility); err != nil {
373
437
return nil, err
374
438
}
375
439
r.OwnerPath = owner.String
@@ -49,6 +49,70 @@ type Repo struct {49
Visibility string49
Visibility string50
LogoMIME string50
LogoMIME string51
CreatedAt time.Time51
CreatedAt time.Time52
// ReleaseVisibility is "inherit" (zelfde als de repo), "private" of53
// "public". Zie ReleasesPublic.54
ReleaseVisibility string55
}56
57
// ReleasesPublic meldt of releases (pagina, notities, assets) voor58
// niet-leden zichtbaar zijn. Broncode valt hier nooit onder.59
func (r Repo) ReleasesPublic() bool {60
switch r.ReleaseVisibility {61
case "public":62
return true63
case "private":64
return false65
default:66
return r.Visibility == "public"67
}68
}69
70
// ValidReleaseVisibility kent inherit, private en public.71
func ValidReleaseVisibility(v string) bool {72
return v == "inherit" || v == "private" || v == "public"73
}74
75
// SetReleaseVisibility zet de zichtbaarheid van releases.76
func (s *Store) SetReleaseVisibility(ctx context.Context, id int64, v string) error {77
if !ValidReleaseVisibility(v) {78
return i18n.E("err.releaseVisibility")79
}80
_, err := s.db.ExecContext(ctx, `UPDATE repos SET release_visibility = ? WHERE id = ?`, v, id)81
return err82
}83
84
// ListReleaseOnlyRepoIDs geeft privé repositories met publieke releases85
// waar deze gebruiker geen lid van is (0 = anoniem). Alleen naam, korte86
// beschrijving en de Releases-pagina zijn voor hen zichtbaar.87
func (s *Store) ListReleaseOnlyRepoIDs(ctx context.Context, userID int64) ([]int64, error) {88
rows, err := s.db.QueryContext(ctx, `SELECT id FROM repos WHERE visibility = 'private' AND release_visibility = 'public' ORDER BY id DESC`)89
if err != nil {90
return nil, err91
}92
var ids []int6493
for rows.Next() {94
var id int6495
if err := rows.Scan(&id); err != nil {96
rows.Close()97
return nil, err98
}99
ids = append(ids, id)100
}101
rows.Close()102
if err := rows.Err(); err != nil {103
return nil, err104
}105
var out []int64106
for _, id := range ids {107
role, err := s.EffectiveRole(ctx, userID, id)108
if err != nil {109
return nil, err110
}111
if !role.CanRead() {112
out = append(out, id)113
}114
}115
return out, nil52
}116
}53
117
54
// HasLogo meldt of er een geüpload logo is.118
// HasLogo meldt of er een geüpload logo is.@@ -255,14 +319,14 @@ func (s *Store) RepoByPath(ctx context.Context, owner, name string) (Repo, error255
const repoSelect = `319
const repoSelect = `256
SELECT r.id, r.owner_kind, r.owner_id,320
SELECT r.id, r.owner_kind, r.owner_id,257
CASE r.owner_kind WHEN 'user' THEN (SELECT username FROM users WHERE id = r.owner_id) ELSE (SELECT path FROM groups WHERE id = r.owner_id) END,321
CASE r.owner_kind WHEN 'user' THEN (SELECT username FROM users WHERE id = r.owner_id) ELSE (SELECT path FROM groups WHERE id = r.owner_id) END,258
r.name, r.description, r.default_branch, r.visibility, r.created_at, r.logo_mime322
r.name, r.description, r.default_branch, r.visibility, r.created_at, r.logo_mime, r.release_visibility259
FROM repos r`323
FROM repos r`260
324
261
func scanRepo(row *sql.Row) (Repo, error) {325
func scanRepo(row *sql.Row) (Repo, error) {262
var r Repo326
var r Repo263
var created string327
var created string264
var owner sql.NullString328
var owner sql.NullString265
if err := row.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created, &r.LogoMIME); err != nil {329
if err := row.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created, &r.LogoMIME, &r.ReleaseVisibility); err != nil {266
if errors.Is(err, sql.ErrNoRows) {330
if errors.Is(err, sql.ErrNoRows) {267
return Repo{}, errNotFound331
return Repo{}, errNotFound268
}332
}@@ -369,7 +433,7 @@ func scanRepos(rows *sql.Rows) ([]Repo, error) {369
var r Repo433
var r Repo370
var created string434
var created string371
var owner sql.NullString435
var owner sql.NullString372
if err := rows.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created, &r.LogoMIME); err != nil {436
if err := rows.Scan(&r.ID, &r.OwnerKind, &r.OwnerID, &owner, &r.Name, &r.Description, &r.DefaultBranch, &r.Visibility, &created, &r.LogoMIME, &r.ReleaseVisibility); err != nil {373
return nil, err437
return nil, err374
}438
}375
r.OwnerPath = owner.String439
r.OwnerPath = owner.String@@ -62,6 +62,7 @@ func (s *Store) migrate() error {
62
62
`ALTER TABLE groups ADD COLUMN default_role TEXT NOT NULL DEFAULT 'developer'`,
63
63
`ALTER TABLE groups ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
64
64
`ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
65
`ALTER TABLE repos ADD COLUMN release_visibility TEXT NOT NULL DEFAULT 'inherit'`,
65
66
`ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,
66
67
`ALTER TABLE notes ADD COLUMN file_path TEXT NOT NULL DEFAULT ''`,
67
68
`ALTER TABLE notes ADD COLUMN line_start INTEGER NOT NULL DEFAULT 0`,
@@ -62,6 +62,7 @@ func (s *Store) migrate() error {62
`ALTER TABLE groups ADD COLUMN default_role TEXT NOT NULL DEFAULT 'developer'`,62
`ALTER TABLE groups ADD COLUMN default_role TEXT NOT NULL DEFAULT 'developer'`,63
`ALTER TABLE groups ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,63
`ALTER TABLE groups ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,64
`ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,64
`ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,65
`ALTER TABLE repos ADD COLUMN release_visibility TEXT NOT NULL DEFAULT 'inherit'`,65
`ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,66
`ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,66
`ALTER TABLE notes ADD COLUMN file_path TEXT NOT NULL DEFAULT ''`,67
`ALTER TABLE notes ADD COLUMN file_path TEXT NOT NULL DEFAULT ''`,67
`ALTER TABLE notes ADD COLUMN line_start INTEGER NOT NULL DEFAULT 0`,68
`ALTER TABLE notes ADD COLUMN line_start INTEGER NOT NULL DEFAULT 0`,@@ -233,7 +233,15 @@ cmd_branch() {
233
233
req POST "$(proj "$p")/repository/branches" "$(json --arg n "$name" --arg f "$from" '{name:$n} + (if $f=="" then {} else {from:$f} end)')" | jq -r '.name // .'
234
234
}
235
235
cmd_release() {
236
[[ ${1:-} == create ]] || die "release create PROJECT TAG [--commit SHA] [--name N] [--body B] [--asset JOB:PAD[:NAAM]]..."
236
if [[ ${1:-} == visibility ]]; then
237
# release visibility PROJECT [inherit|private|public]: tonen of zetten
238
local p=${2:?project} v=${3:-}
239
if [[ -z $v ]]; then get "$(proj "$p")" | jq -r '.release_visibility'; return; fi
240
[[ $v == inherit || $v == private || $v == public ]] || die "release visibility PROJECT inherit|private|public"
241
req PUT "$(proj "$p")" "$(json --arg v "$v" '{release_visibility:$v}')" | jq -r '"\(.path) releases=\(.release_visibility) repo=\(.visibility)"'
242
return
243
fi
244
[[ ${1:-} == create ]] || die "release create PROJECT TAG [--commit SHA] [--name N] [--body B] [--asset JOB:PAD[:NAAM]]... | release visibility PROJECT [inherit|private|public]"
237
245
local p=${2:?project} tag=${3:?tag}; shift 3
238
246
local commit="" name="" body="" assets="[]"
239
247
while (($#)); do case $1 in
@@ -265,6 +273,7 @@ usage() {
265
273
bg issue list|show|create|comment|close|reopen ...
266
274
bg branch create PROJECT NAAM [--from REF]
267
275
bg release create PROJECT TAG [--commit SHA] [--asset JOB:PAD[:NAAM]]
276
bg release visibility PROJECT [inherit|private|public] zichtbaarheid releases tonen of zetten
268
277
bg file get PROJECT PAD [--ref REF]
269
278
bg runner list|show ID|jobs ID [N] [--group PAD] (account-runners zonder --group)
270
279
bg runner token [--json] [--group PAD] registratietoken (eenmalig, 24 uur)
@@ -233,7 +233,15 @@ cmd_branch() {233
req POST "$(proj "$p")/repository/branches" "$(json --arg n "$name" --arg f "$from" '{name:$n} + (if $f=="" then {} else {from:$f} end)')" | jq -r '.name // .'233
req POST "$(proj "$p")/repository/branches" "$(json --arg n "$name" --arg f "$from" '{name:$n} + (if $f=="" then {} else {from:$f} end)')" | jq -r '.name // .'234
}234
}235
cmd_release() {235
cmd_release() {236
[[ ${1:-} == create ]] || die "release create PROJECT TAG [--commit SHA] [--name N] [--body B] [--asset JOB:PAD[:NAAM]]..."236
if [[ ${1:-} == visibility ]]; then237
# release visibility PROJECT [inherit|private|public]: tonen of zetten238
local p=${2:?project} v=${3:-}239
if [[ -z $v ]]; then get "$(proj "$p")" | jq -r '.release_visibility'; return; fi240
[[ $v == inherit || $v == private || $v == public ]] || die "release visibility PROJECT inherit|private|public"241
req PUT "$(proj "$p")" "$(json --arg v "$v" '{release_visibility:$v}')" | jq -r '"\(.path) releases=\(.release_visibility) repo=\(.visibility)"'242
return243
fi244
[[ ${1:-} == create ]] || die "release create PROJECT TAG [--commit SHA] [--name N] [--body B] [--asset JOB:PAD[:NAAM]]... | release visibility PROJECT [inherit|private|public]"237
local p=${2:?project} tag=${3:?tag}; shift 3245
local p=${2:?project} tag=${3:?tag}; shift 3238
local commit="" name="" body="" assets="[]"246
local commit="" name="" body="" assets="[]"239
while (($#)); do case $1 in247
while (($#)); do case $1 in@@ -265,6 +273,7 @@ usage() {265
bg issue list|show|create|comment|close|reopen ...273
bg issue list|show|create|comment|close|reopen ...266
bg branch create PROJECT NAAM [--from REF]274
bg branch create PROJECT NAAM [--from REF]267
bg release create PROJECT TAG [--commit SHA] [--asset JOB:PAD[:NAAM]]275
bg release create PROJECT TAG [--commit SHA] [--asset JOB:PAD[:NAAM]]276
bg release visibility PROJECT [inherit|private|public] zichtbaarheid releases tonen of zetten268
bg file get PROJECT PAD [--ref REF]277
bg file get PROJECT PAD [--ref REF]269
bg runner list|show ID|jobs ID [N] [--group PAD] (account-runners zonder --group)278
bg runner list|show ID|jobs ID [N] [--group PAD] (account-runners zonder --group)270
bg runner token [--json] [--group PAD] registratietoken (eenmalig, 24 uur)279
bg runner token [--json] [--group PAD] registratietoken (eenmalig, 24 uur)