BlueGit

timfa bluegit

Merge branch 'cursor/releases-root-redirect' into 'stage'

timfa

Authored 2026-10-25 · 3 weeks ago

Hash
1c141f870ffdaec9f678c3b1982d9e2a0f8d2ecc
Pipeline
Passed
5 files changed +51 −2
internal/server/release_visibility_test.go +25 −0
@@ -176,6 +176,31 @@ func TestReleaseVisibilityMatrix(t *testing.T) {
176 176 } else if canCode && c != 200 {
177 177 t.Errorf("%s %s projectpagina: %d", label, a.name, c)
178 178 }
179 // Varianten van de projectroot (t695u): /, /- en /-/.
180 for _, suf := range []string{"/", "/-", "/-/"} {
181 c, _, h := rvGet(t, a.client, base+"/team/lib"+suf, "")
182 loc := h.Get("Location")
183 switch {
184 case !canCode && relPublic:
185 if c != http.StatusSeeOther || loc != "/team/lib/-/releases" {
186 t.Errorf("%s %s %s: %d %s", label, a.name, suf, c, loc)
187 }
188 case canCode:
189 if c != http.StatusSeeOther || loc != "/team/lib" {
190 t.Errorf("%s %s %s: %d %s", label, a.name, suf, c, loc)
191 }
192 default:
193 if c < 400 {
194 t.Errorf("%s %s %s lekt: %d %s", label, a.name, suf, c, loc)
195 }
196 }
197 }
198 // Niet-bestaand blijft 404; open redirect via dubbele slash kan niet.
199 for _, p := range []string{"/team/nope", "/team/nope/", "/team/nope/-", "//evil.example/x/-"} {
200 if c, _, h := rvGet(t, a.client, base+p, ""); c != 404 && !strings.HasPrefix(h.Get("Location"), "/") || strings.HasPrefix(h.Get("Location"), "//") {
201 t.Errorf("%s %s %s: %d %s", label, a.name, p, c, h.Get("Location"))
202 }
203 }
179 204 // Lid: tabbladen; publieke code met privé releases: geen Releases-tab.
180 205 if canCode {
181 206 _, body, _ := rvGet(t, a.client, base+"/team/lib/-/tree", "")
@@ -176,6 +176,31 @@ func TestReleaseVisibilityMatrix(t *testing.T) {
176 } else if canCode && c != 200 {
176 } else if canCode && c != 200 {
177 t.Errorf("%s %s projectpagina: %d", label, a.name, c)
177 t.Errorf("%s %s projectpagina: %d", label, a.name, c)
178 }
178 }
179 // Varianten van de projectroot (t695u): /, /- en /-/.
180 for _, suf := range []string{"/", "/-", "/-/"} {
181 c, _, h := rvGet(t, a.client, base+"/team/lib"+suf, "")
182 loc := h.Get("Location")
183 switch {
184 case !canCode && relPublic:
185 if c != http.StatusSeeOther || loc != "/team/lib/-/releases" {
186 t.Errorf("%s %s %s: %d %s", label, a.name, suf, c, loc)
187 }
188 case canCode:
189 if c != http.StatusSeeOther || loc != "/team/lib" {
190 t.Errorf("%s %s %s: %d %s", label, a.name, suf, c, loc)
191 }
192 default:
193 if c < 400 {
194 t.Errorf("%s %s %s lekt: %d %s", label, a.name, suf, c, loc)
195 }
196 }
197 }
198 // Niet-bestaand blijft 404; open redirect via dubbele slash kan niet.
199 for _, p := range []string{"/team/nope", "/team/nope/", "/team/nope/-", "//evil.example/x/-"} {
200 if c, _, h := rvGet(t, a.client, base+p, ""); c != 404 && !strings.HasPrefix(h.Get("Location"), "/") || strings.HasPrefix(h.Get("Location"), "//") {
201 t.Errorf("%s %s %s: %d %s", label, a.name, p, c, h.Get("Location"))
202 }
203 }
179 // Lid: tabbladen; publieke code met privé releases: geen Releases-tab.
204 // Lid: tabbladen; publieke code met privé releases: geen Releases-tab.
180 if canCode {
205 if canCode {
181 _, body, _ := rvGet(t, a.client, base+"/team/lib/-/tree", "")
206 _, body, _ := rvGet(t, a.client, base+"/team/lib/-/tree", "")
internal/server/repo_handlers.go +17 −1
@@ -34,7 +34,7 @@ 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() {
37 if !readable && releaseOnly(repo, role) && r.Method == http.MethodGet && isRepoRootPath(r.URL.Path, repo) {
38 38 // Privé repo met publieke releases: alleen de Releases-pagina.
39 39 http.Redirect(w, r, "/"+repo.FullPath()+"/-/releases", http.StatusSeeOther)
40 40 return store.User{}, store.Repo{}, "", false
@@ -502,3 +502,19 @@ func safeSHA(s string) bool {
502 502 }
503 503 return true
504 504 }
505
506 // isRepoRootPath: /{owner}/{repo}, met of zonder slash, of /{owner}/{repo}/-.
507 func isRepoRootPath(p string, repo store.Repo) bool {
508 t := strings.Trim(p, "/")
509 return t == repo.FullPath() || t == repo.FullPath()+"/-"
510 }
511
512 // repoRootAlias: /{owner}/{repo}/ en /{owner}/{repo}/- gaan naar de projectpagina
513 // (of, release-only, naar Releases via guard). Geen toegang: 404 zoals niet-bestaand.
514 func (s *Server) repoRootAlias(w http.ResponseWriter, r *http.Request) {
515 _, repo, _, ok := s.guard(w, r, access.RoleReadonly)
516 if !ok {
517 return
518 }
519 http.Redirect(w, r, "/"+repo.FullPath(), http.StatusSeeOther)
520 }
@@ -34,7 +34,7 @@ func (s *Server) guard(w http.ResponseWriter, r *http.Request, min access.Role)
34 role = access.RoleNone
34 role = access.RoleNone
35 }
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() {
37 if !readable && releaseOnly(repo, role) && r.Method == http.MethodGet && isRepoRootPath(r.URL.Path, repo) {
38 // Privé repo met publieke releases: alleen de Releases-pagina.
38 // Privé repo met publieke releases: alleen de Releases-pagina.
39 http.Redirect(w, r, "/"+repo.FullPath()+"/-/releases", http.StatusSeeOther)
39 http.Redirect(w, r, "/"+repo.FullPath()+"/-/releases", http.StatusSeeOther)
40 return store.User{}, store.Repo{}, "", false
40 return store.User{}, store.Repo{}, "", false
@@ -502,3 +502,19 @@ func safeSHA(s string) bool {
502 }
502 }
503 return true
503 return true
504}
504}
505
506// isRepoRootPath: /{owner}/{repo}, met of zonder slash, of /{owner}/{repo}/-.
507func isRepoRootPath(p string, repo store.Repo) bool {
508 t := strings.Trim(p, "/")
509 return t == repo.FullPath() || t == repo.FullPath()+"/-"
510}
511
512// repoRootAlias: /{owner}/{repo}/ en /{owner}/{repo}/- gaan naar de projectpagina
513// (of, release-only, naar Releases via guard). Geen toegang: 404 zoals niet-bestaand.
514func (s *Server) repoRootAlias(w http.ResponseWriter, r *http.Request) {
515 _, repo, _, ok := s.guard(w, r, access.RoleReadonly)
516 if !ok {
517 return
518 }
519 http.Redirect(w, r, "/"+repo.FullPath(), http.StatusSeeOther)
520}
internal/server/server.go +3 −0
@@ -175,6 +175,9 @@ func (s *Server) Handler() http.Handler {
175 175 mux.HandleFunc("POST /api/v1/groups/{path}/secrets/{name}/replace", s.groupSecretReplaceAPI)
176 176 mux.HandleFunc("DELETE /api/v1/groups/{path}/secrets/{name}", s.groupSecretDeleteAPI)
177 177 mux.HandleFunc("GET /{owner}/{repo}", s.repoHome)
178 mux.HandleFunc("GET /{owner}/{repo}/{$}", s.repoRootAlias)
179 mux.HandleFunc("GET /{owner}/{repo}/-", s.repoRootAlias)
180 mux.HandleFunc("GET /{owner}/{repo}/-/{$}", s.repoRootAlias)
178 181 mux.HandleFunc("GET /{owner}/{repo}/-/tree", s.treeRoot)
179 182 mux.HandleFunc("GET /{owner}/{repo}/-/tree/{path...}", s.tree)
180 183 mux.HandleFunc("GET /{owner}/{repo}/-/blob/{path...}", s.blob)
@@ -175,6 +175,9 @@ func (s *Server) Handler() http.Handler {
175 mux.HandleFunc("POST /api/v1/groups/{path}/secrets/{name}/replace", s.groupSecretReplaceAPI)
175 mux.HandleFunc("POST /api/v1/groups/{path}/secrets/{name}/replace", s.groupSecretReplaceAPI)
176 mux.HandleFunc("DELETE /api/v1/groups/{path}/secrets/{name}", s.groupSecretDeleteAPI)
176 mux.HandleFunc("DELETE /api/v1/groups/{path}/secrets/{name}", s.groupSecretDeleteAPI)
177 mux.HandleFunc("GET /{owner}/{repo}", s.repoHome)
177 mux.HandleFunc("GET /{owner}/{repo}", s.repoHome)
178 mux.HandleFunc("GET /{owner}/{repo}/{$}", s.repoRootAlias)
179 mux.HandleFunc("GET /{owner}/{repo}/-", s.repoRootAlias)
180 mux.HandleFunc("GET /{owner}/{repo}/-/{$}", s.repoRootAlias)
178 mux.HandleFunc("GET /{owner}/{repo}/-/tree", s.treeRoot)
181 mux.HandleFunc("GET /{owner}/{repo}/-/tree", s.treeRoot)
179 mux.HandleFunc("GET /{owner}/{repo}/-/tree/{path...}", s.tree)
182 mux.HandleFunc("GET /{owner}/{repo}/-/tree/{path...}", s.tree)
180 mux.HandleFunc("GET /{owner}/{repo}/-/blob/{path...}", s.blob)
183 mux.HandleFunc("GET /{owner}/{repo}/-/blob/{path...}", s.blob)
internal/server/static/style.css +5 −0
@@ -1486,3 +1486,8 @@ table.kv td, table.kv th { overflow-wrap: anywhere; word-break: break-word; }
1486 1486 .svgpreview { position: static; margin: 0.6rem 1rem; width: auto; height: 10rem; }
1487 1487 }
1488 1488 .codehead .fileacts button:disabled { opacity: 0.45; cursor: not-allowed; }
1489
1490 /* Release-assets: naam + grootte links, acties rechts op dezelfde regel. */
1491 li.rel-asset { display: flex; flex-wrap: wrap; align-items: center; justify-content: space-between; gap: .25rem .75rem; }
1492 li.rel-asset .rel-asset-name { min-width: 0; overflow-wrap: anywhere; }
1493 li.rel-asset form.rel-asset-actions { display: inline-flex; align-items: center; gap: .35rem; margin: 0; margin-left: auto; }
@@ -1486,3 +1486,8 @@ table.kv td, table.kv th { overflow-wrap: anywhere; word-break: break-word; }
1486 .svgpreview { position: static; margin: 0.6rem 1rem; width: auto; height: 10rem; }
1486 .svgpreview { position: static; margin: 0.6rem 1rem; width: auto; height: 10rem; }
1487}
1487}
1488.codehead .fileacts button:disabled { opacity: 0.45; cursor: not-allowed; }
1488.codehead .fileacts button:disabled { opacity: 0.45; cursor: not-allowed; }
1489
1490/* Release-assets: naam + grootte links, acties rechts op dezelfde regel. */
1491li.rel-asset { display: flex; flex-wrap: wrap; align-items: center; justify-content: space-between; gap: .25rem .75rem; }
1492li.rel-asset .rel-asset-name { min-width: 0; overflow-wrap: anywhere; }
1493li.rel-asset form.rel-asset-actions { display: inline-flex; align-items: center; gap: .35rem; margin: 0; margin-left: auto; }
internal/server/templates/collab.html +1 −1
@@ -545,7 +545,7 @@
545 545 {{if .Body}}<pre>{{.Body}}</pre>{{end}}
546 546 <ul>
547 547 {{$tag := .Tag}}{{$path := $.Repo.FullPath}}
548 {{range .Assets}}<li><a href="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}">{{.Name}}</a> <span class="muted">{{.Size}} {{t "rel.bytes"}}</span>{{if $.CanAdmin}} <form class="inline tiphost" method="post" action="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}/delete" data-confirm="{{t "rel.deleteAssetAsk" .Name}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit" class="ghost danger small">{{t "rel.deleteAsset"}}</button> {{tip "rel.tip.deleteAsset"}}</form>{{end}}</li>{{end}}
548 {{range .Assets}}<li class="rel-asset"><span class="rel-asset-name"><a href="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}">{{.Name}}</a> <span class="muted">{{.Size}} {{t "rel.bytes"}}</span></span>{{if $.CanAdmin}} <form class="inline tiphost rel-asset-actions" method="post" action="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}/delete" data-confirm="{{t "rel.deleteAssetAsk" .Name}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit" class="ghost danger small">{{t "rel.deleteAsset"}}</button> {{tip "rel.tip.deleteAsset"}}</form>{{end}}</li>{{end}}
549 549 </ul>
550 550 {{if $.CanAdmin}}<form class="tiphost" method="post" action="/{{$path}}/-/releases/{{.Tag}}/delete" data-confirm="{{t "rel.deleteAsk" .Tag}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><label class="row"><input type="checkbox" name="delete_tag" value="1"> {{t "rel.deleteTag"}}</label> <button type="submit" class="danger">{{t "rel.delete"}}</button> {{tip "rel.tip.delete"}}</form>{{end}}
551 551 </article>
@@ -545,7 +545,7 @@
545 {{if .Body}}<pre>{{.Body}}</pre>{{end}}
545 {{if .Body}}<pre>{{.Body}}</pre>{{end}}
546 <ul>
546 <ul>
547 {{$tag := .Tag}}{{$path := $.Repo.FullPath}}
547 {{$tag := .Tag}}{{$path := $.Repo.FullPath}}
548 {{range .Assets}}<li><a href="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}">{{.Name}}</a> <span class="muted">{{.Size}} {{t "rel.bytes"}}</span>{{if $.CanAdmin}} <form class="inline tiphost" method="post" action="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}/delete" data-confirm="{{t "rel.deleteAssetAsk" .Name}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit" class="ghost danger small">{{t "rel.deleteAsset"}}</button> {{tip "rel.tip.deleteAsset"}}</form>{{end}}</li>{{end}}
548 {{range .Assets}}<li class="rel-asset"><span class="rel-asset-name"><a href="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}">{{.Name}}</a> <span class="muted">{{.Size}} {{t "rel.bytes"}}</span></span>{{if $.CanAdmin}} <form class="inline tiphost rel-asset-actions" method="post" action="/{{$path}}/-/releases/{{$tag}}/assets/{{.Name}}/delete" data-confirm="{{t "rel.deleteAssetAsk" .Name}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><button type="submit" class="ghost danger small">{{t "rel.deleteAsset"}}</button> {{tip "rel.tip.deleteAsset"}}</form>{{end}}</li>{{end}}
549 </ul>
549 </ul>
550 {{if $.CanAdmin}}<form class="tiphost" method="post" action="/{{$path}}/-/releases/{{.Tag}}/delete" data-confirm="{{t "rel.deleteAsk" .Tag}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><label class="row"><input type="checkbox" name="delete_tag" value="1"> {{t "rel.deleteTag"}}</label> <button type="submit" class="danger">{{t "rel.delete"}}</button> {{tip "rel.tip.delete"}}</form>{{end}}
550 {{if $.CanAdmin}}<form class="tiphost" method="post" action="/{{$path}}/-/releases/{{.Tag}}/delete" data-confirm="{{t "rel.deleteAsk" .Tag}}"><input type="hidden" name="csrf" value="{{$.CSRF}}"><label class="row"><input type="checkbox" name="delete_tag" value="1"> {{t "rel.deleteTag"}}</label> <button type="submit" class="danger">{{t "rel.delete"}}</button> {{tip "rel.tip.delete"}}</form>{{end}}
551</article>
551</article>