BlueGit

timfa bluegit

fix: beschermde secrets alleen bekijken en bewerken als maintainer

De UI en de API weigeren een lagere rol bij tonen, wijzigen en vervangen.
Een test dekt repository en groep, zonder de waarde terug te geven.

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

timfa project_87923614_bot_3aff574f6f98414b945a8799374f9092 · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
be133ac8b59cd8b5bdd180b0ad06d20589a5cd04
Parent
89b83b18
3 files changed +245 −22
internal/server/secret_api.go +48 −12
@@ -18,7 +18,7 @@ type secretBody struct {
18 18 }
19 19
20 20 func (s *Server) repoSecretsAPI(w http.ResponseWriter, r *http.Request) {
21 repo, _, ok := s.webhookAPIRepo(w, r)
21 repo, _, ok := s.secretAPIRepo(w, r)
22 22 if !ok {
23 23 return
24 24 }
@@ -26,7 +26,7 @@ func (s *Server) repoSecretsAPI(w http.ResponseWriter, r *http.Request) {
26 26 }
27 27
28 28 func (s *Server) groupSecretsAPI(w http.ResponseWriter, r *http.Request) {
29 g, _, ok := s.webhookAPIGroup(w, r)
29 g, _, ok := s.secretAPIGroup(w, r)
30 30 if !ok {
31 31 return
32 32 }
@@ -34,7 +34,7 @@ func (s *Server) groupSecretsAPI(w http.ResponseWriter, r *http.Request) {
34 34 }
35 35
36 36 func (s *Server) repoSecretCreateAPI(w http.ResponseWriter, r *http.Request) {
37 repo, _, ok := s.webhookAPIRepo(w, r)
37 repo, _, ok := s.secretAPIRepo(w, r)
38 38 if !ok {
39 39 return
40 40 }
@@ -42,7 +42,7 @@ func (s *Server) repoSecretCreateAPI(w http.ResponseWriter, r *http.Request) {
42 42 }
43 43
44 44 func (s *Server) groupSecretCreateAPI(w http.ResponseWriter, r *http.Request) {
45 g, _, ok := s.webhookAPIGroup(w, r)
45 g, _, ok := s.secretAPIGroup(w, r)
46 46 if !ok {
47 47 return
48 48 }
@@ -50,7 +50,7 @@ func (s *Server) groupSecretCreateAPI(w http.ResponseWriter, r *http.Request) {
50 50 }
51 51
52 52 func (s *Server) repoSecretRevealAPI(w http.ResponseWriter, r *http.Request) {
53 repo, _, ok := s.webhookAPIRepo(w, r)
53 repo, _, ok := s.secretAPIRepo(w, r)
54 54 if !ok {
55 55 return
56 56 }
@@ -58,7 +58,7 @@ func (s *Server) repoSecretRevealAPI(w http.ResponseWriter, r *http.Request) {
58 58 }
59 59
60 60 func (s *Server) groupSecretRevealAPI(w http.ResponseWriter, r *http.Request) {
61 g, _, ok := s.webhookAPIGroup(w, r)
61 g, _, ok := s.secretAPIGroup(w, r)
62 62 if !ok {
63 63 return
64 64 }
@@ -66,7 +66,7 @@ func (s *Server) groupSecretRevealAPI(w http.ResponseWriter, r *http.Request) {
66 66 }
67 67
68 68 func (s *Server) repoSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {
69 repo, _, ok := s.webhookAPIRepo(w, r)
69 repo, _, ok := s.secretAPIRepo(w, r)
70 70 if !ok {
71 71 return
72 72 }
@@ -74,7 +74,7 @@ func (s *Server) repoSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {
74 74 }
75 75
76 76 func (s *Server) groupSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {
77 g, _, ok := s.webhookAPIGroup(w, r)
77 g, _, ok := s.secretAPIGroup(w, r)
78 78 if !ok {
79 79 return
80 80 }
@@ -82,7 +82,7 @@ func (s *Server) groupSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {
82 82 }
83 83
84 84 func (s *Server) repoSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {
85 repo, _, ok := s.webhookAPIRepo(w, r)
85 repo, _, ok := s.secretAPIRepo(w, r)
86 86 if !ok {
87 87 return
88 88 }
@@ -90,7 +90,7 @@ func (s *Server) repoSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {
90 90 }
91 91
92 92 func (s *Server) groupSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {
93 g, _, ok := s.webhookAPIGroup(w, r)
93 g, _, ok := s.secretAPIGroup(w, r)
94 94 if !ok {
95 95 return
96 96 }
@@ -98,7 +98,7 @@ func (s *Server) groupSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {
98 98 }
99 99
100 100 func (s *Server) repoSecretDeleteAPI(w http.ResponseWriter, r *http.Request) {
101 repo, _, ok := s.webhookAPIRepo(w, r)
101 repo, _, ok := s.secretAPIRepo(w, r)
102 102 if !ok {
103 103 return
104 104 }
@@ -106,13 +106,49 @@ func (s *Server) repoSecretDeleteAPI(w http.ResponseWriter, r *http.Request) {
106 106 }
107 107
108 108 func (s *Server) groupSecretDeleteAPI(w http.ResponseWriter, r *http.Request) {
109 g, _, ok := s.webhookAPIGroup(w, r)
109 g, _, ok := s.secretAPIGroup(w, r)
110 110 if !ok {
111 111 return
112 112 }
113 113 s.secretDeleteAPI(w, r, "group", g.ID)
114 114 }
115 115
116 func (s *Server) secretAPIRepo(w http.ResponseWriter, r *http.Request) (store.Repo, store.User, bool) {
117 u, ok := s.webhookAPIUser(w, r)
118 if !ok {
119 return store.Repo{}, store.User{}, false
120 }
121 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
122 if err != nil {
123 http.NotFound(w, r)
124 return store.Repo{}, store.User{}, false
125 }
126 role, err := s.Store.EffectiveRole(r.Context(), u.ID, repo.ID)
127 if err != nil || !role.CanManageSecrets() {
128 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
129 return store.Repo{}, store.User{}, false
130 }
131 return repo, u, true
132 }
133
134 func (s *Server) secretAPIGroup(w http.ResponseWriter, r *http.Request) (store.Group, store.User, bool) {
135 u, ok := s.webhookAPIUser(w, r)
136 if !ok {
137 return store.Group{}, store.User{}, false
138 }
139 g, err := s.Store.GroupByPath(r.Context(), r.PathValue("path"))
140 if err != nil {
141 http.NotFound(w, r)
142 return store.Group{}, store.User{}, false
143 }
144 role, err := s.Store.GroupRole(r.Context(), g.ID, u.ID)
145 if err != nil || !role.CanManageSecrets() {
146 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
147 return store.Group{}, store.User{}, false
148 }
149 return g, u, true
150 }
151
116 152 func (s *Server) secretListAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {
117 153 list, err := s.Store.ListSecrets(r.Context(), kind, scopeID)
118 154 if err != nil {
@@ -18,7 +18,7 @@ type secretBody struct {
18}
18}
19
19
20func (s *Server) repoSecretsAPI(w http.ResponseWriter, r *http.Request) {
20func (s *Server) repoSecretsAPI(w http.ResponseWriter, r *http.Request) {
21 repo, _, ok := s.webhookAPIRepo(w, r)
21 repo, _, ok := s.secretAPIRepo(w, r)
22 if !ok {
22 if !ok {
23 return
23 return
24 }
24 }
@@ -26,7 +26,7 @@ func (s *Server) repoSecretsAPI(w http.ResponseWriter, r *http.Request) {
26}
26}
27
27
28func (s *Server) groupSecretsAPI(w http.ResponseWriter, r *http.Request) {
28func (s *Server) groupSecretsAPI(w http.ResponseWriter, r *http.Request) {
29 g, _, ok := s.webhookAPIGroup(w, r)
29 g, _, ok := s.secretAPIGroup(w, r)
30 if !ok {
30 if !ok {
31 return
31 return
32 }
32 }
@@ -34,7 +34,7 @@ func (s *Server) groupSecretsAPI(w http.ResponseWriter, r *http.Request) {
34}
34}
35
35
36func (s *Server) repoSecretCreateAPI(w http.ResponseWriter, r *http.Request) {
36func (s *Server) repoSecretCreateAPI(w http.ResponseWriter, r *http.Request) {
37 repo, _, ok := s.webhookAPIRepo(w, r)
37 repo, _, ok := s.secretAPIRepo(w, r)
38 if !ok {
38 if !ok {
39 return
39 return
40 }
40 }
@@ -42,7 +42,7 @@ func (s *Server) repoSecretCreateAPI(w http.ResponseWriter, r *http.Request) {
42}
42}
43
43
44func (s *Server) groupSecretCreateAPI(w http.ResponseWriter, r *http.Request) {
44func (s *Server) groupSecretCreateAPI(w http.ResponseWriter, r *http.Request) {
45 g, _, ok := s.webhookAPIGroup(w, r)
45 g, _, ok := s.secretAPIGroup(w, r)
46 if !ok {
46 if !ok {
47 return
47 return
48 }
48 }
@@ -50,7 +50,7 @@ func (s *Server) groupSecretCreateAPI(w http.ResponseWriter, r *http.Request) {
50}
50}
51
51
52func (s *Server) repoSecretRevealAPI(w http.ResponseWriter, r *http.Request) {
52func (s *Server) repoSecretRevealAPI(w http.ResponseWriter, r *http.Request) {
53 repo, _, ok := s.webhookAPIRepo(w, r)
53 repo, _, ok := s.secretAPIRepo(w, r)
54 if !ok {
54 if !ok {
55 return
55 return
56 }
56 }
@@ -58,7 +58,7 @@ func (s *Server) repoSecretRevealAPI(w http.ResponseWriter, r *http.Request) {
58}
58}
59
59
60func (s *Server) groupSecretRevealAPI(w http.ResponseWriter, r *http.Request) {
60func (s *Server) groupSecretRevealAPI(w http.ResponseWriter, r *http.Request) {
61 g, _, ok := s.webhookAPIGroup(w, r)
61 g, _, ok := s.secretAPIGroup(w, r)
62 if !ok {
62 if !ok {
63 return
63 return
64 }
64 }
@@ -66,7 +66,7 @@ func (s *Server) groupSecretRevealAPI(w http.ResponseWriter, r *http.Request) {
66}
66}
67
67
68func (s *Server) repoSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {
68func (s *Server) repoSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {
69 repo, _, ok := s.webhookAPIRepo(w, r)
69 repo, _, ok := s.secretAPIRepo(w, r)
70 if !ok {
70 if !ok {
71 return
71 return
72 }
72 }
@@ -74,7 +74,7 @@ func (s *Server) repoSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {
74}
74}
75
75
76func (s *Server) groupSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {
76func (s *Server) groupSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {
77 g, _, ok := s.webhookAPIGroup(w, r)
77 g, _, ok := s.secretAPIGroup(w, r)
78 if !ok {
78 if !ok {
79 return
79 return
80 }
80 }
@@ -82,7 +82,7 @@ func (s *Server) groupSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {
82}
82}
83
83
84func (s *Server) repoSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {
84func (s *Server) repoSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {
85 repo, _, ok := s.webhookAPIRepo(w, r)
85 repo, _, ok := s.secretAPIRepo(w, r)
86 if !ok {
86 if !ok {
87 return
87 return
88 }
88 }
@@ -90,7 +90,7 @@ func (s *Server) repoSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {
90}
90}
91
91
92func (s *Server) groupSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {
92func (s *Server) groupSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {
93 g, _, ok := s.webhookAPIGroup(w, r)
93 g, _, ok := s.secretAPIGroup(w, r)
94 if !ok {
94 if !ok {
95 return
95 return
96 }
96 }
@@ -98,7 +98,7 @@ func (s *Server) groupSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {
98}
98}
99
99
100func (s *Server) repoSecretDeleteAPI(w http.ResponseWriter, r *http.Request) {
100func (s *Server) repoSecretDeleteAPI(w http.ResponseWriter, r *http.Request) {
101 repo, _, ok := s.webhookAPIRepo(w, r)
101 repo, _, ok := s.secretAPIRepo(w, r)
102 if !ok {
102 if !ok {
103 return
103 return
104 }
104 }
@@ -106,13 +106,49 @@ func (s *Server) repoSecretDeleteAPI(w http.ResponseWriter, r *http.Request) {
106}
106}
107
107
108func (s *Server) groupSecretDeleteAPI(w http.ResponseWriter, r *http.Request) {
108func (s *Server) groupSecretDeleteAPI(w http.ResponseWriter, r *http.Request) {
109 g, _, ok := s.webhookAPIGroup(w, r)
109 g, _, ok := s.secretAPIGroup(w, r)
110 if !ok {
110 if !ok {
111 return
111 return
112 }
112 }
113 s.secretDeleteAPI(w, r, "group", g.ID)
113 s.secretDeleteAPI(w, r, "group", g.ID)
114}
114}
115
115
116func (s *Server) secretAPIRepo(w http.ResponseWriter, r *http.Request) (store.Repo, store.User, bool) {
117 u, ok := s.webhookAPIUser(w, r)
118 if !ok {
119 return store.Repo{}, store.User{}, false
120 }
121 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
122 if err != nil {
123 http.NotFound(w, r)
124 return store.Repo{}, store.User{}, false
125 }
126 role, err := s.Store.EffectiveRole(r.Context(), u.ID, repo.ID)
127 if err != nil || !role.CanManageSecrets() {
128 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
129 return store.Repo{}, store.User{}, false
130 }
131 return repo, u, true
132}
133
134func (s *Server) secretAPIGroup(w http.ResponseWriter, r *http.Request) (store.Group, store.User, bool) {
135 u, ok := s.webhookAPIUser(w, r)
136 if !ok {
137 return store.Group{}, store.User{}, false
138 }
139 g, err := s.Store.GroupByPath(r.Context(), r.PathValue("path"))
140 if err != nil {
141 http.NotFound(w, r)
142 return store.Group{}, store.User{}, false
143 }
144 role, err := s.Store.GroupRole(r.Context(), g.ID, u.ID)
145 if err != nil || !role.CanManageSecrets() {
146 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
147 return store.Group{}, store.User{}, false
148 }
149 return g, u, true
150}
151
116func (s *Server) secretListAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {
152func (s *Server) secretListAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {
117 list, err := s.Store.ListSecrets(r.Context(), kind, scopeID)
153 list, err := s.Store.ListSecrets(r.Context(), kind, scopeID)
118 if err != nil {
154 if err != nil {
internal/server/secret_edit_test.go +170 −0
@@ -12,7 +12,9 @@ import (
12 12 "strconv"
13 13 "strings"
14 14 "testing"
15 "time"
15 16
17 "gitlab.com/Timfa/bluegit/internal/access"
16 18 "gitlab.com/Timfa/bluegit/internal/auth"
17 19 "gitlab.com/Timfa/bluegit/internal/config"
18 20 "gitlab.com/Timfa/bluegit/internal/store"
@@ -349,3 +351,171 @@ func TestWebhookTableAndEdit(t *testing.T) {
349 351 t.Fatalf("api bijgewerkt %#v %v", hooks, err)
350 352 }
351 353 }
354
355 func TestProtectedSecretRequiresMaintainer(t *testing.T) {
356 if _, err := exec.LookPath("git"); err != nil {
357 t.Skip("git ontbreekt")
358 }
359 storage := t.TempDir()
360 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
361 if err != nil {
362 t.Fatal(err)
363 }
364 t.Cleanup(func() { _ = st.Close() })
365 cfg := config.Config{
366 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
367 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
368 Git: config.Git{Binary: "git", DefaultBranch: "master"},
369 }
370 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
371 ts := httptest.NewServer(srv.Handler())
372 t.Cleanup(ts.Close)
373
374 jar, _ := cookiejar.New(nil)
375 client := &http.Client{Jar: jar}
376 res, err := client.Get(ts.URL + "/login")
377 if err != nil {
378 t.Fatal(err)
379 }
380 _ = read(t, res)
381
382 ctx := context.Background()
383 tim, err := st.UserByUsername(ctx, "tim")
384 if err != nil {
385 t.Fatal(err)
386 }
387 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
388 "csrf": {csrfOf(t, readBody(t, client, ts.URL+"/new"))}, "name": {"locked"}, "visibility": {"private"},
389 })
390 if err != nil {
391 t.Fatal(err)
392 }
393 _ = read(t, res)
394 repo, err := st.RepoByPath(ctx, "tim", "locked")
395 if err != nil {
396 t.Fatal(err)
397 }
398 const secretValue = "protected-waarde-99"
399 if err := st.CreateSecret(ctx, "repo", repo.ID, "DEPLOY_KEY", secretValue, true, false); err != nil {
400 t.Fatal(err)
401 }
402 ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
403 if err != nil {
404 t.Fatal(err)
405 }
406 if err := st.SetMember(ctx, "repo", repo.ID, "ada", access.RoleDeveloper); err != nil {
407 t.Fatal(err)
408 }
409 adaSess, err := st.CreateSession(ctx, ada.ID, "dev", time.Now().Add(time.Hour))
410 if err != nil {
411 t.Fatal(err)
412 }
413 adaJar, _ := cookiejar.New(nil)
414 adaClient := &http.Client{Jar: adaJar}
415 u, _ := url.Parse(ts.URL)
416 adaJar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: adaSess.ID, Path: "/"}})
417
418 page := readBody(t, adaClient, ts.URL+"/tim/locked/-/settings?tab=secrets")
419 if strings.Contains(page, secretValue) || strings.Contains(page, `data-reveal="DEPLOY_KEY"`) || strings.Contains(page, `value="update"`) {
420 t.Fatalf("ontwikkelaar ziet een protected secret:\n%s", page)
421 }
422 res, err = adaClient.PostForm(ts.URL+"/tim/locked/-/secrets/reveal", url.Values{
423 "csrf": {adaSess.CSRF}, "name": {"DEPLOY_KEY"},
424 })
425 if err != nil {
426 t.Fatal(err)
427 }
428 revealed := read(t, res)
429 if res.StatusCode != http.StatusForbidden || strings.Contains(revealed, secretValue) {
430 t.Fatalf("ui toon %d %s", res.StatusCode, revealed)
431 }
432 res, err = adaClient.PostForm(ts.URL+"/tim/locked/-/secrets", url.Values{
433 "csrf": {adaSess.CSRF}, "mode": {"update"}, "name": {"DEPLOY_KEY"}, "value": {"gekraakt"},
434 })
435 if err != nil {
436 t.Fatal(err)
437 }
438 edited := read(t, res)
439 if res.StatusCode != http.StatusForbidden || strings.Contains(edited, secretValue) || strings.Contains(edited, "gekraakt") {
440 t.Fatalf("ui bewerken %d %s", res.StatusCode, edited)
441 }
442
443 adaTok, err := st.CreateToken(ctx, ada.ID, "ada")
444 if err != nil {
445 t.Fatal(err)
446 }
447 timTok, err := st.CreateToken(ctx, tim.ID, "tim")
448 if err != nil {
449 t.Fatal(err)
450 }
451 call := func(tok, method, path, body string) (int, string) {
452 t.Helper()
453 req, err := http.NewRequest(method, ts.URL+path, strings.NewReader(body))
454 if err != nil {
455 t.Fatal(err)
456 }
457 req.Header.Set("Authorization", "Bearer "+tok)
458 req.Header.Set("Content-Type", "application/json")
459 res, err := client.Do(req)
460 if err != nil {
461 t.Fatal(err)
462 }
463 return res.StatusCode, read(t, res)
464 }
465 for _, tc := range []struct{ method, path, body string }{
466 {http.MethodGet, "/api/v1/repos/tim/locked/secrets", ""},
467 {http.MethodGet, "/api/v1/repos/tim/locked/secrets/DEPLOY_KEY", ""},
468 {http.MethodPut, "/api/v1/repos/tim/locked/secrets/DEPLOY_KEY", `{"value":"gekraakt","protected":false}`},
469 {http.MethodPost, "/api/v1/repos/tim/locked/secrets/DEPLOY_KEY/replace", `{"value":"gekraakt","protected":true}`},
470 } {
471 code, body := call(adaTok, tc.method, tc.path, tc.body)
472 if code != http.StatusForbidden || strings.Contains(body, secretValue) || strings.Contains(body, "gekraakt") {
473 t.Fatalf("api %s %s %d %s", tc.method, tc.path, code, body)
474 }
475 }
476 vals, err := st.SecretValues(ctx, "repo", repo.ID, true)
477 if err != nil || vals["DEPLOY_KEY"] != secretValue {
478 t.Fatalf("waarde veranderde: %#v %v", vals, err)
479 }
480 code, body := call(timTok, http.MethodGet, "/api/v1/repos/tim/locked/secrets/DEPLOY_KEY", "")
481 if code != http.StatusOK || !strings.Contains(body, secretValue) {
482 t.Fatalf("maintainer toon %d %s", code, body)
483 }
484
485 g, err := st.CreateGroup(ctx, tim.ID, "Team", "team", "", "developer")
486 if err != nil {
487 t.Fatal(err)
488 }
489 if err := st.SetMember(ctx, "group", g.ID, "ada", access.RoleDeveloper); err != nil {
490 t.Fatal(err)
491 }
492 const groupValue = "groep-protected-waarde"
493 if err := st.CreateSecret(ctx, "group", g.ID, "GROUP_KEY", groupValue, true, false); err != nil {
494 t.Fatal(err)
495 }
496 groupPage := readBody(t, adaClient, ts.URL+"/groups/team?tab=settings")
497 if strings.Contains(groupPage, groupValue) || strings.Contains(groupPage, `data-reveal="GROUP_KEY"`) {
498 t.Fatalf("groepsontwikkelaar ziet het secret:\n%s", groupPage)
499 }
500 code, body = call(adaTok, http.MethodGet, "/api/v1/groups/team/secrets/GROUP_KEY", "")
501 if code != http.StatusForbidden || strings.Contains(body, groupValue) {
502 t.Fatalf("groep api toon %d %s", code, body)
503 }
504 code, body = call(adaTok, http.MethodPut, "/api/v1/groups/team/secrets/GROUP_KEY", `{"value":"gekraakt","protected":false}`)
505 if code != http.StatusForbidden || strings.Contains(body, groupValue) {
506 t.Fatalf("groep api bewerken %d %s", code, body)
507 }
508 code, body = call(timTok, http.MethodGet, "/api/v1/groups/team/secrets/GROUP_KEY", "")
509 if code != http.StatusOK || !strings.Contains(body, groupValue) {
510 t.Fatalf("groepseigenaar toon %d %s", code, body)
511 }
512 }
513
514 func readBody(t *testing.T, client *http.Client, rawURL string) string {
515 t.Helper()
516 res, err := client.Get(rawURL)
517 if err != nil {
518 t.Fatal(err)
519 }
520 return read(t, res)
521 }
@@ -12,7 +12,9 @@ import (
12 "strconv"
12 "strconv"
13 "strings"
13 "strings"
14 "testing"
14 "testing"
15 "time"
15
16
17 "gitlab.com/Timfa/bluegit/internal/access"
16 "gitlab.com/Timfa/bluegit/internal/auth"
18 "gitlab.com/Timfa/bluegit/internal/auth"
17 "gitlab.com/Timfa/bluegit/internal/config"
19 "gitlab.com/Timfa/bluegit/internal/config"
18 "gitlab.com/Timfa/bluegit/internal/store"
20 "gitlab.com/Timfa/bluegit/internal/store"
@@ -349,3 +351,171 @@ func TestWebhookTableAndEdit(t *testing.T) {
349 t.Fatalf("api bijgewerkt %#v %v", hooks, err)
351 t.Fatalf("api bijgewerkt %#v %v", hooks, err)
350 }
352 }
351}
353}
354
355func TestProtectedSecretRequiresMaintainer(t *testing.T) {
356 if _, err := exec.LookPath("git"); err != nil {
357 t.Skip("git ontbreekt")
358 }
359 storage := t.TempDir()
360 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
361 if err != nil {
362 t.Fatal(err)
363 }
364 t.Cleanup(func() { _ = st.Close() })
365 cfg := config.Config{
366 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
367 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
368 Git: config.Git{Binary: "git", DefaultBranch: "master"},
369 }
370 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
371 ts := httptest.NewServer(srv.Handler())
372 t.Cleanup(ts.Close)
373
374 jar, _ := cookiejar.New(nil)
375 client := &http.Client{Jar: jar}
376 res, err := client.Get(ts.URL + "/login")
377 if err != nil {
378 t.Fatal(err)
379 }
380 _ = read(t, res)
381
382 ctx := context.Background()
383 tim, err := st.UserByUsername(ctx, "tim")
384 if err != nil {
385 t.Fatal(err)
386 }
387 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
388 "csrf": {csrfOf(t, readBody(t, client, ts.URL+"/new"))}, "name": {"locked"}, "visibility": {"private"},
389 })
390 if err != nil {
391 t.Fatal(err)
392 }
393 _ = read(t, res)
394 repo, err := st.RepoByPath(ctx, "tim", "locked")
395 if err != nil {
396 t.Fatal(err)
397 }
398 const secretValue = "protected-waarde-99"
399 if err := st.CreateSecret(ctx, "repo", repo.ID, "DEPLOY_KEY", secretValue, true, false); err != nil {
400 t.Fatal(err)
401 }
402 ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
403 if err != nil {
404 t.Fatal(err)
405 }
406 if err := st.SetMember(ctx, "repo", repo.ID, "ada", access.RoleDeveloper); err != nil {
407 t.Fatal(err)
408 }
409 adaSess, err := st.CreateSession(ctx, ada.ID, "dev", time.Now().Add(time.Hour))
410 if err != nil {
411 t.Fatal(err)
412 }
413 adaJar, _ := cookiejar.New(nil)
414 adaClient := &http.Client{Jar: adaJar}
415 u, _ := url.Parse(ts.URL)
416 adaJar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: adaSess.ID, Path: "/"}})
417
418 page := readBody(t, adaClient, ts.URL+"/tim/locked/-/settings?tab=secrets")
419 if strings.Contains(page, secretValue) || strings.Contains(page, `data-reveal="DEPLOY_KEY"`) || strings.Contains(page, `value="update"`) {
420 t.Fatalf("ontwikkelaar ziet een protected secret:\n%s", page)
421 }
422 res, err = adaClient.PostForm(ts.URL+"/tim/locked/-/secrets/reveal", url.Values{
423 "csrf": {adaSess.CSRF}, "name": {"DEPLOY_KEY"},
424 })
425 if err != nil {
426 t.Fatal(err)
427 }
428 revealed := read(t, res)
429 if res.StatusCode != http.StatusForbidden || strings.Contains(revealed, secretValue) {
430 t.Fatalf("ui toon %d %s", res.StatusCode, revealed)
431 }
432 res, err = adaClient.PostForm(ts.URL+"/tim/locked/-/secrets", url.Values{
433 "csrf": {adaSess.CSRF}, "mode": {"update"}, "name": {"DEPLOY_KEY"}, "value": {"gekraakt"},
434 })
435 if err != nil {
436 t.Fatal(err)
437 }
438 edited := read(t, res)
439 if res.StatusCode != http.StatusForbidden || strings.Contains(edited, secretValue) || strings.Contains(edited, "gekraakt") {
440 t.Fatalf("ui bewerken %d %s", res.StatusCode, edited)
441 }
442
443 adaTok, err := st.CreateToken(ctx, ada.ID, "ada")
444 if err != nil {
445 t.Fatal(err)
446 }
447 timTok, err := st.CreateToken(ctx, tim.ID, "tim")
448 if err != nil {
449 t.Fatal(err)
450 }
451 call := func(tok, method, path, body string) (int, string) {
452 t.Helper()
453 req, err := http.NewRequest(method, ts.URL+path, strings.NewReader(body))
454 if err != nil {
455 t.Fatal(err)
456 }
457 req.Header.Set("Authorization", "Bearer "+tok)
458 req.Header.Set("Content-Type", "application/json")
459 res, err := client.Do(req)
460 if err != nil {
461 t.Fatal(err)
462 }
463 return res.StatusCode, read(t, res)
464 }
465 for _, tc := range []struct{ method, path, body string }{
466 {http.MethodGet, "/api/v1/repos/tim/locked/secrets", ""},
467 {http.MethodGet, "/api/v1/repos/tim/locked/secrets/DEPLOY_KEY", ""},
468 {http.MethodPut, "/api/v1/repos/tim/locked/secrets/DEPLOY_KEY", `{"value":"gekraakt","protected":false}`},
469 {http.MethodPost, "/api/v1/repos/tim/locked/secrets/DEPLOY_KEY/replace", `{"value":"gekraakt","protected":true}`},
470 } {
471 code, body := call(adaTok, tc.method, tc.path, tc.body)
472 if code != http.StatusForbidden || strings.Contains(body, secretValue) || strings.Contains(body, "gekraakt") {
473 t.Fatalf("api %s %s %d %s", tc.method, tc.path, code, body)
474 }
475 }
476 vals, err := st.SecretValues(ctx, "repo", repo.ID, true)
477 if err != nil || vals["DEPLOY_KEY"] != secretValue {
478 t.Fatalf("waarde veranderde: %#v %v", vals, err)
479 }
480 code, body := call(timTok, http.MethodGet, "/api/v1/repos/tim/locked/secrets/DEPLOY_KEY", "")
481 if code != http.StatusOK || !strings.Contains(body, secretValue) {
482 t.Fatalf("maintainer toon %d %s", code, body)
483 }
484
485 g, err := st.CreateGroup(ctx, tim.ID, "Team", "team", "", "developer")
486 if err != nil {
487 t.Fatal(err)
488 }
489 if err := st.SetMember(ctx, "group", g.ID, "ada", access.RoleDeveloper); err != nil {
490 t.Fatal(err)
491 }
492 const groupValue = "groep-protected-waarde"
493 if err := st.CreateSecret(ctx, "group", g.ID, "GROUP_KEY", groupValue, true, false); err != nil {
494 t.Fatal(err)
495 }
496 groupPage := readBody(t, adaClient, ts.URL+"/groups/team?tab=settings")
497 if strings.Contains(groupPage, groupValue) || strings.Contains(groupPage, `data-reveal="GROUP_KEY"`) {
498 t.Fatalf("groepsontwikkelaar ziet het secret:\n%s", groupPage)
499 }
500 code, body = call(adaTok, http.MethodGet, "/api/v1/groups/team/secrets/GROUP_KEY", "")
501 if code != http.StatusForbidden || strings.Contains(body, groupValue) {
502 t.Fatalf("groep api toon %d %s", code, body)
503 }
504 code, body = call(adaTok, http.MethodPut, "/api/v1/groups/team/secrets/GROUP_KEY", `{"value":"gekraakt","protected":false}`)
505 if code != http.StatusForbidden || strings.Contains(body, groupValue) {
506 t.Fatalf("groep api bewerken %d %s", code, body)
507 }
508 code, body = call(timTok, http.MethodGet, "/api/v1/groups/team/secrets/GROUP_KEY", "")
509 if code != http.StatusOK || !strings.Contains(body, groupValue) {
510 t.Fatalf("groepseigenaar toon %d %s", code, body)
511 }
512}
513
514func readBody(t *testing.T, client *http.Client, rawURL string) string {
515 t.Helper()
516 res, err := client.Get(rawURL)
517 if err != nil {
518 t.Fatal(err)
519 }
520 return read(t, res)
521}
internal/server/settings_handlers.go +27 −10
@@ -295,16 +295,35 @@ func (s *Server) groupSecretDelete(w http.ResponseWriter, r *http.Request) {
295 295 s.secretDelete(w, r, "group")
296 296 }
297 297
298 // secretScope laat alleen een maintainer secrets bekijken of bewerken, ook protected.
299 func (s *Server) secretScope(w http.ResponseWriter, r *http.Request, kind string) (int64, string, bool) {
300 if kind == "group" {
301 g, role, ok := s.guardGroup(w, r, access.RoleReadonly)
302 if !ok {
303 return 0, "", false
304 }
305 if !role.CanManageSecrets() {
306 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
307 return 0, "", false
308 }
309 return g.ID, "/groups/" + g.Path + "?tab=settings#secrets", true
310 }
311 _, repo, role, ok := s.guard(w, r, access.RoleReadonly)
312 if !ok {
313 return 0, "", false
314 }
315 if !role.CanManageSecrets() {
316 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
317 return 0, "", false
318 }
319 return repo.ID, repoURL(repo) + "/-/settings?tab=secrets", true
320 }
321
298 322 func (s *Server) secretPost(w http.ResponseWriter, r *http.Request, kind string) {
299 scopeID, back, ok := s.adminScope(w, r, kind)
323 scopeID, back, ok := s.secretScope(w, r, kind)
300 324 if !ok || !s.csrfOK(w, r) {
301 325 return
302 326 }
303 back = strings.Split(back, "?")[0]
304 back += scopeTab(kind, "secrets")
305 if kind == "group" {
306 back += "#secrets"
307 }
308 327 name := strings.TrimSpace(r.FormValue("name"))
309 328 value := r.FormValue("value")
310 329 protected := r.FormValue("protected") == "1"
@@ -335,7 +354,7 @@ func (s *Server) groupSecretReveal(w http.ResponseWriter, r *http.Request) {
335 354 }
336 355
337 356 func (s *Server) secretReveal(w http.ResponseWriter, r *http.Request, kind string) {
338 scopeID, _, ok := s.adminScope(w, r, kind)
357 scopeID, _, ok := s.secretScope(w, r, kind)
339 358 if !ok || !s.csrfOK(w, r) {
340 359 return
341 360 }
@@ -371,12 +390,10 @@ func secretStatus(err error) int {
371 390 }
372 391
373 392 func (s *Server) secretDelete(w http.ResponseWriter, r *http.Request, kind string) {
374 scopeID, back, ok := s.adminScope(w, r, kind)
393 scopeID, back, ok := s.secretScope(w, r, kind)
375 394 if !ok || !s.csrfOK(w, r) {
376 395 return
377 396 }
378 back = strings.Split(back, "?")[0]
379 back += scopeTab(kind, "secrets")
380 397 _ = s.Store.DeleteSecret(r.Context(), kind, scopeID, r.FormValue("name"))
381 398 s.redirect(w, r, back, s.tr(r, "flash.secretRemoved"), "")
382 399 }
@@ -295,16 +295,35 @@ func (s *Server) groupSecretDelete(w http.ResponseWriter, r *http.Request) {
295 s.secretDelete(w, r, "group")
295 s.secretDelete(w, r, "group")
296}
296}
297
297
298// secretScope laat alleen een maintainer secrets bekijken of bewerken, ook protected.
299func (s *Server) secretScope(w http.ResponseWriter, r *http.Request, kind string) (int64, string, bool) {
300 if kind == "group" {
301 g, role, ok := s.guardGroup(w, r, access.RoleReadonly)
302 if !ok {
303 return 0, "", false
304 }
305 if !role.CanManageSecrets() {
306 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
307 return 0, "", false
308 }
309 return g.ID, "/groups/" + g.Path + "?tab=settings#secrets", true
310 }
311 _, repo, role, ok := s.guard(w, r, access.RoleReadonly)
312 if !ok {
313 return 0, "", false
314 }
315 if !role.CanManageSecrets() {
316 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
317 return 0, "", false
318 }
319 return repo.ID, repoURL(repo) + "/-/settings?tab=secrets", true
320}
321
298func (s *Server) secretPost(w http.ResponseWriter, r *http.Request, kind string) {
322func (s *Server) secretPost(w http.ResponseWriter, r *http.Request, kind string) {
299 scopeID, back, ok := s.adminScope(w, r, kind)
323 scopeID, back, ok := s.secretScope(w, r, kind)
300 if !ok || !s.csrfOK(w, r) {
324 if !ok || !s.csrfOK(w, r) {
301 return
325 return
302 }
326 }
303 back = strings.Split(back, "?")[0]
304 back += scopeTab(kind, "secrets")
305 if kind == "group" {
306 back += "#secrets"
307 }
308 name := strings.TrimSpace(r.FormValue("name"))
327 name := strings.TrimSpace(r.FormValue("name"))
309 value := r.FormValue("value")
328 value := r.FormValue("value")
310 protected := r.FormValue("protected") == "1"
329 protected := r.FormValue("protected") == "1"
@@ -335,7 +354,7 @@ func (s *Server) groupSecretReveal(w http.ResponseWriter, r *http.Request) {
335}
354}
336
355
337func (s *Server) secretReveal(w http.ResponseWriter, r *http.Request, kind string) {
356func (s *Server) secretReveal(w http.ResponseWriter, r *http.Request, kind string) {
338 scopeID, _, ok := s.adminScope(w, r, kind)
357 scopeID, _, ok := s.secretScope(w, r, kind)
339 if !ok || !s.csrfOK(w, r) {
358 if !ok || !s.csrfOK(w, r) {
340 return
359 return
341 }
360 }
@@ -371,12 +390,10 @@ func secretStatus(err error) int {
371}
390}
372
391
373func (s *Server) secretDelete(w http.ResponseWriter, r *http.Request, kind string) {
392func (s *Server) secretDelete(w http.ResponseWriter, r *http.Request, kind string) {
374 scopeID, back, ok := s.adminScope(w, r, kind)
393 scopeID, back, ok := s.secretScope(w, r, kind)
375 if !ok || !s.csrfOK(w, r) {
394 if !ok || !s.csrfOK(w, r) {
376 return
395 return
377 }
396 }
378 back = strings.Split(back, "?")[0]
379 back += scopeTab(kind, "secrets")
380 _ = s.Store.DeleteSecret(r.Context(), kind, scopeID, r.FormValue("name"))
397 _ = s.Store.DeleteSecret(r.Context(), kind, scopeID, r.FormValue("name"))
381 s.redirect(w, r, back, s.tr(r, "flash.secretRemoved"), "")
398 s.redirect(w, r, back, s.tr(r, "flash.secretRemoved"), "")
382}
399}