BlueGit

timfa bluegit

Merged

Release: stage naar master

!98 · merged 3 weeks ago

timfa wants to merge 4 commits from stage into master

Pipeline

#426 Passed
Stage: build

Reviews

  • No reviews yet.

Merged by timfa on 27 October 2026 a8fc802f

Overview Commits 4 Pipelines 1 Changes 16

Changes

16 files changed +454 −2
internal/i18n/catalog_dashlimit.go added +8 −0
@@ -0,0 +1,8 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, map[string]string{"dash.showAll": "Show all (%d more)", "dash.moreTip": "The overview shows the 10 most recently pushed.", "dash.groupsTip": "Sorted by the most recent push in a repository of the group; groups without pushes come last."})
5 addCatalog(nl, map[string]string{"dash.showAll": "Alles tonen (nog %d)", "dash.moreTip": "Het overzicht toont de 10 waarin het laatst gepusht is.", "dash.groupsTip": "Gesorteerd op de laatste push in een repository van de groep; groepen zonder push staan onderaan."})
6 addCatalog(de, map[string]string{"dash.showAll": "Alle anzeigen (%d weitere)", "dash.moreTip": "Die Übersicht zeigt die 10 mit dem jüngsten Push.", "dash.groupsTip": "Nach dem letzten Push in einem Repository der Gruppe sortiert; Gruppen ohne Push stehen unten."})
7 addCatalog(fr, map[string]string{"dash.showAll": "Tout afficher (%d de plus)", "dash.moreTip": "L'aperçu montre les 10 avec le push le plus récent.", "dash.groupsTip": "Trié par dernier push dans un dépôt du groupe ; les groupes sans push sont en bas."})
8 }
@@ -0,0 +1,8 @@
1package i18n
2
3func init() {
4 addCatalog(en, map[string]string{"dash.showAll": "Show all (%d more)", "dash.moreTip": "The overview shows the 10 most recently pushed.", "dash.groupsTip": "Sorted by the most recent push in a repository of the group; groups without pushes come last."})
5 addCatalog(nl, map[string]string{"dash.showAll": "Alles tonen (nog %d)", "dash.moreTip": "Het overzicht toont de 10 waarin het laatst gepusht is.", "dash.groupsTip": "Gesorteerd op de laatste push in een repository van de groep; groepen zonder push staan onderaan."})
6 addCatalog(de, map[string]string{"dash.showAll": "Alle anzeigen (%d weitere)", "dash.moreTip": "Die Übersicht zeigt die 10 mit dem jüngsten Push.", "dash.groupsTip": "Nach dem letzten Push in einem Repository der Gruppe sortiert; Gruppen ohne Push stehen unten."})
7 addCatalog(fr, map[string]string{"dash.showAll": "Tout afficher (%d de plus)", "dash.moreTip": "L'aperçu montre les 10 avec le push le plus récent.", "dash.groupsTip": "Trié par dernier push dans un dépôt du groupe ; les groupes sans push sont en bas."})
8}
internal/i18n/catalog_secinherit.go added +40 −0
@@ -0,0 +1,40 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, map[string]string{
5 "sec.inheritedFrom": "Inherited from group %s",
6 "sec.inheritedTip": "Jobs get these group secrets first. A project secret with the same name replaces it. Values are never shown here.",
7 "sec.source": "Source",
8 "sec.overridden": "Overridden",
9 "sec.overriddenTip": "Overridden by a project variable with the same name; jobs use the project value.",
10 "sec.protected": "Protected",
11 "sec.protectedTip": "Only injected on protected branches and tags. On other refs this group secret is absent, even when it is not overridden.",
12 })
13 addCatalog(nl, map[string]string{
14 "sec.inheritedFrom": "Geërfd van groep %s",
15 "sec.inheritedTip": "Jobs krijgen eerst deze groepsgeheimen. Een projectgeheim met dezelfde naam vervangt het. Waarden worden hier nooit getoond.",
16 "sec.source": "Bron",
17 "sec.overridden": "Overschreven",
18 "sec.overriddenTip": "Overschreven door projectvariabele met dezelfde naam; jobs gebruiken de projectwaarde.",
19 "sec.protected": "Beschermd",
20 "sec.protectedTip": "Alleen beschikbaar op beschermde branches en tags. Op andere refs ontbreekt dit groepsgeheim, ook als het niet overschreven is.",
21 })
22 addCatalog(de, map[string]string{
23 "sec.inheritedFrom": "Geerbt von Gruppe %s",
24 "sec.inheritedTip": "Jobs bekommen zuerst diese Gruppengeheimnisse. Ein Projektgeheimnis mit gleichem Namen ersetzt es. Werte werden hier nie angezeigt.",
25 "sec.source": "Quelle",
26 "sec.overridden": "Überschrieben",
27 "sec.overriddenTip": "Von einer Projektvariable mit gleichem Namen überschrieben; Jobs nutzen den Projektwert.",
28 "sec.protected": "Geschützt",
29 "sec.protectedTip": "Nur auf geschützten Branches und Tags verfügbar. Auf anderen Refs fehlt dieses Gruppengeheimnis, auch wenn es nicht überschrieben ist.",
30 })
31 addCatalog(fr, map[string]string{
32 "sec.inheritedFrom": "Hérité du groupe %s",
33 "sec.inheritedTip": "Les jobs reçoivent d'abord ces secrets de groupe. Un secret de projet du même nom le remplace. Les valeurs ne sont jamais affichées ici.",
34 "sec.source": "Source",
35 "sec.overridden": "Remplacé",
36 "sec.overriddenTip": "Remplacé par une variable de projet du même nom ; les jobs utilisent la valeur du projet.",
37 "sec.protected": "Protégé",
38 "sec.protectedTip": "Injecté seulement sur les branches et tags protégés. Ailleurs ce secret de groupe est absent, même s'il n'est pas remplacé.",
39 })
40 }
@@ -0,0 +1,40 @@
1package i18n
2
3func init() {
4 addCatalog(en, map[string]string{
5 "sec.inheritedFrom": "Inherited from group %s",
6 "sec.inheritedTip": "Jobs get these group secrets first. A project secret with the same name replaces it. Values are never shown here.",
7 "sec.source": "Source",
8 "sec.overridden": "Overridden",
9 "sec.overriddenTip": "Overridden by a project variable with the same name; jobs use the project value.",
10 "sec.protected": "Protected",
11 "sec.protectedTip": "Only injected on protected branches and tags. On other refs this group secret is absent, even when it is not overridden.",
12 })
13 addCatalog(nl, map[string]string{
14 "sec.inheritedFrom": "Geërfd van groep %s",
15 "sec.inheritedTip": "Jobs krijgen eerst deze groepsgeheimen. Een projectgeheim met dezelfde naam vervangt het. Waarden worden hier nooit getoond.",
16 "sec.source": "Bron",
17 "sec.overridden": "Overschreven",
18 "sec.overriddenTip": "Overschreven door projectvariabele met dezelfde naam; jobs gebruiken de projectwaarde.",
19 "sec.protected": "Beschermd",
20 "sec.protectedTip": "Alleen beschikbaar op beschermde branches en tags. Op andere refs ontbreekt dit groepsgeheim, ook als het niet overschreven is.",
21 })
22 addCatalog(de, map[string]string{
23 "sec.inheritedFrom": "Geerbt von Gruppe %s",
24 "sec.inheritedTip": "Jobs bekommen zuerst diese Gruppengeheimnisse. Ein Projektgeheimnis mit gleichem Namen ersetzt es. Werte werden hier nie angezeigt.",
25 "sec.source": "Quelle",
26 "sec.overridden": "Überschrieben",
27 "sec.overriddenTip": "Von einer Projektvariable mit gleichem Namen überschrieben; Jobs nutzen den Projektwert.",
28 "sec.protected": "Geschützt",
29 "sec.protectedTip": "Nur auf geschützten Branches und Tags verfügbar. Auf anderen Refs fehlt dieses Gruppengeheimnis, auch wenn es nicht überschrieben ist.",
30 })
31 addCatalog(fr, map[string]string{
32 "sec.inheritedFrom": "Hérité du groupe %s",
33 "sec.inheritedTip": "Les jobs reçoivent d'abord ces secrets de groupe. Un secret de projet du même nom le remplace. Les valeurs ne sont jamais affichées ici.",
34 "sec.source": "Source",
35 "sec.overridden": "Remplacé",
36 "sec.overriddenTip": "Remplacé par une variable de projet du même nom ; les jobs utilisent la valeur du projet.",
37 "sec.protected": "Protégé",
38 "sec.protectedTip": "Injecté seulement sur les branches et tags protégés. Ailleurs ce secret de groupe est absent, même s'il n'est pas remplacé.",
39 })
40}
internal/server/api_openapi.go +7 −0
@@ -131,6 +131,7 @@ func apiBinds() []apiBind {
131 131 {path: "/groups/{path}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},
132 132 {path: "/projects/{owner}/{repo}/webhooks", method: "GET", code: "200", resp: "Webhook", array: true},
133 133 {path: "/projects/{owner}/{repo}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},
134 {path: "/projects/{owner}/{repo}/secrets/inherited", method: "GET", code: "200", resp: "InheritedSecret", array: true},
134 135 {path: "/groups/{path}/webhooks/{id}", method: "PATCH", code: "200", body: "WebhookUpdate", resp: "Webhook"},
135 136 {path: "/groups/{path}/webhooks/{id}", method: "DELETE", code: "204", empty: true},
136 137 {path: "/groups/{path}/webhooks/{id}/copy", method: "POST", code: "201", body: "WebhookCopy", resp: "WebhookCopyResult"},
@@ -382,6 +383,12 @@ func apiSchemas() map[string]any {
382 383 "headers": str("Extra headers. Empty keeps the current headers."),
383 384 "body": str("Body template."),
384 385 }),
386 "InheritedSecret": obj("A group secret the project inherits. Values are never returned. Jobs get group secrets first; a project secret with the same name wins.", map[string]any{
387 "name": str("Secret name."),
388 "group": str("Path of the group it comes from."),
389 "protected": boolean("Only injected on protected refs."),
390 "overridden": boolean("A project secret with the same name replaces it."),
391 }),
385 392 "WebhookCopy": obj("Copy a webhook to a project or group where you are maintainer. Secrets the hook references and the target cannot already see are copied encrypted on the server; their values never reach the client.", map[string]any{
386 393 "target_type": str("project or group."),
387 394 "target": str("Target path: owner/project or group path."),
@@ -131,6 +131,7 @@ func apiBinds() []apiBind {
131 {path: "/groups/{path}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},
131 {path: "/groups/{path}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},
132 {path: "/projects/{owner}/{repo}/webhooks", method: "GET", code: "200", resp: "Webhook", array: true},
132 {path: "/projects/{owner}/{repo}/webhooks", method: "GET", code: "200", resp: "Webhook", array: true},
133 {path: "/projects/{owner}/{repo}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},
133 {path: "/projects/{owner}/{repo}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},
134 {path: "/projects/{owner}/{repo}/secrets/inherited", method: "GET", code: "200", resp: "InheritedSecret", array: true},
134 {path: "/groups/{path}/webhooks/{id}", method: "PATCH", code: "200", body: "WebhookUpdate", resp: "Webhook"},
135 {path: "/groups/{path}/webhooks/{id}", method: "PATCH", code: "200", body: "WebhookUpdate", resp: "Webhook"},
135 {path: "/groups/{path}/webhooks/{id}", method: "DELETE", code: "204", empty: true},
136 {path: "/groups/{path}/webhooks/{id}", method: "DELETE", code: "204", empty: true},
136 {path: "/groups/{path}/webhooks/{id}/copy", method: "POST", code: "201", body: "WebhookCopy", resp: "WebhookCopyResult"},
137 {path: "/groups/{path}/webhooks/{id}/copy", method: "POST", code: "201", body: "WebhookCopy", resp: "WebhookCopyResult"},
@@ -382,6 +383,12 @@ func apiSchemas() map[string]any {
382 "headers": str("Extra headers. Empty keeps the current headers."),
383 "headers": str("Extra headers. Empty keeps the current headers."),
383 "body": str("Body template."),
384 "body": str("Body template."),
384 }),
385 }),
386 "InheritedSecret": obj("A group secret the project inherits. Values are never returned. Jobs get group secrets first; a project secret with the same name wins.", map[string]any{
387 "name": str("Secret name."),
388 "group": str("Path of the group it comes from."),
389 "protected": boolean("Only injected on protected refs."),
390 "overridden": boolean("A project secret with the same name replaces it."),
391 }),
385 "WebhookCopy": obj("Copy a webhook to a project or group where you are maintainer. Secrets the hook references and the target cannot already see are copied encrypted on the server; their values never reach the client.", map[string]any{
392 "WebhookCopy": obj("Copy a webhook to a project or group where you are maintainer. Secrets the hook references and the target cannot already see are copied encrypted on the server; their values never reach the client.", map[string]any{
386 "target_type": str("project or group."),
393 "target_type": str("project or group."),
387 "target": str("Target path: owner/project or group path."),
394 "target": str("Target path: owner/project or group path."),
internal/server/api_routes.go +1 −0
@@ -94,6 +94,7 @@ var apiCatalog = []apiRoute{
94 94 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/members", access.ScopeWrite, authUser, "Add project member", (*Server).apiProjectMembers},
95 95 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/members/{username}", access.ScopeWrite, authUser, "Remove project member", (*Server).apiDeleteProjectMember},
96 96 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/secrets", access.ScopeRead, authUser, "List project secrets", (*Server).apiProjectSecrets},
97 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/secrets/inherited", access.ScopeRead, authUser, "List group secrets this project inherits (names only). overridden is true when a project secret with the same name wins.", (*Server).apiProjectInheritedSecrets},
97 98 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/secrets", access.ScopeWrite, authUser, "Set project secret", (*Server).apiProjectSecrets},
98 99 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/secrets/{name}", access.ScopeWrite, authUser, "Delete project secret", (*Server).apiDeleteProjectSecret},
99 100 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/webhooks", access.ScopeRead, authUser, "List project webhooks", (*Server).apiProjectHooks},
@@ -94,6 +94,7 @@ var apiCatalog = []apiRoute{
94 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/members", access.ScopeWrite, authUser, "Add project member", (*Server).apiProjectMembers},
94 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/members", access.ScopeWrite, authUser, "Add project member", (*Server).apiProjectMembers},
95 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/members/{username}", access.ScopeWrite, authUser, "Remove project member", (*Server).apiDeleteProjectMember},
95 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/members/{username}", access.ScopeWrite, authUser, "Remove project member", (*Server).apiDeleteProjectMember},
96 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/secrets", access.ScopeRead, authUser, "List project secrets", (*Server).apiProjectSecrets},
96 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/secrets", access.ScopeRead, authUser, "List project secrets", (*Server).apiProjectSecrets},
97 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/secrets/inherited", access.ScopeRead, authUser, "List group secrets this project inherits (names only). overridden is true when a project secret with the same name wins.", (*Server).apiProjectInheritedSecrets},
97 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/secrets", access.ScopeWrite, authUser, "Set project secret", (*Server).apiProjectSecrets},
98 {http.MethodPost, "/api/v1/projects/{owner}/{repo}/secrets", access.ScopeWrite, authUser, "Set project secret", (*Server).apiProjectSecrets},
98 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/secrets/{name}", access.ScopeWrite, authUser, "Delete project secret", (*Server).apiDeleteProjectSecret},
99 {http.MethodDelete, "/api/v1/projects/{owner}/{repo}/secrets/{name}", access.ScopeWrite, authUser, "Delete project secret", (*Server).apiDeleteProjectSecret},
99 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/webhooks", access.ScopeRead, authUser, "List project webhooks", (*Server).apiProjectHooks},
100 {http.MethodGet, "/api/v1/projects/{owner}/{repo}/webhooks", access.ScopeRead, authUser, "List project webhooks", (*Server).apiProjectHooks},
internal/server/auth_handlers.go +15 −0
@@ -106,6 +106,11 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
106 106 return
107 107 }
108 108 store.SortReposByPush(repos)
109 all := r.URL.Query().Get("all")
110 if len(repos) > dashLimit && all != "repos" {
111 v.MoreRepos = len(repos) - dashLimit
112 repos = repos[:dashLimit]
113 }
109 114 v.Repos = repos
110 115 v.ReleaseRepos = s.releaseOnlyRepos(r, v.User.ID)
111 116 groups, err := s.Store.ListGroups(r.Context(), v.User.ID)
@@ -113,6 +118,13 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
113 118 http.Error(w, s.tr(r, "err.overview"), http.StatusInternalServerError)
114 119 return
115 120 }
121 if at, err := s.Store.GroupPushTimes(r.Context()); err == nil {
122 store.SortGroupsByPush(groups, at)
123 }
124 if len(groups) > dashLimit && all != "groups" {
125 v.MoreGroups = len(groups) - dashLimit
126 groups = groups[:dashLimit]
127 }
116 128 v.Groups = groups
117 129 v.Title = s.tr(r, "nav.dashboard")
118 130 v.Page = "dashboard"
@@ -253,3 +265,6 @@ func parseID(s string, dest *int64) (int64, error) {
253 265 }
254 266
255 267 var errBadID = http.ErrMissingFile
268
269 // dashLimit is het aantal repos en groepen op het overzicht.
270 const dashLimit = 10
@@ -106,6 +106,11 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
106 return
106 return
107 }
107 }
108 store.SortReposByPush(repos)
108 store.SortReposByPush(repos)
109 all := r.URL.Query().Get("all")
110 if len(repos) > dashLimit && all != "repos" {
111 v.MoreRepos = len(repos) - dashLimit
112 repos = repos[:dashLimit]
113 }
109 v.Repos = repos
114 v.Repos = repos
110 v.ReleaseRepos = s.releaseOnlyRepos(r, v.User.ID)
115 v.ReleaseRepos = s.releaseOnlyRepos(r, v.User.ID)
111 groups, err := s.Store.ListGroups(r.Context(), v.User.ID)
116 groups, err := s.Store.ListGroups(r.Context(), v.User.ID)
@@ -113,6 +118,13 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
113 http.Error(w, s.tr(r, "err.overview"), http.StatusInternalServerError)
118 http.Error(w, s.tr(r, "err.overview"), http.StatusInternalServerError)
114 return
119 return
115 }
120 }
121 if at, err := s.Store.GroupPushTimes(r.Context()); err == nil {
122 store.SortGroupsByPush(groups, at)
123 }
124 if len(groups) > dashLimit && all != "groups" {
125 v.MoreGroups = len(groups) - dashLimit
126 groups = groups[:dashLimit]
127 }
116 v.Groups = groups
128 v.Groups = groups
117 v.Title = s.tr(r, "nav.dashboard")
129 v.Title = s.tr(r, "nav.dashboard")
118 v.Page = "dashboard"
130 v.Page = "dashboard"
@@ -253,3 +265,6 @@ func parseID(s string, dest *int64) (int64, error) {
253}
265}
254
266
255var errBadID = http.ErrMissingFile
267var errBadID = http.ErrMissingFile
268
269// dashLimit is het aantal repos en groepen op het overzicht.
270const dashLimit = 10
internal/server/dash_limit_test.go added +92 −0
@@ -0,0 +1,92 @@
1 package server
2
3 import (
4 "context"
5 "fmt"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "os/exec"
10 "path/filepath"
11 "strings"
12 "testing"
13 "time"
14
15 "gitlab.com/Timfa/bluegit/internal/auth"
16 "gitlab.com/Timfa/bluegit/internal/config"
17 "gitlab.com/Timfa/bluegit/internal/store"
18 )
19
20 func TestDashboardLimitsToTen(t *testing.T) {
21 if _, err := exec.LookPath("git"); err != nil {
22 t.Skip("git ontbreekt")
23 }
24 storage := t.TempDir()
25 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
26 if err != nil {
27 t.Fatal(err)
28 }
29 t.Cleanup(func() { _ = st.Close() })
30 ctx := context.Background()
31 ada, err := st.UpsertUser(ctx, 1, "ada", "", false)
32 if err != nil {
33 t.Fatal(err)
34 }
35 dev, err := st.UpsertUser(ctx, 2, "dev", "", false)
36 if err != nil {
37 t.Fatal(err)
38 }
39 issue := func(u store.User) string {
40 plain, _, err := st.IssueToken(ctx, u.ID, store.TokenRequest{Name: u.Username, Scopes: "api", ExpiresAt: time.Time{}})
41 if err != nil {
42 t.Fatal(err)
43 }
44 return plain
45 }
46 adaTok, devTok := issue(ada), issue(dev)
47 cfg := config.Config{
48 BaseURL: "http://127.0.0.1:9", StoragePath: storage,
49 Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
50 Git: config.Git{Binary: "git", DefaultBranch: "master"},
51 }
52 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
53 ts := httptest.NewServer(srv.Handler())
54 t.Cleanup(ts.Close)
55
56 for i := 0; i < 12; i++ {
57 r, err := st.CreateRepo(ctx, "user", ada.ID, fmt.Sprintf("r%02d", i), "", "master", "private")
58 if err != nil {
59 t.Fatal(err)
60 }
61 _ = st.TouchPushed(ctx, r.ID, time.Date(2026, 1, 1+i, 0, 0, 0, 0, time.UTC))
62 }
63 _, _ = devTok, adaTok
64 jar, _ := cookiejar.New(nil)
65 client := &http.Client{Jar: jar}
66 res, err := client.Get(ts.URL + "/login")
67 if err != nil {
68 t.Fatal(err)
69 }
70 _ = read(t, res)
71 get := func(path string) string {
72 res, err := client.Get(ts.URL + path)
73 if err != nil {
74 t.Fatal(err)
75 }
76 return read(t, res)
77 }
78 dash := get("/")
79 if n := strings.Count(dash, `class="reponame" href="/ada/r`); n != 10 {
80 t.Fatalf("dashboard toont %d repos", n)
81 }
82 if !strings.Contains(dash, `href="/?all=repos"`) || !strings.Contains(dash, "(2 more)") {
83 t.Fatal("alles-tonen-link ontbreekt")
84 }
85 if strings.Index(dash, `href="/ada/r11"`) > strings.Index(dash, `href="/ada/r10"`) || strings.Contains(dash, `href="/ada/r01"`) {
86 t.Fatal("volgorde of afkapping klopt niet")
87 }
88 full := get("/?all=repos")
89 if n := strings.Count(full, `class="reponame" href="/ada/r`); n != 12 {
90 t.Fatalf("alles tonen geeft %d", n)
91 }
92 }
@@ -0,0 +1,92 @@
1package server
2
3import (
4 "context"
5 "fmt"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "os/exec"
10 "path/filepath"
11 "strings"
12 "testing"
13 "time"
14
15 "gitlab.com/Timfa/bluegit/internal/auth"
16 "gitlab.com/Timfa/bluegit/internal/config"
17 "gitlab.com/Timfa/bluegit/internal/store"
18)
19
20func TestDashboardLimitsToTen(t *testing.T) {
21 if _, err := exec.LookPath("git"); err != nil {
22 t.Skip("git ontbreekt")
23 }
24 storage := t.TempDir()
25 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
26 if err != nil {
27 t.Fatal(err)
28 }
29 t.Cleanup(func() { _ = st.Close() })
30 ctx := context.Background()
31 ada, err := st.UpsertUser(ctx, 1, "ada", "", false)
32 if err != nil {
33 t.Fatal(err)
34 }
35 dev, err := st.UpsertUser(ctx, 2, "dev", "", false)
36 if err != nil {
37 t.Fatal(err)
38 }
39 issue := func(u store.User) string {
40 plain, _, err := st.IssueToken(ctx, u.ID, store.TokenRequest{Name: u.Username, Scopes: "api", ExpiresAt: time.Time{}})
41 if err != nil {
42 t.Fatal(err)
43 }
44 return plain
45 }
46 adaTok, devTok := issue(ada), issue(dev)
47 cfg := config.Config{
48 BaseURL: "http://127.0.0.1:9", StoragePath: storage,
49 Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
50 Git: config.Git{Binary: "git", DefaultBranch: "master"},
51 }
52 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
53 ts := httptest.NewServer(srv.Handler())
54 t.Cleanup(ts.Close)
55
56 for i := 0; i < 12; i++ {
57 r, err := st.CreateRepo(ctx, "user", ada.ID, fmt.Sprintf("r%02d", i), "", "master", "private")
58 if err != nil {
59 t.Fatal(err)
60 }
61 _ = st.TouchPushed(ctx, r.ID, time.Date(2026, 1, 1+i, 0, 0, 0, 0, time.UTC))
62 }
63 _, _ = devTok, adaTok
64 jar, _ := cookiejar.New(nil)
65 client := &http.Client{Jar: jar}
66 res, err := client.Get(ts.URL + "/login")
67 if err != nil {
68 t.Fatal(err)
69 }
70 _ = read(t, res)
71 get := func(path string) string {
72 res, err := client.Get(ts.URL + path)
73 if err != nil {
74 t.Fatal(err)
75 }
76 return read(t, res)
77 }
78 dash := get("/")
79 if n := strings.Count(dash, `class="reponame" href="/ada/r`); n != 10 {
80 t.Fatalf("dashboard toont %d repos", n)
81 }
82 if !strings.Contains(dash, `href="/?all=repos"`) || !strings.Contains(dash, "(2 more)") {
83 t.Fatal("alles-tonen-link ontbreekt")
84 }
85 if strings.Index(dash, `href="/ada/r11"`) > strings.Index(dash, `href="/ada/r10"`) || strings.Contains(dash, `href="/ada/r01"`) {
86 t.Fatal("volgorde of afkapping klopt niet")
87 }
88 full := get("/?all=repos")
89 if n := strings.Count(full, `class="reponame" href="/ada/r`); n != 12 {
90 t.Fatalf("alles tonen geeft %d", n)
91 }
92}
internal/server/secret_api.go +7 −1
@@ -159,8 +159,14 @@ func (s *Server) secretListAPI(w http.ResponseWriter, r *http.Request, kind stri
159 159 for _, m := range list {
160 160 out = append(out, secretMetaJSON(m))
161 161 }
162 resp := map[string]any{"secrets": out}
163 if kind == "repo" {
164 if repo, err := s.Store.RepoByID(r.Context(), scopeID); err == nil {
165 resp["inherited"] = inheritedJSON(s.inheritedSecrets(r.Context(), repo))
166 }
167 }
162 168 w.Header().Set("Content-Type", "application/json")
163 _ = json.NewEncoder(w).Encode(map[string]any{"secrets": out})
169 _ = json.NewEncoder(w).Encode(resp)
164 170 }
165 171
166 172 func (s *Server) secretWriteAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64, mode string) {
@@ -159,8 +159,14 @@ func (s *Server) secretListAPI(w http.ResponseWriter, r *http.Request, kind stri
159 for _, m := range list {
159 for _, m := range list {
160 out = append(out, secretMetaJSON(m))
160 out = append(out, secretMetaJSON(m))
161 }
161 }
162 resp := map[string]any{"secrets": out}
163 if kind == "repo" {
164 if repo, err := s.Store.RepoByID(r.Context(), scopeID); err == nil {
165 resp["inherited"] = inheritedJSON(s.inheritedSecrets(r.Context(), repo))
166 }
167 }
162 w.Header().Set("Content-Type", "application/json")
168 w.Header().Set("Content-Type", "application/json")
163 _ = json.NewEncoder(w).Encode(map[string]any{"secrets": out})
169 _ = json.NewEncoder(w).Encode(resp)
164}
170}
165
171
166func (s *Server) secretWriteAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64, mode string) {
172func (s *Server) secretWriteAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64, mode string) {
internal/server/secret_inherit.go added +68 −0
@@ -0,0 +1,68 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6
7 "gitlab.com/Timfa/bluegit/internal/access"
8
9 "gitlab.com/Timfa/bluegit/internal/store"
10 )
11
12 // InheritedSecret is een groepsgeheim dat een project erft. Nooit met waarde.
13 type InheritedSecret struct {
14 Name string
15 Group string
16 GroupName string
17 Protected bool
18 Overridden bool
19 }
20
21 // inheritedSecrets volgt de runner (environment): eerst de groep van de
22 // eigenaar, daarna wint een projectgeheim met dezelfde naam.
23 func (s *Server) inheritedSecrets(ctx context.Context, repo store.Repo) []InheritedSecret {
24 if repo.OwnerKind != "group" {
25 return nil
26 }
27 g, err := s.Store.GroupByID(ctx, repo.OwnerID)
28 if err != nil {
29 return nil
30 }
31 list, err := s.Store.ListSecrets(ctx, "group", g.ID)
32 if err != nil || len(list) == 0 {
33 return nil
34 }
35 own := map[string]bool{}
36 mine, _ := s.Store.ListSecrets(ctx, "repo", repo.ID)
37 for _, m := range mine {
38 own[m.Name] = true
39 }
40 out := make([]InheritedSecret, 0, len(list))
41 for _, m := range list {
42 out = append(out, InheritedSecret{Name: m.Name, Group: g.Path, GroupName: g.Name, Protected: m.Protected, Overridden: own[m.Name]})
43 }
44 return out
45 }
46
47 func inheritedJSON(list []InheritedSecret) []map[string]any {
48 out := make([]map[string]any, 0, len(list))
49 for _, i := range list {
50 out = append(out, map[string]any{"name": i.Name, "group": i.Group, "protected": i.Protected, "overridden": i.Overridden})
51 }
52 return out
53 }
54
55 // apiProjectInheritedSecrets: GET /api/v1/projects/{owner}/{repo}/secrets/inherited.
56 func (s *Server) apiProjectInheritedSecrets(w http.ResponseWriter, r *http.Request) {
57 repo, _, ok := s.apiRepo(w, r, access.RoleReadonly)
58 if !ok {
59 return
60 }
61 if err := s.manageScope(r.Context(), apiUser(r), "repo", repo.ID); err != nil {
62 s.writeAPIErr(w, r, err)
63 return
64 }
65 rows := inheritedJSON(s.inheritedSecrets(r.Context(), repo))
66 page, per := pageQuery(r)
67 writePage(w, r, slicePage(rows, page, per), len(rows), page, per)
68 }
@@ -0,0 +1,68 @@
1package server
2
3import (
4 "context"
5 "net/http"
6
7 "gitlab.com/Timfa/bluegit/internal/access"
8
9 "gitlab.com/Timfa/bluegit/internal/store"
10)
11
12// InheritedSecret is een groepsgeheim dat een project erft. Nooit met waarde.
13type InheritedSecret struct {
14 Name string
15 Group string
16 GroupName string
17 Protected bool
18 Overridden bool
19}
20
21// inheritedSecrets volgt de runner (environment): eerst de groep van de
22// eigenaar, daarna wint een projectgeheim met dezelfde naam.
23func (s *Server) inheritedSecrets(ctx context.Context, repo store.Repo) []InheritedSecret {
24 if repo.OwnerKind != "group" {
25 return nil
26 }
27 g, err := s.Store.GroupByID(ctx, repo.OwnerID)
28 if err != nil {
29 return nil
30 }
31 list, err := s.Store.ListSecrets(ctx, "group", g.ID)
32 if err != nil || len(list) == 0 {
33 return nil
34 }
35 own := map[string]bool{}
36 mine, _ := s.Store.ListSecrets(ctx, "repo", repo.ID)
37 for _, m := range mine {
38 own[m.Name] = true
39 }
40 out := make([]InheritedSecret, 0, len(list))
41 for _, m := range list {
42 out = append(out, InheritedSecret{Name: m.Name, Group: g.Path, GroupName: g.Name, Protected: m.Protected, Overridden: own[m.Name]})
43 }
44 return out
45}
46
47func inheritedJSON(list []InheritedSecret) []map[string]any {
48 out := make([]map[string]any, 0, len(list))
49 for _, i := range list {
50 out = append(out, map[string]any{"name": i.Name, "group": i.Group, "protected": i.Protected, "overridden": i.Overridden})
51 }
52 return out
53}
54
55// apiProjectInheritedSecrets: GET /api/v1/projects/{owner}/{repo}/secrets/inherited.
56func (s *Server) apiProjectInheritedSecrets(w http.ResponseWriter, r *http.Request) {
57 repo, _, ok := s.apiRepo(w, r, access.RoleReadonly)
58 if !ok {
59 return
60 }
61 if err := s.manageScope(r.Context(), apiUser(r), "repo", repo.ID); err != nil {
62 s.writeAPIErr(w, r, err)
63 return
64 }
65 rows := inheritedJSON(s.inheritedSecrets(r.Context(), repo))
66 page, per := pageQuery(r)
67 writePage(w, r, slicePage(rows, page, per), len(rows), page, per)
68}
internal/server/secret_inherit_test.go added +134 −0
@@ -0,0 +1,134 @@
1 package server
2
3 import (
4 "context"
5 "encoding/json"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "os/exec"
10 "path/filepath"
11 "strings"
12 "testing"
13 "time"
14
15 "gitlab.com/Timfa/bluegit/internal/auth"
16 "gitlab.com/Timfa/bluegit/internal/config"
17 "gitlab.com/Timfa/bluegit/internal/store"
18 )
19
20 func TestInheritedGroupSecrets(t *testing.T) {
21 if _, err := exec.LookPath("git"); err != nil {
22 t.Skip("git ontbreekt")
23 }
24 storage := t.TempDir()
25 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
26 if err != nil {
27 t.Fatal(err)
28 }
29 t.Cleanup(func() { _ = st.Close() })
30 ctx := context.Background()
31 ada, err := st.UpsertUser(ctx, 1, "ada", "", false)
32 if err != nil {
33 t.Fatal(err)
34 }
35 dev, err := st.UpsertUser(ctx, 2, "dev", "", false)
36 if err != nil {
37 t.Fatal(err)
38 }
39 issue := func(u store.User) string {
40 plain, _, err := st.IssueToken(ctx, u.ID, store.TokenRequest{Name: u.Username, Scopes: "api", ExpiresAt: time.Time{}})
41 if err != nil {
42 t.Fatal(err)
43 }
44 return plain
45 }
46 adaTok, devTok := issue(ada), issue(dev)
47 cfg := config.Config{
48 BaseURL: "http://127.0.0.1:9", StoragePath: storage,
49 Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
50 Git: config.Git{Binary: "git", DefaultBranch: "master"},
51 }
52 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
53 ts := httptest.NewServer(srv.Handler())
54 t.Cleanup(ts.Close)
55
56 const groupVal = "groeps-waarde-geheim-123456"
57 var all strings.Builder
58 call := func(method, path, token, body string) (int, string) {
59 t.Helper()
60 req, _ := http.NewRequest(method, ts.URL+path, strings.NewReader(body))
61 if body != "" {
62 req.Header.Set("Content-Type", "application/json")
63 }
64 req.Header.Set("Authorization", "Bearer "+token)
65 res, err := http.DefaultClient.Do(req)
66 if err != nil {
67 t.Fatal(err)
68 }
69 out := read(t, res)
70 all.WriteString(out)
71 return res.StatusCode, out
72 }
73 if code, body := call(http.MethodPost, "/api/v1/groups", adaTok, `{"name":"Team"}`); code != 201 {
74 t.Fatalf("groep %d %s", code, body)
75 }
76 if code, body := call(http.MethodPost, "/api/v1/projects", adaTok, `{"name":"App","group":"team","visibility":"private"}`); code != 201 {
77 t.Fatalf("project %d %s", code, body)
78 }
79 team, _ := st.GroupByPath(ctx, "team")
80 app, err := st.RepoByPath(ctx, "team", "app")
81 if err != nil {
82 t.Fatal(err)
83 }
84 _ = st.PutSecret(ctx, "group", team.ID, "HOST", groupVal, false)
85 _ = st.PutSecret(ctx, "group", team.ID, "ADA_WEBHOOK", groupVal, true)
86 _ = st.PutSecret(ctx, "repo", app.ID, "HOST", "project-waarde-123456", false)
87
88 code, body := call(http.MethodGet, "/api/v1/projects/team/app/secrets/inherited", adaTok, "")
89 if code != 200 || !strings.Contains(body, `"name":"HOST"`) || !strings.Contains(body, `"overridden":true`) {
90 t.Fatalf("inherited %d %s", code, body)
91 }
92 var rows []map[string]any
93 _ = json.Unmarshal([]byte(body), &rows)
94 for _, r := range rows {
95 want := r["name"] == "HOST"
96 if r["overridden"] != want || r["group"] != "team" {
97 t.Fatalf("rij %v", r)
98 }
99 if r["name"] == "ADA_WEBHOOK" && r["protected"] != true {
100 t.Fatalf("protected %v", r)
101 }
102 }
103 code, body = call(http.MethodGet, "/api/v1/projects/team/app/secrets", adaTok, "")
104 if code != 200 || !strings.HasPrefix(strings.TrimSpace(body), "[") {
105 t.Fatalf("bestaande lijst moet een array blijven: %d %s", code, body)
106 }
107 code, body = call(http.MethodGet, "/api/v1/projects/team/app/secrets/inherited", devTok, "")
108 if code != 403 && code != 404 {
109 t.Fatalf("dev ziet geerfde geheimen: %d", code)
110 }
111
112 jar, _ := cookiejar.New(nil)
113 client := &http.Client{Jar: jar}
114 res, err := client.Get(ts.URL + "/login")
115 if err != nil {
116 t.Fatal(err)
117 }
118 _ = read(t, res)
119 res, err = client.Get(ts.URL + "/team/app/-/settings?tab=secrets")
120 if err != nil {
121 t.Fatal(err)
122 }
123 page := read(t, res)
124 all.WriteString(page)
125 if !strings.Contains(page, "Inherited from group Team") || !strings.Contains(page, "<s data-tip=") || !strings.Contains(page, "<code>HOST</code></s>") {
126 t.Fatalf("geerfde sectie of doorhaling ontbreekt")
127 }
128 if strings.Contains(page, "<code>ADA_WEBHOOK</code></s>") {
129 t.Fatal("ADA_WEBHOOK hoort niet doorgestreept")
130 }
131 if strings.Contains(all.String(), groupVal) || strings.Contains(all.String(), "project-waarde-123456") {
132 t.Fatal("waarde gelekt")
133 }
134 }
@@ -0,0 +1,134 @@
1package server
2
3import (
4 "context"
5 "encoding/json"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "os/exec"
10 "path/filepath"
11 "strings"
12 "testing"
13 "time"
14
15 "gitlab.com/Timfa/bluegit/internal/auth"
16 "gitlab.com/Timfa/bluegit/internal/config"
17 "gitlab.com/Timfa/bluegit/internal/store"
18)
19
20func TestInheritedGroupSecrets(t *testing.T) {
21 if _, err := exec.LookPath("git"); err != nil {
22 t.Skip("git ontbreekt")
23 }
24 storage := t.TempDir()
25 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
26 if err != nil {
27 t.Fatal(err)
28 }
29 t.Cleanup(func() { _ = st.Close() })
30 ctx := context.Background()
31 ada, err := st.UpsertUser(ctx, 1, "ada", "", false)
32 if err != nil {
33 t.Fatal(err)
34 }
35 dev, err := st.UpsertUser(ctx, 2, "dev", "", false)
36 if err != nil {
37 t.Fatal(err)
38 }
39 issue := func(u store.User) string {
40 plain, _, err := st.IssueToken(ctx, u.ID, store.TokenRequest{Name: u.Username, Scopes: "api", ExpiresAt: time.Time{}})
41 if err != nil {
42 t.Fatal(err)
43 }
44 return plain
45 }
46 adaTok, devTok := issue(ada), issue(dev)
47 cfg := config.Config{
48 BaseURL: "http://127.0.0.1:9", StoragePath: storage,
49 Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
50 Git: config.Git{Binary: "git", DefaultBranch: "master"},
51 }
52 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
53 ts := httptest.NewServer(srv.Handler())
54 t.Cleanup(ts.Close)
55
56 const groupVal = "groeps-waarde-geheim-123456"
57 var all strings.Builder
58 call := func(method, path, token, body string) (int, string) {
59 t.Helper()
60 req, _ := http.NewRequest(method, ts.URL+path, strings.NewReader(body))
61 if body != "" {
62 req.Header.Set("Content-Type", "application/json")
63 }
64 req.Header.Set("Authorization", "Bearer "+token)
65 res, err := http.DefaultClient.Do(req)
66 if err != nil {
67 t.Fatal(err)
68 }
69 out := read(t, res)
70 all.WriteString(out)
71 return res.StatusCode, out
72 }
73 if code, body := call(http.MethodPost, "/api/v1/groups", adaTok, `{"name":"Team"}`); code != 201 {
74 t.Fatalf("groep %d %s", code, body)
75 }
76 if code, body := call(http.MethodPost, "/api/v1/projects", adaTok, `{"name":"App","group":"team","visibility":"private"}`); code != 201 {
77 t.Fatalf("project %d %s", code, body)
78 }
79 team, _ := st.GroupByPath(ctx, "team")
80 app, err := st.RepoByPath(ctx, "team", "app")
81 if err != nil {
82 t.Fatal(err)
83 }
84 _ = st.PutSecret(ctx, "group", team.ID, "HOST", groupVal, false)
85 _ = st.PutSecret(ctx, "group", team.ID, "ADA_WEBHOOK", groupVal, true)
86 _ = st.PutSecret(ctx, "repo", app.ID, "HOST", "project-waarde-123456", false)
87
88 code, body := call(http.MethodGet, "/api/v1/projects/team/app/secrets/inherited", adaTok, "")
89 if code != 200 || !strings.Contains(body, `"name":"HOST"`) || !strings.Contains(body, `"overridden":true`) {
90 t.Fatalf("inherited %d %s", code, body)
91 }
92 var rows []map[string]any
93 _ = json.Unmarshal([]byte(body), &rows)
94 for _, r := range rows {
95 want := r["name"] == "HOST"
96 if r["overridden"] != want || r["group"] != "team" {
97 t.Fatalf("rij %v", r)
98 }
99 if r["name"] == "ADA_WEBHOOK" && r["protected"] != true {
100 t.Fatalf("protected %v", r)
101 }
102 }
103 code, body = call(http.MethodGet, "/api/v1/projects/team/app/secrets", adaTok, "")
104 if code != 200 || !strings.HasPrefix(strings.TrimSpace(body), "[") {
105 t.Fatalf("bestaande lijst moet een array blijven: %d %s", code, body)
106 }
107 code, body = call(http.MethodGet, "/api/v1/projects/team/app/secrets/inherited", devTok, "")
108 if code != 403 && code != 404 {
109 t.Fatalf("dev ziet geerfde geheimen: %d", code)
110 }
111
112 jar, _ := cookiejar.New(nil)
113 client := &http.Client{Jar: jar}
114 res, err := client.Get(ts.URL + "/login")
115 if err != nil {
116 t.Fatal(err)
117 }
118 _ = read(t, res)
119 res, err = client.Get(ts.URL + "/team/app/-/settings?tab=secrets")
120 if err != nil {
121 t.Fatal(err)
122 }
123 page := read(t, res)
124 all.WriteString(page)
125 if !strings.Contains(page, "Inherited from group Team") || !strings.Contains(page, "<s data-tip=") || !strings.Contains(page, "<code>HOST</code></s>") {
126 t.Fatalf("geerfde sectie of doorhaling ontbreekt")
127 }
128 if strings.Contains(page, "<code>ADA_WEBHOOK</code></s>") {
129 t.Fatal("ADA_WEBHOOK hoort niet doorgestreept")
130 }
131 if strings.Contains(all.String(), groupVal) || strings.Contains(all.String(), "project-waarde-123456") {
132 t.Fatal("waarde gelekt")
133 }
134}
internal/server/server.go +3 −0
@@ -655,6 +655,7 @@ type View struct {
655 655 Releases []store.Release
656 656 Members []store.Member
657 657 Secrets []store.SecretMeta
658 Inherited []InheritedSecret
658 659 HookSecrets []SecretChoice
659 660 Hooks []HookView
660 661 HookTargets []HookTarget
@@ -708,6 +709,8 @@ type View struct {
708 709 Query string
709 710 SortDir string
710 711 SortBy string
712 MoreRepos int
713 MoreGroups int
711 714 FlipDir string
712 715 Cards []RepoCard
713 716 Head *CommitRow
@@ -655,6 +655,7 @@ type View struct {
655 Releases []store.Release
655 Releases []store.Release
656 Members []store.Member
656 Members []store.Member
657 Secrets []store.SecretMeta
657 Secrets []store.SecretMeta
658 Inherited []InheritedSecret
658 HookSecrets []SecretChoice
659 HookSecrets []SecretChoice
659 Hooks []HookView
660 Hooks []HookView
660 HookTargets []HookTarget
661 HookTargets []HookTarget
@@ -708,6 +709,8 @@ type View struct {
708 Query string
709 Query string
709 SortDir string
710 SortDir string
710 SortBy string
711 SortBy string
712 MoreRepos int
713 MoreGroups int
711 FlipDir string
714 FlipDir string
712 Cards []RepoCard
715 Cards []RepoCard
713 Head *CommitRow
716 Head *CommitRow
internal/server/settings_handlers.go +1 −0
@@ -33,6 +33,7 @@ func (s *Server) settings(w http.ResponseWriter, r *http.Request) {
33 33 }
34 34 }
35 35 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "repo", repo.ID)
36 v.Inherited = s.inheritedSecrets(r.Context(), repo)
36 37 v.HookSecrets = s.repoSecretChoices(r, repo)
37 38 v.Patterns, _ = s.Store.ProtectedPatterns(r.Context(), repo.ID)
38 39 v.TagPatterns, _ = s.Store.ProtectedTagPatterns(r.Context(), repo.ID)
@@ -33,6 +33,7 @@ func (s *Server) settings(w http.ResponseWriter, r *http.Request) {
33 }
33 }
34 }
34 }
35 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "repo", repo.ID)
35 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "repo", repo.ID)
36 v.Inherited = s.inheritedSecrets(r.Context(), repo)
36 v.HookSecrets = s.repoSecretChoices(r, repo)
37 v.HookSecrets = s.repoSecretChoices(r, repo)
37 v.Patterns, _ = s.Store.ProtectedPatterns(r.Context(), repo.ID)
38 v.Patterns, _ = s.Store.ProtectedPatterns(r.Context(), repo.ID)
38 v.TagPatterns, _ = s.Store.ProtectedTagPatterns(r.Context(), repo.ID)
39 v.TagPatterns, _ = s.Store.ProtectedTagPatterns(r.Context(), repo.ID)
internal/server/static/style.css +1 −0
@@ -633,6 +633,7 @@ svg.ico { width: 14px; height: 14px; flex: none; }
633 633 .status.canceled { background: #f3f0f0; color: #57606a; }
634 634 .status.obsolete { background: #f4f5f7; color: #8c959f; font-weight: 600; }
635 635 .status.blocked { background: #eef2f7; color: #57606a; }
636 .hooktable.inherited tr.overridden td { color: #8c959f; }
636 637 .mark { position: relative; width: 16px; height: 16px; border-radius: 50%; display: inline-block; flex: none; background: #8c959f; }
637 638 .status.passed .mark, .stage-dot.passed .mark { background: #1aaa55; }
638 639 .status.failed .mark, .stage-dot.failed .mark { background: #dd2b0e; }
@@ -633,6 +633,7 @@ svg.ico { width: 14px; height: 14px; flex: none; }
633.status.canceled { background: #f3f0f0; color: #57606a; }
633.status.canceled { background: #f3f0f0; color: #57606a; }
634.status.obsolete { background: #f4f5f7; color: #8c959f; font-weight: 600; }
634.status.obsolete { background: #f4f5f7; color: #8c959f; font-weight: 600; }
635.status.blocked { background: #eef2f7; color: #57606a; }
635.status.blocked { background: #eef2f7; color: #57606a; }
636.hooktable.inherited tr.overridden td { color: #8c959f; }
636.mark { position: relative; width: 16px; height: 16px; border-radius: 50%; display: inline-block; flex: none; background: #8c959f; }
637.mark { position: relative; width: 16px; height: 16px; border-radius: 50%; display: inline-block; flex: none; background: #8c959f; }
637.status.passed .mark, .stage-dot.passed .mark { background: #1aaa55; }
638.status.passed .mark, .stage-dot.passed .mark { background: #1aaa55; }
638.status.failed .mark, .stage-dot.failed .mark { background: #dd2b0e; }
639.status.failed .mark, .stage-dot.failed .mark { background: #dd2b0e; }
internal/server/templates/collab.html +15 −0
@@ -742,6 +742,21 @@
742 742 </table>
743 743 </div>
744 744 {{end}}
745 {{if .Inherited}}
746 <h3>{{t "sec.inheritedFrom" (index .Inherited 0).GroupName}} <span class="muted" data-tip="{{t "sec.inheritedTip"}}">ⓘ</span></h3>
747 <div class="hscroll">
748 <table class="hooktable inherited">
749 <thead><tr><th>{{t "set.secretName"}}</th><th>{{t "sec.source"}}</th><th>{{t "wh.flags"}}</th></tr></thead>
750 <tbody>
751 {{range .Inherited}}<tr{{if .Overridden}} class="overridden"{{end}}>
752 <td>{{if .Overridden}}<s data-tip="{{t "sec.overriddenTip"}}"><code>{{.Name}}</code></s> <span class="pill">{{t "sec.overridden"}}</span>{{else}}<code>{{.Name}}</code>{{end}}</td>
753 <td><a href="/groups/{{.Group}}?tab=settings">{{.GroupName}}</a></td>
754 <td>{{if .Protected}}<span class="pill" data-tip="{{t "sec.protectedTip"}}">{{t "sec.protected"}}</span>{{end}}</td>
755 </tr>{{end}}
756 </tbody>
757 </table>
758 </div>
759 {{end}}
745 760 <p class="muted">{{t "set.valuesHidden"}}</p>
746 761 <script src="/assets/secrets.js"></script>
747 762 {{end}}
@@ -742,6 +742,21 @@
742</table>
742</table>
743</div>
743</div>
744{{end}}
744{{end}}
745{{if .Inherited}}
746<h3>{{t "sec.inheritedFrom" (index .Inherited 0).GroupName}} <span class="muted" data-tip="{{t "sec.inheritedTip"}}">ⓘ</span></h3>
747<div class="hscroll">
748<table class="hooktable inherited">
749 <thead><tr><th>{{t "set.secretName"}}</th><th>{{t "sec.source"}}</th><th>{{t "wh.flags"}}</th></tr></thead>
750 <tbody>
751 {{range .Inherited}}<tr{{if .Overridden}} class="overridden"{{end}}>
752 <td>{{if .Overridden}}<s data-tip="{{t "sec.overriddenTip"}}"><code>{{.Name}}</code></s> <span class="pill">{{t "sec.overridden"}}</span>{{else}}<code>{{.Name}}</code>{{end}}</td>
753 <td><a href="/groups/{{.Group}}?tab=settings">{{.GroupName}}</a></td>
754 <td>{{if .Protected}}<span class="pill" data-tip="{{t "sec.protectedTip"}}">{{t "sec.protected"}}</span>{{end}}</td>
755 </tr>{{end}}
756 </tbody>
757</table>
758</div>
759{{end}}
745<p class="muted">{{t "set.valuesHidden"}}</p>
760<p class="muted">{{t "set.valuesHidden"}}</p>
746<script src="/assets/secrets.js"></script>
761<script src="/assets/secrets.js"></script>
747{{end}}
762{{end}}
internal/server/templates/pages.html +3 −1
@@ -97,13 +97,15 @@
97 97 <ul class="repolist">
98 98 {{range .Repos}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/{{.FullPath}}" title="{{pushedLabel .}}">{{.FullPath}}</a> <span class="pill">{{visName .Visibility}}</span>{{if .Description}}<div class="muted">{{.Description}}</div>{{end}}</div></li>{{end}}
99 99 </ul>
100 {{if .MoreRepos}}<p><a class="btn ghost tiny" href="/?all=repos" data-tip="{{t "dash.moreTip"}}">{{t "dash.showAll" .MoreRepos}}</a></p>{{end}}
100 101 </section>
101 102 <section class="panel">
102 <h2>{{t "dash.groups"}}</h2>
103 <h2><span data-tip="{{t "dash.groupsTip"}}">{{t "dash.groups"}}</span></h2>
103 104 {{if not .Groups}}<p class="muted">{{t "dash.noGroups"}}</p>{{end}}
104 105 <ul class="repolist">
105 106 {{range .Groups}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/groups/{{.Path}}">{{.Name}}</a> <span class="muted">{{.Path}}</span></div></li>{{end}}
106 107 </ul>
108 {{if .MoreGroups}}<p><a class="btn ghost tiny" href="/?all=groups" data-tip="{{t "dash.moreTip"}}">{{t "dash.showAll" .MoreGroups}}</a></p>{{end}}
107 109 </section>
108 110 </div>
109 111 {{template "releaserepos" .}}
@@ -97,13 +97,15 @@
97 <ul class="repolist">
97 <ul class="repolist">
98 {{range .Repos}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/{{.FullPath}}" title="{{pushedLabel .}}">{{.FullPath}}</a> <span class="pill">{{visName .Visibility}}</span>{{if .Description}}<div class="muted">{{.Description}}</div>{{end}}</div></li>{{end}}
98 {{range .Repos}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/{{.FullPath}}" title="{{pushedLabel .}}">{{.FullPath}}</a> <span class="pill">{{visName .Visibility}}</span>{{if .Description}}<div class="muted">{{.Description}}</div>{{end}}</div></li>{{end}}
99 </ul>
99 </ul>
100 {{if .MoreRepos}}<p><a class="btn ghost tiny" href="/?all=repos" data-tip="{{t "dash.moreTip"}}">{{t "dash.showAll" .MoreRepos}}</a></p>{{end}}
100 </section>
101 </section>
101 <section class="panel">
102 <section class="panel">
102 <h2>{{t "dash.groups"}}</h2>
103 <h2><span data-tip="{{t "dash.groupsTip"}}">{{t "dash.groups"}}</span></h2>
103 {{if not .Groups}}<p class="muted">{{t "dash.noGroups"}}</p>{{end}}
104 {{if not .Groups}}<p class="muted">{{t "dash.noGroups"}}</p>{{end}}
104 <ul class="repolist">
105 <ul class="repolist">
105 {{range .Groups}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/groups/{{.Path}}">{{.Name}}</a> <span class="muted">{{.Path}}</span></div></li>{{end}}
106 {{range .Groups}}<li>{{template "namemark" .}}<div class="grown"><a class="reponame" href="/groups/{{.Path}}">{{.Name}}</a> <span class="muted">{{.Path}}</span></div></li>{{end}}
106 </ul>
107 </ul>
108 {{if .MoreGroups}}<p><a class="btn ghost tiny" href="/?all=groups" data-tip="{{t "dash.moreTip"}}">{{t "dash.showAll" .MoreGroups}}</a></p>{{end}}
107 </section>
109 </section>
108</div>
110</div>
109{{template "releaserepos" .}}
111{{template "releaserepos" .}}
internal/store/pushsort_test.go +25 −0
@@ -67,3 +67,28 @@ func TestReposSortedByLastPush(t *testing.T) {
67 67 t.Fatalf("groep %+v", gl)
68 68 }
69 69 }
70
71 func TestGroupsSortedByLastPush(t *testing.T) {
72 s := openStore(t)
73 ctx := context.Background()
74 tim, _ := s.UpsertUser(ctx, 1, "tim", "", false)
75 a, _ := s.CreateGroup(ctx, tim.ID, "Alpha", "alpha", "", access.RoleDeveloper)
76 b, _ := s.CreateGroup(ctx, tim.ID, "Beta", "beta", "", access.RoleDeveloper)
77 c, _ := s.CreateGroup(ctx, tim.ID, "Gamma", "gamma", "", access.RoleDeveloper)
78 ra, _ := s.CreateRepo(ctx, "group", a.ID, "x", "", "master", "public")
79 rc, _ := s.CreateRepo(ctx, "group", c.ID, "y", "", "master", "public")
80 rc2, _ := s.CreateRepo(ctx, "group", c.ID, "z", "", "master", "public")
81 base := time.Date(2026, 10, 1, 0, 0, 0, 0, time.UTC)
82 _ = s.TouchPushed(ctx, ra.ID, base)
83 _ = s.TouchPushed(ctx, rc.ID, base.Add(-time.Hour))
84 _ = s.TouchPushed(ctx, rc2.ID, base.Add(time.Hour))
85 at, err := s.GroupPushTimes(ctx)
86 if err != nil {
87 t.Fatal(err)
88 }
89 list := []Group{a, b, c}
90 SortGroupsByPush(list, at)
91 if list[0].ID != c.ID || list[1].ID != a.ID || list[2].ID != b.ID {
92 t.Fatalf("volgorde %s %s %s", list[0].Name, list[1].Name, list[2].Name)
93 }
94 }
@@ -67,3 +67,28 @@ func TestReposSortedByLastPush(t *testing.T) {
67 t.Fatalf("groep %+v", gl)
67 t.Fatalf("groep %+v", gl)
68 }
68 }
69}
69}
70
71func TestGroupsSortedByLastPush(t *testing.T) {
72 s := openStore(t)
73 ctx := context.Background()
74 tim, _ := s.UpsertUser(ctx, 1, "tim", "", false)
75 a, _ := s.CreateGroup(ctx, tim.ID, "Alpha", "alpha", "", access.RoleDeveloper)
76 b, _ := s.CreateGroup(ctx, tim.ID, "Beta", "beta", "", access.RoleDeveloper)
77 c, _ := s.CreateGroup(ctx, tim.ID, "Gamma", "gamma", "", access.RoleDeveloper)
78 ra, _ := s.CreateRepo(ctx, "group", a.ID, "x", "", "master", "public")
79 rc, _ := s.CreateRepo(ctx, "group", c.ID, "y", "", "master", "public")
80 rc2, _ := s.CreateRepo(ctx, "group", c.ID, "z", "", "master", "public")
81 base := time.Date(2026, 10, 1, 0, 0, 0, 0, time.UTC)
82 _ = s.TouchPushed(ctx, ra.ID, base)
83 _ = s.TouchPushed(ctx, rc.ID, base.Add(-time.Hour))
84 _ = s.TouchPushed(ctx, rc2.ID, base.Add(time.Hour))
85 at, err := s.GroupPushTimes(ctx)
86 if err != nil {
87 t.Fatal(err)
88 }
89 list := []Group{a, b, c}
90 SortGroupsByPush(list, at)
91 if list[0].ID != c.ID || list[1].ID != a.ID || list[2].ID != b.ID {
92 t.Fatalf("volgorde %s %s %s", list[0].Name, list[1].Name, list[2].Name)
93 }
94}
internal/store/repos.go +34 −0
@@ -908,3 +908,37 @@ func SortReposByPush(list []Repo) {
908 908 return a.ID < b.ID
909 909 })
910 910 }
911
912 // GroupPushTimes geeft per groep de laatste push in een van haar repos.
913 // Groepen zonder push ontbreken in de map.
914 func (s *Store) GroupPushTimes(ctx context.Context) (map[int64]time.Time, error) {
915 rows, err := s.db.QueryContext(ctx, `SELECT owner_id, MAX(pushed_at) FROM repos WHERE owner_kind = 'group' AND pushed_at <> '' GROUP BY owner_id`)
916 if err != nil {
917 return nil, err
918 }
919 defer rows.Close()
920 out := map[int64]time.Time{}
921 for rows.Next() {
922 var id int64
923 var at string
924 if err := rows.Scan(&id, &at); err != nil {
925 return nil, err
926 }
927 out[id] = parseTime(at)
928 }
929 return out, rows.Err()
930 }
931
932 // SortGroupsByPush: laatste push eerst, groepen zonder push onderaan, dan op naam.
933 func SortGroupsByPush(list []Group, at map[int64]time.Time) {
934 sort.SliceStable(list, func(i, j int) bool {
935 a, b := at[list[i].ID], at[list[j].ID]
936 if a.IsZero() != b.IsZero() {
937 return !a.IsZero()
938 }
939 if !a.Equal(b) {
940 return a.After(b)
941 }
942 return strings.ToLower(list[i].Name) < strings.ToLower(list[j].Name)
943 })
944 }
@@ -908,3 +908,37 @@ func SortReposByPush(list []Repo) {
908 return a.ID < b.ID
908 return a.ID < b.ID
909 })
909 })
910}
910}
911
912// GroupPushTimes geeft per groep de laatste push in een van haar repos.
913// Groepen zonder push ontbreken in de map.
914func (s *Store) GroupPushTimes(ctx context.Context) (map[int64]time.Time, error) {
915 rows, err := s.db.QueryContext(ctx, `SELECT owner_id, MAX(pushed_at) FROM repos WHERE owner_kind = 'group' AND pushed_at <> '' GROUP BY owner_id`)
916 if err != nil {
917 return nil, err
918 }
919 defer rows.Close()
920 out := map[int64]time.Time{}
921 for rows.Next() {
922 var id int64
923 var at string
924 if err := rows.Scan(&id, &at); err != nil {
925 return nil, err
926 }
927 out[id] = parseTime(at)
928 }
929 return out, rows.Err()
930}
931
932// SortGroupsByPush: laatste push eerst, groepen zonder push onderaan, dan op naam.
933func SortGroupsByPush(list []Group, at map[int64]time.Time) {
934 sort.SliceStable(list, func(i, j int) bool {
935 a, b := at[list[i].ID], at[list[j].ID]
936 if a.IsZero() != b.IsZero() {
937 return !a.IsZero()
938 }
939 if !a.Equal(b) {
940 return a.After(b)
941 }
942 return strings.ToLower(list[i].Name) < strings.ToLower(list[j].Name)
943 })
944}