BlueGit

timfa bluegit

feat: sta gemengde secretnamen toe en kies ze bij een webhook

Een geheim mag [A-Za-z_][A-Za-z0-9_]* heten, zoals in GitLab. De
webhook van een repository of groep kiest dat geheim uit een
doorzoekbare lijst met bron, of geen. De waarde blijft verborgen.
Hetzelfde kan via de API met een bg_-token.

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

timfa project_87923614_bot_3aff574f6f98414b945a8799374f9092 · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
c102b10cb7a125c4ba7d3b45e7b2f8e1e06503eb
Parent
25146e27
14 files changed +687 −41
internal/access/access.go +8 −5
@@ -8,6 +8,7 @@ package access
8 8
9 9 import (
10 10 "path"
11 "regexp"
11 12 "strings"
12 13
13 14 "gitlab.com/Timfa/bluegit/internal/i18n"
@@ -223,16 +224,18 @@ func InjectSecret(secretProtected, refProtected bool) bool {
223 224 return true
224 225 }
225 226
227 // secretNameRE is dezelfde vorm als een GitLab-variabele: een letter of
228 // underscore, daarna letters, cijfers en underscores. Hoofdletters en
229 // kleine letters zijn allebei geldig.
230 var secretNameRE = regexp.MustCompile(`^[A-Za-z_][A-Za-z0-9_]*$`)
231
226 232 // ValidSecretName eist een omgevingsvariabelenaam.
227 233 func ValidSecretName(name string) error {
228 234 if name == "" || len(name) > 80 {
229 235 return i18n.E("err.secretLen")
230 236 }
231 for i, c := range name {
232 ok := c == '_' || (c >= 'A' && c <= 'Z') || (i > 0 && c >= '0' && c <= '9')
233 if !ok {
234 return i18n.E("err.secretForm", name)
235 }
237 if !secretNameRE.MatchString(name) {
238 return i18n.E("err.secretForm", name)
236 239 }
237 240 return nil
238 241 }
@@ -8,6 +8,7 @@ package access
8
8
9import (
9import (
10 "path"
10 "path"
11 "regexp"
11 "strings"
12 "strings"
12
13
13 "gitlab.com/Timfa/bluegit/internal/i18n"
14 "gitlab.com/Timfa/bluegit/internal/i18n"
@@ -223,16 +224,18 @@ func InjectSecret(secretProtected, refProtected bool) bool {
223 return true
224 return true
224}
225}
225
226
227// secretNameRE is dezelfde vorm als een GitLab-variabele: een letter of
228// underscore, daarna letters, cijfers en underscores. Hoofdletters en
229// kleine letters zijn allebei geldig.
230var secretNameRE = regexp.MustCompile(`^[A-Za-z_][A-Za-z0-9_]*$`)
231
226// ValidSecretName eist een omgevingsvariabelenaam.
232// ValidSecretName eist een omgevingsvariabelenaam.
227func ValidSecretName(name string) error {
233func ValidSecretName(name string) error {
228 if name == "" || len(name) > 80 {
234 if name == "" || len(name) > 80 {
229 return i18n.E("err.secretLen")
235 return i18n.E("err.secretLen")
230 }
236 }
231 for i, c := range name {
237 if !secretNameRE.MatchString(name) {
232 ok := c == '_' || (c >= 'A' && c <= 'Z') || (i > 0 && c >= '0' && c <= '9')
238 return i18n.E("err.secretForm", name)
233 if !ok {
234 return i18n.E("err.secretForm", name)
235 }
236 }
239 }
237 return nil
240 return nil
238}
241}
internal/access/access_test.go +17 −5
@@ -1,6 +1,9 @@
1 1 package access
2 2
3 import "testing"
3 import (
4 "strings"
5 "testing"
6 )
4 7
5 8 func TestParseAndRank(t *testing.T) {
6 9 cases := []struct {
@@ -133,13 +136,22 @@ func TestInjectSecret(t *testing.T) {
133 136 }
134 137
135 138 func TestSecretName(t *testing.T) {
136 if err := ValidSecretName("DEPLOY_SSH_KEY"); err != nil {
137 t.Fatal(err)
139 for _, ok := range []string{"DEPLOY_SSH_KEY", "Ada_Webhook", "lower", "_ok", "A"} {
140 if err := ValidSecretName(ok); err != nil {
141 t.Fatalf("%s: %v", ok, err)
142 }
138 143 }
139 for _, bad := range []string{"", "lower", "1KEY", "A-B", "HAS SPACE"} {
140 if err := ValidSecretName(bad); err == nil {
144 for _, bad := range []string{"", "1KEY", "A-B", "HAS SPACE", "naam.met.punt"} {
145 err := ValidSecretName(bad)
146 if err == nil {
141 147 t.Fatalf("naam %q hoort afgekeurd", bad)
142 148 }
149 if bad != "" && !strings.Contains(err.Error(), "[A-Za-z_][A-Za-z0-9_]*") {
150 t.Fatalf("fout voor %q: %v", bad, err)
151 }
152 }
153 if err := ValidSecretName(strings.Repeat("a", 81)); err == nil {
154 t.Fatal("81 tekens hoort afgekeurd")
143 155 }
144 156 }
145 157
@@ -1,6 +1,9 @@
1package access
1package access
2
2
3import "testing"
3import (
4 "strings"
5 "testing"
6)
4
7
5func TestParseAndRank(t *testing.T) {
8func TestParseAndRank(t *testing.T) {
6 cases := []struct {
9 cases := []struct {
@@ -133,13 +136,22 @@ func TestInjectSecret(t *testing.T) {
133}
136}
134
137
135func TestSecretName(t *testing.T) {
138func TestSecretName(t *testing.T) {
136 if err := ValidSecretName("DEPLOY_SSH_KEY"); err != nil {
139 for _, ok := range []string{"DEPLOY_SSH_KEY", "Ada_Webhook", "lower", "_ok", "A"} {
137 t.Fatal(err)
140 if err := ValidSecretName(ok); err != nil {
141 t.Fatalf("%s: %v", ok, err)
142 }
138 }
143 }
139 for _, bad := range []string{"", "lower", "1KEY", "A-B", "HAS SPACE"} {
144 for _, bad := range []string{"", "1KEY", "A-B", "HAS SPACE", "naam.met.punt"} {
140 if err := ValidSecretName(bad); err == nil {
145 err := ValidSecretName(bad)
146 if err == nil {
141 t.Fatalf("naam %q hoort afgekeurd", bad)
147 t.Fatalf("naam %q hoort afgekeurd", bad)
142 }
148 }
149 if bad != "" && !strings.Contains(err.Error(), "[A-Za-z_][A-Za-z0-9_]*") {
150 t.Fatalf("fout voor %q: %v", bad, err)
151 }
152 }
153 if err := ValidSecretName(strings.Repeat("a", 81)); err == nil {
154 t.Fatal("81 tekens hoort afgekeurd")
143 }
155 }
144}
156}
145
157
internal/i18n/catalog_secret.go added +44 −0
@@ -0,0 +1,44 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, secretEN)
5 addCatalog(nl, secretNL)
6 addCatalog(de, secretDE)
7 addCatalog(fr, secretFR)
8 }
9
10 var secretEN = map[string]string{
11 "err.secretForm": "secret name %q must match [A-Za-z_][A-Za-z0-9_]*",
12 "wh.tokenHint": "Choose a secret. The value stays hidden.",
13 "wh.noSecret": "None",
14 "wh.secretSearch": "Search secrets",
15 "wh.src.repo": "Repository %s",
16 "wh.src.group": "Group %s",
17 }
18
19 var secretNL = map[string]string{
20 "err.secretForm": "geheimnaam %q moet [A-Za-z_][A-Za-z0-9_]* zijn",
21 "wh.tokenHint": "Kies een geheim. De waarde blijft verborgen.",
22 "wh.noSecret": "Geen",
23 "wh.secretSearch": "Zoek een geheim",
24 "wh.src.repo": "Repository %s",
25 "wh.src.group": "Groep %s",
26 }
27
28 var secretDE = map[string]string{
29 "err.secretForm": "Geheimnisname %q muss [A-Za-z_][A-Za-z0-9_]* entsprechen",
30 "wh.tokenHint": "Wähle ein Geheimnis. Der Wert bleibt verborgen.",
31 "wh.noSecret": "Keins",
32 "wh.secretSearch": "Geheimnis suchen",
33 "wh.src.repo": "Repository %s",
34 "wh.src.group": "Gruppe %s",
35 }
36
37 var secretFR = map[string]string{
38 "err.secretForm": "le nom de secret %q doit correspondre à [A-Za-z_][A-Za-z0-9_]*",
39 "wh.tokenHint": "Choisis un secret. La valeur reste cachée.",
40 "wh.noSecret": "Aucun",
41 "wh.secretSearch": "Chercher un secret",
42 "wh.src.repo": "Dépôt %s",
43 "wh.src.group": "Groupe %s",
44 }
@@ -0,0 +1,44 @@
1package i18n
2
3func init() {
4 addCatalog(en, secretEN)
5 addCatalog(nl, secretNL)
6 addCatalog(de, secretDE)
7 addCatalog(fr, secretFR)
8}
9
10var secretEN = map[string]string{
11 "err.secretForm": "secret name %q must match [A-Za-z_][A-Za-z0-9_]*",
12 "wh.tokenHint": "Choose a secret. The value stays hidden.",
13 "wh.noSecret": "None",
14 "wh.secretSearch": "Search secrets",
15 "wh.src.repo": "Repository %s",
16 "wh.src.group": "Group %s",
17}
18
19var secretNL = map[string]string{
20 "err.secretForm": "geheimnaam %q moet [A-Za-z_][A-Za-z0-9_]* zijn",
21 "wh.tokenHint": "Kies een geheim. De waarde blijft verborgen.",
22 "wh.noSecret": "Geen",
23 "wh.secretSearch": "Zoek een geheim",
24 "wh.src.repo": "Repository %s",
25 "wh.src.group": "Groep %s",
26}
27
28var secretDE = map[string]string{
29 "err.secretForm": "Geheimnisname %q muss [A-Za-z_][A-Za-z0-9_]* entsprechen",
30 "wh.tokenHint": "Wähle ein Geheimnis. Der Wert bleibt verborgen.",
31 "wh.noSecret": "Keins",
32 "wh.secretSearch": "Geheimnis suchen",
33 "wh.src.repo": "Repository %s",
34 "wh.src.group": "Gruppe %s",
35}
36
37var secretFR = map[string]string{
38 "err.secretForm": "le nom de secret %q doit correspondre à [A-Za-z_][A-Za-z0-9_]*",
39 "wh.tokenHint": "Choisis un secret. La valeur reste cachée.",
40 "wh.noSecret": "Aucun",
41 "wh.secretSearch": "Chercher un secret",
42 "wh.src.repo": "Dépôt %s",
43 "wh.src.group": "Groupe %s",
44}
internal/server/events.go +4 −4
@@ -214,21 +214,21 @@ func (s *Server) Dispatch(repoID int64, ev webhook.Event) {
214 214 }
215 215 patterns, _ := s.Store.ProtectedPatterns(ctx, repo.ID)
216 216 protected := access.BranchProtected(patterns, ev.Branch)
217 s.deliver(ctx, "repo", repo.ID, ev, protected)
217 s.deliver(ctx, "repo", repo.ID, ev, protected, repo)
218 218 if repo.OwnerKind == "group" {
219 s.deliver(ctx, "group", repo.OwnerID, ev, protected)
219 s.deliver(ctx, "group", repo.OwnerID, ev, protected, repo)
220 220 }
221 221 if ev.Type == webhook.EventPipelineFailure {
222 222 s.queueFailureMail(repo, ev)
223 223 }
224 224 }
225 225
226 func (s *Server) deliver(ctx context.Context, kind string, scopeID int64, ev webhook.Event, refProtected bool) {
226 func (s *Server) deliver(ctx context.Context, kind string, scopeID int64, ev webhook.Event, refProtected bool, repo store.Repo) {
227 227 hooks, err := s.Store.ListWebhooks(ctx, kind, scopeID)
228 228 if err != nil {
229 229 return
230 230 }
231 secrets, err := s.Store.SecretValues(ctx, kind, scopeID, refProtected)
231 secrets, err := s.hookSecrets(ctx, kind, scopeID, refProtected, repo)
232 232 if err != nil {
233 233 s.Log.Error("geheimen voor webhook", "err", err)
234 234 return
@@ -214,21 +214,21 @@ func (s *Server) Dispatch(repoID int64, ev webhook.Event) {
214 }
214 }
215 patterns, _ := s.Store.ProtectedPatterns(ctx, repo.ID)
215 patterns, _ := s.Store.ProtectedPatterns(ctx, repo.ID)
216 protected := access.BranchProtected(patterns, ev.Branch)
216 protected := access.BranchProtected(patterns, ev.Branch)
217 s.deliver(ctx, "repo", repo.ID, ev, protected)
217 s.deliver(ctx, "repo", repo.ID, ev, protected, repo)
218 if repo.OwnerKind == "group" {
218 if repo.OwnerKind == "group" {
219 s.deliver(ctx, "group", repo.OwnerID, ev, protected)
219 s.deliver(ctx, "group", repo.OwnerID, ev, protected, repo)
220 }
220 }
221 if ev.Type == webhook.EventPipelineFailure {
221 if ev.Type == webhook.EventPipelineFailure {
222 s.queueFailureMail(repo, ev)
222 s.queueFailureMail(repo, ev)
223 }
223 }
224}
224}
225
225
226func (s *Server) deliver(ctx context.Context, kind string, scopeID int64, ev webhook.Event, refProtected bool) {
226func (s *Server) deliver(ctx context.Context, kind string, scopeID int64, ev webhook.Event, refProtected bool, repo store.Repo) {
227 hooks, err := s.Store.ListWebhooks(ctx, kind, scopeID)
227 hooks, err := s.Store.ListWebhooks(ctx, kind, scopeID)
228 if err != nil {
228 if err != nil {
229 return
229 return
230 }
230 }
231 secrets, err := s.Store.SecretValues(ctx, kind, scopeID, refProtected)
231 secrets, err := s.hookSecrets(ctx, kind, scopeID, refProtected, repo)
232 if err != nil {
232 if err != nil {
233 s.Log.Error("geheimen voor webhook", "err", err)
233 s.Log.Error("geheimen voor webhook", "err", err)
234 return
234 return
internal/server/secret_choices.go added +74 −0
@@ -0,0 +1,74 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6
7 "gitlab.com/Timfa/bluegit/internal/store"
8 )
9
10 // SecretChoice is een geheimnaam die een webhook mag noemen.
11 // De waarde zit er niet bij.
12 type SecretChoice struct {
13 Name string `json:"name"`
14 Source string `json:"source"`
15 Label string `json:"label"`
16 }
17
18 func (s *Server) repoSecretChoices(r *http.Request, repo store.Repo) []SecretChoice {
19 var out []SecretChoice
20 if repo.OwnerKind == "group" {
21 if g, err := s.Store.GroupByID(r.Context(), repo.OwnerID); err == nil {
22 out = append(out, s.choicesFrom(r, "group", g.ID, s.tr(r, "wh.src.group", g.Path))...)
23 }
24 }
25 out = append(out, s.choicesFrom(r, "repo", repo.ID, s.tr(r, "wh.src.repo", repo.FullPath()))...)
26 if out == nil {
27 out = []SecretChoice{}
28 }
29 return out
30 }
31
32 func (s *Server) groupSecretChoices(r *http.Request, g store.Group) []SecretChoice {
33 out := s.choicesFrom(r, "group", g.ID, s.tr(r, "wh.src.group", g.Path))
34 if out == nil {
35 out = []SecretChoice{}
36 }
37 return out
38 }
39
40 func (s *Server) choicesFrom(r *http.Request, kind string, id int64, label string) []SecretChoice {
41 list, err := s.Store.ListSecrets(r.Context(), kind, id)
42 if err != nil || len(list) == 0 {
43 return nil
44 }
45 out := make([]SecretChoice, 0, len(list))
46 for _, m := range list {
47 out = append(out, SecretChoice{Name: m.Name, Source: kind, Label: label})
48 }
49 return out
50 }
51
52 // hookSecrets geeft de namen die een webhook mag invullen.
53 // Een repository-webhook ziet eerst de groepsgeheimen en daarna de
54 // eigen geheimen; dezelfde naam laat de repository winnen.
55 func (s *Server) hookSecrets(ctx context.Context, kind string, scopeID int64, refProtected bool, repo store.Repo) (map[string]string, error) {
56 out := map[string]string{}
57 if kind == "repo" && repo.OwnerKind == "group" {
58 groupVals, err := s.Store.SecretValues(ctx, "group", repo.OwnerID, refProtected)
59 if err != nil {
60 return nil, err
61 }
62 for k, v := range groupVals {
63 out[k] = v
64 }
65 }
66 own, err := s.Store.SecretValues(ctx, kind, scopeID, refProtected)
67 if err != nil {
68 return nil, err
69 }
70 for k, v := range own {
71 out[k] = v
72 }
73 return out, nil
74 }
@@ -0,0 +1,74 @@
1package server
2
3import (
4 "context"
5 "net/http"
6
7 "gitlab.com/Timfa/bluegit/internal/store"
8)
9
10// SecretChoice is een geheimnaam die een webhook mag noemen.
11// De waarde zit er niet bij.
12type SecretChoice struct {
13 Name string `json:"name"`
14 Source string `json:"source"`
15 Label string `json:"label"`
16}
17
18func (s *Server) repoSecretChoices(r *http.Request, repo store.Repo) []SecretChoice {
19 var out []SecretChoice
20 if repo.OwnerKind == "group" {
21 if g, err := s.Store.GroupByID(r.Context(), repo.OwnerID); err == nil {
22 out = append(out, s.choicesFrom(r, "group", g.ID, s.tr(r, "wh.src.group", g.Path))...)
23 }
24 }
25 out = append(out, s.choicesFrom(r, "repo", repo.ID, s.tr(r, "wh.src.repo", repo.FullPath()))...)
26 if out == nil {
27 out = []SecretChoice{}
28 }
29 return out
30}
31
32func (s *Server) groupSecretChoices(r *http.Request, g store.Group) []SecretChoice {
33 out := s.choicesFrom(r, "group", g.ID, s.tr(r, "wh.src.group", g.Path))
34 if out == nil {
35 out = []SecretChoice{}
36 }
37 return out
38}
39
40func (s *Server) choicesFrom(r *http.Request, kind string, id int64, label string) []SecretChoice {
41 list, err := s.Store.ListSecrets(r.Context(), kind, id)
42 if err != nil || len(list) == 0 {
43 return nil
44 }
45 out := make([]SecretChoice, 0, len(list))
46 for _, m := range list {
47 out = append(out, SecretChoice{Name: m.Name, Source: kind, Label: label})
48 }
49 return out
50}
51
52// hookSecrets geeft de namen die een webhook mag invullen.
53// Een repository-webhook ziet eerst de groepsgeheimen en daarna de
54// eigen geheimen; dezelfde naam laat de repository winnen.
55func (s *Server) hookSecrets(ctx context.Context, kind string, scopeID int64, refProtected bool, repo store.Repo) (map[string]string, error) {
56 out := map[string]string{}
57 if kind == "repo" && repo.OwnerKind == "group" {
58 groupVals, err := s.Store.SecretValues(ctx, "group", repo.OwnerID, refProtected)
59 if err != nil {
60 return nil, err
61 }
62 for k, v := range groupVals {
63 out[k] = v
64 }
65 }
66 own, err := s.Store.SecretValues(ctx, kind, scopeID, refProtected)
67 if err != nil {
68 return nil, err
69 }
70 for k, v := range own {
71 out[k] = v
72 }
73 return out, nil
74}
internal/server/server.go +5 −0
@@ -112,6 +112,10 @@ func (s *Server) Handler() http.Handler {
112 112 mux.HandleFunc("POST /{owner}/{repo}/git-upload-pack", s.gitHTTP)
113 113 mux.HandleFunc("POST /{owner}/{repo}/git-receive-pack", s.gitHTTP)
114 114 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/releases", s.createRelease)
115 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/webhook-secrets", s.repoWebhookSecrets)
116 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/webhooks", s.repoWebhookAPI)
117 mux.HandleFunc("GET /api/v1/groups/{path}/webhook-secrets", s.groupWebhookSecrets)
118 mux.HandleFunc("POST /api/v1/groups/{path}/hooks", s.groupWebhookAPI)
115 119
116 120 mux.HandleFunc("GET /{owner}/{repo}", s.repoHome)
117 121 mux.HandleFunc("GET /{owner}/{repo}/-/tree", s.treeRoot)
@@ -498,6 +502,7 @@ type View struct {
498 502 Releases []store.Release
499 503 Members []store.Member
500 504 Secrets []store.SecretMeta
505 HookSecrets []SecretChoice
501 506 Hooks []HookView
502 507 Patterns []string
503 508 TagPatterns []string
@@ -112,6 +112,10 @@ func (s *Server) Handler() http.Handler {
112 mux.HandleFunc("POST /{owner}/{repo}/git-upload-pack", s.gitHTTP)
112 mux.HandleFunc("POST /{owner}/{repo}/git-upload-pack", s.gitHTTP)
113 mux.HandleFunc("POST /{owner}/{repo}/git-receive-pack", s.gitHTTP)
113 mux.HandleFunc("POST /{owner}/{repo}/git-receive-pack", s.gitHTTP)
114 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/releases", s.createRelease)
114 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/releases", s.createRelease)
115 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/webhook-secrets", s.repoWebhookSecrets)
116 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/webhooks", s.repoWebhookAPI)
117 mux.HandleFunc("GET /api/v1/groups/{path}/webhook-secrets", s.groupWebhookSecrets)
118 mux.HandleFunc("POST /api/v1/groups/{path}/hooks", s.groupWebhookAPI)
115
119
116 mux.HandleFunc("GET /{owner}/{repo}", s.repoHome)
120 mux.HandleFunc("GET /{owner}/{repo}", s.repoHome)
117 mux.HandleFunc("GET /{owner}/{repo}/-/tree", s.treeRoot)
121 mux.HandleFunc("GET /{owner}/{repo}/-/tree", s.treeRoot)
@@ -498,6 +502,7 @@ type View struct {
498 Releases []store.Release
502 Releases []store.Release
499 Members []store.Member
503 Members []store.Member
500 Secrets []store.SecretMeta
504 Secrets []store.SecretMeta
505 HookSecrets []SecretChoice
501 Hooks []HookView
506 Hooks []HookView
502 Patterns []string
507 Patterns []string
503 TagPatterns []string
508 TagPatterns []string
internal/server/settings_handlers.go +24 −22
@@ -1,6 +1,7 @@
1 1 package server
2 2
3 3 import (
4 "context"
4 5 "net/http"
5 6 "os"
6 7 "sort"
@@ -32,6 +33,7 @@ func (s *Server) settings(w http.ResponseWriter, r *http.Request) {
32 33 }
33 34 }
34 35 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "repo", repo.ID)
36 v.HookSecrets = s.repoSecretChoices(r, repo)
35 37 v.Patterns, _ = s.Store.ProtectedPatterns(r.Context(), repo.ID)
36 38 v.TagPatterns, _ = s.Store.ProtectedTagPatterns(r.Context(), repo.ID)
37 39 v.Hooks = s.hookViews(r, "repo", repo.ID)
@@ -209,27 +211,13 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
209 211 return
210 212 }
211 213 back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")
212 preset := r.FormValue("preset")
213 if !webhook.KnownPreset(preset) {
214 s.redirect(w, r, back, "", s.tr(r, "err.preset"))
215 return
216 }
217 filter := strings.TrimSpace(r.FormValue("branch_filter"))
218 if _, err := webhook.MatchBranch(filter, "main"); err != nil {
219 s.redirect(w, r, back, "", s.trErr(r, err))
220 return
221 }
222 214 var events []string
223 215 for _, e := range webhook.AllEvents() {
224 216 if r.FormValue("event_"+e) == "1" {
225 217 events = append(events, e)
226 218 }
227 219 }
228 if len(events) == 0 {
229 s.redirect(w, r, back, "", s.tr(r, "err.pickEvent"))
230 return
231 }
232 spec, err := webhook.Prepare(preset, webhook.Input{
220 _, err := s.createWebhookRecord(r.Context(), kind, scopeID, strings.TrimSpace(r.FormValue("name")), r.FormValue("preset"), r.FormValue("branch_filter"), events, webhook.Input{
233 221 URL: r.FormValue("url"), Username: r.FormValue("username"), Avatar: r.FormValue("avatar"),
234 222 Icon: r.FormValue("icon"), Alias: r.FormValue("alias"), Token: r.FormValue("token"),
235 223 Chat: r.FormValue("chat"), Server: r.FormValue("server"), Topic: r.FormValue("topic"),
@@ -241,16 +229,29 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
241 229 s.redirect(w, r, back, "", s.trErr(r, err))
242 230 return
243 231 }
244 _, err = s.Store.CreateWebhook(r.Context(), store.Webhook{
245 ScopeKind: kind, ScopeID: scopeID, Name: strings.TrimSpace(r.FormValue("name")),
232 s.redirect(w, r, back, s.tr(r, "flash.webhookSaved"), "")
233 }
234
235 func (s *Server) createWebhookRecord(ctx context.Context, kind string, scopeID int64, name, preset, filter string, events []string, in webhook.Input) (int64, error) {
236 if !webhook.KnownPreset(preset) {
237 return 0, i18n.E("err.preset")
238 }
239 filter = strings.TrimSpace(filter)
240 if _, err := webhook.MatchBranch(filter, "main"); err != nil {
241 return 0, err
242 }
243 if len(events) == 0 {
244 return 0, i18n.E("err.pickEvent")
245 }
246 spec, err := webhook.Prepare(preset, in)
247 if err != nil {
248 return 0, err
249 }
250 return s.Store.CreateWebhook(ctx, store.Webhook{
251 ScopeKind: kind, ScopeID: scopeID, Name: name,
246 252 Preset: preset, URLTemplate: spec.URL, Headers: spec.Headers,
247 253 BodyTemplate: spec.Body, Events: events, BranchFilter: filter, Method: spec.Method,
248 254 })
249 if err != nil {
250 s.redirect(w, r, back, "", s.trErr(r, err))
251 return
252 }
253 s.redirect(w, r, back, s.tr(r, "flash.webhookSaved"), "")
254 255 }
255 256
256 257 func (s *Server) webhookDelete(w http.ResponseWriter, r *http.Request, kind string) {
@@ -406,6 +407,7 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
406 407 if tab == "settings" && role.CanManageSettings() {
407 408 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
408 409 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
410 v.HookSecrets = s.groupSecretChoices(r, g)
409 411 v.Hooks = s.hookViews(r, "group", g.ID)
410 412 s.fillGroupApproval(r, &v, g)
411 413 if v.User != nil && v.User.ID == g.OwnerID {
@@ -1,6 +1,7 @@
1package server
1package server
2
2
3import (
3import (
4 "context"
4 "net/http"
5 "net/http"
5 "os"
6 "os"
6 "sort"
7 "sort"
@@ -32,6 +33,7 @@ func (s *Server) settings(w http.ResponseWriter, r *http.Request) {
32 }
33 }
33 }
34 }
34 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "repo", repo.ID)
35 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "repo", repo.ID)
36 v.HookSecrets = s.repoSecretChoices(r, repo)
35 v.Patterns, _ = s.Store.ProtectedPatterns(r.Context(), repo.ID)
37 v.Patterns, _ = s.Store.ProtectedPatterns(r.Context(), repo.ID)
36 v.TagPatterns, _ = s.Store.ProtectedTagPatterns(r.Context(), repo.ID)
38 v.TagPatterns, _ = s.Store.ProtectedTagPatterns(r.Context(), repo.ID)
37 v.Hooks = s.hookViews(r, "repo", repo.ID)
39 v.Hooks = s.hookViews(r, "repo", repo.ID)
@@ -209,27 +211,13 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
209 return
211 return
210 }
212 }
211 back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")
213 back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")
212 preset := r.FormValue("preset")
213 if !webhook.KnownPreset(preset) {
214 s.redirect(w, r, back, "", s.tr(r, "err.preset"))
215 return
216 }
217 filter := strings.TrimSpace(r.FormValue("branch_filter"))
218 if _, err := webhook.MatchBranch(filter, "main"); err != nil {
219 s.redirect(w, r, back, "", s.trErr(r, err))
220 return
221 }
222 var events []string
214 var events []string
223 for _, e := range webhook.AllEvents() {
215 for _, e := range webhook.AllEvents() {
224 if r.FormValue("event_"+e) == "1" {
216 if r.FormValue("event_"+e) == "1" {
225 events = append(events, e)
217 events = append(events, e)
226 }
218 }
227 }
219 }
228 if len(events) == 0 {
220 _, err := s.createWebhookRecord(r.Context(), kind, scopeID, strings.TrimSpace(r.FormValue("name")), r.FormValue("preset"), r.FormValue("branch_filter"), events, webhook.Input{
229 s.redirect(w, r, back, "", s.tr(r, "err.pickEvent"))
230 return
231 }
232 spec, err := webhook.Prepare(preset, webhook.Input{
233 URL: r.FormValue("url"), Username: r.FormValue("username"), Avatar: r.FormValue("avatar"),
221 URL: r.FormValue("url"), Username: r.FormValue("username"), Avatar: r.FormValue("avatar"),
234 Icon: r.FormValue("icon"), Alias: r.FormValue("alias"), Token: r.FormValue("token"),
222 Icon: r.FormValue("icon"), Alias: r.FormValue("alias"), Token: r.FormValue("token"),
235 Chat: r.FormValue("chat"), Server: r.FormValue("server"), Topic: r.FormValue("topic"),
223 Chat: r.FormValue("chat"), Server: r.FormValue("server"), Topic: r.FormValue("topic"),
@@ -241,16 +229,29 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
241 s.redirect(w, r, back, "", s.trErr(r, err))
229 s.redirect(w, r, back, "", s.trErr(r, err))
242 return
230 return
243 }
231 }
244 _, err = s.Store.CreateWebhook(r.Context(), store.Webhook{
232 s.redirect(w, r, back, s.tr(r, "flash.webhookSaved"), "")
245 ScopeKind: kind, ScopeID: scopeID, Name: strings.TrimSpace(r.FormValue("name")),
233}
234
235func (s *Server) createWebhookRecord(ctx context.Context, kind string, scopeID int64, name, preset, filter string, events []string, in webhook.Input) (int64, error) {
236 if !webhook.KnownPreset(preset) {
237 return 0, i18n.E("err.preset")
238 }
239 filter = strings.TrimSpace(filter)
240 if _, err := webhook.MatchBranch(filter, "main"); err != nil {
241 return 0, err
242 }
243 if len(events) == 0 {
244 return 0, i18n.E("err.pickEvent")
245 }
246 spec, err := webhook.Prepare(preset, in)
247 if err != nil {
248 return 0, err
249 }
250 return s.Store.CreateWebhook(ctx, store.Webhook{
251 ScopeKind: kind, ScopeID: scopeID, Name: name,
246 Preset: preset, URLTemplate: spec.URL, Headers: spec.Headers,
252 Preset: preset, URLTemplate: spec.URL, Headers: spec.Headers,
247 BodyTemplate: spec.Body, Events: events, BranchFilter: filter, Method: spec.Method,
253 BodyTemplate: spec.Body, Events: events, BranchFilter: filter, Method: spec.Method,
248 })
254 })
249 if err != nil {
250 s.redirect(w, r, back, "", s.trErr(r, err))
251 return
252 }
253 s.redirect(w, r, back, s.tr(r, "flash.webhookSaved"), "")
254}
255}
255
256
256func (s *Server) webhookDelete(w http.ResponseWriter, r *http.Request, kind string) {
257func (s *Server) webhookDelete(w http.ResponseWriter, r *http.Request, kind string) {
@@ -406,6 +407,7 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
406 if tab == "settings" && role.CanManageSettings() {
407 if tab == "settings" && role.CanManageSettings() {
407 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
408 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
408 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
409 v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
410 v.HookSecrets = s.groupSecretChoices(r, g)
409 v.Hooks = s.hookViews(r, "group", g.ID)
411 v.Hooks = s.hookViews(r, "group", g.ID)
410 s.fillGroupApproval(r, &v, g)
412 s.fillGroupApproval(r, &v, g)
411 if v.User != nil && v.User.ID == g.OwnerID {
413 if v.User != nil && v.User.ID == g.OwnerID {
internal/server/static/style.css +25 −0
@@ -818,6 +818,31 @@ tr[hidden] { display: none; }
818 818 .commitlayout { grid-template-columns: minmax(0, 1fr); }
819 819 .commitfiles { position: static; max-height: 16rem; }
820 820 }
821 form.wh .secret-custom { display: none; }
822 form.wh.secret-ready .secret-native {
823 position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px;
824 overflow: hidden; clip: rect(0, 0, 0, 0); border: 0;
825 }
826 form.wh.secret-ready .secret-custom { display: block; }
827 .secret-pick { position: relative; }
828 .secret-toggle {
829 width: 100%; justify-content: flex-start;
830 background: var(--card); color: var(--ink); border: 1px solid var(--line);
831 }
832 .secret-menu {
833 margin: 0; padding: var(--sp-2); border: 1px solid var(--line);
834 border-radius: var(--radius); background: var(--card); box-shadow: var(--shadow);
835 max-height: 16rem; overflow: auto;
836 }
837 .secret-menu ul { list-style: none; margin: 0; padding: 0; }
838 .secret-menu li[hidden] { display: none; }
839 .secret-menu li button {
840 width: 100%; justify-content: space-between;
841 background: transparent; color: var(--ink); border: 0;
842 }
843 .secret-menu li button:hover { background: var(--blue-soft); }
844 .secret-menu input { width: 100%; margin-bottom: var(--sp-2); }
845
821 846 @media (max-width: 800px) {
822 847 .proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }
823 848 .proj > *, .fileview > *, .toolbar, .commitbar, .hscroll { min-width: 0; max-width: 100%; }
@@ -818,6 +818,31 @@ tr[hidden] { display: none; }
818 .commitlayout { grid-template-columns: minmax(0, 1fr); }
818 .commitlayout { grid-template-columns: minmax(0, 1fr); }
819 .commitfiles { position: static; max-height: 16rem; }
819 .commitfiles { position: static; max-height: 16rem; }
820}
820}
821form.wh .secret-custom { display: none; }
822form.wh.secret-ready .secret-native {
823 position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px;
824 overflow: hidden; clip: rect(0, 0, 0, 0); border: 0;
825}
826form.wh.secret-ready .secret-custom { display: block; }
827.secret-pick { position: relative; }
828.secret-toggle {
829 width: 100%; justify-content: flex-start;
830 background: var(--card); color: var(--ink); border: 1px solid var(--line);
831}
832.secret-menu {
833 margin: 0; padding: var(--sp-2); border: 1px solid var(--line);
834 border-radius: var(--radius); background: var(--card); box-shadow: var(--shadow);
835 max-height: 16rem; overflow: auto;
836}
837.secret-menu ul { list-style: none; margin: 0; padding: 0; }
838.secret-menu li[hidden] { display: none; }
839.secret-menu li button {
840 width: 100%; justify-content: space-between;
841 background: transparent; color: var(--ink); border: 0;
842}
843.secret-menu li button:hover { background: var(--blue-soft); }
844.secret-menu input { width: 100%; margin-bottom: var(--sp-2); }
845
821@media (max-width: 800px) {
846@media (max-width: 800px) {
822 .proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }
847 .proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }
823 .proj > *, .fileview > *, .toolbar, .commitbar, .hscroll { min-width: 0; max-width: 100%; }
848 .proj > *, .fileview > *, .toolbar, .commitbar, .hscroll { min-width: 0; max-width: 100%; }
internal/server/static/webhook.js +91 −1
@@ -12,11 +12,101 @@
12 12 form.setAttribute("data-preset", preset);
13 13 form.querySelectorAll(".wh-field").forEach(function (el) {
14 14 var on = el.classList.contains("for-" + preset);
15 el.querySelectorAll("input, textarea, select").forEach(function (input) {
15 el.querySelectorAll("input, textarea, select, button").forEach(function (input) {
16 16 input.disabled = !on;
17 17 });
18 18 });
19 form.querySelectorAll("[data-secret-menu]").forEach(function (menu) {
20 if (menu.matches(":popover-open") && menu.hidePopover) {
21 menu.hidePopover();
22 }
23 });
19 24 }
20 25 select.addEventListener("change", apply);
21 26 apply();
27
28 form.classList.add("secret-ready");
29 form.querySelectorAll("[data-secret-pick], .secret-pick").forEach(bindPick);
30
31 function bindPick(pick) {
32 var native = pick.querySelector("select[name=token]");
33 var button = pick.querySelector("[data-secret-button]");
34 var menu = pick.querySelector("[data-secret-menu]");
35 if (!native || !button || !menu) {
36 return;
37 }
38 var filter = menu.querySelector("[data-secret-filter]");
39 var items = Array.prototype.slice.call(menu.querySelectorAll("[data-secret-name]"));
40 function labelOf(name) {
41 for (var i = 0; i < items.length; i++) {
42 if (items[i].getAttribute("data-secret-name") === name) {
43 return items[i].getAttribute("data-secret-label") || name;
44 }
45 }
46 return button.getAttribute("data-empty") || "";
47 }
48 function paint() {
49 button.textContent = labelOf(native.value);
50 }
51 function choose(name) {
52 native.value = name;
53 paint();
54 if (menu.hidePopover) {
55 menu.hidePopover();
56 }
57 }
58 function open() {
59 if (button.disabled || native.disabled) {
60 return;
61 }
62 filter.value = "";
63 filterItems();
64 if (menu.showPopover) {
65 menu.showPopover();
66 }
67 var rect = button.getBoundingClientRect();
68 var width = Math.max(rect.width, 240);
69 menu.style.position = "fixed";
70 menu.style.width = width + "px";
71 menu.style.left = Math.max(8, Math.min(rect.left, window.innerWidth - width - 8)) + "px";
72 menu.style.top = Math.min(rect.bottom + 4, window.innerHeight - 16) + "px";
73 filter.focus();
74 }
75 function filterItems() {
76 var q = filter.value.trim().toLowerCase();
77 items.forEach(function (el) {
78 var blob = (el.getAttribute("data-secret-label") || "").toLowerCase();
79 el.parentElement.hidden = q !== "" && blob.indexOf(q) === -1;
80 });
81 }
82 button.addEventListener("click", function () {
83 if (menu.matches(":popover-open")) {
84 menu.hidePopover();
85 return;
86 }
87 open();
88 });
89 filter.addEventListener("input", filterItems);
90 filter.addEventListener("keydown", function (ev) {
91 if (ev.key !== "Enter") {
92 return;
93 }
94 ev.preventDefault();
95 var visible = items.filter(function (el) { return !el.parentElement.hidden; });
96 if (visible.length === 1) {
97 choose(visible[0].getAttribute("data-secret-name"));
98 }
99 });
100 items.forEach(function (el) {
101 el.addEventListener("click", function () {
102 choose(el.getAttribute("data-secret-name"));
103 });
104 });
105 document.addEventListener("keydown", function (ev) {
106 if (ev.key === "Escape" && menu.matches(":popover-open")) {
107 menu.hidePopover();
108 }
109 });
110 paint();
111 }
22 112 })();
@@ -12,11 +12,101 @@
12 form.setAttribute("data-preset", preset);
12 form.setAttribute("data-preset", preset);
13 form.querySelectorAll(".wh-field").forEach(function (el) {
13 form.querySelectorAll(".wh-field").forEach(function (el) {
14 var on = el.classList.contains("for-" + preset);
14 var on = el.classList.contains("for-" + preset);
15 el.querySelectorAll("input, textarea, select").forEach(function (input) {
15 el.querySelectorAll("input, textarea, select, button").forEach(function (input) {
16 input.disabled = !on;
16 input.disabled = !on;
17 });
17 });
18 });
18 });
19 form.querySelectorAll("[data-secret-menu]").forEach(function (menu) {
20 if (menu.matches(":popover-open") && menu.hidePopover) {
21 menu.hidePopover();
22 }
23 });
19 }
24 }
20 select.addEventListener("change", apply);
25 select.addEventListener("change", apply);
21 apply();
26 apply();
27
28 form.classList.add("secret-ready");
29 form.querySelectorAll("[data-secret-pick], .secret-pick").forEach(bindPick);
30
31 function bindPick(pick) {
32 var native = pick.querySelector("select[name=token]");
33 var button = pick.querySelector("[data-secret-button]");
34 var menu = pick.querySelector("[data-secret-menu]");
35 if (!native || !button || !menu) {
36 return;
37 }
38 var filter = menu.querySelector("[data-secret-filter]");
39 var items = Array.prototype.slice.call(menu.querySelectorAll("[data-secret-name]"));
40 function labelOf(name) {
41 for (var i = 0; i < items.length; i++) {
42 if (items[i].getAttribute("data-secret-name") === name) {
43 return items[i].getAttribute("data-secret-label") || name;
44 }
45 }
46 return button.getAttribute("data-empty") || "";
47 }
48 function paint() {
49 button.textContent = labelOf(native.value);
50 }
51 function choose(name) {
52 native.value = name;
53 paint();
54 if (menu.hidePopover) {
55 menu.hidePopover();
56 }
57 }
58 function open() {
59 if (button.disabled || native.disabled) {
60 return;
61 }
62 filter.value = "";
63 filterItems();
64 if (menu.showPopover) {
65 menu.showPopover();
66 }
67 var rect = button.getBoundingClientRect();
68 var width = Math.max(rect.width, 240);
69 menu.style.position = "fixed";
70 menu.style.width = width + "px";
71 menu.style.left = Math.max(8, Math.min(rect.left, window.innerWidth - width - 8)) + "px";
72 menu.style.top = Math.min(rect.bottom + 4, window.innerHeight - 16) + "px";
73 filter.focus();
74 }
75 function filterItems() {
76 var q = filter.value.trim().toLowerCase();
77 items.forEach(function (el) {
78 var blob = (el.getAttribute("data-secret-label") || "").toLowerCase();
79 el.parentElement.hidden = q !== "" && blob.indexOf(q) === -1;
80 });
81 }
82 button.addEventListener("click", function () {
83 if (menu.matches(":popover-open")) {
84 menu.hidePopover();
85 return;
86 }
87 open();
88 });
89 filter.addEventListener("input", filterItems);
90 filter.addEventListener("keydown", function (ev) {
91 if (ev.key !== "Enter") {
92 return;
93 }
94 ev.preventDefault();
95 var visible = items.filter(function (el) { return !el.parentElement.hidden; });
96 if (visible.length === 1) {
97 choose(visible[0].getAttribute("data-secret-name"));
98 }
99 });
100 items.forEach(function (el) {
101 el.addEventListener("click", function () {
102 choose(el.getAttribute("data-secret-name"));
103 });
104 });
105 document.addEventListener("keydown", function (ev) {
106 if (ev.key === "Escape" && menu.matches(":popover-open")) {
107 menu.hidePopover();
108 }
109 });
110 paint();
111 }
22})();
112})();
internal/server/templates/collab.html +18 −2
@@ -546,8 +546,24 @@
546 546 <label class="wh-field for-mattermost">{{t "wh.username"}} <input name="username" disabled></label>
547 547 <label class="wh-field for-mattermost">{{t "wh.icon"}} <input name="icon" placeholder="https://example.test/icon.png" disabled></label>
548 548 <label class="wh-field for-rocketchat">{{t "wh.alias"}} <input name="alias" disabled></label>
549 <label class="wh-field for-telegram for-matrix for-gotify for-grok">{{t "wh.token"}} <input name="token" placeholder="BOT_TOKEN" required disabled> <span class="muted">{{t "wh.tokenHint"}}</span></label>
550 <label class="wh-field for-ntfy">{{t "wh.token"}} <input name="token" placeholder="BOT_TOKEN" disabled> <span class="muted">{{t "wh.tokenHint"}}</span></label>
549 <div class="wh-field secret-pick for-telegram for-matrix for-gotify for-grok for-ntfy">
550 <span class="fieldlabel">{{t "wh.token"}}</span>
551 <select class="secret-native" name="token">
552 <option value="">{{t "wh.noSecret"}}</option>
553 {{range .HookSecrets}}<option value="{{.Name}}">{{.Name}} · {{.Label}}</option>{{end}}
554 </select>
555 <div class="secret-custom">
556 <button type="button" class="secret-toggle" data-secret-button data-empty="{{t "wh.noSecret"}}">{{t "wh.noSecret"}}</button>
557 <div class="secret-menu" data-secret-menu popover="manual">
558 <input type="search" data-secret-filter placeholder="{{t "wh.secretSearch"}}" autocomplete="off">
559 <ul>
560 <li><button type="button" data-secret-name="" data-secret-label="{{t "wh.noSecret"}}">{{t "wh.noSecret"}}</button></li>
561 {{range .HookSecrets}}<li><button type="button" data-secret-name="{{.Name}}" data-secret-label="{{.Name}} · {{.Label}}"><code>{{.Name}}</code> <span class="muted">{{.Label}}</span></button></li>{{end}}
562 </ul>
563 </div>
564 </div>
565 <span class="muted">{{t "wh.tokenHint"}}</span>
566 </div>
551 567 <label class="wh-field for-telegram">{{t "wh.chat"}} <input name="chat" required disabled></label>
552 568 <label class="wh-field for-ntfy">{{t "wh.server"}} <input name="server" placeholder="https://ntfy.sh" disabled></label>
553 569 <label class="wh-field for-gotify">{{t "wh.server"}} <input name="server" placeholder="https://gotify.example" required disabled></label>
@@ -546,8 +546,24 @@
546 <label class="wh-field for-mattermost">{{t "wh.username"}} <input name="username" disabled></label>
546 <label class="wh-field for-mattermost">{{t "wh.username"}} <input name="username" disabled></label>
547 <label class="wh-field for-mattermost">{{t "wh.icon"}} <input name="icon" placeholder="https://example.test/icon.png" disabled></label>
547 <label class="wh-field for-mattermost">{{t "wh.icon"}} <input name="icon" placeholder="https://example.test/icon.png" disabled></label>
548 <label class="wh-field for-rocketchat">{{t "wh.alias"}} <input name="alias" disabled></label>
548 <label class="wh-field for-rocketchat">{{t "wh.alias"}} <input name="alias" disabled></label>
549 <label class="wh-field for-telegram for-matrix for-gotify for-grok">{{t "wh.token"}} <input name="token" placeholder="BOT_TOKEN" required disabled> <span class="muted">{{t "wh.tokenHint"}}</span></label>
549 <div class="wh-field secret-pick for-telegram for-matrix for-gotify for-grok for-ntfy">
550 <label class="wh-field for-ntfy">{{t "wh.token"}} <input name="token" placeholder="BOT_TOKEN" disabled> <span class="muted">{{t "wh.tokenHint"}}</span></label>
550 <span class="fieldlabel">{{t "wh.token"}}</span>
551 <select class="secret-native" name="token">
552 <option value="">{{t "wh.noSecret"}}</option>
553 {{range .HookSecrets}}<option value="{{.Name}}">{{.Name}} · {{.Label}}</option>{{end}}
554 </select>
555 <div class="secret-custom">
556 <button type="button" class="secret-toggle" data-secret-button data-empty="{{t "wh.noSecret"}}">{{t "wh.noSecret"}}</button>
557 <div class="secret-menu" data-secret-menu popover="manual">
558 <input type="search" data-secret-filter placeholder="{{t "wh.secretSearch"}}" autocomplete="off">
559 <ul>
560 <li><button type="button" data-secret-name="" data-secret-label="{{t "wh.noSecret"}}">{{t "wh.noSecret"}}</button></li>
561 {{range .HookSecrets}}<li><button type="button" data-secret-name="{{.Name}}" data-secret-label="{{.Name}} · {{.Label}}"><code>{{.Name}}</code> <span class="muted">{{.Label}}</span></button></li>{{end}}
562 </ul>
563 </div>
564 </div>
565 <span class="muted">{{t "wh.tokenHint"}}</span>
566 </div>
551 <label class="wh-field for-telegram">{{t "wh.chat"}} <input name="chat" required disabled></label>
567 <label class="wh-field for-telegram">{{t "wh.chat"}} <input name="chat" required disabled></label>
552 <label class="wh-field for-ntfy">{{t "wh.server"}} <input name="server" placeholder="https://ntfy.sh" disabled></label>
568 <label class="wh-field for-ntfy">{{t "wh.server"}} <input name="server" placeholder="https://ntfy.sh" disabled></label>
553 <label class="wh-field for-gotify">{{t "wh.server"}} <input name="server" placeholder="https://gotify.example" required disabled></label>
569 <label class="wh-field for-gotify">{{t "wh.server"}} <input name="server" placeholder="https://gotify.example" required disabled></label>
internal/server/webhook_api.go added +145 −0
@@ -0,0 +1,145 @@
1 package server
2
3 import (
4 "encoding/json"
5 "io"
6 "net/http"
7 "strings"
8
9 "gitlab.com/Timfa/bluegit/internal/store"
10 "gitlab.com/Timfa/bluegit/internal/webhook"
11 )
12
13 func (s *Server) repoWebhookSecrets(w http.ResponseWriter, r *http.Request) {
14 repo, _, ok := s.webhookAPIRepo(w, r)
15 if !ok {
16 return
17 }
18 s.writeSecretChoices(w, s.repoSecretChoices(r, repo))
19 }
20
21 func (s *Server) groupWebhookSecrets(w http.ResponseWriter, r *http.Request) {
22 g, _, ok := s.webhookAPIGroup(w, r)
23 if !ok {
24 return
25 }
26 s.writeSecretChoices(w, s.groupSecretChoices(r, g))
27 }
28
29 func (s *Server) repoWebhookAPI(w http.ResponseWriter, r *http.Request) {
30 repo, _, ok := s.webhookAPIRepo(w, r)
31 if !ok {
32 return
33 }
34 s.writeWebhookCreate(w, r, "repo", repo.ID)
35 }
36
37 func (s *Server) groupWebhookAPI(w http.ResponseWriter, r *http.Request) {
38 g, _, ok := s.webhookAPIGroup(w, r)
39 if !ok {
40 return
41 }
42 s.writeWebhookCreate(w, r, "group", g.ID)
43 }
44
45 func (s *Server) writeSecretChoices(w http.ResponseWriter, choices []SecretChoice) {
46 if choices == nil {
47 choices = []SecretChoice{}
48 }
49 w.Header().Set("Content-Type", "application/json")
50 _ = json.NewEncoder(w).Encode(map[string]any{"secrets": choices})
51 }
52
53 func (s *Server) writeWebhookCreate(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {
54 var body struct {
55 Name string `json:"name"`
56 Preset string `json:"preset"`
57 BranchFilter string `json:"branch_filter"`
58 Events []string `json:"events"`
59 URL string `json:"url"`
60 Username string `json:"username"`
61 Avatar string `json:"avatar"`
62 Icon string `json:"icon"`
63 Alias string `json:"alias"`
64 Token string `json:"token"`
65 Chat string `json:"chat"`
66 Server string `json:"server"`
67 Topic string `json:"topic"`
68 Homeserver string `json:"homeserver"`
69 Room string `json:"room"`
70 Method string `json:"method"`
71 ContentType string `json:"content_type"`
72 Headers string `json:"headers"`
73 Body string `json:"body"`
74 }
75 if err := json.NewDecoder(io.LimitReader(r.Body, 1<<20)).Decode(&body); err != nil {
76 http.Error(w, s.tr(r, "err.json"), http.StatusBadRequest)
77 return
78 }
79 id, err := s.createWebhookRecord(r.Context(), kind, scopeID, strings.TrimSpace(body.Name), body.Preset, body.BranchFilter, body.Events, webhook.Input{
80 URL: body.URL, Username: body.Username, Avatar: body.Avatar, Icon: body.Icon, Alias: body.Alias,
81 Token: body.Token, Chat: body.Chat, Server: body.Server, Topic: body.Topic,
82 Homeserver: body.Homeserver, Room: body.Room, Method: body.Method, ContentType: body.ContentType,
83 Headers: body.Headers, Body: body.Body,
84 })
85 if err != nil {
86 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
87 return
88 }
89 w.Header().Set("Content-Type", "application/json")
90 w.WriteHeader(http.StatusCreated)
91 _ = json.NewEncoder(w).Encode(map[string]any{"id": id})
92 }
93
94 func (s *Server) webhookAPIRepo(w http.ResponseWriter, r *http.Request) (store.Repo, store.User, bool) {
95 u, ok := s.webhookAPIUser(w, r)
96 if !ok {
97 return store.Repo{}, store.User{}, false
98 }
99 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
100 if err != nil {
101 http.NotFound(w, r)
102 return store.Repo{}, store.User{}, false
103 }
104 role, err := s.Store.EffectiveRole(r.Context(), u.ID, repo.ID)
105 if err != nil || !role.CanManageSettings() {
106 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
107 return store.Repo{}, store.User{}, false
108 }
109 return repo, u, true
110 }
111
112 func (s *Server) webhookAPIGroup(w http.ResponseWriter, r *http.Request) (store.Group, store.User, bool) {
113 u, ok := s.webhookAPIUser(w, r)
114 if !ok {
115 return store.Group{}, store.User{}, false
116 }
117 g, err := s.Store.GroupByPath(r.Context(), r.PathValue("path"))
118 if err != nil {
119 http.NotFound(w, r)
120 return store.Group{}, store.User{}, false
121 }
122 role, err := s.Store.GroupRole(r.Context(), g.ID, u.ID)
123 if err != nil || !role.CanManageSettings() {
124 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
125 return store.Group{}, store.User{}, false
126 }
127 return g, u, true
128 }
129
130 func (s *Server) webhookAPIUser(w http.ResponseWriter, r *http.Request) (store.User, bool) {
131 token := bearer(r)
132 if token == "" {
133 token = strings.TrimSpace(r.Header.Get("PRIVATE-TOKEN"))
134 }
135 if !strings.HasPrefix(token, "bg_") {
136 http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
137 return store.User{}, false
138 }
139 u, err := s.Store.UserByToken(r.Context(), token)
140 if err != nil {
141 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
142 return store.User{}, false
143 }
144 return u, true
145 }
@@ -0,0 +1,145 @@
1package server
2
3import (
4 "encoding/json"
5 "io"
6 "net/http"
7 "strings"
8
9 "gitlab.com/Timfa/bluegit/internal/store"
10 "gitlab.com/Timfa/bluegit/internal/webhook"
11)
12
13func (s *Server) repoWebhookSecrets(w http.ResponseWriter, r *http.Request) {
14 repo, _, ok := s.webhookAPIRepo(w, r)
15 if !ok {
16 return
17 }
18 s.writeSecretChoices(w, s.repoSecretChoices(r, repo))
19}
20
21func (s *Server) groupWebhookSecrets(w http.ResponseWriter, r *http.Request) {
22 g, _, ok := s.webhookAPIGroup(w, r)
23 if !ok {
24 return
25 }
26 s.writeSecretChoices(w, s.groupSecretChoices(r, g))
27}
28
29func (s *Server) repoWebhookAPI(w http.ResponseWriter, r *http.Request) {
30 repo, _, ok := s.webhookAPIRepo(w, r)
31 if !ok {
32 return
33 }
34 s.writeWebhookCreate(w, r, "repo", repo.ID)
35}
36
37func (s *Server) groupWebhookAPI(w http.ResponseWriter, r *http.Request) {
38 g, _, ok := s.webhookAPIGroup(w, r)
39 if !ok {
40 return
41 }
42 s.writeWebhookCreate(w, r, "group", g.ID)
43}
44
45func (s *Server) writeSecretChoices(w http.ResponseWriter, choices []SecretChoice) {
46 if choices == nil {
47 choices = []SecretChoice{}
48 }
49 w.Header().Set("Content-Type", "application/json")
50 _ = json.NewEncoder(w).Encode(map[string]any{"secrets": choices})
51}
52
53func (s *Server) writeWebhookCreate(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {
54 var body struct {
55 Name string `json:"name"`
56 Preset string `json:"preset"`
57 BranchFilter string `json:"branch_filter"`
58 Events []string `json:"events"`
59 URL string `json:"url"`
60 Username string `json:"username"`
61 Avatar string `json:"avatar"`
62 Icon string `json:"icon"`
63 Alias string `json:"alias"`
64 Token string `json:"token"`
65 Chat string `json:"chat"`
66 Server string `json:"server"`
67 Topic string `json:"topic"`
68 Homeserver string `json:"homeserver"`
69 Room string `json:"room"`
70 Method string `json:"method"`
71 ContentType string `json:"content_type"`
72 Headers string `json:"headers"`
73 Body string `json:"body"`
74 }
75 if err := json.NewDecoder(io.LimitReader(r.Body, 1<<20)).Decode(&body); err != nil {
76 http.Error(w, s.tr(r, "err.json"), http.StatusBadRequest)
77 return
78 }
79 id, err := s.createWebhookRecord(r.Context(), kind, scopeID, strings.TrimSpace(body.Name), body.Preset, body.BranchFilter, body.Events, webhook.Input{
80 URL: body.URL, Username: body.Username, Avatar: body.Avatar, Icon: body.Icon, Alias: body.Alias,
81 Token: body.Token, Chat: body.Chat, Server: body.Server, Topic: body.Topic,
82 Homeserver: body.Homeserver, Room: body.Room, Method: body.Method, ContentType: body.ContentType,
83 Headers: body.Headers, Body: body.Body,
84 })
85 if err != nil {
86 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
87 return
88 }
89 w.Header().Set("Content-Type", "application/json")
90 w.WriteHeader(http.StatusCreated)
91 _ = json.NewEncoder(w).Encode(map[string]any{"id": id})
92}
93
94func (s *Server) webhookAPIRepo(w http.ResponseWriter, r *http.Request) (store.Repo, store.User, bool) {
95 u, ok := s.webhookAPIUser(w, r)
96 if !ok {
97 return store.Repo{}, store.User{}, false
98 }
99 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
100 if err != nil {
101 http.NotFound(w, r)
102 return store.Repo{}, store.User{}, false
103 }
104 role, err := s.Store.EffectiveRole(r.Context(), u.ID, repo.ID)
105 if err != nil || !role.CanManageSettings() {
106 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
107 return store.Repo{}, store.User{}, false
108 }
109 return repo, u, true
110}
111
112func (s *Server) webhookAPIGroup(w http.ResponseWriter, r *http.Request) (store.Group, store.User, bool) {
113 u, ok := s.webhookAPIUser(w, r)
114 if !ok {
115 return store.Group{}, store.User{}, false
116 }
117 g, err := s.Store.GroupByPath(r.Context(), r.PathValue("path"))
118 if err != nil {
119 http.NotFound(w, r)
120 return store.Group{}, store.User{}, false
121 }
122 role, err := s.Store.GroupRole(r.Context(), g.ID, u.ID)
123 if err != nil || !role.CanManageSettings() {
124 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
125 return store.Group{}, store.User{}, false
126 }
127 return g, u, true
128}
129
130func (s *Server) webhookAPIUser(w http.ResponseWriter, r *http.Request) (store.User, bool) {
131 token := bearer(r)
132 if token == "" {
133 token = strings.TrimSpace(r.Header.Get("PRIVATE-TOKEN"))
134 }
135 if !strings.HasPrefix(token, "bg_") {
136 http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
137 return store.User{}, false
138 }
139 u, err := s.Store.UserByToken(r.Context(), token)
140 if err != nil {
141 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
142 return store.User{}, false
143 }
144 return u, true
145}
internal/server/webhook_form_test.go +1 −1
@@ -153,7 +153,7 @@ func TestWebhookPresetForm(t *testing.T) {
153 153 t.Fatal(err)
154 154 }
155 155 nl := read(t, res)
156 if !strings.Contains(nl, "Geen preset") || !strings.Contains(nl, "Webhook-URL") || !strings.Contains(nl, "Naam van een geheim") {
156 if !strings.Contains(nl, "Geen preset") || !strings.Contains(nl, "Webhook-URL") || !strings.Contains(nl, "Kies een geheim") {
157 157 t.Fatalf("nederlandse preset:\n%s", nl)
158 158 }
159 159 }
@@ -153,7 +153,7 @@ func TestWebhookPresetForm(t *testing.T) {
153 t.Fatal(err)
153 t.Fatal(err)
154 }
154 }
155 nl := read(t, res)
155 nl := read(t, res)
156 if !strings.Contains(nl, "Geen preset") || !strings.Contains(nl, "Webhook-URL") || !strings.Contains(nl, "Naam van een geheim") {
156 if !strings.Contains(nl, "Geen preset") || !strings.Contains(nl, "Webhook-URL") || !strings.Contains(nl, "Kies een geheim") {
157 t.Fatalf("nederlandse preset:\n%s", nl)
157 t.Fatalf("nederlandse preset:\n%s", nl)
158 }
158 }
159}
159}
internal/server/webhook_secret_test.go added +227 −0
@@ -0,0 +1,227 @@
1 package server
2
3 import (
4 "context"
5 "encoding/json"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "net/url"
10 "os/exec"
11 "path/filepath"
12 "strings"
13 "testing"
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 TestWebhookSecretChoices(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 cfg := config.Config{
31 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
32 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
33 Git: config.Git{Binary: "git", DefaultBranch: "master"},
34 }
35 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
36 ts := httptest.NewServer(srv.Handler())
37 t.Cleanup(ts.Close)
38
39 jar, _ := cookiejar.New(nil)
40 client := &http.Client{Jar: jar}
41 res, err := client.Get(ts.URL + "/login")
42 if err != nil {
43 t.Fatal(err)
44 }
45 page := read(t, res)
46 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
47 "csrf": {csrfOf(t, page)}, "name": {"hooks"}, "visibility": {"private"},
48 })
49 if err != nil {
50 t.Fatal(err)
51 }
52 _ = read(t, res)
53
54 ctx := context.Background()
55 tim, err := st.UserByUsername(ctx, "tim")
56 if err != nil {
57 t.Fatal(err)
58 }
59 repo, err := st.RepoByPath(ctx, "tim", "hooks")
60 if err != nil {
61 t.Fatal(err)
62 }
63 if err := st.PutSecret(ctx, "repo", repo.ID, "Ada_Webhook", "waarde-niet-tonen", false); err != nil {
64 t.Fatal(err)
65 }
66 g, err := st.CreateGroup(ctx, tim.ID, "Team", "team", "", "developer")
67 if err != nil {
68 t.Fatal(err)
69 }
70 if err := st.PutSecret(ctx, "group", g.ID, "GROUP_TOKEN", "groepswaarde", false); err != nil {
71 t.Fatal(err)
72 }
73 grown, err := st.CreateRepo(ctx, "group", g.ID, "app", "", "master", "private")
74 if err != nil {
75 t.Fatal(err)
76 }
77 if err := st.PutSecret(ctx, "repo", grown.ID, "Ada_Webhook", "repo-wint", true); err != nil {
78 t.Fatal(err)
79 }
80
81 res, err = client.Get(ts.URL + "/tim/hooks/-/settings?tab=webhooks")
82 if err != nil {
83 t.Fatal(err)
84 }
85 form := read(t, res)
86 for _, needle := range []string{
87 `name="token"`, `data-secret-button`, `data-secret-filter`, ">None<",
88 "Ada_Webhook", "Repository tim/hooks",
89 } {
90 if !strings.Contains(form, needle) {
91 t.Fatalf("formulier mist %q", needle)
92 }
93 }
94 if strings.Contains(form, "waarde-niet-tonen") {
95 t.Fatal("geheime waarde op de webhookpagina")
96 }
97 res, err = client.PostForm(ts.URL+"/tim/hooks/-/secrets", url.Values{
98 "csrf": {csrfOf(t, form)}, "name": {"Ada Webhook"}, "value": {"x"},
99 })
100 if err != nil {
101 t.Fatal(err)
102 }
103 bad := read(t, res)
104 if !strings.Contains(bad, `[A-Za-z_][A-Za-z0-9_]*`) || !strings.Contains(bad, "Ada Webhook") {
105 t.Fatalf("foutmelding:\n%s", bad)
106 }
107
108 res, err = client.Get(ts.URL + "/team/app/-/settings?tab=webhooks")
109 if err != nil {
110 t.Fatal(err)
111 }
112 groupForm := read(t, res)
113 if !strings.Contains(groupForm, "GROUP_TOKEN") || !strings.Contains(groupForm, "Group team") || !strings.Contains(groupForm, "Ada_Webhook") {
114 t.Fatalf("groep en repository:\n%s", groupForm)
115 }
116 if strings.Contains(groupForm, "groepswaarde") || strings.Contains(groupForm, "repo-wint") {
117 t.Fatal("waarde van een overgeërfd geheim op de pagina")
118 }
119
120 merged, err := srv.hookSecrets(ctx, "repo", grown.ID, true, grown)
121 if err != nil {
122 t.Fatal(err)
123 }
124 if merged["GROUP_TOKEN"] != "groepswaarde" || merged["Ada_Webhook"] != "repo-wint" {
125 t.Fatalf("samenvoegen: %#v", merged)
126 }
127 open, err := srv.hookSecrets(ctx, "repo", grown.ID, false, grown)
128 if err != nil {
129 t.Fatal(err)
130 }
131 if _, ok := open["Ada_Webhook"]; ok {
132 t.Fatal("beschermd repositorygeheim hoort weg te blijven op een gewone branch")
133 }
134 if open["GROUP_TOKEN"] != "groepswaarde" {
135 t.Fatalf("onbeschermd groepgeheim: %#v", open)
136 }
137
138 token, err := st.CreateToken(ctx, tim.ID, "laptop")
139 if err != nil {
140 t.Fatal(err)
141 }
142 call := func(method, path, body, auth string) (int, string) {
143 t.Helper()
144 req, err := http.NewRequest(method, ts.URL+path, strings.NewReader(body))
145 if err != nil {
146 t.Fatal(err)
147 }
148 if auth != "" {
149 req.Header.Set("Authorization", "Bearer "+auth)
150 }
151 req.Header.Set("Content-Type", "application/json")
152 res, err := client.Do(req)
153 if err != nil {
154 t.Fatal(err)
155 }
156 buf := read(t, res)
157 return res.StatusCode, buf
158 }
159 code, body := call(http.MethodGet, "/api/v1/repos/tim/hooks/webhook-secrets", "", "")
160 if code != http.StatusUnauthorized {
161 t.Fatalf("zonder token %d %s", code, body)
162 }
163 code, body = call(http.MethodGet, "/api/v1/repos/tim/hooks/webhook-secrets", "", token)
164 if code != http.StatusOK || !strings.Contains(body, "Ada_Webhook") || strings.Contains(body, "waarde-niet-tonen") || strings.Contains(body, `"value"`) {
165 t.Fatalf("lijst %d %s", code, body)
166 }
167 var listed struct {
168 Secrets []SecretChoice `json:"secrets"`
169 }
170 if err := json.Unmarshal([]byte(body), &listed); err != nil {
171 t.Fatal(err)
172 }
173 if len(listed.Secrets) != 1 || listed.Secrets[0].Source != "repo" || listed.Secrets[0].Name != "Ada_Webhook" {
174 t.Fatalf("keuzes %#v", listed.Secrets)
175 }
176 code, body = call(http.MethodGet, "/api/v1/groups/team/webhook-secrets", "", token)
177 if code != http.StatusOK || !strings.Contains(body, "GROUP_TOKEN") || strings.Contains(body, "groepswaarde") {
178 t.Fatalf("groepslijst %d %s", code, body)
179 }
180 code, body = call(http.MethodGet, "/api/v1/repos/team/app/webhook-secrets", "", token)
181 if code != http.StatusOK || !strings.Contains(body, `"source":"group"`) || !strings.Contains(body, `"source":"repo"`) {
182 t.Fatalf("overerving %d %s", code, body)
183 }
184 ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
185 if err != nil {
186 t.Fatal(err)
187 }
188 if err := st.SetMember(ctx, "repo", repo.ID, "ada", "developer"); err != nil {
189 t.Fatal(err)
190 }
191 adaTok, err := st.CreateToken(ctx, ada.ID, "ada")
192 if err != nil {
193 t.Fatal(err)
194 }
195 code, body = call(http.MethodGet, "/api/v1/repos/tim/hooks/webhook-secrets", "", adaTok)
196 if code != http.StatusForbidden {
197 t.Fatalf("ontwikkelaar %d %s", code, body)
198 }
199 raw, _ := json.Marshal(map[string]any{
200 "name": "tg", "preset": "telegram", "token": "Ada_Webhook", "chat": "100", "events": []string{"push"},
201 })
202 code, body = call(http.MethodPost, "/api/v1/repos/tim/hooks/webhooks", string(raw), token)
203 if code != http.StatusCreated {
204 t.Fatalf("aanmaken %d %s", code, body)
205 }
206 hooks, err := st.ListWebhooks(ctx, "repo", repo.ID)
207 if err != nil {
208 t.Fatal(err)
209 }
210 if len(hooks) != 1 || !strings.Contains(hooks[0].URLTemplate, "{{secret.Ada_Webhook}}") {
211 t.Fatalf("webhook %#v", hooks)
212 }
213 raw, _ = json.Marshal(map[string]any{
214 "name": "slecht", "preset": "telegram", "token": "Ada Webhook", "chat": "1", "events": []string{"push"},
215 })
216 code, body = call(http.MethodPost, "/api/v1/repos/tim/hooks/webhooks", string(raw), token)
217 if code != http.StatusBadRequest || !strings.Contains(body, "[A-Za-z_][A-Za-z0-9_]*") {
218 t.Fatalf("api-fout %d %s", code, body)
219 }
220 raw, _ = json.Marshal(map[string]any{
221 "name": "ping", "preset": "ntfy", "topic": "builds", "events": []string{"push"},
222 })
223 code, body = call(http.MethodPost, "/api/v1/groups/team/hooks", string(raw), token)
224 if code != http.StatusCreated {
225 t.Fatalf("groepshaak %d %s", code, body)
226 }
227 }
@@ -0,0 +1,227 @@
1package server
2
3import (
4 "context"
5 "encoding/json"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "net/url"
10 "os/exec"
11 "path/filepath"
12 "strings"
13 "testing"
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 TestWebhookSecretChoices(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 cfg := config.Config{
31 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
32 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
33 Git: config.Git{Binary: "git", DefaultBranch: "master"},
34 }
35 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
36 ts := httptest.NewServer(srv.Handler())
37 t.Cleanup(ts.Close)
38
39 jar, _ := cookiejar.New(nil)
40 client := &http.Client{Jar: jar}
41 res, err := client.Get(ts.URL + "/login")
42 if err != nil {
43 t.Fatal(err)
44 }
45 page := read(t, res)
46 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
47 "csrf": {csrfOf(t, page)}, "name": {"hooks"}, "visibility": {"private"},
48 })
49 if err != nil {
50 t.Fatal(err)
51 }
52 _ = read(t, res)
53
54 ctx := context.Background()
55 tim, err := st.UserByUsername(ctx, "tim")
56 if err != nil {
57 t.Fatal(err)
58 }
59 repo, err := st.RepoByPath(ctx, "tim", "hooks")
60 if err != nil {
61 t.Fatal(err)
62 }
63 if err := st.PutSecret(ctx, "repo", repo.ID, "Ada_Webhook", "waarde-niet-tonen", false); err != nil {
64 t.Fatal(err)
65 }
66 g, err := st.CreateGroup(ctx, tim.ID, "Team", "team", "", "developer")
67 if err != nil {
68 t.Fatal(err)
69 }
70 if err := st.PutSecret(ctx, "group", g.ID, "GROUP_TOKEN", "groepswaarde", false); err != nil {
71 t.Fatal(err)
72 }
73 grown, err := st.CreateRepo(ctx, "group", g.ID, "app", "", "master", "private")
74 if err != nil {
75 t.Fatal(err)
76 }
77 if err := st.PutSecret(ctx, "repo", grown.ID, "Ada_Webhook", "repo-wint", true); err != nil {
78 t.Fatal(err)
79 }
80
81 res, err = client.Get(ts.URL + "/tim/hooks/-/settings?tab=webhooks")
82 if err != nil {
83 t.Fatal(err)
84 }
85 form := read(t, res)
86 for _, needle := range []string{
87 `name="token"`, `data-secret-button`, `data-secret-filter`, ">None<",
88 "Ada_Webhook", "Repository tim/hooks",
89 } {
90 if !strings.Contains(form, needle) {
91 t.Fatalf("formulier mist %q", needle)
92 }
93 }
94 if strings.Contains(form, "waarde-niet-tonen") {
95 t.Fatal("geheime waarde op de webhookpagina")
96 }
97 res, err = client.PostForm(ts.URL+"/tim/hooks/-/secrets", url.Values{
98 "csrf": {csrfOf(t, form)}, "name": {"Ada Webhook"}, "value": {"x"},
99 })
100 if err != nil {
101 t.Fatal(err)
102 }
103 bad := read(t, res)
104 if !strings.Contains(bad, `[A-Za-z_][A-Za-z0-9_]*`) || !strings.Contains(bad, "Ada Webhook") {
105 t.Fatalf("foutmelding:\n%s", bad)
106 }
107
108 res, err = client.Get(ts.URL + "/team/app/-/settings?tab=webhooks")
109 if err != nil {
110 t.Fatal(err)
111 }
112 groupForm := read(t, res)
113 if !strings.Contains(groupForm, "GROUP_TOKEN") || !strings.Contains(groupForm, "Group team") || !strings.Contains(groupForm, "Ada_Webhook") {
114 t.Fatalf("groep en repository:\n%s", groupForm)
115 }
116 if strings.Contains(groupForm, "groepswaarde") || strings.Contains(groupForm, "repo-wint") {
117 t.Fatal("waarde van een overgeërfd geheim op de pagina")
118 }
119
120 merged, err := srv.hookSecrets(ctx, "repo", grown.ID, true, grown)
121 if err != nil {
122 t.Fatal(err)
123 }
124 if merged["GROUP_TOKEN"] != "groepswaarde" || merged["Ada_Webhook"] != "repo-wint" {
125 t.Fatalf("samenvoegen: %#v", merged)
126 }
127 open, err := srv.hookSecrets(ctx, "repo", grown.ID, false, grown)
128 if err != nil {
129 t.Fatal(err)
130 }
131 if _, ok := open["Ada_Webhook"]; ok {
132 t.Fatal("beschermd repositorygeheim hoort weg te blijven op een gewone branch")
133 }
134 if open["GROUP_TOKEN"] != "groepswaarde" {
135 t.Fatalf("onbeschermd groepgeheim: %#v", open)
136 }
137
138 token, err := st.CreateToken(ctx, tim.ID, "laptop")
139 if err != nil {
140 t.Fatal(err)
141 }
142 call := func(method, path, body, auth string) (int, string) {
143 t.Helper()
144 req, err := http.NewRequest(method, ts.URL+path, strings.NewReader(body))
145 if err != nil {
146 t.Fatal(err)
147 }
148 if auth != "" {
149 req.Header.Set("Authorization", "Bearer "+auth)
150 }
151 req.Header.Set("Content-Type", "application/json")
152 res, err := client.Do(req)
153 if err != nil {
154 t.Fatal(err)
155 }
156 buf := read(t, res)
157 return res.StatusCode, buf
158 }
159 code, body := call(http.MethodGet, "/api/v1/repos/tim/hooks/webhook-secrets", "", "")
160 if code != http.StatusUnauthorized {
161 t.Fatalf("zonder token %d %s", code, body)
162 }
163 code, body = call(http.MethodGet, "/api/v1/repos/tim/hooks/webhook-secrets", "", token)
164 if code != http.StatusOK || !strings.Contains(body, "Ada_Webhook") || strings.Contains(body, "waarde-niet-tonen") || strings.Contains(body, `"value"`) {
165 t.Fatalf("lijst %d %s", code, body)
166 }
167 var listed struct {
168 Secrets []SecretChoice `json:"secrets"`
169 }
170 if err := json.Unmarshal([]byte(body), &listed); err != nil {
171 t.Fatal(err)
172 }
173 if len(listed.Secrets) != 1 || listed.Secrets[0].Source != "repo" || listed.Secrets[0].Name != "Ada_Webhook" {
174 t.Fatalf("keuzes %#v", listed.Secrets)
175 }
176 code, body = call(http.MethodGet, "/api/v1/groups/team/webhook-secrets", "", token)
177 if code != http.StatusOK || !strings.Contains(body, "GROUP_TOKEN") || strings.Contains(body, "groepswaarde") {
178 t.Fatalf("groepslijst %d %s", code, body)
179 }
180 code, body = call(http.MethodGet, "/api/v1/repos/team/app/webhook-secrets", "", token)
181 if code != http.StatusOK || !strings.Contains(body, `"source":"group"`) || !strings.Contains(body, `"source":"repo"`) {
182 t.Fatalf("overerving %d %s", code, body)
183 }
184 ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
185 if err != nil {
186 t.Fatal(err)
187 }
188 if err := st.SetMember(ctx, "repo", repo.ID, "ada", "developer"); err != nil {
189 t.Fatal(err)
190 }
191 adaTok, err := st.CreateToken(ctx, ada.ID, "ada")
192 if err != nil {
193 t.Fatal(err)
194 }
195 code, body = call(http.MethodGet, "/api/v1/repos/tim/hooks/webhook-secrets", "", adaTok)
196 if code != http.StatusForbidden {
197 t.Fatalf("ontwikkelaar %d %s", code, body)
198 }
199 raw, _ := json.Marshal(map[string]any{
200 "name": "tg", "preset": "telegram", "token": "Ada_Webhook", "chat": "100", "events": []string{"push"},
201 })
202 code, body = call(http.MethodPost, "/api/v1/repos/tim/hooks/webhooks", string(raw), token)
203 if code != http.StatusCreated {
204 t.Fatalf("aanmaken %d %s", code, body)
205 }
206 hooks, err := st.ListWebhooks(ctx, "repo", repo.ID)
207 if err != nil {
208 t.Fatal(err)
209 }
210 if len(hooks) != 1 || !strings.Contains(hooks[0].URLTemplate, "{{secret.Ada_Webhook}}") {
211 t.Fatalf("webhook %#v", hooks)
212 }
213 raw, _ = json.Marshal(map[string]any{
214 "name": "slecht", "preset": "telegram", "token": "Ada Webhook", "chat": "1", "events": []string{"push"},
215 })
216 code, body = call(http.MethodPost, "/api/v1/repos/tim/hooks/webhooks", string(raw), token)
217 if code != http.StatusBadRequest || !strings.Contains(body, "[A-Za-z_][A-Za-z0-9_]*") {
218 t.Fatalf("api-fout %d %s", code, body)
219 }
220 raw, _ = json.Marshal(map[string]any{
221 "name": "ping", "preset": "ntfy", "topic": "builds", "events": []string{"push"},
222 })
223 code, body = call(http.MethodPost, "/api/v1/groups/team/hooks", string(raw), token)
224 if code != http.StatusCreated {
225 t.Fatalf("groepshaak %d %s", code, body)
226 }
227}
internal/webhook/preset_test.go +4 −1
@@ -313,7 +313,10 @@ func TestPresetRejects(t *testing.T) {
313 313 if _, err := Prepare("nope", Input{}); err == nil {
314 314 t.Fatal("onbekende preset")
315 315 }
316 if _, err := Prepare(PresetTelegram, Input{Token: "lower", Chat: "1"}); err == nil {
316 if _, err := Prepare(PresetTelegram, Input{Token: "Ada_Webhook", Chat: "1"}); err != nil {
317 t.Fatal(err)
318 }
319 if _, err := Prepare(PresetTelegram, Input{Token: "1bad", Chat: "1"}); err == nil {
317 320 t.Fatal("geheime naam")
318 321 }
319 322 if _, err := Prepare(PresetTelegram, Input{Token: "BOT_TOKEN", Chat: ""}); err == nil {
@@ -313,7 +313,10 @@ func TestPresetRejects(t *testing.T) {
313 if _, err := Prepare("nope", Input{}); err == nil {
313 if _, err := Prepare("nope", Input{}); err == nil {
314 t.Fatal("onbekende preset")
314 t.Fatal("onbekende preset")
315 }
315 }
316 if _, err := Prepare(PresetTelegram, Input{Token: "lower", Chat: "1"}); err == nil {
316 if _, err := Prepare(PresetTelegram, Input{Token: "Ada_Webhook", Chat: "1"}); err != nil {
317 t.Fatal(err)
318 }
319 if _, err := Prepare(PresetTelegram, Input{Token: "1bad", Chat: "1"}); err == nil {
317 t.Fatal("geheime naam")
320 t.Fatal("geheime naam")
318 }
321 }
319 if _, err := Prepare(PresetTelegram, Input{Token: "BOT_TOKEN", Chat: ""}); err == nil {
322 if _, err := Prepare(PresetTelegram, Input{Token: "BOT_TOKEN", Chat: ""}); err == nil {