feat: toon webhooks in een tabel en maak secrets bewerkbaar
Bestaande webhooks zijn te bewerken en de gebeurtenissen staan in een grid. Een invisible secret is daarna alleen te verwijderen of te vervangen, ook via de API. Co-authored-by: tim <tim@timfalken.com>
@@ -8,37 +8,97 @@ func init() {
8
8
}
9
9
10
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",
11
"err.secretForm": "secret name %q must match [A-Za-z_][A-Za-z0-9_]*",
12
"err.secretExists": "secret %q already exists",
13
"err.secretHidden": "secret %q is invisible and cannot be viewed or edited",
14
"err.secretVisible": "secret %q is visible; edit it instead of replacing it",
15
"wh.tokenHint": "Choose a secret. The value stays hidden.",
16
"wh.noSecret": "None",
17
"wh.secretSearch": "Search secrets",
18
"wh.src.repo": "Repository %s",
19
"wh.src.group": "Group %s",
20
"wh.edit": "Edit webhook",
21
"wh.update": "Save changes",
22
"wh.events": "Events",
23
"wh.flags": "Flags",
24
"wh.actions": "Actions",
25
"action.edit": "Edit",
26
"action.show": "Show",
27
"action.replace": "Replace",
28
"set.invisible": "Invisible",
29
"set.invisibleHint": "An invisible secret cannot be viewed or edited afterwards. You can only delete it or replace the value.",
30
"set.valuesHidden": "Values stay hidden until you choose Show. An invisible secret cannot be shown.",
31
"flash.secretReplaced": "Secret replaced",
17
32
}
18
33
19
34
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",
35
"err.secretForm": "geheimnaam %q moet [A-Za-z_][A-Za-z0-9_]* zijn",
36
"err.secretExists": "geheim %q bestaat al",
37
"err.secretHidden": "geheim %q is onzichtbaar en kan niet bekeken of bewerkt worden",
38
"err.secretVisible": "geheim %q is zichtbaar; bewerk het in plaats van het te vervangen",
39
"wh.tokenHint": "Kies een geheim. De waarde blijft verborgen.",
40
"wh.noSecret": "Geen",
41
"wh.secretSearch": "Zoek een geheim",
42
"wh.src.repo": "Repository %s",
43
"wh.src.group": "Groep %s",
44
"wh.edit": "Webhook bewerken",
45
"wh.update": "Wijzigingen opslaan",
46
"wh.events": "Gebeurtenissen",
47
"wh.flags": "Vlaggen",
48
"wh.actions": "Acties",
49
"action.edit": "Bewerken",
50
"action.show": "Toon",
51
"action.replace": "Vervangen",
52
"set.invisible": "Onzichtbaar",
53
"set.invisibleHint": "Een onzichtbaar geheim is daarna niet meer te bekijken of te bewerken. Je kunt het alleen verwijderen of de waarde vervangen.",
54
"set.valuesHidden": "Waarden blijven verborgen tot je Toon kiest. Een onzichtbaar geheim kan niet getoond worden.",
55
"flash.secretReplaced": "Geheim vervangen",
26
56
}
27
57
28
58
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",
59
"err.secretForm": "Geheimnisname %q muss [A-Za-z_][A-Za-z0-9_]* entsprechen",
60
"err.secretHidden": "Geheimnis %q ist unsichtbar und kann nicht angesehen oder bearbeitet werden",
61
"err.secretExists": "Geheimnis %q existiert bereits",
62
"err.secretVisible": "Geheimnis %q ist sichtbar; bearbeite es, statt es zu ersetzen",
63
"wh.tokenHint": "Wähle ein Geheimnis. Der Wert bleibt verborgen.",
64
"wh.noSecret": "Keins",
65
"wh.secretSearch": "Geheimnis suchen",
66
"wh.src.repo": "Repository %s",
67
"wh.src.group": "Gruppe %s",
68
"wh.edit": "Webhook bearbeiten",
69
"wh.update": "Änderungen speichern",
70
"wh.events": "Ereignisse",
71
"wh.flags": "Merkmale",
72
"wh.actions": "Aktionen",
73
"action.edit": "Bearbeiten",
74
"action.show": "Anzeigen",
75
"action.replace": "Ersetzen",
76
"set.invisible": "Unsichtbar",
77
"set.invisibleHint": "Ein unsichtbares Geheimnis kann danach nicht mehr angesehen oder bearbeitet werden. Du kannst es nur löschen oder den Wert ersetzen.",
78
"set.valuesHidden": "Werte bleiben verborgen, bis du Anzeigen wählst. Ein unsichtbares Geheimnis kann nicht angezeigt werden.",
79
"flash.secretReplaced": "Geheimnis ersetzt",
35
80
}
36
81
37
82
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",
83
"err.secretForm": "le nom de secret %q doit correspondre à [A-Za-z_][A-Za-z0-9_]*",
84
"err.secretExists": "le secret %q existe déjà",
85
"err.secretHidden": "le secret %q est invisible et ne peut pas être consulté ni modifié",
86
"err.secretVisible": "le secret %q est visible ; modifie-le au lieu de le remplacer",
87
"wh.tokenHint": "Choisis un secret. La valeur reste cachée.",
88
"wh.noSecret": "Aucun",
89
"wh.secretSearch": "Chercher un secret",
90
"wh.src.repo": "Dépôt %s",
91
"wh.src.group": "Groupe %s",
92
"wh.edit": "Modifier le webhook",
93
"wh.update": "Enregistrer les modifications",
94
"wh.events": "Événements",
95
"wh.flags": "Drapeaux",
96
"wh.actions": "Actions",
97
"action.edit": "Modifier",
98
"action.show": "Afficher",
99
"action.replace": "Remplacer",
100
"set.invisible": "Invisible",
101
"set.invisibleHint": "Un secret invisible ne peut plus être consulté ni modifié ensuite. Tu peux seulement le supprimer ou remplacer la valeur.",
102
"set.valuesHidden": "Les valeurs restent cachées jusqu'au choix Afficher. Un secret invisible ne peut pas être affiché.",
103
"flash.secretReplaced": "Secret remplacé",
44
104
}
@@ -8,37 +8,97 @@ func init() {8
}8
}9
9
10
var secretEN = map[string]string{10
var secretEN = map[string]string{11
"err.secretForm": "secret name %q must match [A-Za-z_][A-Za-z0-9_]*",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.",12
"err.secretExists": "secret %q already exists",13
"wh.noSecret": "None",13
"err.secretHidden": "secret %q is invisible and cannot be viewed or edited",14
"wh.secretSearch": "Search secrets",14
"err.secretVisible": "secret %q is visible; edit it instead of replacing it",15
"wh.src.repo": "Repository %s",15
"wh.tokenHint": "Choose a secret. The value stays hidden.",16
"wh.src.group": "Group %s",16
"wh.noSecret": "None",17
"wh.secretSearch": "Search secrets",18
"wh.src.repo": "Repository %s",19
"wh.src.group": "Group %s",20
"wh.edit": "Edit webhook",21
"wh.update": "Save changes",22
"wh.events": "Events",23
"wh.flags": "Flags",24
"wh.actions": "Actions",25
"action.edit": "Edit",26
"action.show": "Show",27
"action.replace": "Replace",28
"set.invisible": "Invisible",29
"set.invisibleHint": "An invisible secret cannot be viewed or edited afterwards. You can only delete it or replace the value.",30
"set.valuesHidden": "Values stay hidden until you choose Show. An invisible secret cannot be shown.",31
"flash.secretReplaced": "Secret replaced",17
}32
}18
33
19
var secretNL = map[string]string{34
var secretNL = map[string]string{20
"err.secretForm": "geheimnaam %q moet [A-Za-z_][A-Za-z0-9_]* zijn",35
"err.secretForm": "geheimnaam %q moet [A-Za-z_][A-Za-z0-9_]* zijn",21
"wh.tokenHint": "Kies een geheim. De waarde blijft verborgen.",36
"err.secretExists": "geheim %q bestaat al",22
"wh.noSecret": "Geen",37
"err.secretHidden": "geheim %q is onzichtbaar en kan niet bekeken of bewerkt worden",23
"wh.secretSearch": "Zoek een geheim",38
"err.secretVisible": "geheim %q is zichtbaar; bewerk het in plaats van het te vervangen",24
"wh.src.repo": "Repository %s",39
"wh.tokenHint": "Kies een geheim. De waarde blijft verborgen.",25
"wh.src.group": "Groep %s",40
"wh.noSecret": "Geen",41
"wh.secretSearch": "Zoek een geheim",42
"wh.src.repo": "Repository %s",43
"wh.src.group": "Groep %s",44
"wh.edit": "Webhook bewerken",45
"wh.update": "Wijzigingen opslaan",46
"wh.events": "Gebeurtenissen",47
"wh.flags": "Vlaggen",48
"wh.actions": "Acties",49
"action.edit": "Bewerken",50
"action.show": "Toon",51
"action.replace": "Vervangen",52
"set.invisible": "Onzichtbaar",53
"set.invisibleHint": "Een onzichtbaar geheim is daarna niet meer te bekijken of te bewerken. Je kunt het alleen verwijderen of de waarde vervangen.",54
"set.valuesHidden": "Waarden blijven verborgen tot je Toon kiest. Een onzichtbaar geheim kan niet getoond worden.",55
"flash.secretReplaced": "Geheim vervangen",26
}56
}27
57
28
var secretDE = map[string]string{58
var secretDE = map[string]string{29
"err.secretForm": "Geheimnisname %q muss [A-Za-z_][A-Za-z0-9_]* entsprechen",59
"err.secretForm": "Geheimnisname %q muss [A-Za-z_][A-Za-z0-9_]* entsprechen",30
"wh.tokenHint": "Wähle ein Geheimnis. Der Wert bleibt verborgen.",60
"err.secretHidden": "Geheimnis %q ist unsichtbar und kann nicht angesehen oder bearbeitet werden",31
"wh.noSecret": "Keins",61
"err.secretExists": "Geheimnis %q existiert bereits",32
"wh.secretSearch": "Geheimnis suchen",62
"err.secretVisible": "Geheimnis %q ist sichtbar; bearbeite es, statt es zu ersetzen",33
"wh.src.repo": "Repository %s",63
"wh.tokenHint": "Wähle ein Geheimnis. Der Wert bleibt verborgen.",34
"wh.src.group": "Gruppe %s",64
"wh.noSecret": "Keins",65
"wh.secretSearch": "Geheimnis suchen",66
"wh.src.repo": "Repository %s",67
"wh.src.group": "Gruppe %s",68
"wh.edit": "Webhook bearbeiten",69
"wh.update": "Änderungen speichern",70
"wh.events": "Ereignisse",71
"wh.flags": "Merkmale",72
"wh.actions": "Aktionen",73
"action.edit": "Bearbeiten",74
"action.show": "Anzeigen",75
"action.replace": "Ersetzen",76
"set.invisible": "Unsichtbar",77
"set.invisibleHint": "Ein unsichtbares Geheimnis kann danach nicht mehr angesehen oder bearbeitet werden. Du kannst es nur löschen oder den Wert ersetzen.",78
"set.valuesHidden": "Werte bleiben verborgen, bis du Anzeigen wählst. Ein unsichtbares Geheimnis kann nicht angezeigt werden.",79
"flash.secretReplaced": "Geheimnis ersetzt",35
}80
}36
81
37
var secretFR = map[string]string{82
var secretFR = map[string]string{38
"err.secretForm": "le nom de secret %q doit correspondre à [A-Za-z_][A-Za-z0-9_]*",83
"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.",84
"err.secretExists": "le secret %q existe déjà",40
"wh.noSecret": "Aucun",85
"err.secretHidden": "le secret %q est invisible et ne peut pas être consulté ni modifié",41
"wh.secretSearch": "Chercher un secret",86
"err.secretVisible": "le secret %q est visible ; modifie-le au lieu de le remplacer",42
"wh.src.repo": "Dépôt %s",87
"wh.tokenHint": "Choisis un secret. La valeur reste cachée.",43
"wh.src.group": "Groupe %s",88
"wh.noSecret": "Aucun",89
"wh.secretSearch": "Chercher un secret",90
"wh.src.repo": "Dépôt %s",91
"wh.src.group": "Groupe %s",92
"wh.edit": "Modifier le webhook",93
"wh.update": "Enregistrer les modifications",94
"wh.events": "Événements",95
"wh.flags": "Drapeaux",96
"wh.actions": "Actions",97
"action.edit": "Modifier",98
"action.show": "Afficher",99
"action.replace": "Remplacer",100
"set.invisible": "Invisible",101
"set.invisibleHint": "Un secret invisible ne peut plus être consulté ni modifié ensuite. Tu peux seulement le supprimer ou remplacer la valeur.",102
"set.valuesHidden": "Les valeurs restent cachées jusqu'au choix Afficher. Un secret invisible ne peut pas être affiché.",103
"flash.secretReplaced": "Secret remplacé",44
}104
}@@ -0,0 +1,212 @@
1
package server
2
3
import (
4
"encoding/json"
5
"io"
6
"net/http"
7
"strings"
8
"time"
9
10
"gitlab.com/Timfa/bluegit/internal/store"
11
)
12
13
type secretBody struct {
14
Name string `json:"name"`
15
Value string `json:"value"`
16
Protected bool `json:"protected"`
17
Invisible bool `json:"invisible"`
18
}
19
20
func (s *Server) repoSecretsAPI(w http.ResponseWriter, r *http.Request) {
21
repo, _, ok := s.webhookAPIRepo(w, r)
22
if !ok {
23
return
24
}
25
s.secretListAPI(w, r, "repo", repo.ID)
26
}
27
28
func (s *Server) groupSecretsAPI(w http.ResponseWriter, r *http.Request) {
29
g, _, ok := s.webhookAPIGroup(w, r)
30
if !ok {
31
return
32
}
33
s.secretListAPI(w, r, "group", g.ID)
34
}
35
36
func (s *Server) repoSecretCreateAPI(w http.ResponseWriter, r *http.Request) {
37
repo, _, ok := s.webhookAPIRepo(w, r)
38
if !ok {
39
return
40
}
41
s.secretWriteAPI(w, r, "repo", repo.ID, "create")
42
}
43
44
func (s *Server) groupSecretCreateAPI(w http.ResponseWriter, r *http.Request) {
45
g, _, ok := s.webhookAPIGroup(w, r)
46
if !ok {
47
return
48
}
49
s.secretWriteAPI(w, r, "group", g.ID, "create")
50
}
51
52
func (s *Server) repoSecretRevealAPI(w http.ResponseWriter, r *http.Request) {
53
repo, _, ok := s.webhookAPIRepo(w, r)
54
if !ok {
55
return
56
}
57
s.secretRevealAPI(w, r, "repo", repo.ID)
58
}
59
60
func (s *Server) groupSecretRevealAPI(w http.ResponseWriter, r *http.Request) {
61
g, _, ok := s.webhookAPIGroup(w, r)
62
if !ok {
63
return
64
}
65
s.secretRevealAPI(w, r, "group", g.ID)
66
}
67
68
func (s *Server) repoSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {
69
repo, _, ok := s.webhookAPIRepo(w, r)
70
if !ok {
71
return
72
}
73
s.secretWriteAPI(w, r, "repo", repo.ID, "update")
74
}
75
76
func (s *Server) groupSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {
77
g, _, ok := s.webhookAPIGroup(w, r)
78
if !ok {
79
return
80
}
81
s.secretWriteAPI(w, r, "group", g.ID, "update")
82
}
83
84
func (s *Server) repoSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {
85
repo, _, ok := s.webhookAPIRepo(w, r)
86
if !ok {
87
return
88
}
89
s.secretWriteAPI(w, r, "repo", repo.ID, "replace")
90
}
91
92
func (s *Server) groupSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {
93
g, _, ok := s.webhookAPIGroup(w, r)
94
if !ok {
95
return
96
}
97
s.secretWriteAPI(w, r, "group", g.ID, "replace")
98
}
99
100
func (s *Server) repoSecretDeleteAPI(w http.ResponseWriter, r *http.Request) {
101
repo, _, ok := s.webhookAPIRepo(w, r)
102
if !ok {
103
return
104
}
105
s.secretDeleteAPI(w, r, "repo", repo.ID)
106
}
107
108
func (s *Server) groupSecretDeleteAPI(w http.ResponseWriter, r *http.Request) {
109
g, _, ok := s.webhookAPIGroup(w, r)
110
if !ok {
111
return
112
}
113
s.secretDeleteAPI(w, r, "group", g.ID)
114
}
115
116
func (s *Server) secretListAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {
117
list, err := s.Store.ListSecrets(r.Context(), kind, scopeID)
118
if err != nil {
119
http.Error(w, s.trErr(r, err), http.StatusInternalServerError)
120
return
121
}
122
out := make([]map[string]any, 0, len(list))
123
for _, m := range list {
124
out = append(out, secretMetaJSON(m))
125
}
126
w.Header().Set("Content-Type", "application/json")
127
_ = json.NewEncoder(w).Encode(map[string]any{"secrets": out})
128
}
129
130
func (s *Server) secretWriteAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64, mode string) {
131
var body secretBody
132
if err := json.NewDecoder(io.LimitReader(r.Body, 1<<20)).Decode(&body); err != nil {
133
http.Error(w, s.tr(r, "err.json"), http.StatusBadRequest)
134
return
135
}
136
name := strings.TrimSpace(body.Name)
137
if mode != "create" {
138
name = strings.TrimSpace(r.PathValue("name"))
139
}
140
var err error
141
switch mode {
142
case "update":
143
err = s.Store.UpdateSecret(r.Context(), kind, scopeID, name, body.Value, body.Protected)
144
case "replace":
145
err = s.Store.ReplaceSecret(r.Context(), kind, scopeID, name, body.Value, body.Protected)
146
default:
147
err = s.Store.CreateSecret(r.Context(), kind, scopeID, name, body.Value, body.Protected, body.Invisible)
148
}
149
if err != nil {
150
s.writeSecretErr(w, r, err)
151
return
152
}
153
meta, err := s.secretMeta(r, kind, scopeID, name)
154
if err != nil {
155
s.writeSecretErr(w, r, err)
156
return
157
}
158
w.Header().Set("Content-Type", "application/json")
159
if mode == "create" {
160
w.WriteHeader(http.StatusCreated)
161
}
162
_ = json.NewEncoder(w).Encode(secretMetaJSON(meta))
163
}
164
165
func (s *Server) secretRevealAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {
166
name := strings.TrimSpace(r.PathValue("name"))
167
value, err := s.Store.RevealSecret(r.Context(), kind, scopeID, name)
168
if err != nil {
169
s.writeSecretErr(w, r, err)
170
return
171
}
172
w.Header().Set("Content-Type", "application/json")
173
_ = json.NewEncoder(w).Encode(map[string]string{"name": name, "value": value})
174
}
175
176
func (s *Server) secretDeleteAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {
177
if err := s.Store.DeleteSecret(r.Context(), kind, scopeID, strings.TrimSpace(r.PathValue("name"))); err != nil {
178
s.writeSecretErr(w, r, err)
179
return
180
}
181
w.WriteHeader(http.StatusNoContent)
182
}
183
184
func (s *Server) secretMeta(r *http.Request, kind string, scopeID int64, name string) (store.SecretMeta, error) {
185
list, err := s.Store.ListSecrets(r.Context(), kind, scopeID)
186
if err != nil {
187
return store.SecretMeta{}, err
188
}
189
for _, m := range list {
190
if m.Name == name {
191
return m, nil
192
}
193
}
194
return store.SecretMeta{}, store.NotFound()
195
}
196
197
func secretMetaJSON(m store.SecretMeta) map[string]any {
198
created := ""
199
if !m.CreatedAt.IsZero() {
200
created = m.CreatedAt.UTC().Format(time.RFC3339)
201
}
202
return map[string]any{
203
"name": m.Name,
204
"protected": m.Protected,
205
"invisible": m.Invisible,
206
"created_at": created,
207
}
208
}
209
210
func (s *Server) writeSecretErr(w http.ResponseWriter, r *http.Request, err error) {
211
http.Error(w, s.trErr(r, err), secretStatus(err))
212
}
@@ -0,0 +1,212 @@1
package server2
3
import (4
"encoding/json"5
"io"6
"net/http"7
"strings"8
"time"9
10
"gitlab.com/Timfa/bluegit/internal/store"11
)12
13
type secretBody struct {14
Name string `json:"name"`15
Value string `json:"value"`16
Protected bool `json:"protected"`17
Invisible bool `json:"invisible"`18
}19
20
func (s *Server) repoSecretsAPI(w http.ResponseWriter, r *http.Request) {21
repo, _, ok := s.webhookAPIRepo(w, r)22
if !ok {23
return24
}25
s.secretListAPI(w, r, "repo", repo.ID)26
}27
28
func (s *Server) groupSecretsAPI(w http.ResponseWriter, r *http.Request) {29
g, _, ok := s.webhookAPIGroup(w, r)30
if !ok {31
return32
}33
s.secretListAPI(w, r, "group", g.ID)34
}35
36
func (s *Server) repoSecretCreateAPI(w http.ResponseWriter, r *http.Request) {37
repo, _, ok := s.webhookAPIRepo(w, r)38
if !ok {39
return40
}41
s.secretWriteAPI(w, r, "repo", repo.ID, "create")42
}43
44
func (s *Server) groupSecretCreateAPI(w http.ResponseWriter, r *http.Request) {45
g, _, ok := s.webhookAPIGroup(w, r)46
if !ok {47
return48
}49
s.secretWriteAPI(w, r, "group", g.ID, "create")50
}51
52
func (s *Server) repoSecretRevealAPI(w http.ResponseWriter, r *http.Request) {53
repo, _, ok := s.webhookAPIRepo(w, r)54
if !ok {55
return56
}57
s.secretRevealAPI(w, r, "repo", repo.ID)58
}59
60
func (s *Server) groupSecretRevealAPI(w http.ResponseWriter, r *http.Request) {61
g, _, ok := s.webhookAPIGroup(w, r)62
if !ok {63
return64
}65
s.secretRevealAPI(w, r, "group", g.ID)66
}67
68
func (s *Server) repoSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {69
repo, _, ok := s.webhookAPIRepo(w, r)70
if !ok {71
return72
}73
s.secretWriteAPI(w, r, "repo", repo.ID, "update")74
}75
76
func (s *Server) groupSecretUpdateAPI(w http.ResponseWriter, r *http.Request) {77
g, _, ok := s.webhookAPIGroup(w, r)78
if !ok {79
return80
}81
s.secretWriteAPI(w, r, "group", g.ID, "update")82
}83
84
func (s *Server) repoSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {85
repo, _, ok := s.webhookAPIRepo(w, r)86
if !ok {87
return88
}89
s.secretWriteAPI(w, r, "repo", repo.ID, "replace")90
}91
92
func (s *Server) groupSecretReplaceAPI(w http.ResponseWriter, r *http.Request) {93
g, _, ok := s.webhookAPIGroup(w, r)94
if !ok {95
return96
}97
s.secretWriteAPI(w, r, "group", g.ID, "replace")98
}99
100
func (s *Server) repoSecretDeleteAPI(w http.ResponseWriter, r *http.Request) {101
repo, _, ok := s.webhookAPIRepo(w, r)102
if !ok {103
return104
}105
s.secretDeleteAPI(w, r, "repo", repo.ID)106
}107
108
func (s *Server) groupSecretDeleteAPI(w http.ResponseWriter, r *http.Request) {109
g, _, ok := s.webhookAPIGroup(w, r)110
if !ok {111
return112
}113
s.secretDeleteAPI(w, r, "group", g.ID)114
}115
116
func (s *Server) secretListAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {117
list, err := s.Store.ListSecrets(r.Context(), kind, scopeID)118
if err != nil {119
http.Error(w, s.trErr(r, err), http.StatusInternalServerError)120
return121
}122
out := make([]map[string]any, 0, len(list))123
for _, m := range list {124
out = append(out, secretMetaJSON(m))125
}126
w.Header().Set("Content-Type", "application/json")127
_ = json.NewEncoder(w).Encode(map[string]any{"secrets": out})128
}129
130
func (s *Server) secretWriteAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64, mode string) {131
var body secretBody132
if err := json.NewDecoder(io.LimitReader(r.Body, 1<<20)).Decode(&body); err != nil {133
http.Error(w, s.tr(r, "err.json"), http.StatusBadRequest)134
return135
}136
name := strings.TrimSpace(body.Name)137
if mode != "create" {138
name = strings.TrimSpace(r.PathValue("name"))139
}140
var err error141
switch mode {142
case "update":143
err = s.Store.UpdateSecret(r.Context(), kind, scopeID, name, body.Value, body.Protected)144
case "replace":145
err = s.Store.ReplaceSecret(r.Context(), kind, scopeID, name, body.Value, body.Protected)146
default:147
err = s.Store.CreateSecret(r.Context(), kind, scopeID, name, body.Value, body.Protected, body.Invisible)148
}149
if err != nil {150
s.writeSecretErr(w, r, err)151
return152
}153
meta, err := s.secretMeta(r, kind, scopeID, name)154
if err != nil {155
s.writeSecretErr(w, r, err)156
return157
}158
w.Header().Set("Content-Type", "application/json")159
if mode == "create" {160
w.WriteHeader(http.StatusCreated)161
}162
_ = json.NewEncoder(w).Encode(secretMetaJSON(meta))163
}164
165
func (s *Server) secretRevealAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {166
name := strings.TrimSpace(r.PathValue("name"))167
value, err := s.Store.RevealSecret(r.Context(), kind, scopeID, name)168
if err != nil {169
s.writeSecretErr(w, r, err)170
return171
}172
w.Header().Set("Content-Type", "application/json")173
_ = json.NewEncoder(w).Encode(map[string]string{"name": name, "value": value})174
}175
176
func (s *Server) secretDeleteAPI(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {177
if err := s.Store.DeleteSecret(r.Context(), kind, scopeID, strings.TrimSpace(r.PathValue("name"))); err != nil {178
s.writeSecretErr(w, r, err)179
return180
}181
w.WriteHeader(http.StatusNoContent)182
}183
184
func (s *Server) secretMeta(r *http.Request, kind string, scopeID int64, name string) (store.SecretMeta, error) {185
list, err := s.Store.ListSecrets(r.Context(), kind, scopeID)186
if err != nil {187
return store.SecretMeta{}, err188
}189
for _, m := range list {190
if m.Name == name {191
return m, nil192
}193
}194
return store.SecretMeta{}, store.NotFound()195
}196
197
func secretMetaJSON(m store.SecretMeta) map[string]any {198
created := ""199
if !m.CreatedAt.IsZero() {200
created = m.CreatedAt.UTC().Format(time.RFC3339)201
}202
return map[string]any{203
"name": m.Name,204
"protected": m.Protected,205
"invisible": m.Invisible,206
"created_at": created,207
}208
}209
210
func (s *Server) writeSecretErr(w http.ResponseWriter, r *http.Request, err error) {211
http.Error(w, s.trErr(r, err), secretStatus(err))212
}@@ -0,0 +1,351 @@
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
"strconv"
13
"strings"
14
"testing"
15
16
"gitlab.com/Timfa/bluegit/internal/auth"
17
"gitlab.com/Timfa/bluegit/internal/config"
18
"gitlab.com/Timfa/bluegit/internal/store"
19
)
20
21
func TestSecretEditShowAndInvisible(t *testing.T) {
22
if _, err := exec.LookPath("git"); err != nil {
23
t.Skip("git ontbreekt")
24
}
25
storage := t.TempDir()
26
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
27
if err != nil {
28
t.Fatal(err)
29
}
30
t.Cleanup(func() { _ = st.Close() })
31
cfg := config.Config{
32
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
33
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
34
Git: config.Git{Binary: "git", DefaultBranch: "master"},
35
}
36
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
37
ts := httptest.NewServer(srv.Handler())
38
t.Cleanup(ts.Close)
39
40
jar, _ := cookiejar.New(nil)
41
client := &http.Client{Jar: jar}
42
res, err := client.Get(ts.URL + "/login")
43
if err != nil {
44
t.Fatal(err)
45
}
46
page := read(t, res)
47
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
48
"csrf": {csrfOf(t, page)}, "name": {"secrets"}, "visibility": {"private"},
49
})
50
if err != nil {
51
t.Fatal(err)
52
}
53
_ = read(t, res)
54
res, err = client.Get(ts.URL + "/tim/secrets/-/settings?tab=secrets")
55
if err != nil {
56
t.Fatal(err)
57
}
58
page = read(t, res)
59
for _, needle := range []string{`name="invisible"`, "evgrid", "/assets/secrets.js", "An invisible secret"} {
60
if !strings.Contains(page, needle) {
61
t.Fatalf("formulier mist %q", needle)
62
}
63
}
64
post := func(values url.Values) string {
65
t.Helper()
66
values.Set("csrf", csrfOf(t, page))
67
res, err := client.PostForm(ts.URL+"/tim/secrets/-/secrets", values)
68
if err != nil {
69
t.Fatal(err)
70
}
71
page = read(t, res)
72
return page
73
}
74
post(url.Values{"name": {"SHOWN"}, "value": {"zichtbaar-waarde"}, "protected": {"1"}})
75
post(url.Values{"name": {"HIDDEN"}, "value": {"onzichtbare-waarde"}, "invisible": {"1"}})
76
if strings.Contains(page, "zichtbaar-waarde") || strings.Contains(page, "onzichtbare-waarde") {
77
t.Fatal("waarde staat in de eerste html")
78
}
79
if !strings.Contains(page, `data-reveal="SHOWN"`) || strings.Contains(page, `data-reveal="HIDDEN"`) {
80
t.Fatalf("toonknop:\n%s", page)
81
}
82
if !strings.Contains(page, `value="replace"`) || !strings.Contains(page, ">Show<") || !strings.Contains(page, ">Edit<") || !strings.Contains(page, ">Replace<") {
83
t.Fatalf("knoppen:\n%s", page)
84
}
85
res, err = client.PostForm(ts.URL+"/tim/secrets/-/secrets/reveal", url.Values{
86
"csrf": {csrfOf(t, page)}, "name": {"SHOWN"},
87
})
88
if err != nil {
89
t.Fatal(err)
90
}
91
shown := read(t, res)
92
if res.StatusCode != http.StatusOK || !strings.Contains(shown, "zichtbaar-waarde") {
93
t.Fatalf("toon %d %s", res.StatusCode, shown)
94
}
95
res, err = client.PostForm(ts.URL+"/tim/secrets/-/secrets/reveal", url.Values{
96
"csrf": {csrfOf(t, page)}, "name": {"HIDDEN"},
97
})
98
if err != nil {
99
t.Fatal(err)
100
}
101
hidden := read(t, res)
102
if res.StatusCode != http.StatusForbidden || strings.Contains(hidden, "onzichtbare-waarde") {
103
t.Fatalf("verborgen toon %d %s", res.StatusCode, hidden)
104
}
105
post(url.Values{"mode": {"update"}, "name": {"SHOWN"}, "value": {"nieuwe-waarde"}})
106
if !strings.Contains(page, "Secret saved") {
107
t.Fatalf("bewerken:\n%s", page)
108
}
109
post(url.Values{"mode": {"update"}, "name": {"HIDDEN"}, "value": {"mag-niet"}})
110
if !strings.Contains(page, "invisible") || strings.Contains(page, "mag-niet") {
111
t.Fatalf("bewerken van onzichtbaar:\n%s", page)
112
}
113
post(url.Values{"mode": {"replace"}, "name": {"HIDDEN"}, "value": {"vervangen-waarde"}, "protected": {"1"}})
114
if !strings.Contains(page, "Secret replaced") || strings.Contains(page, "vervangen-waarde") || strings.Contains(page, "onzichtbare-waarde") {
115
t.Fatalf("vervangen:\n%s", page)
116
}
117
118
ctx := context.Background()
119
tim, err := st.UserByUsername(ctx, "tim")
120
if err != nil {
121
t.Fatal(err)
122
}
123
repo, err := st.RepoByPath(ctx, "tim", "secrets")
124
if err != nil {
125
t.Fatal(err)
126
}
127
vals, err := st.SecretValues(ctx, "repo", repo.ID, true)
128
if err != nil || vals["SHOWN"] != "nieuwe-waarde" || vals["HIDDEN"] != "vervangen-waarde" {
129
t.Fatalf("opgeslagen %#v %v", vals, err)
130
}
131
list, err := st.ListSecrets(ctx, "repo", repo.ID)
132
if err != nil {
133
t.Fatal(err)
134
}
135
for _, m := range list {
136
if m.Name == "HIDDEN" && (!m.Invisible || !m.Protected) {
137
t.Fatalf("vlaggen %+v", m)
138
}
139
if m.Name == "SHOWN" && (m.Invisible || m.Protected) {
140
t.Fatalf("zichtbaar werd %+v", m)
141
}
142
}
143
token, err := st.CreateToken(ctx, tim.ID, "laptop")
144
if err != nil {
145
t.Fatal(err)
146
}
147
call := func(method, path, body string) (int, string) {
148
t.Helper()
149
req, err := http.NewRequest(method, ts.URL+path, strings.NewReader(body))
150
if err != nil {
151
t.Fatal(err)
152
}
153
req.Header.Set("Authorization", "Bearer "+token)
154
req.Header.Set("Content-Type", "application/json")
155
res, err := client.Do(req)
156
if err != nil {
157
t.Fatal(err)
158
}
159
return res.StatusCode, read(t, res)
160
}
161
code, body := call(http.MethodGet, "/api/v1/repos/tim/secrets/secrets", "")
162
if code != http.StatusOK || strings.Contains(body, "nieuwe-waarde") || strings.Contains(body, "vervangen-waarde") || !strings.Contains(body, `"invisible":true`) {
163
t.Fatalf("lijst %d %s", code, body)
164
}
165
code, body = call(http.MethodGet, "/api/v1/repos/tim/secrets/secrets/SHOWN", "")
166
if code != http.StatusOK || !strings.Contains(body, "nieuwe-waarde") {
167
t.Fatalf("api toon %d %s", code, body)
168
}
169
code, body = call(http.MethodGet, "/api/v1/repos/tim/secrets/secrets/HIDDEN", "")
170
if code != http.StatusForbidden || strings.Contains(body, "vervangen-waarde") {
171
t.Fatalf("api verborgen %d %s", code, body)
172
}
173
code, body = call(http.MethodPut, "/api/v1/repos/tim/secrets/secrets/HIDDEN", `{"value":"nee","protected":false}`)
174
if code != http.StatusForbidden || strings.Contains(body, "nee") {
175
t.Fatalf("api bewerken %d %s", code, body)
176
}
177
code, body = call(http.MethodPost, "/api/v1/repos/tim/secrets/secrets/HIDDEN/replace", `{"value":"api-nieuw","protected":false}`)
178
if code != http.StatusOK || strings.Contains(body, "api-nieuw") || !strings.Contains(body, `"invisible":true`) {
179
t.Fatalf("api vervangen %d %s", code, body)
180
}
181
code, body = call(http.MethodPut, "/api/v1/repos/tim/secrets/secrets/SHOWN", `{"value":"api-zichtbaar","protected":true}`)
182
if code != http.StatusOK || strings.Contains(body, "api-zichtbaar") || !strings.Contains(body, `"protected":true`) {
183
t.Fatalf("api update %d %s", code, body)
184
}
185
code, body = call(http.MethodPost, "/api/v1/repos/tim/secrets/secrets", `{"name":"GROUPLESS","value":"x"}`)
186
if code != http.StatusCreated || strings.Contains(body, `"value"`) {
187
t.Fatalf("api aanmaken %d %s", code, body)
188
}
189
code, body = call(http.MethodPost, "/api/v1/repos/tim/secrets/secrets", `{"name":"SHOWN","value":"x","invisible":true}`)
190
if code != http.StatusConflict {
191
t.Fatalf("api dubbel %d %s", code, body)
192
}
193
code, body = call(http.MethodDelete, "/api/v1/repos/tim/secrets/secrets/HIDDEN", "")
194
if code != http.StatusNoContent {
195
t.Fatalf("api weg %d %s", code, body)
196
}
197
var listed struct {
198
Secrets []struct {
199
Name string `json:"name"`
200
Invisible bool `json:"invisible"`
201
} `json:"secrets"`
202
}
203
code, body = call(http.MethodGet, "/api/v1/repos/tim/secrets/secrets", "")
204
if err := json.Unmarshal([]byte(body), &listed); err != nil {
205
t.Fatal(err)
206
}
207
for _, m := range listed.Secrets {
208
if m.Name == "HIDDEN" {
209
t.Fatalf("verwijderd blijft in de lijst %s", body)
210
}
211
}
212
_ = code
213
214
g, err := st.CreateGroup(ctx, tim.ID, "Team", "team", "", "developer")
215
if err != nil {
216
t.Fatal(err)
217
}
218
if err := st.CreateSecret(ctx, "group", g.ID, "GROUP_HIDDEN", "groep-geheim", false, true); err != nil {
219
t.Fatal(err)
220
}
221
res, err = client.Get(ts.URL + "/groups/team?tab=settings")
222
if err != nil {
223
t.Fatal(err)
224
}
225
groupPage := read(t, res)
226
if strings.Contains(groupPage, "groep-geheim") || !strings.Contains(groupPage, "GROUP_HIDDEN") || !strings.Contains(groupPage, ">Replace<") || strings.Contains(groupPage, `data-reveal="GROUP_HIDDEN"`) {
227
t.Fatalf("groepsgeheim:\n%s", groupPage)
228
}
229
code, body = call(http.MethodGet, "/api/v1/groups/team/secrets/GROUP_HIDDEN", "")
230
if code != http.StatusForbidden || strings.Contains(body, "groep-geheim") {
231
t.Fatalf("groep api %d %s", code, body)
232
}
233
}
234
235
func TestWebhookTableAndEdit(t *testing.T) {
236
if _, err := exec.LookPath("git"); err != nil {
237
t.Skip("git ontbreekt")
238
}
239
storage := t.TempDir()
240
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
241
if err != nil {
242
t.Fatal(err)
243
}
244
t.Cleanup(func() { _ = st.Close() })
245
cfg := config.Config{
246
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
247
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
248
Git: config.Git{Binary: "git", DefaultBranch: "master"},
249
}
250
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
251
ts := httptest.NewServer(srv.Handler())
252
t.Cleanup(ts.Close)
253
jar, _ := cookiejar.New(nil)
254
client := &http.Client{Jar: jar}
255
res, err := client.Get(ts.URL + "/login")
256
if err != nil {
257
t.Fatal(err)
258
}
259
page := read(t, res)
260
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
261
"csrf": {csrfOf(t, page)}, "name": {"hooks"}, "visibility": {"private"},
262
})
263
if err != nil {
264
t.Fatal(err)
265
}
266
_ = read(t, res)
267
res, err = client.Get(ts.URL + "/tim/hooks/-/settings?tab=webhooks")
268
if err != nil {
269
t.Fatal(err)
270
}
271
page = read(t, res)
272
if !strings.Contains(page, "evgrid") || !strings.Contains(page, `data-preset="custom"`) {
273
t.Fatalf("compact formulier:\n%s", page)
274
}
275
res, err = client.PostForm(ts.URL+"/tim/hooks/-/webhooks", url.Values{
276
"csrf": {csrfOf(t, page)}, "name": {"ada"}, "preset": {"telegram"},
277
"token": {"BOT_TOKEN"}, "chat": {"100"}, "event_push": {"1"}, "event_pipeline_success": {"1"},
278
})
279
if err != nil {
280
t.Fatal(err)
281
}
282
page = read(t, res)
283
for _, needle := range []string{"hooktable", "urlclip", "data-tip=", ">Edit<", ">Remove<", "pipeline succeeded"} {
284
if !strings.Contains(page, needle) {
285
t.Fatalf("tabel mist %q\n%s", needle, page)
286
}
287
}
288
ctx := context.Background()
289
repo, err := st.RepoByPath(ctx, "tim", "hooks")
290
if err != nil {
291
t.Fatal(err)
292
}
293
hooks, err := st.ListWebhooks(ctx, "repo", repo.ID)
294
if err != nil || len(hooks) != 1 || !strings.Contains(hooks[0].Fields, `"chat":"100"`) {
295
t.Fatalf("velden %#v %v", hooks, err)
296
}
297
res, err = client.Get(ts.URL + "/tim/hooks/-/settings?tab=webhooks&hook=" + strconv.FormatInt(hooks[0].ID, 10))
298
if err != nil {
299
t.Fatal(err)
300
}
301
edit := read(t, res)
302
for _, needle := range []string{
303
`name="id"`, `value="ada"`, `value="100"`, `value="telegram" selected`,
304
"Edit webhook", `name="event_push" value="1" checked`,
305
} {
306
if !strings.Contains(edit, needle) {
307
t.Fatalf("bewerken mist %q\n%s", needle, edit)
308
}
309
}
310
res, err = client.PostForm(ts.URL+"/tim/hooks/-/webhooks", url.Values{
311
"csrf": {csrfOf(t, edit)}, "id": {strconv.FormatInt(hooks[0].ID, 10)}, "name": {"ada"},
312
"preset": {"telegram"}, "token": {"BOT_TOKEN"}, "chat": {"200"}, "event_push": {"1"},
313
})
314
if err != nil {
315
t.Fatal(err)
316
}
317
_ = read(t, res)
318
hooks, err = st.ListWebhooks(ctx, "repo", repo.ID)
319
if err != nil || len(hooks) != 1 || !strings.Contains(hooks[0].BodyTemplate, `"chat_id":"200"`) || strings.Contains(hooks[0].Fields, `"chat":"100"`) {
320
t.Fatalf("bijgewerkt %#v %v", hooks, err)
321
}
322
tim, err := st.UserByUsername(ctx, "tim")
323
if err != nil {
324
t.Fatal(err)
325
}
326
token, err := st.CreateToken(ctx, tim.ID, "laptop")
327
if err != nil {
328
t.Fatal(err)
329
}
330
raw, _ := json.Marshal(map[string]any{
331
"name": "ada", "preset": "telegram", "token": "BOT_TOKEN", "chat": "300", "events": []string{"push"},
332
})
333
req, err := http.NewRequest(http.MethodPut, ts.URL+"/api/v1/repos/tim/hooks/webhooks/"+strconv.FormatInt(hooks[0].ID, 10), strings.NewReader(string(raw)))
334
if err != nil {
335
t.Fatal(err)
336
}
337
req.Header.Set("Authorization", "Bearer "+token)
338
req.Header.Set("Content-Type", "application/json")
339
res, err = client.Do(req)
340
if err != nil {
341
t.Fatal(err)
342
}
343
body := read(t, res)
344
if res.StatusCode != http.StatusOK {
345
t.Fatalf("api %d %s", res.StatusCode, body)
346
}
347
hooks, err = st.ListWebhooks(ctx, "repo", repo.ID)
348
if err != nil || len(hooks) != 1 || !strings.Contains(hooks[0].BodyTemplate, `"chat_id":"300"`) {
349
t.Fatalf("api bijgewerkt %#v %v", hooks, err)
350
}
351
}
@@ -0,0 +1,351 @@1
package server2
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
"strconv"13
"strings"14
"testing"15
16
"gitlab.com/Timfa/bluegit/internal/auth"17
"gitlab.com/Timfa/bluegit/internal/config"18
"gitlab.com/Timfa/bluegit/internal/store"19
)20
21
func TestSecretEditShowAndInvisible(t *testing.T) {22
if _, err := exec.LookPath("git"); err != nil {23
t.Skip("git ontbreekt")24
}25
storage := t.TempDir()26
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())27
if err != nil {28
t.Fatal(err)29
}30
t.Cleanup(func() { _ = st.Close() })31
cfg := config.Config{32
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,33
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},34
Git: config.Git{Binary: "git", DefaultBranch: "master"},35
}36
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}37
ts := httptest.NewServer(srv.Handler())38
t.Cleanup(ts.Close)39
40
jar, _ := cookiejar.New(nil)41
client := &http.Client{Jar: jar}42
res, err := client.Get(ts.URL + "/login")43
if err != nil {44
t.Fatal(err)45
}46
page := read(t, res)47
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{48
"csrf": {csrfOf(t, page)}, "name": {"secrets"}, "visibility": {"private"},49
})50
if err != nil {51
t.Fatal(err)52
}53
_ = read(t, res)54
res, err = client.Get(ts.URL + "/tim/secrets/-/settings?tab=secrets")55
if err != nil {56
t.Fatal(err)57
}58
page = read(t, res)59
for _, needle := range []string{`name="invisible"`, "evgrid", "/assets/secrets.js", "An invisible secret"} {60
if !strings.Contains(page, needle) {61
t.Fatalf("formulier mist %q", needle)62
}63
}64
post := func(values url.Values) string {65
t.Helper()66
values.Set("csrf", csrfOf(t, page))67
res, err := client.PostForm(ts.URL+"/tim/secrets/-/secrets", values)68
if err != nil {69
t.Fatal(err)70
}71
page = read(t, res)72
return page73
}74
post(url.Values{"name": {"SHOWN"}, "value": {"zichtbaar-waarde"}, "protected": {"1"}})75
post(url.Values{"name": {"HIDDEN"}, "value": {"onzichtbare-waarde"}, "invisible": {"1"}})76
if strings.Contains(page, "zichtbaar-waarde") || strings.Contains(page, "onzichtbare-waarde") {77
t.Fatal("waarde staat in de eerste html")78
}79
if !strings.Contains(page, `data-reveal="SHOWN"`) || strings.Contains(page, `data-reveal="HIDDEN"`) {80
t.Fatalf("toonknop:\n%s", page)81
}82
if !strings.Contains(page, `value="replace"`) || !strings.Contains(page, ">Show<") || !strings.Contains(page, ">Edit<") || !strings.Contains(page, ">Replace<") {83
t.Fatalf("knoppen:\n%s", page)84
}85
res, err = client.PostForm(ts.URL+"/tim/secrets/-/secrets/reveal", url.Values{86
"csrf": {csrfOf(t, page)}, "name": {"SHOWN"},87
})88
if err != nil {89
t.Fatal(err)90
}91
shown := read(t, res)92
if res.StatusCode != http.StatusOK || !strings.Contains(shown, "zichtbaar-waarde") {93
t.Fatalf("toon %d %s", res.StatusCode, shown)94
}95
res, err = client.PostForm(ts.URL+"/tim/secrets/-/secrets/reveal", url.Values{96
"csrf": {csrfOf(t, page)}, "name": {"HIDDEN"},97
})98
if err != nil {99
t.Fatal(err)100
}101
hidden := read(t, res)102
if res.StatusCode != http.StatusForbidden || strings.Contains(hidden, "onzichtbare-waarde") {103
t.Fatalf("verborgen toon %d %s", res.StatusCode, hidden)104
}105
post(url.Values{"mode": {"update"}, "name": {"SHOWN"}, "value": {"nieuwe-waarde"}})106
if !strings.Contains(page, "Secret saved") {107
t.Fatalf("bewerken:\n%s", page)108
}109
post(url.Values{"mode": {"update"}, "name": {"HIDDEN"}, "value": {"mag-niet"}})110
if !strings.Contains(page, "invisible") || strings.Contains(page, "mag-niet") {111
t.Fatalf("bewerken van onzichtbaar:\n%s", page)112
}113
post(url.Values{"mode": {"replace"}, "name": {"HIDDEN"}, "value": {"vervangen-waarde"}, "protected": {"1"}})114
if !strings.Contains(page, "Secret replaced") || strings.Contains(page, "vervangen-waarde") || strings.Contains(page, "onzichtbare-waarde") {115
t.Fatalf("vervangen:\n%s", page)116
}117
118
ctx := context.Background()119
tim, err := st.UserByUsername(ctx, "tim")120
if err != nil {121
t.Fatal(err)122
}123
repo, err := st.RepoByPath(ctx, "tim", "secrets")124
if err != nil {125
t.Fatal(err)126
}127
vals, err := st.SecretValues(ctx, "repo", repo.ID, true)128
if err != nil || vals["SHOWN"] != "nieuwe-waarde" || vals["HIDDEN"] != "vervangen-waarde" {129
t.Fatalf("opgeslagen %#v %v", vals, err)130
}131
list, err := st.ListSecrets(ctx, "repo", repo.ID)132
if err != nil {133
t.Fatal(err)134
}135
for _, m := range list {136
if m.Name == "HIDDEN" && (!m.Invisible || !m.Protected) {137
t.Fatalf("vlaggen %+v", m)138
}139
if m.Name == "SHOWN" && (m.Invisible || m.Protected) {140
t.Fatalf("zichtbaar werd %+v", m)141
}142
}143
token, err := st.CreateToken(ctx, tim.ID, "laptop")144
if err != nil {145
t.Fatal(err)146
}147
call := func(method, path, body string) (int, string) {148
t.Helper()149
req, err := http.NewRequest(method, ts.URL+path, strings.NewReader(body))150
if err != nil {151
t.Fatal(err)152
}153
req.Header.Set("Authorization", "Bearer "+token)154
req.Header.Set("Content-Type", "application/json")155
res, err := client.Do(req)156
if err != nil {157
t.Fatal(err)158
}159
return res.StatusCode, read(t, res)160
}161
code, body := call(http.MethodGet, "/api/v1/repos/tim/secrets/secrets", "")162
if code != http.StatusOK || strings.Contains(body, "nieuwe-waarde") || strings.Contains(body, "vervangen-waarde") || !strings.Contains(body, `"invisible":true`) {163
t.Fatalf("lijst %d %s", code, body)164
}165
code, body = call(http.MethodGet, "/api/v1/repos/tim/secrets/secrets/SHOWN", "")166
if code != http.StatusOK || !strings.Contains(body, "nieuwe-waarde") {167
t.Fatalf("api toon %d %s", code, body)168
}169
code, body = call(http.MethodGet, "/api/v1/repos/tim/secrets/secrets/HIDDEN", "")170
if code != http.StatusForbidden || strings.Contains(body, "vervangen-waarde") {171
t.Fatalf("api verborgen %d %s", code, body)172
}173
code, body = call(http.MethodPut, "/api/v1/repos/tim/secrets/secrets/HIDDEN", `{"value":"nee","protected":false}`)174
if code != http.StatusForbidden || strings.Contains(body, "nee") {175
t.Fatalf("api bewerken %d %s", code, body)176
}177
code, body = call(http.MethodPost, "/api/v1/repos/tim/secrets/secrets/HIDDEN/replace", `{"value":"api-nieuw","protected":false}`)178
if code != http.StatusOK || strings.Contains(body, "api-nieuw") || !strings.Contains(body, `"invisible":true`) {179
t.Fatalf("api vervangen %d %s", code, body)180
}181
code, body = call(http.MethodPut, "/api/v1/repos/tim/secrets/secrets/SHOWN", `{"value":"api-zichtbaar","protected":true}`)182
if code != http.StatusOK || strings.Contains(body, "api-zichtbaar") || !strings.Contains(body, `"protected":true`) {183
t.Fatalf("api update %d %s", code, body)184
}185
code, body = call(http.MethodPost, "/api/v1/repos/tim/secrets/secrets", `{"name":"GROUPLESS","value":"x"}`)186
if code != http.StatusCreated || strings.Contains(body, `"value"`) {187
t.Fatalf("api aanmaken %d %s", code, body)188
}189
code, body = call(http.MethodPost, "/api/v1/repos/tim/secrets/secrets", `{"name":"SHOWN","value":"x","invisible":true}`)190
if code != http.StatusConflict {191
t.Fatalf("api dubbel %d %s", code, body)192
}193
code, body = call(http.MethodDelete, "/api/v1/repos/tim/secrets/secrets/HIDDEN", "")194
if code != http.StatusNoContent {195
t.Fatalf("api weg %d %s", code, body)196
}197
var listed struct {198
Secrets []struct {199
Name string `json:"name"`200
Invisible bool `json:"invisible"`201
} `json:"secrets"`202
}203
code, body = call(http.MethodGet, "/api/v1/repos/tim/secrets/secrets", "")204
if err := json.Unmarshal([]byte(body), &listed); err != nil {205
t.Fatal(err)206
}207
for _, m := range listed.Secrets {208
if m.Name == "HIDDEN" {209
t.Fatalf("verwijderd blijft in de lijst %s", body)210
}211
}212
_ = code213
214
g, err := st.CreateGroup(ctx, tim.ID, "Team", "team", "", "developer")215
if err != nil {216
t.Fatal(err)217
}218
if err := st.CreateSecret(ctx, "group", g.ID, "GROUP_HIDDEN", "groep-geheim", false, true); err != nil {219
t.Fatal(err)220
}221
res, err = client.Get(ts.URL + "/groups/team?tab=settings")222
if err != nil {223
t.Fatal(err)224
}225
groupPage := read(t, res)226
if strings.Contains(groupPage, "groep-geheim") || !strings.Contains(groupPage, "GROUP_HIDDEN") || !strings.Contains(groupPage, ">Replace<") || strings.Contains(groupPage, `data-reveal="GROUP_HIDDEN"`) {227
t.Fatalf("groepsgeheim:\n%s", groupPage)228
}229
code, body = call(http.MethodGet, "/api/v1/groups/team/secrets/GROUP_HIDDEN", "")230
if code != http.StatusForbidden || strings.Contains(body, "groep-geheim") {231
t.Fatalf("groep api %d %s", code, body)232
}233
}234
235
func TestWebhookTableAndEdit(t *testing.T) {236
if _, err := exec.LookPath("git"); err != nil {237
t.Skip("git ontbreekt")238
}239
storage := t.TempDir()240
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())241
if err != nil {242
t.Fatal(err)243
}244
t.Cleanup(func() { _ = st.Close() })245
cfg := config.Config{246
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,247
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},248
Git: config.Git{Binary: "git", DefaultBranch: "master"},249
}250
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}251
ts := httptest.NewServer(srv.Handler())252
t.Cleanup(ts.Close)253
jar, _ := cookiejar.New(nil)254
client := &http.Client{Jar: jar}255
res, err := client.Get(ts.URL + "/login")256
if err != nil {257
t.Fatal(err)258
}259
page := read(t, res)260
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{261
"csrf": {csrfOf(t, page)}, "name": {"hooks"}, "visibility": {"private"},262
})263
if err != nil {264
t.Fatal(err)265
}266
_ = read(t, res)267
res, err = client.Get(ts.URL + "/tim/hooks/-/settings?tab=webhooks")268
if err != nil {269
t.Fatal(err)270
}271
page = read(t, res)272
if !strings.Contains(page, "evgrid") || !strings.Contains(page, `data-preset="custom"`) {273
t.Fatalf("compact formulier:\n%s", page)274
}275
res, err = client.PostForm(ts.URL+"/tim/hooks/-/webhooks", url.Values{276
"csrf": {csrfOf(t, page)}, "name": {"ada"}, "preset": {"telegram"},277
"token": {"BOT_TOKEN"}, "chat": {"100"}, "event_push": {"1"}, "event_pipeline_success": {"1"},278
})279
if err != nil {280
t.Fatal(err)281
}282
page = read(t, res)283
for _, needle := range []string{"hooktable", "urlclip", "data-tip=", ">Edit<", ">Remove<", "pipeline succeeded"} {284
if !strings.Contains(page, needle) {285
t.Fatalf("tabel mist %q\n%s", needle, page)286
}287
}288
ctx := context.Background()289
repo, err := st.RepoByPath(ctx, "tim", "hooks")290
if err != nil {291
t.Fatal(err)292
}293
hooks, err := st.ListWebhooks(ctx, "repo", repo.ID)294
if err != nil || len(hooks) != 1 || !strings.Contains(hooks[0].Fields, `"chat":"100"`) {295
t.Fatalf("velden %#v %v", hooks, err)296
}297
res, err = client.Get(ts.URL + "/tim/hooks/-/settings?tab=webhooks&hook=" + strconv.FormatInt(hooks[0].ID, 10))298
if err != nil {299
t.Fatal(err)300
}301
edit := read(t, res)302
for _, needle := range []string{303
`name="id"`, `value="ada"`, `value="100"`, `value="telegram" selected`,304
"Edit webhook", `name="event_push" value="1" checked`,305
} {306
if !strings.Contains(edit, needle) {307
t.Fatalf("bewerken mist %q\n%s", needle, edit)308
}309
}310
res, err = client.PostForm(ts.URL+"/tim/hooks/-/webhooks", url.Values{311
"csrf": {csrfOf(t, edit)}, "id": {strconv.FormatInt(hooks[0].ID, 10)}, "name": {"ada"},312
"preset": {"telegram"}, "token": {"BOT_TOKEN"}, "chat": {"200"}, "event_push": {"1"},313
})314
if err != nil {315
t.Fatal(err)316
}317
_ = read(t, res)318
hooks, err = st.ListWebhooks(ctx, "repo", repo.ID)319
if err != nil || len(hooks) != 1 || !strings.Contains(hooks[0].BodyTemplate, `"chat_id":"200"`) || strings.Contains(hooks[0].Fields, `"chat":"100"`) {320
t.Fatalf("bijgewerkt %#v %v", hooks, err)321
}322
tim, err := st.UserByUsername(ctx, "tim")323
if err != nil {324
t.Fatal(err)325
}326
token, err := st.CreateToken(ctx, tim.ID, "laptop")327
if err != nil {328
t.Fatal(err)329
}330
raw, _ := json.Marshal(map[string]any{331
"name": "ada", "preset": "telegram", "token": "BOT_TOKEN", "chat": "300", "events": []string{"push"},332
})333
req, err := http.NewRequest(http.MethodPut, ts.URL+"/api/v1/repos/tim/hooks/webhooks/"+strconv.FormatInt(hooks[0].ID, 10), strings.NewReader(string(raw)))334
if err != nil {335
t.Fatal(err)336
}337
req.Header.Set("Authorization", "Bearer "+token)338
req.Header.Set("Content-Type", "application/json")339
res, err = client.Do(req)340
if err != nil {341
t.Fatal(err)342
}343
body := read(t, res)344
if res.StatusCode != http.StatusOK {345
t.Fatalf("api %d %s", res.StatusCode, body)346
}347
hooks, err = st.ListWebhooks(ctx, "repo", repo.ID)348
if err != nil || len(hooks) != 1 || !strings.Contains(hooks[0].BodyTemplate, `"chat_id":"300"`) {349
t.Fatalf("api bijgewerkt %#v %v", hooks, err)350
}351
}@@ -104,6 +104,7 @@ func (s *Server) Handler() http.Handler {
104
104
mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
105
105
mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
106
106
mux.HandleFunc("POST /groups/{path}/secrets", s.groupSecret)
107
mux.HandleFunc("POST /groups/{path}/secrets/reveal", s.groupSecretReveal)
107
108
mux.HandleFunc("POST /groups/{path}/secrets/delete", s.groupSecretDelete)
108
109
mux.HandleFunc("POST /groups/{path}/webhooks", s.groupWebhook)
109
110
mux.HandleFunc("POST /groups/{path}/webhooks/delete", s.groupWebhookDelete)
@@ -114,8 +115,22 @@ func (s *Server) Handler() http.Handler {
114
115
mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/releases", s.createRelease)
115
116
mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/webhook-secrets", s.repoWebhookSecrets)
116
117
mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/webhooks", s.repoWebhookAPI)
118
mux.HandleFunc("PUT /api/v1/repos/{owner}/{repo}/webhooks/{id}", s.repoWebhookUpdate)
119
mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/secrets", s.repoSecretsAPI)
120
mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/secrets", s.repoSecretCreateAPI)
121
mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/secrets/{name}", s.repoSecretRevealAPI)
122
mux.HandleFunc("PUT /api/v1/repos/{owner}/{repo}/secrets/{name}", s.repoSecretUpdateAPI)
123
mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/secrets/{name}/replace", s.repoSecretReplaceAPI)
124
mux.HandleFunc("DELETE /api/v1/repos/{owner}/{repo}/secrets/{name}", s.repoSecretDeleteAPI)
117
125
mux.HandleFunc("GET /api/v1/groups/{path}/webhook-secrets", s.groupWebhookSecrets)
118
126
mux.HandleFunc("POST /api/v1/groups/{path}/hooks", s.groupWebhookAPI)
127
mux.HandleFunc("PUT /api/v1/groups/{path}/hooks/{id}", s.groupWebhookUpdate)
128
mux.HandleFunc("GET /api/v1/groups/{path}/secrets", s.groupSecretsAPI)
129
mux.HandleFunc("POST /api/v1/groups/{path}/secrets", s.groupSecretCreateAPI)
130
mux.HandleFunc("GET /api/v1/groups/{path}/secrets/{name}", s.groupSecretRevealAPI)
131
mux.HandleFunc("PUT /api/v1/groups/{path}/secrets/{name}", s.groupSecretUpdateAPI)
132
mux.HandleFunc("POST /api/v1/groups/{path}/secrets/{name}/replace", s.groupSecretReplaceAPI)
133
mux.HandleFunc("DELETE /api/v1/groups/{path}/secrets/{name}", s.groupSecretDeleteAPI)
119
134
120
135
mux.HandleFunc("GET /{owner}/{repo}", s.repoHome)
121
136
mux.HandleFunc("GET /{owner}/{repo}/-/tree", s.treeRoot)
@@ -169,6 +184,7 @@ func (s *Server) Handler() http.Handler {
169
184
mux.HandleFunc("POST /{owner}/{repo}/-/protected-tags", s.addProtectedTag)
170
185
mux.HandleFunc("POST /{owner}/{repo}/-/protected-tags/remove", s.removeProtectedTag)
171
186
mux.HandleFunc("POST /{owner}/{repo}/-/secrets", s.repoSecret)
187
mux.HandleFunc("POST /{owner}/{repo}/-/secrets/reveal", s.repoSecretReveal)
172
188
mux.HandleFunc("POST /{owner}/{repo}/-/secrets/delete", s.repoSecretDelete)
173
189
mux.HandleFunc("POST /{owner}/{repo}/-/webhooks", s.repoWebhook)
174
190
mux.HandleFunc("POST /{owner}/{repo}/-/webhooks/delete", s.repoWebhookDelete)
@@ -504,6 +520,7 @@ type View struct {
504
520
Secrets []store.SecretMeta
505
521
HookSecrets []SecretChoice
506
522
Hooks []HookView
523
HookEdit HookDraft
507
524
Patterns []string
508
525
TagPatterns []string
509
526
Tags []TagRow
@@ -672,7 +689,36 @@ type HookView struct {
672
689
Method string
673
690
Filter string
674
691
Events string
692
Badges []string
675
693
Deliveries []store.Delivery
676
694
}
677
695
696
// HookDraft vult het webhookformulier bij bewerken. ID 0 is een nieuw formulier.
697
type HookDraft struct {
698
ID int64
699
Name string
700
Preset string
701
Filter string
702
URL string
703
Username string
704
Avatar string
705
Icon string
706
Alias string
707
Token string
708
Chat string
709
Server string
710
Topic string
711
Home string
712
Room string
713
Method string
714
CType string
715
Headers string
716
Body string
717
OnPush bool
718
OnMR bool
719
OnOK bool
720
OnFail bool
721
OnRel bool
722
}
723
678
724
func repoURL(repo store.Repo) string { return "/" + repo.FullPath() }
@@ -104,6 +104,7 @@ func (s *Server) Handler() http.Handler {104
mux.HandleFunc("POST /groups/{path}/members", s.groupMember)104
mux.HandleFunc("POST /groups/{path}/members", s.groupMember)105
mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)105
mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)106
mux.HandleFunc("POST /groups/{path}/secrets", s.groupSecret)106
mux.HandleFunc("POST /groups/{path}/secrets", s.groupSecret)107
mux.HandleFunc("POST /groups/{path}/secrets/reveal", s.groupSecretReveal)107
mux.HandleFunc("POST /groups/{path}/secrets/delete", s.groupSecretDelete)108
mux.HandleFunc("POST /groups/{path}/secrets/delete", s.groupSecretDelete)108
mux.HandleFunc("POST /groups/{path}/webhooks", s.groupWebhook)109
mux.HandleFunc("POST /groups/{path}/webhooks", s.groupWebhook)109
mux.HandleFunc("POST /groups/{path}/webhooks/delete", s.groupWebhookDelete)110
mux.HandleFunc("POST /groups/{path}/webhooks/delete", s.groupWebhookDelete)@@ -114,8 +115,22 @@ func (s *Server) Handler() http.Handler {114
mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/releases", s.createRelease)115
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("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("POST /api/v1/repos/{owner}/{repo}/webhooks", s.repoWebhookAPI)118
mux.HandleFunc("PUT /api/v1/repos/{owner}/{repo}/webhooks/{id}", s.repoWebhookUpdate)119
mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/secrets", s.repoSecretsAPI)120
mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/secrets", s.repoSecretCreateAPI)121
mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/secrets/{name}", s.repoSecretRevealAPI)122
mux.HandleFunc("PUT /api/v1/repos/{owner}/{repo}/secrets/{name}", s.repoSecretUpdateAPI)123
mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/secrets/{name}/replace", s.repoSecretReplaceAPI)124
mux.HandleFunc("DELETE /api/v1/repos/{owner}/{repo}/secrets/{name}", s.repoSecretDeleteAPI)117
mux.HandleFunc("GET /api/v1/groups/{path}/webhook-secrets", s.groupWebhookSecrets)125
mux.HandleFunc("GET /api/v1/groups/{path}/webhook-secrets", s.groupWebhookSecrets)118
mux.HandleFunc("POST /api/v1/groups/{path}/hooks", s.groupWebhookAPI)126
mux.HandleFunc("POST /api/v1/groups/{path}/hooks", s.groupWebhookAPI)127
mux.HandleFunc("PUT /api/v1/groups/{path}/hooks/{id}", s.groupWebhookUpdate)128
mux.HandleFunc("GET /api/v1/groups/{path}/secrets", s.groupSecretsAPI)129
mux.HandleFunc("POST /api/v1/groups/{path}/secrets", s.groupSecretCreateAPI)130
mux.HandleFunc("GET /api/v1/groups/{path}/secrets/{name}", s.groupSecretRevealAPI)131
mux.HandleFunc("PUT /api/v1/groups/{path}/secrets/{name}", s.groupSecretUpdateAPI)132
mux.HandleFunc("POST /api/v1/groups/{path}/secrets/{name}/replace", s.groupSecretReplaceAPI)133
mux.HandleFunc("DELETE /api/v1/groups/{path}/secrets/{name}", s.groupSecretDeleteAPI)119
134
120
mux.HandleFunc("GET /{owner}/{repo}", s.repoHome)135
mux.HandleFunc("GET /{owner}/{repo}", s.repoHome)121
mux.HandleFunc("GET /{owner}/{repo}/-/tree", s.treeRoot)136
mux.HandleFunc("GET /{owner}/{repo}/-/tree", s.treeRoot)@@ -169,6 +184,7 @@ func (s *Server) Handler() http.Handler {169
mux.HandleFunc("POST /{owner}/{repo}/-/protected-tags", s.addProtectedTag)184
mux.HandleFunc("POST /{owner}/{repo}/-/protected-tags", s.addProtectedTag)170
mux.HandleFunc("POST /{owner}/{repo}/-/protected-tags/remove", s.removeProtectedTag)185
mux.HandleFunc("POST /{owner}/{repo}/-/protected-tags/remove", s.removeProtectedTag)171
mux.HandleFunc("POST /{owner}/{repo}/-/secrets", s.repoSecret)186
mux.HandleFunc("POST /{owner}/{repo}/-/secrets", s.repoSecret)187
mux.HandleFunc("POST /{owner}/{repo}/-/secrets/reveal", s.repoSecretReveal)172
mux.HandleFunc("POST /{owner}/{repo}/-/secrets/delete", s.repoSecretDelete)188
mux.HandleFunc("POST /{owner}/{repo}/-/secrets/delete", s.repoSecretDelete)173
mux.HandleFunc("POST /{owner}/{repo}/-/webhooks", s.repoWebhook)189
mux.HandleFunc("POST /{owner}/{repo}/-/webhooks", s.repoWebhook)174
mux.HandleFunc("POST /{owner}/{repo}/-/webhooks/delete", s.repoWebhookDelete)190
mux.HandleFunc("POST /{owner}/{repo}/-/webhooks/delete", s.repoWebhookDelete)@@ -504,6 +520,7 @@ type View struct {504
Secrets []store.SecretMeta520
Secrets []store.SecretMeta505
HookSecrets []SecretChoice521
HookSecrets []SecretChoice506
Hooks []HookView522
Hooks []HookView523
HookEdit HookDraft507
Patterns []string524
Patterns []string508
TagPatterns []string525
TagPatterns []string509
Tags []TagRow526
Tags []TagRow@@ -672,7 +689,36 @@ type HookView struct {672
Method string689
Method string673
Filter string690
Filter string674
Events string691
Events string692
Badges []string675
Deliveries []store.Delivery693
Deliveries []store.Delivery676
}694
}677
695
696
// HookDraft vult het webhookformulier bij bewerken. ID 0 is een nieuw formulier.697
type HookDraft struct {698
ID int64699
Name string700
Preset string701
Filter string702
URL string703
Username string704
Avatar string705
Icon string706
Alias string707
Token string708
Chat string709
Server string710
Topic string711
Home string712
Room string713
Method string714
CType string715
Headers string716
Body string717
OnPush bool718
OnMR bool719
OnOK bool720
OnFail bool721
OnRel bool722
}723
678
func repoURL(repo store.Repo) string { return "/" + repo.FullPath() }724
func repoURL(repo store.Repo) string { return "/" + repo.FullPath() }@@ -2,6 +2,8 @@ package server
2
2
3
3
import (
4
4
"context"
5
"encoding/json"
6
"errors"
5
7
"net/http"
6
8
"os"
7
9
"sort"
@@ -37,6 +39,7 @@ func (s *Server) settings(w http.ResponseWriter, r *http.Request) {
37
39
v.Patterns, _ = s.Store.ProtectedPatterns(r.Context(), repo.ID)
38
40
v.TagPatterns, _ = s.Store.ProtectedTagPatterns(r.Context(), repo.ID)
39
41
v.Hooks = s.hookViews(r, "repo", repo.ID)
42
s.fillHookEdit(r, &v, "repo", repo.ID)
40
43
s.fillApproval(r, &v, repo)
41
44
}
42
45
s.render(w, "settings", v)
@@ -47,17 +50,140 @@ func (s *Server) hookViews(r *http.Request, kind string, id int64) []HookView {
47
50
if err != nil {
48
51
return nil
49
52
}
53
lang := s.langOf(r)
50
54
var out []HookView
51
55
for _, h := range hooks {
52
56
d, _ := s.Store.RecentDeliveries(r.Context(), h.ID)
53
57
out = append(out, HookView{
54
58
ID: h.ID, Name: h.Name, Preset: h.Preset, URL: h.URLTemplate, Method: h.Method,
55
Filter: h.BranchFilter, Events: strings.Join(h.Events, ", "), Deliveries: d,
59
Filter: h.BranchFilter, Events: strings.Join(h.Events, ", "),
60
Badges: eventBadges(lang, h.Events), Deliveries: d,
56
61
})
57
62
}
58
63
return out
59
64
}
60
65
66
func eventBadges(lang i18n.Lang, events []string) []string {
67
var out []string
68
for _, e := range events {
69
key := ""
70
switch e {
71
case webhook.EventPush:
72
key = "set.ev.push"
73
case webhook.EventMergeRequest:
74
key = "set.ev.mr"
75
case webhook.EventPipelineSuccess:
76
key = "set.ev.ok"
77
case webhook.EventPipelineFailure:
78
key = "set.ev.fail"
79
case webhook.EventRelease:
80
key = "set.ev.release"
81
}
82
if key == "" {
83
out = append(out, e)
84
continue
85
}
86
out = append(out, i18n.T(lang, key))
87
}
88
return out
89
}
90
91
func (s *Server) fillHookEdit(r *http.Request, v *View, kind string, id int64) {
92
if kind == "repo" && v.Tab != "webhooks" {
93
return
94
}
95
if kind == "group" && v.Tab != "settings" {
96
return
97
}
98
raw := strings.TrimSpace(r.URL.Query().Get("hook"))
99
if raw == "" {
100
return
101
}
102
hid, err := strconv.ParseInt(raw, 10, 64)
103
if err != nil || hid <= 0 {
104
return
105
}
106
h, err := s.Store.Webhook(r.Context(), kind, id, hid)
107
if err != nil {
108
return
109
}
110
v.HookEdit = draftFrom(h)
111
if v.HookEdit.Token != "" {
112
v.HookSecrets = keepToken(v.HookSecrets, v.HookEdit.Token)
113
}
114
}
115
116
func keepToken(in []SecretChoice, name string) []SecretChoice {
117
for _, c := range in {
118
if c.Name == name {
119
return in
120
}
121
}
122
return append(in, SecretChoice{Name: name, Label: name})
123
}
124
125
func draftFrom(h store.Webhook) HookDraft {
126
d := HookDraft{
127
ID: h.ID, Name: h.Name, Preset: h.Preset, Filter: h.BranchFilter, Method: h.Method,
128
}
129
var in webhook.Input
130
if h.Fields != "" && json.Unmarshal([]byte(h.Fields), &in) == nil {
131
d.URL, d.Username, d.Avatar, d.Icon, d.Alias = in.URL, in.Username, in.Avatar, in.Icon, in.Alias
132
d.Token, d.Chat, d.Server, d.Topic = in.Token, in.Chat, in.Server, in.Topic
133
d.Home, d.Room, d.CType, d.Headers, d.Body = in.Homeserver, in.Room, in.ContentType, in.Headers, in.Body
134
if in.Method != "" {
135
d.Method = in.Method
136
}
137
} else {
138
d.URL = h.URLTemplate
139
d.Body = h.BodyTemplate
140
d.Headers = headerLines(h.Headers)
141
d.CType = h.Headers["Content-Type"]
142
}
143
for _, e := range h.Events {
144
switch e {
145
case webhook.EventPush:
146
d.OnPush = true
147
case webhook.EventMergeRequest:
148
d.OnMR = true
149
case webhook.EventPipelineSuccess:
150
d.OnOK = true
151
case webhook.EventPipelineFailure:
152
d.OnFail = true
153
case webhook.EventRelease:
154
d.OnRel = true
155
}
156
}
157
if d.Preset == "" {
158
d.Preset = webhook.PresetCustom
159
}
160
if d.Method == "" {
161
d.Method = "POST"
162
}
163
return d
164
}
165
166
func headerLines(h map[string]string) string {
167
if len(h) == 0 {
168
return ""
169
}
170
keys := make([]string, 0, len(h))
171
for k := range h {
172
keys = append(keys, k)
173
}
174
sort.Strings(keys)
175
var b strings.Builder
176
for i, k := range keys {
177
if i > 0 {
178
b.WriteByte('\n')
179
}
180
b.WriteString(k)
181
b.WriteString(": ")
182
b.WriteString(h[k])
183
}
184
return b.String()
185
}
186
61
187
func (s *Server) updateRepo(w http.ResponseWriter, r *http.Request) {
62
188
_, repo, _, ok := s.guard(w, r, access.RoleMaintainer)
63
189
if !ok || !s.csrfOK(w, r) {
@@ -176,11 +302,72 @@ func (s *Server) secretPost(w http.ResponseWriter, r *http.Request, kind string)
176
302
}
177
303
back = strings.Split(back, "?")[0]
178
304
back += scopeTab(kind, "secrets")
179
if err := s.Store.PutSecret(r.Context(), kind, scopeID, strings.TrimSpace(r.FormValue("name")), r.FormValue("value"), r.FormValue("protected") == "1"); err != nil {
305
if kind == "group" {
306
back += "#secrets"
307
}
308
name := strings.TrimSpace(r.FormValue("name"))
309
value := r.FormValue("value")
310
protected := r.FormValue("protected") == "1"
311
flash := "flash.secretSaved"
312
var err error
313
switch r.FormValue("mode") {
314
case "update":
315
err = s.Store.UpdateSecret(r.Context(), kind, scopeID, name, value, protected)
316
case "replace":
317
err = s.Store.ReplaceSecret(r.Context(), kind, scopeID, name, value, protected)
318
flash = "flash.secretReplaced"
319
default:
320
err = s.Store.CreateSecret(r.Context(), kind, scopeID, name, value, protected, r.FormValue("invisible") == "1")
321
}
322
if err != nil {
180
323
s.redirect(w, r, back, "", s.trErr(r, err))
181
324
return
182
325
}
183
s.redirect(w, r, back, s.tr(r, "flash.secretSaved"), "")
326
s.redirect(w, r, back, s.tr(r, flash), "")
327
}
328
329
func (s *Server) repoSecretReveal(w http.ResponseWriter, r *http.Request) {
330
s.secretReveal(w, r, "repo")
331
}
332
333
func (s *Server) groupSecretReveal(w http.ResponseWriter, r *http.Request) {
334
s.secretReveal(w, r, "group")
335
}
336
337
func (s *Server) secretReveal(w http.ResponseWriter, r *http.Request, kind string) {
338
scopeID, _, ok := s.adminScope(w, r, kind)
339
if !ok || !s.csrfOK(w, r) {
340
return
341
}
342
value, err := s.Store.RevealSecret(r.Context(), kind, scopeID, strings.TrimSpace(r.FormValue("name")))
343
w.Header().Set("Content-Type", "application/json")
344
if err != nil {
345
s.writeSecretJSONErr(w, r, err)
346
return
347
}
348
_ = json.NewEncoder(w).Encode(map[string]string{"value": value})
349
}
350
351
func (s *Server) writeSecretJSONErr(w http.ResponseWriter, r *http.Request, err error) {
352
w.Header().Set("Content-Type", "application/json")
353
w.WriteHeader(secretStatus(err))
354
_ = json.NewEncoder(w).Encode(map[string]string{"error": s.trErr(r, err)})
355
}
356
357
func secretStatus(err error) int {
358
if store.Missing(err) {
359
return http.StatusNotFound
360
}
361
var ie i18n.Error
362
if errors.As(err, &ie) {
363
switch ie.Key {
364
case "err.secretHidden":
365
return http.StatusForbidden
366
case "err.secretExists", "err.secretVisible":
367
return http.StatusConflict
368
}
369
}
370
return http.StatusBadRequest
184
371
}
185
372
186
373
func (s *Server) secretDelete(w http.ResponseWriter, r *http.Request, kind string) {
@@ -211,13 +398,17 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
211
398
return
212
399
}
213
400
back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")
401
if kind == "group" {
402
back += "#webhooks"
403
}
214
404
var events []string
215
405
for _, e := range webhook.AllEvents() {
216
406
if r.FormValue("event_"+e) == "1" {
217
407
events = append(events, e)
218
408
}
219
409
}
220
_, err := s.createWebhookRecord(r.Context(), kind, scopeID, strings.TrimSpace(r.FormValue("name")), r.FormValue("preset"), r.FormValue("branch_filter"), events, webhook.Input{
410
id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
411
_, err := s.saveWebhookRecord(r.Context(), kind, scopeID, id, strings.TrimSpace(r.FormValue("name")), r.FormValue("preset"), r.FormValue("branch_filter"), events, webhook.Input{
221
412
URL: r.FormValue("url"), Username: r.FormValue("username"), Avatar: r.FormValue("avatar"),
222
413
Icon: r.FormValue("icon"), Alias: r.FormValue("alias"), Token: r.FormValue("token"),
223
414
Chat: r.FormValue("chat"), Server: r.FormValue("server"), Topic: r.FormValue("topic"),
@@ -233,6 +424,10 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string
233
424
}
234
425
235
426
func (s *Server) createWebhookRecord(ctx context.Context, kind string, scopeID int64, name, preset, filter string, events []string, in webhook.Input) (int64, error) {
427
return s.saveWebhookRecord(ctx, kind, scopeID, 0, name, preset, filter, events, in)
428
}
429
430
func (s *Server) saveWebhookRecord(ctx context.Context, kind string, scopeID, id int64, name, preset, filter string, events []string, in webhook.Input) (int64, error) {
236
431
if !webhook.KnownPreset(preset) {
237
432
return 0, i18n.E("err.preset")
238
433
}
@@ -247,11 +442,23 @@ func (s *Server) createWebhookRecord(ctx context.Context, kind string, scopeID i
247
442
if err != nil {
248
443
return 0, err
249
444
}
250
return s.Store.CreateWebhook(ctx, store.Webhook{
251
ScopeKind: kind, ScopeID: scopeID, Name: name,
445
raw, err := json.Marshal(in)
446
if err != nil {
447
return 0, err
448
}
449
rec := store.Webhook{
450
ID: id, ScopeKind: kind, ScopeID: scopeID, Name: name,
252
451
Preset: preset, URLTemplate: spec.URL, Headers: spec.Headers,
253
452
BodyTemplate: spec.Body, Events: events, BranchFilter: filter, Method: spec.Method,
254
})
453
Fields: string(raw),
454
}
455
if id > 0 {
456
if err := s.Store.UpdateWebhook(ctx, rec); err != nil {
457
return 0, err
458
}
459
return id, nil
460
}
461
return s.Store.CreateWebhook(ctx, rec)
255
462
}
256
463
257
464
func (s *Server) webhookDelete(w http.ResponseWriter, r *http.Request, kind string) {
@@ -409,6 +616,7 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
409
616
v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)
410
617
v.HookSecrets = s.groupSecretChoices(r, g)
411
618
v.Hooks = s.hookViews(r, "group", g.ID)
619
s.fillHookEdit(r, &v, "group", g.ID)
412
620
s.fillGroupApproval(r, &v, g)
413
621
if v.User != nil && v.User.ID == g.OwnerID {
414
622
v.IsOwner = true
@@ -2,6 +2,8 @@ package server2
2
3
import (3
import (4
"context"4
"context"5
"encoding/json"6
"errors"5
"net/http"7
"net/http"6
"os"8
"os"7
"sort"9
"sort"@@ -37,6 +39,7 @@ func (s *Server) settings(w http.ResponseWriter, r *http.Request) {37
v.Patterns, _ = s.Store.ProtectedPatterns(r.Context(), repo.ID)39
v.Patterns, _ = s.Store.ProtectedPatterns(r.Context(), repo.ID)38
v.TagPatterns, _ = s.Store.ProtectedTagPatterns(r.Context(), repo.ID)40
v.TagPatterns, _ = s.Store.ProtectedTagPatterns(r.Context(), repo.ID)39
v.Hooks = s.hookViews(r, "repo", repo.ID)41
v.Hooks = s.hookViews(r, "repo", repo.ID)42
s.fillHookEdit(r, &v, "repo", repo.ID)40
s.fillApproval(r, &v, repo)43
s.fillApproval(r, &v, repo)41
}44
}42
s.render(w, "settings", v)45
s.render(w, "settings", v)@@ -47,17 +50,140 @@ func (s *Server) hookViews(r *http.Request, kind string, id int64) []HookView {47
if err != nil {50
if err != nil {48
return nil51
return nil49
}52
}53
lang := s.langOf(r)50
var out []HookView54
var out []HookView51
for _, h := range hooks {55
for _, h := range hooks {52
d, _ := s.Store.RecentDeliveries(r.Context(), h.ID)56
d, _ := s.Store.RecentDeliveries(r.Context(), h.ID)53
out = append(out, HookView{57
out = append(out, HookView{54
ID: h.ID, Name: h.Name, Preset: h.Preset, URL: h.URLTemplate, Method: h.Method,58
ID: h.ID, Name: h.Name, Preset: h.Preset, URL: h.URLTemplate, Method: h.Method,55
Filter: h.BranchFilter, Events: strings.Join(h.Events, ", "), Deliveries: d,59
Filter: h.BranchFilter, Events: strings.Join(h.Events, ", "),60
Badges: eventBadges(lang, h.Events), Deliveries: d,56
})61
})57
}62
}58
return out63
return out59
}64
}60
65
66
func eventBadges(lang i18n.Lang, events []string) []string {67
var out []string68
for _, e := range events {69
key := ""70
switch e {71
case webhook.EventPush:72
key = "set.ev.push"73
case webhook.EventMergeRequest:74
key = "set.ev.mr"75
case webhook.EventPipelineSuccess:76
key = "set.ev.ok"77
case webhook.EventPipelineFailure:78
key = "set.ev.fail"79
case webhook.EventRelease:80
key = "set.ev.release"81
}82
if key == "" {83
out = append(out, e)84
continue85
}86
out = append(out, i18n.T(lang, key))87
}88
return out89
}90
91
func (s *Server) fillHookEdit(r *http.Request, v *View, kind string, id int64) {92
if kind == "repo" && v.Tab != "webhooks" {93
return94
}95
if kind == "group" && v.Tab != "settings" {96
return97
}98
raw := strings.TrimSpace(r.URL.Query().Get("hook"))99
if raw == "" {100
return101
}102
hid, err := strconv.ParseInt(raw, 10, 64)103
if err != nil || hid <= 0 {104
return105
}106
h, err := s.Store.Webhook(r.Context(), kind, id, hid)107
if err != nil {108
return109
}110
v.HookEdit = draftFrom(h)111
if v.HookEdit.Token != "" {112
v.HookSecrets = keepToken(v.HookSecrets, v.HookEdit.Token)113
}114
}115
116
func keepToken(in []SecretChoice, name string) []SecretChoice {117
for _, c := range in {118
if c.Name == name {119
return in120
}121
}122
return append(in, SecretChoice{Name: name, Label: name})123
}124
125
func draftFrom(h store.Webhook) HookDraft {126
d := HookDraft{127
ID: h.ID, Name: h.Name, Preset: h.Preset, Filter: h.BranchFilter, Method: h.Method,128
}129
var in webhook.Input130
if h.Fields != "" && json.Unmarshal([]byte(h.Fields), &in) == nil {131
d.URL, d.Username, d.Avatar, d.Icon, d.Alias = in.URL, in.Username, in.Avatar, in.Icon, in.Alias132
d.Token, d.Chat, d.Server, d.Topic = in.Token, in.Chat, in.Server, in.Topic133
d.Home, d.Room, d.CType, d.Headers, d.Body = in.Homeserver, in.Room, in.ContentType, in.Headers, in.Body134
if in.Method != "" {135
d.Method = in.Method136
}137
} else {138
d.URL = h.URLTemplate139
d.Body = h.BodyTemplate140
d.Headers = headerLines(h.Headers)141
d.CType = h.Headers["Content-Type"]142
}143
for _, e := range h.Events {144
switch e {145
case webhook.EventPush:146
d.OnPush = true147
case webhook.EventMergeRequest:148
d.OnMR = true149
case webhook.EventPipelineSuccess:150
d.OnOK = true151
case webhook.EventPipelineFailure:152
d.OnFail = true153
case webhook.EventRelease:154
d.OnRel = true155
}156
}157
if d.Preset == "" {158
d.Preset = webhook.PresetCustom159
}160
if d.Method == "" {161
d.Method = "POST"162
}163
return d164
}165
166
func headerLines(h map[string]string) string {167
if len(h) == 0 {168
return ""169
}170
keys := make([]string, 0, len(h))171
for k := range h {172
keys = append(keys, k)173
}174
sort.Strings(keys)175
var b strings.Builder176
for i, k := range keys {177
if i > 0 {178
b.WriteByte('\n')179
}180
b.WriteString(k)181
b.WriteString(": ")182
b.WriteString(h[k])183
}184
return b.String()185
}186
61
func (s *Server) updateRepo(w http.ResponseWriter, r *http.Request) {187
func (s *Server) updateRepo(w http.ResponseWriter, r *http.Request) {62
_, repo, _, ok := s.guard(w, r, access.RoleMaintainer)188
_, repo, _, ok := s.guard(w, r, access.RoleMaintainer)63
if !ok || !s.csrfOK(w, r) {189
if !ok || !s.csrfOK(w, r) {@@ -176,11 +302,72 @@ func (s *Server) secretPost(w http.ResponseWriter, r *http.Request, kind string)176
}302
}177
back = strings.Split(back, "?")[0]303
back = strings.Split(back, "?")[0]178
back += scopeTab(kind, "secrets")304
back += scopeTab(kind, "secrets")179
if err := s.Store.PutSecret(r.Context(), kind, scopeID, strings.TrimSpace(r.FormValue("name")), r.FormValue("value"), r.FormValue("protected") == "1"); err != nil {305
if kind == "group" {306
back += "#secrets"307
}308
name := strings.TrimSpace(r.FormValue("name"))309
value := r.FormValue("value")310
protected := r.FormValue("protected") == "1"311
flash := "flash.secretSaved"312
var err error313
switch r.FormValue("mode") {314
case "update":315
err = s.Store.UpdateSecret(r.Context(), kind, scopeID, name, value, protected)316
case "replace":317
err = s.Store.ReplaceSecret(r.Context(), kind, scopeID, name, value, protected)318
flash = "flash.secretReplaced"319
default:320
err = s.Store.CreateSecret(r.Context(), kind, scopeID, name, value, protected, r.FormValue("invisible") == "1")321
}322
if err != nil {180
s.redirect(w, r, back, "", s.trErr(r, err))323
s.redirect(w, r, back, "", s.trErr(r, err))181
return324
return182
}325
}183
s.redirect(w, r, back, s.tr(r, "flash.secretSaved"), "")326
s.redirect(w, r, back, s.tr(r, flash), "")327
}328
329
func (s *Server) repoSecretReveal(w http.ResponseWriter, r *http.Request) {330
s.secretReveal(w, r, "repo")331
}332
333
func (s *Server) groupSecretReveal(w http.ResponseWriter, r *http.Request) {334
s.secretReveal(w, r, "group")335
}336
337
func (s *Server) secretReveal(w http.ResponseWriter, r *http.Request, kind string) {338
scopeID, _, ok := s.adminScope(w, r, kind)339
if !ok || !s.csrfOK(w, r) {340
return341
}342
value, err := s.Store.RevealSecret(r.Context(), kind, scopeID, strings.TrimSpace(r.FormValue("name")))343
w.Header().Set("Content-Type", "application/json")344
if err != nil {345
s.writeSecretJSONErr(w, r, err)346
return347
}348
_ = json.NewEncoder(w).Encode(map[string]string{"value": value})349
}350
351
func (s *Server) writeSecretJSONErr(w http.ResponseWriter, r *http.Request, err error) {352
w.Header().Set("Content-Type", "application/json")353
w.WriteHeader(secretStatus(err))354
_ = json.NewEncoder(w).Encode(map[string]string{"error": s.trErr(r, err)})355
}356
357
func secretStatus(err error) int {358
if store.Missing(err) {359
return http.StatusNotFound360
}361
var ie i18n.Error362
if errors.As(err, &ie) {363
switch ie.Key {364
case "err.secretHidden":365
return http.StatusForbidden366
case "err.secretExists", "err.secretVisible":367
return http.StatusConflict368
}369
}370
return http.StatusBadRequest184
}371
}185
372
186
func (s *Server) secretDelete(w http.ResponseWriter, r *http.Request, kind string) {373
func (s *Server) secretDelete(w http.ResponseWriter, r *http.Request, kind string) {@@ -211,13 +398,17 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string211
return398
return212
}399
}213
back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")400
back = strings.Split(back, "?")[0] + scopeTab(kind, "webhooks")401
if kind == "group" {402
back += "#webhooks"403
}214
var events []string404
var events []string215
for _, e := range webhook.AllEvents() {405
for _, e := range webhook.AllEvents() {216
if r.FormValue("event_"+e) == "1" {406
if r.FormValue("event_"+e) == "1" {217
events = append(events, e)407
events = append(events, e)218
}408
}219
}409
}220
_, err := s.createWebhookRecord(r.Context(), kind, scopeID, strings.TrimSpace(r.FormValue("name")), r.FormValue("preset"), r.FormValue("branch_filter"), events, webhook.Input{410
id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)411
_, err := s.saveWebhookRecord(r.Context(), kind, scopeID, id, strings.TrimSpace(r.FormValue("name")), r.FormValue("preset"), r.FormValue("branch_filter"), events, webhook.Input{221
URL: r.FormValue("url"), Username: r.FormValue("username"), Avatar: r.FormValue("avatar"),412
URL: r.FormValue("url"), Username: r.FormValue("username"), Avatar: r.FormValue("avatar"),222
Icon: r.FormValue("icon"), Alias: r.FormValue("alias"), Token: r.FormValue("token"),413
Icon: r.FormValue("icon"), Alias: r.FormValue("alias"), Token: r.FormValue("token"),223
Chat: r.FormValue("chat"), Server: r.FormValue("server"), Topic: r.FormValue("topic"),414
Chat: r.FormValue("chat"), Server: r.FormValue("server"), Topic: r.FormValue("topic"),@@ -233,6 +424,10 @@ func (s *Server) webhookPost(w http.ResponseWriter, r *http.Request, kind string233
}424
}234
425
235
func (s *Server) createWebhookRecord(ctx context.Context, kind string, scopeID int64, name, preset, filter string, events []string, in webhook.Input) (int64, error) {426
func (s *Server) createWebhookRecord(ctx context.Context, kind string, scopeID int64, name, preset, filter string, events []string, in webhook.Input) (int64, error) {427
return s.saveWebhookRecord(ctx, kind, scopeID, 0, name, preset, filter, events, in)428
}429
430
func (s *Server) saveWebhookRecord(ctx context.Context, kind string, scopeID, id int64, name, preset, filter string, events []string, in webhook.Input) (int64, error) {236
if !webhook.KnownPreset(preset) {431
if !webhook.KnownPreset(preset) {237
return 0, i18n.E("err.preset")432
return 0, i18n.E("err.preset")238
}433
}@@ -247,11 +442,23 @@ func (s *Server) createWebhookRecord(ctx context.Context, kind string, scopeID i247
if err != nil {442
if err != nil {248
return 0, err443
return 0, err249
}444
}250
return s.Store.CreateWebhook(ctx, store.Webhook{445
raw, err := json.Marshal(in)251
ScopeKind: kind, ScopeID: scopeID, Name: name,446
if err != nil {447
return 0, err448
}449
rec := store.Webhook{450
ID: id, ScopeKind: kind, ScopeID: scopeID, Name: name,252
Preset: preset, URLTemplate: spec.URL, Headers: spec.Headers,451
Preset: preset, URLTemplate: spec.URL, Headers: spec.Headers,253
BodyTemplate: spec.Body, Events: events, BranchFilter: filter, Method: spec.Method,452
BodyTemplate: spec.Body, Events: events, BranchFilter: filter, Method: spec.Method,254
})453
Fields: string(raw),454
}455
if id > 0 {456
if err := s.Store.UpdateWebhook(ctx, rec); err != nil {457
return 0, err458
}459
return id, nil460
}461
return s.Store.CreateWebhook(ctx, rec)255
}462
}256
463
257
func (s *Server) webhookDelete(w http.ResponseWriter, r *http.Request, kind string) {464
func (s *Server) webhookDelete(w http.ResponseWriter, r *http.Request, kind string) {@@ -409,6 +616,7 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {409
v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)616
v.Secrets, _ = s.Store.ListSecrets(r.Context(), "group", g.ID)410
v.HookSecrets = s.groupSecretChoices(r, g)617
v.HookSecrets = s.groupSecretChoices(r, g)411
v.Hooks = s.hookViews(r, "group", g.ID)618
v.Hooks = s.hookViews(r, "group", g.ID)619
s.fillHookEdit(r, &v, "group", g.ID)412
s.fillGroupApproval(r, &v, g)620
s.fillGroupApproval(r, &v, g)413
if v.User != nil && v.User.ID == g.OwnerID {621
if v.User != nil && v.User.ID == g.OwnerID {414
v.IsOwner = true622
v.IsOwner = true@@ -0,0 +1,36 @@
1
(function () {
2
var root = document.querySelector("[data-reveal-url]");
3
if (!root) {
4
return;
5
}
6
var csrfEl = document.querySelector("[data-secret-csrf]");
7
root.querySelectorAll("[data-reveal]").forEach(function (btn) {
8
btn.addEventListener("click", function () {
9
var row = btn.closest("tr");
10
var out = row && row.querySelector("[data-revealed]");
11
if (!out) {
12
return;
13
}
14
var csrf = csrfEl ? csrfEl.value : "";
15
var body = "csrf=" + encodeURIComponent(csrf) + "&name=" + encodeURIComponent(btn.getAttribute("data-reveal") || "");
16
fetch(root.getAttribute("data-reveal-url"), {
17
method: "POST",
18
headers: { "Content-Type": "application/x-www-form-urlencoded" },
19
body: body
20
}).then(function (res) {
21
return res.text().then(function (text) {
22
var data = {};
23
try {
24
data = JSON.parse(text);
25
} catch (e) {
26
data = { error: text };
27
}
28
return { ok: res.ok, data: data };
29
});
30
}).then(function (r) {
31
out.hidden = false;
32
out.textContent = r.ok ? (r.data.value || "") : (r.data.error || "");
33
});
34
});
35
});
36
})();
@@ -0,0 +1,36 @@1
(function () {2
var root = document.querySelector("[data-reveal-url]");3
if (!root) {4
return;5
}6
var csrfEl = document.querySelector("[data-secret-csrf]");7
root.querySelectorAll("[data-reveal]").forEach(function (btn) {8
btn.addEventListener("click", function () {9
var row = btn.closest("tr");10
var out = row && row.querySelector("[data-revealed]");11
if (!out) {12
return;13
}14
var csrf = csrfEl ? csrfEl.value : "";15
var body = "csrf=" + encodeURIComponent(csrf) + "&name=" + encodeURIComponent(btn.getAttribute("data-reveal") || "");16
fetch(root.getAttribute("data-reveal-url"), {17
method: "POST",18
headers: { "Content-Type": "application/x-www-form-urlencoded" },19
body: body20
}).then(function (res) {21
return res.text().then(function (text) {22
var data = {};23
try {24
data = JSON.parse(text);25
} catch (e) {26
data = { error: text };27
}28
return { ok: res.ok, data: data };29
});30
}).then(function (r) {31
out.hidden = false;32
out.textContent = r.ok ? (r.data.value || "") : (r.data.error || "");33
});34
});35
});36
})();@@ -842,6 +842,33 @@ form.wh.secret-ready .secret-custom { display: block; }
842
842
}
843
843
.secret-menu li button:hover { background: var(--blue-soft); }
844
844
.secret-menu input { width: 100%; margin-bottom: var(--sp-2); }
845
button.tiny, a.tiny, summary.tiny {
846
min-height: 1.75rem; padding: 0 0.55rem; font-size: 0.82rem; width: auto;
847
}
848
button.fit, a.fit { width: auto; }
849
summary.ghost {
850
background: transparent; color: var(--ink); border: 1px solid var(--line);
851
border-radius: var(--radius); display: inline-flex; align-items: center; justify-content: center;
852
font: inherit; cursor: pointer; list-style: none;
853
}
854
summary.ghost::-webkit-details-marker { display: none; }
855
.acts { display: flex; gap: 0.35rem; align-items: center; flex-wrap: wrap; }
856
.acts > * { flex: none; }
857
.evgrid {
858
display: grid; grid-template-columns: repeat(auto-fill, minmax(12rem, 1fr));
859
gap: 0.2rem 0.8rem; margin: 0.35rem 0 0.6rem;
860
}
861
.evgrid label { margin: 0; }
862
form.wh textarea, form.secret textarea, .hooktable textarea { min-height: 4.5rem; }
863
form.wh .grid-2 label { margin-top: 0; }
864
.urlclip {
865
display: inline-block; max-width: 16rem; overflow: hidden;
866
text-overflow: ellipsis; white-space: nowrap; vertical-align: bottom;
867
}
868
.hooktable { background: var(--card); }
869
.hooktable .pill { display: inline-block; margin: 0 0.25rem 0.25rem 0; }
870
.hooktable details[open] > form { display: block; margin-top: 0.45rem; min-width: 16rem; white-space: normal; }
871
.secretvalue { display: block; margin-top: 0.35rem; white-space: pre-wrap; word-break: break-all; font-family: var(--mono); }
845
872
846
873
@media (max-width: 800px) {
847
874
.proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }
@@ -842,6 +842,33 @@ form.wh.secret-ready .secret-custom { display: block; }842
}842
}843
.secret-menu li button:hover { background: var(--blue-soft); }843
.secret-menu li button:hover { background: var(--blue-soft); }844
.secret-menu input { width: 100%; margin-bottom: var(--sp-2); }844
.secret-menu input { width: 100%; margin-bottom: var(--sp-2); }845
button.tiny, a.tiny, summary.tiny {846
min-height: 1.75rem; padding: 0 0.55rem; font-size: 0.82rem; width: auto;847
}848
button.fit, a.fit { width: auto; }849
summary.ghost {850
background: transparent; color: var(--ink); border: 1px solid var(--line);851
border-radius: var(--radius); display: inline-flex; align-items: center; justify-content: center;852
font: inherit; cursor: pointer; list-style: none;853
}854
summary.ghost::-webkit-details-marker { display: none; }855
.acts { display: flex; gap: 0.35rem; align-items: center; flex-wrap: wrap; }856
.acts > * { flex: none; }857
.evgrid {858
display: grid; grid-template-columns: repeat(auto-fill, minmax(12rem, 1fr));859
gap: 0.2rem 0.8rem; margin: 0.35rem 0 0.6rem;860
}861
.evgrid label { margin: 0; }862
form.wh textarea, form.secret textarea, .hooktable textarea { min-height: 4.5rem; }863
form.wh .grid-2 label { margin-top: 0; }864
.urlclip {865
display: inline-block; max-width: 16rem; overflow: hidden;866
text-overflow: ellipsis; white-space: nowrap; vertical-align: bottom;867
}868
.hooktable { background: var(--card); }869
.hooktable .pill { display: inline-block; margin: 0 0.25rem 0.25rem 0; }870
.hooktable details[open] > form { display: block; margin-top: 0.45rem; min-width: 16rem; white-space: normal; }871
.secretvalue { display: block; margin-top: 0.35rem; white-space: pre-wrap; word-break: break-all; font-family: var(--mono); }845
872
846
@media (max-width: 800px) {873
@media (max-width: 800px) {847
.proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }874
.proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }@@ -479,17 +479,7 @@
479
479
</li>{{end}}</ul>
480
480
<p class="muted">{{t "set.tagHint"}}</p>
481
481
{{else if eq .Tab "secrets"}}
482
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/secrets">
483
<input type="hidden" name="csrf" value="{{.CSRF}}">
484
<label>{{t "set.secretName"}} <input name="name" placeholder="DEPLOY_SSH_KEY" required></label>
485
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>
486
<label class="row"><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>
487
<button type="submit">{{t "action.save"}}</button>
488
</form>
489
<ul class="clean">{{range .Secrets}}<li><code>{{.Name}}</code> {{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}
490
<form method="post" action="/{{$.Repo.FullPath}}/-/secrets/delete"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>
491
</li>{{end}}</ul>
492
<p class="muted">{{t "set.valuesHidden"}}</p>
482
{{template "secretpanel" .}}
493
483
{{else if eq .Tab "webhooks"}}
494
484
{{template "webhookform" .}}
495
485
{{else if eq .Tab "approvals"}}
@@ -518,39 +508,114 @@
518
508
{{template "layout-end" .}}
519
509
{{end}}
520
510
511
{{define "secretpanel"}}
512
<form class="panel secret" id="secrets" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/secrets{{else}}/groups/{{.Group.Path}}/secrets{{end}}">
513
<input type="hidden" name="csrf" value="{{.CSRF}}" data-secret-csrf>
514
<label>{{t "set.secretName"}} <input name="name" placeholder="DEPLOY_SSH_KEY" required></label>
515
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>
516
<div class="evgrid">
517
<label><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>
518
<label><input type="checkbox" name="invisible" value="1"> {{t "set.invisible"}}</label>
519
</div>
520
<p class="muted">{{t "set.invisibleHint"}}</p>
521
<button class="fit" type="submit">{{t "action.save"}}</button>
522
</form>
523
{{if .Secrets}}
524
<div class="hscroll">
525
<table class="hooktable" data-reveal-url="{{if .Repo}}/{{.Repo.FullPath}}/-/secrets/reveal{{else}}/groups/{{.Group.Path}}/secrets/reveal{{end}}">
526
<thead><tr>
527
<th>{{t "set.secretName"}}</th>
528
<th>{{t "wh.flags"}}</th>
529
<th>{{t "wh.actions"}}</th>
530
</tr></thead>
531
<tbody>
532
{{range .Secrets}}<tr>
533
<td><code>{{.Name}}</code></td>
534
<td>
535
{{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}
536
{{if .Invisible}}<span class="pill">{{t "set.invisible"}}</span>{{end}}
537
</td>
538
<td>
539
<div class="acts">
540
{{if .Invisible}}
541
<details>
542
<summary class="ghost tiny">{{t "action.replace"}}</summary>
543
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/secrets{{else}}/groups/{{$.Group.Path}}/secrets{{end}}">
544
<input type="hidden" name="csrf" value="{{$.CSRF}}">
545
<input type="hidden" name="mode" value="replace">
546
<input type="hidden" name="name" value="{{.Name}}">
547
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>
548
<label><input type="checkbox" name="protected" value="1" {{if .Protected}}checked{{end}}> {{t "set.protectedOnly"}}</label>
549
<button class="tiny" type="submit">{{t "action.replace"}}</button>
550
</form>
551
</details>
552
{{else}}
553
<button type="button" class="ghost tiny" data-reveal="{{.Name}}">{{t "action.show"}}</button>
554
<details>
555
<summary class="ghost tiny">{{t "action.edit"}}</summary>
556
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/secrets{{else}}/groups/{{$.Group.Path}}/secrets{{end}}">
557
<input type="hidden" name="csrf" value="{{$.CSRF}}">
558
<input type="hidden" name="mode" value="update">
559
<input type="hidden" name="name" value="{{.Name}}">
560
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>
561
<label><input type="checkbox" name="protected" value="1" {{if .Protected}}checked{{end}}> {{t "set.protectedOnly"}}</label>
562
<button class="tiny" type="submit">{{t "action.save"}}</button>
563
</form>
564
</details>
565
{{end}}
566
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/secrets/delete{{else}}/groups/{{$.Group.Path}}/secrets/delete{{end}}">
567
<input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}">
568
<button class="ghost tiny" type="submit">{{t "action.remove"}}</button>
569
</form>
570
</div>
571
<div class="secretvalue" data-revealed hidden></div>
572
</td>
573
</tr>{{end}}
574
</tbody>
575
</table>
576
</div>
577
{{end}}
578
<p class="muted">{{t "set.valuesHidden"}}</p>
579
<script src="/assets/secrets.js"></script>
580
{{end}}
581
521
582
{{define "webhookform"}}
522
<form class="panel wh" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/webhooks{{else}}/groups/{{.Group.Path}}/webhooks{{end}}" data-preset="custom">
583
<div id="webhooks">
584
<form class="panel wh" id="webhook-form" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/webhooks{{else}}/groups/{{.Group.Path}}/webhooks{{end}}" data-preset="{{if .HookEdit.ID}}{{.HookEdit.Preset}}{{else}}custom{{end}}">
523
585
<input type="hidden" name="csrf" value="{{.CSRF}}">
524
<label>{{t "set.whName"}} <input name="name" required></label>
586
{{if .HookEdit.ID}}<input type="hidden" name="id" value="{{.HookEdit.ID}}"><h2>{{t "wh.edit"}}</h2>{{end}}
587
<div class="grid-2">
588
<label>{{t "set.whName"}} <input name="name" value="{{.HookEdit.Name}}" required></label>
525
589
<label>{{t "set.preset"}}
526
590
<select name="preset" data-preset-select>
527
<option value="custom" selected>{{t "set.preset.custom"}}</option>
528
<option value="generic">{{t "set.preset.generic"}}</option>
529
<option value="discord">{{t "set.preset.discord"}}</option>
530
<option value="slack">{{t "set.preset.slack"}}</option>
531
<option value="teams">{{t "set.preset.teams"}}</option>
532
<option value="mattermost">{{t "set.preset.mattermost"}}</option>
533
<option value="rocketchat">{{t "set.preset.rocketchat"}}</option>
534
<option value="telegram">{{t "set.preset.telegram"}}</option>
535
<option value="matrix">{{t "set.preset.matrix"}}</option>
536
<option value="googlechat">{{t "set.preset.googlechat"}}</option>
537
<option value="ntfy">{{t "set.preset.ntfy"}}</option>
538
<option value="gotify">{{t "set.preset.gotify"}}</option>
539
<option value="grok">{{t "set.preset.grok"}}</option>
591
<option value="custom" {{if or (eq .HookEdit.ID 0) (eq .HookEdit.Preset "custom")}}selected{{end}}>{{t "set.preset.custom"}}</option>
592
<option value="generic" {{if eq .HookEdit.Preset "generic"}}selected{{end}}>{{t "set.preset.generic"}}</option>
593
<option value="discord" {{if eq .HookEdit.Preset "discord"}}selected{{end}}>{{t "set.preset.discord"}}</option>
594
<option value="slack" {{if eq .HookEdit.Preset "slack"}}selected{{end}}>{{t "set.preset.slack"}}</option>
595
<option value="teams" {{if eq .HookEdit.Preset "teams"}}selected{{end}}>{{t "set.preset.teams"}}</option>
596
<option value="mattermost" {{if eq .HookEdit.Preset "mattermost"}}selected{{end}}>{{t "set.preset.mattermost"}}</option>
597
<option value="rocketchat" {{if eq .HookEdit.Preset "rocketchat"}}selected{{end}}>{{t "set.preset.rocketchat"}}</option>
598
<option value="telegram" {{if eq .HookEdit.Preset "telegram"}}selected{{end}}>{{t "set.preset.telegram"}}</option>
599
<option value="matrix" {{if eq .HookEdit.Preset "matrix"}}selected{{end}}>{{t "set.preset.matrix"}}</option>
600
<option value="googlechat" {{if eq .HookEdit.Preset "googlechat"}}selected{{end}}>{{t "set.preset.googlechat"}}</option>
601
<option value="ntfy" {{if eq .HookEdit.Preset "ntfy"}}selected{{end}}>{{t "set.preset.ntfy"}}</option>
602
<option value="gotify" {{if eq .HookEdit.Preset "gotify"}}selected{{end}}>{{t "set.preset.gotify"}}</option>
603
<option value="grok" {{if eq .HookEdit.Preset "grok"}}selected{{end}}>{{t "set.preset.grok"}}</option>
540
604
</select>
541
605
</label>
542
<label class="wh-field for-discord for-slack for-teams for-mattermost for-rocketchat for-googlechat">{{t "wh.webhookURL"}} <input name="url" placeholder="https://example.test/hook" required disabled></label>
543
<label class="wh-field for-generic for-grok for-custom">{{t "wh.url"}} <input name="url" placeholder="https://example.test/hook" required></label>
544
<label class="wh-field for-discord">{{t "wh.username"}} <input name="username" disabled></label>
545
<label class="wh-field for-discord">{{t "wh.avatar"}} <input name="avatar" placeholder="https://example.test/avatar.png" 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>
548
<label class="wh-field for-rocketchat">{{t "wh.alias"}} <input name="alias" disabled></label>
606
</div>
607
<label class="wh-field for-discord for-slack for-teams for-mattermost for-rocketchat for-googlechat">{{t "wh.webhookURL"}} <input name="url" value="{{.HookEdit.URL}}" placeholder="https://example.test/hook" required disabled></label>
608
<label class="wh-field for-generic for-grok for-custom">{{t "wh.url"}} <input name="url" value="{{.HookEdit.URL}}" placeholder="https://example.test/hook" required></label>
609
<label class="wh-field for-discord">{{t "wh.username"}} <input name="username" disabled value="{{.HookEdit.Username}}"></label>
610
<label class="wh-field for-discord">{{t "wh.avatar"}} <input name="avatar" value="{{.HookEdit.Avatar}}" placeholder="https://example.test/avatar.png" disabled></label>
611
<label class="wh-field for-mattermost">{{t "wh.username"}} <input name="username" disabled value="{{.HookEdit.Username}}"></label>
612
<label class="wh-field for-mattermost">{{t "wh.icon"}} <input name="icon" value="{{.HookEdit.Icon}}" placeholder="https://example.test/icon.png" disabled></label>
613
<label class="wh-field for-rocketchat">{{t "wh.alias"}} <input name="alias" value="{{.HookEdit.Alias}}" disabled></label>
549
614
<div class="wh-field secret-pick for-telegram for-matrix for-gotify for-grok for-ntfy">
550
615
<span class="fieldlabel">{{t "wh.token"}}</span>
551
616
<select class="secret-native" name="token">
552
<option value="">{{t "wh.noSecret"}}</option>
553
{{range .HookSecrets}}<option value="{{.Name}}">{{.Name}} · {{.Label}}</option>{{end}}
617
<option value="" {{if eq $.HookEdit.Token ""}}selected{{end}}>{{t "wh.noSecret"}}</option>
618
{{range .HookSecrets}}<option value="{{.Name}}" {{if eq $.HookEdit.Token .Name}}selected{{end}}>{{.Name}} · {{.Label}}</option>{{end}}
554
619
</select>
555
620
<div class="secret-custom">
556
621
<button type="button" class="secret-toggle" data-secret-button data-empty="{{t "wh.noSecret"}}">{{t "wh.noSecret"}}</button>
@@ -564,44 +629,68 @@
564
629
</div>
565
630
<span class="muted">{{t "wh.tokenHint"}}</span>
566
631
</div>
567
<label class="wh-field for-telegram">{{t "wh.chat"}} <input name="chat" required disabled></label>
568
<label class="wh-field for-ntfy">{{t "wh.server"}} <input name="server" placeholder="https://ntfy.sh" disabled></label>
569
<label class="wh-field for-gotify">{{t "wh.server"}} <input name="server" placeholder="https://gotify.example" required disabled></label>
570
<label class="wh-field for-ntfy">{{t "wh.topic"}} <input name="topic" required disabled></label>
571
<label class="wh-field for-matrix">{{t "wh.homeserver"}} <input name="homeserver" placeholder="https://matrix.example" required disabled></label>
572
<label class="wh-field for-matrix">{{t "wh.room"}} <input name="room" placeholder="!room:example.org" required disabled></label>
632
<label class="wh-field for-telegram">{{t "wh.chat"}} <input name="chat" value="{{.HookEdit.Chat}}" required disabled></label>
633
<label class="wh-field for-ntfy">{{t "wh.server"}} <input name="server" value="{{.HookEdit.Server}}" placeholder="https://ntfy.sh" disabled></label>
634
<label class="wh-field for-gotify">{{t "wh.server"}} <input name="server" value="{{.HookEdit.Server}}" placeholder="https://gotify.example" required disabled></label>
635
<label class="wh-field for-ntfy">{{t "wh.topic"}} <input name="topic" value="{{.HookEdit.Topic}}" required disabled></label>
636
<label class="wh-field for-matrix">{{t "wh.homeserver"}} <input name="homeserver" value="{{.HookEdit.Home}}" placeholder="https://matrix.example" required disabled></label>
637
<label class="wh-field for-matrix">{{t "wh.room"}} <input name="room" value="{{.HookEdit.Room}}" placeholder="!room:example.org" required disabled></label>
573
638
<label class="wh-field for-custom">{{t "wh.method"}}
574
639
<select name="method">
575
<option>POST</option>
576
<option>PUT</option>
577
<option>PATCH</option>
578
<option>GET</option>
640
<option {{if or (eq .HookEdit.Method "") (eq .HookEdit.Method "POST")}}selected{{end}}>POST</option>
641
<option {{if eq .HookEdit.Method "PUT"}}selected{{end}}>PUT</option>
642
<option {{if eq .HookEdit.Method "PATCH"}}selected{{end}}>PATCH</option>
643
<option {{if eq .HookEdit.Method "GET"}}selected{{end}}>GET</option>
579
644
</select>
580
645
</label>
581
<label class="wh-field for-custom">{{t "wh.contentType"}} <input name="content_type" placeholder="application/json"></label>
582
<label class="wh-field for-custom">{{t "wh.headers"}} <textarea name="headers" placeholder="Authorization: Bearer {{"{{secret.NAME}}"}}"></textarea> <span class="muted">{{t "wh.headerHint"}}</span></label>
583
<label class="wh-field for-custom">{{t "wh.body"}} <textarea name="body"></textarea> <span class="muted">{{t "wh.bodyHint"}}</span></label>
584
<label>{{t "set.branchFilter"}} <input name="branch_filter" placeholder="{{t "set.filterHint"}}"></label>
585
<fieldset>
586
<label><input type="checkbox" name="event_push" value="1"> {{t "set.ev.push"}}</label>
587
<label><input type="checkbox" name="event_merge_request" value="1"> {{t "set.ev.mr"}}</label>
588
<label><input type="checkbox" name="event_pipeline_success" value="1"> {{t "set.ev.ok"}}</label>
589
<label><input type="checkbox" name="event_pipeline_failure" value="1"> {{t "set.ev.fail"}}</label>
590
<label><input type="checkbox" name="event_release_published" value="1"> {{t "set.ev.release"}}</label>
591
</fieldset>
592
<button type="submit">{{t "set.saveWebhook"}}</button>
646
<label class="wh-field for-custom">{{t "wh.contentType"}} <input name="content_type" value="{{.HookEdit.CType}}" placeholder="application/json"></label>
647
<label class="wh-field for-custom">{{t "wh.headers"}} <textarea name="headers" placeholder="Authorization: Bearer {{"{{secret.NAME}}"}}">{{.HookEdit.Headers}}</textarea> <span class="muted">{{t "wh.headerHint"}}</span></label>
648
<label class="wh-field for-custom">{{t "wh.body"}} <textarea name="body">{{.HookEdit.Body}}</textarea> <span class="muted">{{t "wh.bodyHint"}}</span></label>
649
<label>{{t "set.branchFilter"}} <input name="branch_filter" value="{{.HookEdit.Filter}}" placeholder="{{t "set.filterHint"}}"></label>
650
<div class="evgrid">
651
<label><input type="checkbox" name="event_push" value="1" {{if .HookEdit.OnPush}}checked{{end}}> {{t "set.ev.push"}}</label>
652
<label><input type="checkbox" name="event_merge_request" value="1" {{if .HookEdit.OnMR}}checked{{end}}> {{t "set.ev.mr"}}</label>
653
<label><input type="checkbox" name="event_pipeline_success" value="1" {{if .HookEdit.OnOK}}checked{{end}}> {{t "set.ev.ok"}}</label>
654
<label><input type="checkbox" name="event_pipeline_failure" value="1" {{if .HookEdit.OnFail}}checked{{end}}> {{t "set.ev.fail"}}</label>
655
<label><input type="checkbox" name="event_release_published" value="1" {{if .HookEdit.OnRel}}checked{{end}}> {{t "set.ev.release"}}</label>
656
</div>
657
<div class="acts">
658
<button class="fit" type="submit">{{if .HookEdit.ID}}{{t "wh.update"}}{{else}}{{t "set.saveWebhook"}}{{end}}</button>
659
{{if .HookEdit.ID}}<a class="btn ghost tiny" href="{{if .Repo}}/{{.Repo.FullPath}}/-/settings?tab=webhooks{{else}}/groups/{{.Group.Path}}?tab=settings#webhooks{{end}}">{{t "action.cancel"}}</a>{{end}}
660
</div>
593
661
</form>
594
662
<script src="/assets/webhook.js"></script>
595
<ul class="clean">
596
{{range .Hooks}}<li><strong>{{.Name}}</strong> {{presetName .Preset}} <span class="muted">{{.Method}} {{.URL}}</span>
597
<div class="muted">{{.Events}} {{if .Filter}}· filter {{.Filter}}{{end}}</div>
598
{{range .Deliveries}}<div class="muted">{{.EventType}} → {{.StatusCode}} {{.Error}}</div>{{end}}
599
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/webhooks/delete{{else}}/groups/{{$.Group.Path}}/webhooks/delete{{end}}">
600
<input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
601
<button class="ghost" type="submit">{{t "action.remove"}}</button>
602
</form>
603
</li>{{end}}
604
</ul>
663
{{if .Hooks}}
664
<div class="hscroll">
665
<table class="hooktable">
666
<thead><tr>
667
<th>{{t "set.whName"}}</th>
668
<th>{{t "wh.url"}}</th>
669
<th>{{t "wh.events"}}</th>
670
<th>{{t "wh.actions"}}</th>
671
</tr></thead>
672
<tbody>
673
{{range .Hooks}}<tr>
674
<td>{{.Name}} <span class="muted">{{presetName .Preset}}</span></td>
675
<td><span class="urlclip" data-tip="{{.Method}} {{.URL}}" title="{{.Method}} {{.URL}}">{{.Method}} {{.URL}}</span></td>
676
<td>{{range .Badges}}<span class="pill">{{.}}</span>{{end}}{{if .Filter}}<span class="pill">{{.Filter}}</span>{{end}}</td>
677
<td>
678
<div class="acts">
679
<a class="btn ghost tiny" href="{{if $.Repo}}/{{$.Repo.FullPath}}/-/settings?tab=webhooks&hook={{.ID}}{{else}}/groups/{{$.Group.Path}}?tab=settings&hook={{.ID}}{{end}}#webhook-form">{{t "action.edit"}}</a>
680
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/webhooks/delete{{else}}/groups/{{$.Group.Path}}/webhooks/delete{{end}}">
681
<input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">
682
<button class="ghost tiny" type="submit">{{t "action.remove"}}</button>
683
</form>
684
</div>
685
</td>
686
</tr>
687
{{if .Deliveries}}<tr><td colspan="4" class="muted">{{range .Deliveries}}<span>{{.EventType}} → {{.StatusCode}} {{.Error}}</span> {{end}}</td></tr>{{end}}
688
{{end}}
689
</tbody>
690
</table>
691
</div>
692
{{end}}
693
</div>
605
694
{{end}}
606
695
607
696
{{define "group"}}
@@ -653,17 +742,7 @@
653
742
<button type="submit">{{t "action.save"}}</button>
654
743
</form>
655
744
<h2>{{t "set.secrets"}}</h2>
656
<form class="panel" method="post" action="/groups/{{.Group.Path}}/secrets">
657
<input type="hidden" name="csrf" value="{{.CSRF}}">
658
<label>{{t "set.secretName"}} <input name="name" required></label>
659
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>
660
<label class="row"><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>
661
<button type="submit">{{t "action.save"}}</button>
662
</form>
663
<ul class="clean">{{range .Secrets}}<li><code>{{.Name}}</code>
664
<form method="post" action="/groups/{{$.Group.Path}}/secrets/delete"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>
665
</li>{{end}}</ul>
666
<p class="muted">{{t "set.valuesHidden"}}</p>
745
{{template "secretpanel" .}}
667
746
{{if .IsOwner}}
668
747
<h2>{{t "own.transfer"}}</h2>
669
748
{{if .Candidates}}
@@ -479,17 +479,7 @@479
</li>{{end}}</ul>479
</li>{{end}}</ul>480
<p class="muted">{{t "set.tagHint"}}</p>480
<p class="muted">{{t "set.tagHint"}}</p>481
{{else if eq .Tab "secrets"}}481
{{else if eq .Tab "secrets"}}482
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/secrets">482
{{template "secretpanel" .}}483
<input type="hidden" name="csrf" value="{{.CSRF}}">484
<label>{{t "set.secretName"}} <input name="name" placeholder="DEPLOY_SSH_KEY" required></label>485
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>486
<label class="row"><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>487
<button type="submit">{{t "action.save"}}</button>488
</form>489
<ul class="clean">{{range .Secrets}}<li><code>{{.Name}}</code> {{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}490
<form method="post" action="/{{$.Repo.FullPath}}/-/secrets/delete"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>491
</li>{{end}}</ul>492
<p class="muted">{{t "set.valuesHidden"}}</p>493
{{else if eq .Tab "webhooks"}}483
{{else if eq .Tab "webhooks"}}494
{{template "webhookform" .}}484
{{template "webhookform" .}}495
{{else if eq .Tab "approvals"}}485
{{else if eq .Tab "approvals"}}@@ -518,39 +508,114 @@518
{{template "layout-end" .}}508
{{template "layout-end" .}}519
{{end}}509
{{end}}520
510
511
{{define "secretpanel"}}512
<form class="panel secret" id="secrets" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/secrets{{else}}/groups/{{.Group.Path}}/secrets{{end}}">513
<input type="hidden" name="csrf" value="{{.CSRF}}" data-secret-csrf>514
<label>{{t "set.secretName"}} <input name="name" placeholder="DEPLOY_SSH_KEY" required></label>515
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>516
<div class="evgrid">517
<label><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>518
<label><input type="checkbox" name="invisible" value="1"> {{t "set.invisible"}}</label>519
</div>520
<p class="muted">{{t "set.invisibleHint"}}</p>521
<button class="fit" type="submit">{{t "action.save"}}</button>522
</form>523
{{if .Secrets}}524
<div class="hscroll">525
<table class="hooktable" data-reveal-url="{{if .Repo}}/{{.Repo.FullPath}}/-/secrets/reveal{{else}}/groups/{{.Group.Path}}/secrets/reveal{{end}}">526
<thead><tr>527
<th>{{t "set.secretName"}}</th>528
<th>{{t "wh.flags"}}</th>529
<th>{{t "wh.actions"}}</th>530
</tr></thead>531
<tbody>532
{{range .Secrets}}<tr>533
<td><code>{{.Name}}</code></td>534
<td>535
{{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}536
{{if .Invisible}}<span class="pill">{{t "set.invisible"}}</span>{{end}}537
</td>538
<td>539
<div class="acts">540
{{if .Invisible}}541
<details>542
<summary class="ghost tiny">{{t "action.replace"}}</summary>543
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/secrets{{else}}/groups/{{$.Group.Path}}/secrets{{end}}">544
<input type="hidden" name="csrf" value="{{$.CSRF}}">545
<input type="hidden" name="mode" value="replace">546
<input type="hidden" name="name" value="{{.Name}}">547
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>548
<label><input type="checkbox" name="protected" value="1" {{if .Protected}}checked{{end}}> {{t "set.protectedOnly"}}</label>549
<button class="tiny" type="submit">{{t "action.replace"}}</button>550
</form>551
</details>552
{{else}}553
<button type="button" class="ghost tiny" data-reveal="{{.Name}}">{{t "action.show"}}</button>554
<details>555
<summary class="ghost tiny">{{t "action.edit"}}</summary>556
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/secrets{{else}}/groups/{{$.Group.Path}}/secrets{{end}}">557
<input type="hidden" name="csrf" value="{{$.CSRF}}">558
<input type="hidden" name="mode" value="update">559
<input type="hidden" name="name" value="{{.Name}}">560
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>561
<label><input type="checkbox" name="protected" value="1" {{if .Protected}}checked{{end}}> {{t "set.protectedOnly"}}</label>562
<button class="tiny" type="submit">{{t "action.save"}}</button>563
</form>564
</details>565
{{end}}566
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/secrets/delete{{else}}/groups/{{$.Group.Path}}/secrets/delete{{end}}">567
<input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}">568
<button class="ghost tiny" type="submit">{{t "action.remove"}}</button>569
</form>570
</div>571
<div class="secretvalue" data-revealed hidden></div>572
</td>573
</tr>{{end}}574
</tbody>575
</table>576
</div>577
{{end}}578
<p class="muted">{{t "set.valuesHidden"}}</p>579
<script src="/assets/secrets.js"></script>580
{{end}}581
521
{{define "webhookform"}}582
{{define "webhookform"}}522
<form class="panel wh" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/webhooks{{else}}/groups/{{.Group.Path}}/webhooks{{end}}" data-preset="custom">583
<div id="webhooks">584
<form class="panel wh" id="webhook-form" method="post" action="{{if .Repo}}/{{.Repo.FullPath}}/-/webhooks{{else}}/groups/{{.Group.Path}}/webhooks{{end}}" data-preset="{{if .HookEdit.ID}}{{.HookEdit.Preset}}{{else}}custom{{end}}">523
<input type="hidden" name="csrf" value="{{.CSRF}}">585
<input type="hidden" name="csrf" value="{{.CSRF}}">524
<label>{{t "set.whName"}} <input name="name" required></label>586
{{if .HookEdit.ID}}<input type="hidden" name="id" value="{{.HookEdit.ID}}"><h2>{{t "wh.edit"}}</h2>{{end}}587
<div class="grid-2">588
<label>{{t "set.whName"}} <input name="name" value="{{.HookEdit.Name}}" required></label>525
<label>{{t "set.preset"}}589
<label>{{t "set.preset"}}526
<select name="preset" data-preset-select>590
<select name="preset" data-preset-select>527
<option value="custom" selected>{{t "set.preset.custom"}}</option>591
<option value="custom" {{if or (eq .HookEdit.ID 0) (eq .HookEdit.Preset "custom")}}selected{{end}}>{{t "set.preset.custom"}}</option>528
<option value="generic">{{t "set.preset.generic"}}</option>592
<option value="generic" {{if eq .HookEdit.Preset "generic"}}selected{{end}}>{{t "set.preset.generic"}}</option>529
<option value="discord">{{t "set.preset.discord"}}</option>593
<option value="discord" {{if eq .HookEdit.Preset "discord"}}selected{{end}}>{{t "set.preset.discord"}}</option>530
<option value="slack">{{t "set.preset.slack"}}</option>594
<option value="slack" {{if eq .HookEdit.Preset "slack"}}selected{{end}}>{{t "set.preset.slack"}}</option>531
<option value="teams">{{t "set.preset.teams"}}</option>595
<option value="teams" {{if eq .HookEdit.Preset "teams"}}selected{{end}}>{{t "set.preset.teams"}}</option>532
<option value="mattermost">{{t "set.preset.mattermost"}}</option>596
<option value="mattermost" {{if eq .HookEdit.Preset "mattermost"}}selected{{end}}>{{t "set.preset.mattermost"}}</option>533
<option value="rocketchat">{{t "set.preset.rocketchat"}}</option>597
<option value="rocketchat" {{if eq .HookEdit.Preset "rocketchat"}}selected{{end}}>{{t "set.preset.rocketchat"}}</option>534
<option value="telegram">{{t "set.preset.telegram"}}</option>598
<option value="telegram" {{if eq .HookEdit.Preset "telegram"}}selected{{end}}>{{t "set.preset.telegram"}}</option>535
<option value="matrix">{{t "set.preset.matrix"}}</option>599
<option value="matrix" {{if eq .HookEdit.Preset "matrix"}}selected{{end}}>{{t "set.preset.matrix"}}</option>536
<option value="googlechat">{{t "set.preset.googlechat"}}</option>600
<option value="googlechat" {{if eq .HookEdit.Preset "googlechat"}}selected{{end}}>{{t "set.preset.googlechat"}}</option>537
<option value="ntfy">{{t "set.preset.ntfy"}}</option>601
<option value="ntfy" {{if eq .HookEdit.Preset "ntfy"}}selected{{end}}>{{t "set.preset.ntfy"}}</option>538
<option value="gotify">{{t "set.preset.gotify"}}</option>602
<option value="gotify" {{if eq .HookEdit.Preset "gotify"}}selected{{end}}>{{t "set.preset.gotify"}}</option>539
<option value="grok">{{t "set.preset.grok"}}</option>603
<option value="grok" {{if eq .HookEdit.Preset "grok"}}selected{{end}}>{{t "set.preset.grok"}}</option>540
</select>604
</select>541
</label>605
</label>542
<label class="wh-field for-discord for-slack for-teams for-mattermost for-rocketchat for-googlechat">{{t "wh.webhookURL"}} <input name="url" placeholder="https://example.test/hook" required disabled></label>606
</div>543
<label class="wh-field for-generic for-grok for-custom">{{t "wh.url"}} <input name="url" placeholder="https://example.test/hook" required></label>607
<label class="wh-field for-discord for-slack for-teams for-mattermost for-rocketchat for-googlechat">{{t "wh.webhookURL"}} <input name="url" value="{{.HookEdit.URL}}" placeholder="https://example.test/hook" required disabled></label>544
<label class="wh-field for-discord">{{t "wh.username"}} <input name="username" disabled></label>608
<label class="wh-field for-generic for-grok for-custom">{{t "wh.url"}} <input name="url" value="{{.HookEdit.URL}}" placeholder="https://example.test/hook" required></label>545
<label class="wh-field for-discord">{{t "wh.avatar"}} <input name="avatar" placeholder="https://example.test/avatar.png" disabled></label>609
<label class="wh-field for-discord">{{t "wh.username"}} <input name="username" disabled value="{{.HookEdit.Username}}"></label>546
<label class="wh-field for-mattermost">{{t "wh.username"}} <input name="username" disabled></label>610
<label class="wh-field for-discord">{{t "wh.avatar"}} <input name="avatar" value="{{.HookEdit.Avatar}}" placeholder="https://example.test/avatar.png" disabled></label>547
<label class="wh-field for-mattermost">{{t "wh.icon"}} <input name="icon" placeholder="https://example.test/icon.png" disabled></label>611
<label class="wh-field for-mattermost">{{t "wh.username"}} <input name="username" disabled value="{{.HookEdit.Username}}"></label>548
<label class="wh-field for-rocketchat">{{t "wh.alias"}} <input name="alias" disabled></label>612
<label class="wh-field for-mattermost">{{t "wh.icon"}} <input name="icon" value="{{.HookEdit.Icon}}" placeholder="https://example.test/icon.png" disabled></label>613
<label class="wh-field for-rocketchat">{{t "wh.alias"}} <input name="alias" value="{{.HookEdit.Alias}}" disabled></label>549
<div class="wh-field secret-pick for-telegram for-matrix for-gotify for-grok for-ntfy">614
<div class="wh-field secret-pick for-telegram for-matrix for-gotify for-grok for-ntfy">550
<span class="fieldlabel">{{t "wh.token"}}</span>615
<span class="fieldlabel">{{t "wh.token"}}</span>551
<select class="secret-native" name="token">616
<select class="secret-native" name="token">552
<option value="">{{t "wh.noSecret"}}</option>617
<option value="" {{if eq $.HookEdit.Token ""}}selected{{end}}>{{t "wh.noSecret"}}</option>553
{{range .HookSecrets}}<option value="{{.Name}}">{{.Name}} · {{.Label}}</option>{{end}}618
{{range .HookSecrets}}<option value="{{.Name}}" {{if eq $.HookEdit.Token .Name}}selected{{end}}>{{.Name}} · {{.Label}}</option>{{end}}554
</select>619
</select>555
<div class="secret-custom">620
<div class="secret-custom">556
<button type="button" class="secret-toggle" data-secret-button data-empty="{{t "wh.noSecret"}}">{{t "wh.noSecret"}}</button>621
<button type="button" class="secret-toggle" data-secret-button data-empty="{{t "wh.noSecret"}}">{{t "wh.noSecret"}}</button>@@ -564,44 +629,68 @@564
</div>629
</div>565
<span class="muted">{{t "wh.tokenHint"}}</span>630
<span class="muted">{{t "wh.tokenHint"}}</span>566
</div>631
</div>567
<label class="wh-field for-telegram">{{t "wh.chat"}} <input name="chat" required disabled></label>632
<label class="wh-field for-telegram">{{t "wh.chat"}} <input name="chat" value="{{.HookEdit.Chat}}" required disabled></label>568
<label class="wh-field for-ntfy">{{t "wh.server"}} <input name="server" placeholder="https://ntfy.sh" disabled></label>633
<label class="wh-field for-ntfy">{{t "wh.server"}} <input name="server" value="{{.HookEdit.Server}}" placeholder="https://ntfy.sh" disabled></label>569
<label class="wh-field for-gotify">{{t "wh.server"}} <input name="server" placeholder="https://gotify.example" required disabled></label>634
<label class="wh-field for-gotify">{{t "wh.server"}} <input name="server" value="{{.HookEdit.Server}}" placeholder="https://gotify.example" required disabled></label>570
<label class="wh-field for-ntfy">{{t "wh.topic"}} <input name="topic" required disabled></label>635
<label class="wh-field for-ntfy">{{t "wh.topic"}} <input name="topic" value="{{.HookEdit.Topic}}" required disabled></label>571
<label class="wh-field for-matrix">{{t "wh.homeserver"}} <input name="homeserver" placeholder="https://matrix.example" required disabled></label>636
<label class="wh-field for-matrix">{{t "wh.homeserver"}} <input name="homeserver" value="{{.HookEdit.Home}}" placeholder="https://matrix.example" required disabled></label>572
<label class="wh-field for-matrix">{{t "wh.room"}} <input name="room" placeholder="!room:example.org" required disabled></label>637
<label class="wh-field for-matrix">{{t "wh.room"}} <input name="room" value="{{.HookEdit.Room}}" placeholder="!room:example.org" required disabled></label>573
<label class="wh-field for-custom">{{t "wh.method"}}638
<label class="wh-field for-custom">{{t "wh.method"}}574
<select name="method">639
<select name="method">575
<option>POST</option>640
<option {{if or (eq .HookEdit.Method "") (eq .HookEdit.Method "POST")}}selected{{end}}>POST</option>576
<option>PUT</option>641
<option {{if eq .HookEdit.Method "PUT"}}selected{{end}}>PUT</option>577
<option>PATCH</option>642
<option {{if eq .HookEdit.Method "PATCH"}}selected{{end}}>PATCH</option>578
<option>GET</option>643
<option {{if eq .HookEdit.Method "GET"}}selected{{end}}>GET</option>579
</select>644
</select>580
</label>645
</label>581
<label class="wh-field for-custom">{{t "wh.contentType"}} <input name="content_type" placeholder="application/json"></label>646
<label class="wh-field for-custom">{{t "wh.contentType"}} <input name="content_type" value="{{.HookEdit.CType}}" placeholder="application/json"></label>582
<label class="wh-field for-custom">{{t "wh.headers"}} <textarea name="headers" placeholder="Authorization: Bearer {{"{{secret.NAME}}"}}"></textarea> <span class="muted">{{t "wh.headerHint"}}</span></label>647
<label class="wh-field for-custom">{{t "wh.headers"}} <textarea name="headers" placeholder="Authorization: Bearer {{"{{secret.NAME}}"}}">{{.HookEdit.Headers}}</textarea> <span class="muted">{{t "wh.headerHint"}}</span></label>583
<label class="wh-field for-custom">{{t "wh.body"}} <textarea name="body"></textarea> <span class="muted">{{t "wh.bodyHint"}}</span></label>648
<label class="wh-field for-custom">{{t "wh.body"}} <textarea name="body">{{.HookEdit.Body}}</textarea> <span class="muted">{{t "wh.bodyHint"}}</span></label>584
<label>{{t "set.branchFilter"}} <input name="branch_filter" placeholder="{{t "set.filterHint"}}"></label>649
<label>{{t "set.branchFilter"}} <input name="branch_filter" value="{{.HookEdit.Filter}}" placeholder="{{t "set.filterHint"}}"></label>585
<fieldset>650
<div class="evgrid">586
<label><input type="checkbox" name="event_push" value="1"> {{t "set.ev.push"}}</label>651
<label><input type="checkbox" name="event_push" value="1" {{if .HookEdit.OnPush}}checked{{end}}> {{t "set.ev.push"}}</label>587
<label><input type="checkbox" name="event_merge_request" value="1"> {{t "set.ev.mr"}}</label>652
<label><input type="checkbox" name="event_merge_request" value="1" {{if .HookEdit.OnMR}}checked{{end}}> {{t "set.ev.mr"}}</label>588
<label><input type="checkbox" name="event_pipeline_success" value="1"> {{t "set.ev.ok"}}</label>653
<label><input type="checkbox" name="event_pipeline_success" value="1" {{if .HookEdit.OnOK}}checked{{end}}> {{t "set.ev.ok"}}</label>589
<label><input type="checkbox" name="event_pipeline_failure" value="1"> {{t "set.ev.fail"}}</label>654
<label><input type="checkbox" name="event_pipeline_failure" value="1" {{if .HookEdit.OnFail}}checked{{end}}> {{t "set.ev.fail"}}</label>590
<label><input type="checkbox" name="event_release_published" value="1"> {{t "set.ev.release"}}</label>655
<label><input type="checkbox" name="event_release_published" value="1" {{if .HookEdit.OnRel}}checked{{end}}> {{t "set.ev.release"}}</label>591
</fieldset>656
</div>592
<button type="submit">{{t "set.saveWebhook"}}</button>657
<div class="acts">658
<button class="fit" type="submit">{{if .HookEdit.ID}}{{t "wh.update"}}{{else}}{{t "set.saveWebhook"}}{{end}}</button>659
{{if .HookEdit.ID}}<a class="btn ghost tiny" href="{{if .Repo}}/{{.Repo.FullPath}}/-/settings?tab=webhooks{{else}}/groups/{{.Group.Path}}?tab=settings#webhooks{{end}}">{{t "action.cancel"}}</a>{{end}}660
</div>593
</form>661
</form>594
<script src="/assets/webhook.js"></script>662
<script src="/assets/webhook.js"></script>595
<ul class="clean">663
{{if .Hooks}}596
{{range .Hooks}}<li><strong>{{.Name}}</strong> {{presetName .Preset}} <span class="muted">{{.Method}} {{.URL}}</span>664
<div class="hscroll">597
<div class="muted">{{.Events}} {{if .Filter}}· filter {{.Filter}}{{end}}</div>665
<table class="hooktable">598
{{range .Deliveries}}<div class="muted">{{.EventType}} → {{.StatusCode}} {{.Error}}</div>{{end}}666
<thead><tr>599
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/webhooks/delete{{else}}/groups/{{$.Group.Path}}/webhooks/delete{{end}}">667
<th>{{t "set.whName"}}</th>600
<input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">668
<th>{{t "wh.url"}}</th>601
<button class="ghost" type="submit">{{t "action.remove"}}</button>669
<th>{{t "wh.events"}}</th>602
</form>670
<th>{{t "wh.actions"}}</th>603
</li>{{end}}671
</tr></thead>604
</ul>672
<tbody>673
{{range .Hooks}}<tr>674
<td>{{.Name}} <span class="muted">{{presetName .Preset}}</span></td>675
<td><span class="urlclip" data-tip="{{.Method}} {{.URL}}" title="{{.Method}} {{.URL}}">{{.Method}} {{.URL}}</span></td>676
<td>{{range .Badges}}<span class="pill">{{.}}</span>{{end}}{{if .Filter}}<span class="pill">{{.Filter}}</span>{{end}}</td>677
<td>678
<div class="acts">679
<a class="btn ghost tiny" href="{{if $.Repo}}/{{$.Repo.FullPath}}/-/settings?tab=webhooks&hook={{.ID}}{{else}}/groups/{{$.Group.Path}}?tab=settings&hook={{.ID}}{{end}}#webhook-form">{{t "action.edit"}}</a>680
<form method="post" action="{{if $.Repo}}/{{$.Repo.FullPath}}/-/webhooks/delete{{else}}/groups/{{$.Group.Path}}/webhooks/delete{{end}}">681
<input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="id" value="{{.ID}}">682
<button class="ghost tiny" type="submit">{{t "action.remove"}}</button>683
</form>684
</div>685
</td>686
</tr>687
{{if .Deliveries}}<tr><td colspan="4" class="muted">{{range .Deliveries}}<span>{{.EventType}} → {{.StatusCode}} {{.Error}}</span> {{end}}</td></tr>{{end}}688
{{end}}689
</tbody>690
</table>691
</div>692
{{end}}693
</div>605
{{end}}694
{{end}}606
695
607
{{define "group"}}696
{{define "group"}}@@ -653,17 +742,7 @@653
<button type="submit">{{t "action.save"}}</button>742
<button type="submit">{{t "action.save"}}</button>654
</form>743
</form>655
<h2>{{t "set.secrets"}}</h2>744
<h2>{{t "set.secrets"}}</h2>656
<form class="panel" method="post" action="/groups/{{.Group.Path}}/secrets">745
{{template "secretpanel" .}}657
<input type="hidden" name="csrf" value="{{.CSRF}}">658
<label>{{t "set.secretName"}} <input name="name" required></label>659
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>660
<label class="row"><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>661
<button type="submit">{{t "action.save"}}</button>662
</form>663
<ul class="clean">{{range .Secrets}}<li><code>{{.Name}}</code>664
<form method="post" action="/groups/{{$.Group.Path}}/secrets/delete"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="name" value="{{.Name}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>665
</li>{{end}}</ul>666
<p class="muted">{{t "set.valuesHidden"}}</p>667
{{if .IsOwner}}746
{{if .IsOwner}}668
<h2>{{t "own.transfer"}}</h2>747
<h2>{{t "own.transfer"}}</h2>669
{{if .Candidates}}748
{{if .Candidates}}@@ -4,6 +4,7 @@ import (
4
4
"encoding/json"
5
5
"io"
6
6
"net/http"
7
"strconv"
7
8
"strings"
8
9
9
10
"gitlab.com/Timfa/bluegit/internal/store"
@@ -31,7 +32,7 @@ func (s *Server) repoWebhookAPI(w http.ResponseWriter, r *http.Request) {
31
32
if !ok {
32
33
return
33
34
}
34
s.writeWebhookCreate(w, r, "repo", repo.ID)
35
s.writeWebhookSave(w, r, "repo", repo.ID, 0)
35
36
}
36
37
37
38
func (s *Server) groupWebhookAPI(w http.ResponseWriter, r *http.Request) {
@@ -39,7 +40,33 @@ func (s *Server) groupWebhookAPI(w http.ResponseWriter, r *http.Request) {
39
40
if !ok {
40
41
return
41
42
}
42
s.writeWebhookCreate(w, r, "group", g.ID)
43
s.writeWebhookSave(w, r, "group", g.ID, 0)
44
}
45
46
func (s *Server) repoWebhookUpdate(w http.ResponseWriter, r *http.Request) {
47
repo, _, ok := s.webhookAPIRepo(w, r)
48
if !ok {
49
return
50
}
51
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
52
if err != nil || id <= 0 {
53
http.Error(w, s.tr(r, "err.notFound"), http.StatusNotFound)
54
return
55
}
56
s.writeWebhookSave(w, r, "repo", repo.ID, id)
57
}
58
59
func (s *Server) groupWebhookUpdate(w http.ResponseWriter, r *http.Request) {
60
g, _, ok := s.webhookAPIGroup(w, r)
61
if !ok {
62
return
63
}
64
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
65
if err != nil || id <= 0 {
66
http.Error(w, s.tr(r, "err.notFound"), http.StatusNotFound)
67
return
68
}
69
s.writeWebhookSave(w, r, "group", g.ID, id)
43
70
}
44
71
45
72
func (s *Server) writeSecretChoices(w http.ResponseWriter, choices []SecretChoice) {
@@ -50,7 +77,7 @@ func (s *Server) writeSecretChoices(w http.ResponseWriter, choices []SecretChoic
50
77
_ = json.NewEncoder(w).Encode(map[string]any{"secrets": choices})
51
78
}
52
79
53
func (s *Server) writeWebhookCreate(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {
80
func (s *Server) writeWebhookSave(w http.ResponseWriter, r *http.Request, kind string, scopeID, id int64) {
54
81
var body struct {
55
82
Name string `json:"name"`
56
83
Preset string `json:"preset"`
@@ -76,19 +103,25 @@ func (s *Server) writeWebhookCreate(w http.ResponseWriter, r *http.Request, kind
76
103
http.Error(w, s.tr(r, "err.json"), http.StatusBadRequest)
77
104
return
78
105
}
79
id, err := s.createWebhookRecord(r.Context(), kind, scopeID, strings.TrimSpace(body.Name), body.Preset, body.BranchFilter, body.Events, webhook.Input{
106
saved, err := s.saveWebhookRecord(r.Context(), kind, scopeID, id, strings.TrimSpace(body.Name), body.Preset, body.BranchFilter, body.Events, webhook.Input{
80
107
URL: body.URL, Username: body.Username, Avatar: body.Avatar, Icon: body.Icon, Alias: body.Alias,
81
108
Token: body.Token, Chat: body.Chat, Server: body.Server, Topic: body.Topic,
82
109
Homeserver: body.Homeserver, Room: body.Room, Method: body.Method, ContentType: body.ContentType,
83
110
Headers: body.Headers, Body: body.Body,
84
111
})
85
112
if err != nil {
86
http.Error(w, s.trErr(r, err), http.StatusBadRequest)
113
status := http.StatusBadRequest
114
if store.Missing(err) {
115
status = http.StatusNotFound
116
}
117
http.Error(w, s.trErr(r, err), status)
87
118
return
88
119
}
89
120
w.Header().Set("Content-Type", "application/json")
90
w.WriteHeader(http.StatusCreated)
91
_ = json.NewEncoder(w).Encode(map[string]any{"id": id})
121
if id == 0 {
122
w.WriteHeader(http.StatusCreated)
123
}
124
_ = json.NewEncoder(w).Encode(map[string]any{"id": saved})
92
125
}
93
126
94
127
func (s *Server) webhookAPIRepo(w http.ResponseWriter, r *http.Request) (store.Repo, store.User, bool) {
@@ -4,6 +4,7 @@ import (4
"encoding/json"4
"encoding/json"5
"io"5
"io"6
"net/http"6
"net/http"7
"strconv"7
"strings"8
"strings"8
9
9
"gitlab.com/Timfa/bluegit/internal/store"10
"gitlab.com/Timfa/bluegit/internal/store"@@ -31,7 +32,7 @@ func (s *Server) repoWebhookAPI(w http.ResponseWriter, r *http.Request) {31
if !ok {32
if !ok {32
return33
return33
}34
}34
s.writeWebhookCreate(w, r, "repo", repo.ID)35
s.writeWebhookSave(w, r, "repo", repo.ID, 0)35
}36
}36
37
37
func (s *Server) groupWebhookAPI(w http.ResponseWriter, r *http.Request) {38
func (s *Server) groupWebhookAPI(w http.ResponseWriter, r *http.Request) {@@ -39,7 +40,33 @@ func (s *Server) groupWebhookAPI(w http.ResponseWriter, r *http.Request) {39
if !ok {40
if !ok {40
return41
return41
}42
}42
s.writeWebhookCreate(w, r, "group", g.ID)43
s.writeWebhookSave(w, r, "group", g.ID, 0)44
}45
46
func (s *Server) repoWebhookUpdate(w http.ResponseWriter, r *http.Request) {47
repo, _, ok := s.webhookAPIRepo(w, r)48
if !ok {49
return50
}51
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)52
if err != nil || id <= 0 {53
http.Error(w, s.tr(r, "err.notFound"), http.StatusNotFound)54
return55
}56
s.writeWebhookSave(w, r, "repo", repo.ID, id)57
}58
59
func (s *Server) groupWebhookUpdate(w http.ResponseWriter, r *http.Request) {60
g, _, ok := s.webhookAPIGroup(w, r)61
if !ok {62
return63
}64
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)65
if err != nil || id <= 0 {66
http.Error(w, s.tr(r, "err.notFound"), http.StatusNotFound)67
return68
}69
s.writeWebhookSave(w, r, "group", g.ID, id)43
}70
}44
71
45
func (s *Server) writeSecretChoices(w http.ResponseWriter, choices []SecretChoice) {72
func (s *Server) writeSecretChoices(w http.ResponseWriter, choices []SecretChoice) {@@ -50,7 +77,7 @@ func (s *Server) writeSecretChoices(w http.ResponseWriter, choices []SecretChoic50
_ = json.NewEncoder(w).Encode(map[string]any{"secrets": choices})77
_ = json.NewEncoder(w).Encode(map[string]any{"secrets": choices})51
}78
}52
79
53
func (s *Server) writeWebhookCreate(w http.ResponseWriter, r *http.Request, kind string, scopeID int64) {80
func (s *Server) writeWebhookSave(w http.ResponseWriter, r *http.Request, kind string, scopeID, id int64) {54
var body struct {81
var body struct {55
Name string `json:"name"`82
Name string `json:"name"`56
Preset string `json:"preset"`83
Preset string `json:"preset"`@@ -76,19 +103,25 @@ func (s *Server) writeWebhookCreate(w http.ResponseWriter, r *http.Request, kind76
http.Error(w, s.tr(r, "err.json"), http.StatusBadRequest)103
http.Error(w, s.tr(r, "err.json"), http.StatusBadRequest)77
return104
return78
}105
}79
id, err := s.createWebhookRecord(r.Context(), kind, scopeID, strings.TrimSpace(body.Name), body.Preset, body.BranchFilter, body.Events, webhook.Input{106
saved, err := s.saveWebhookRecord(r.Context(), kind, scopeID, id, 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,107
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,108
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,109
Homeserver: body.Homeserver, Room: body.Room, Method: body.Method, ContentType: body.ContentType,83
Headers: body.Headers, Body: body.Body,110
Headers: body.Headers, Body: body.Body,84
})111
})85
if err != nil {112
if err != nil {86
http.Error(w, s.trErr(r, err), http.StatusBadRequest)113
status := http.StatusBadRequest114
if store.Missing(err) {115
status = http.StatusNotFound116
}117
http.Error(w, s.trErr(r, err), status)87
return118
return88
}119
}89
w.Header().Set("Content-Type", "application/json")120
w.Header().Set("Content-Type", "application/json")90
w.WriteHeader(http.StatusCreated)121
if id == 0 {91
_ = json.NewEncoder(w).Encode(map[string]any{"id": id})122
w.WriteHeader(http.StatusCreated)123
}124
_ = json.NewEncoder(w).Encode(map[string]any{"id": saved})92
}125
}93
126
94
func (s *Server) webhookAPIRepo(w http.ResponseWriter, r *http.Request) (store.Repo, store.User, bool) {127
func (s *Server) webhookAPIRepo(w http.ResponseWriter, r *http.Request) (store.Repo, store.User, bool) {@@ -25,6 +25,7 @@ type Webhook struct {
25
25
BranchFilter string
26
26
Active bool
27
27
Method string
28
Fields string
28
29
}
29
30
30
31
// CreateWebhook bewaart een webhook.
@@ -38,9 +39,9 @@ func (s *Store) CreateWebhook(ctx context.Context, w Webhook) (int64, error) {
38
39
if w.Method == "" {
39
40
w.Method = "POST"
40
41
}
41
res, err := s.db.ExecContext(ctx, `INSERT INTO webhooks (scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, method, created_at)
42
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?)`,
43
w.ScopeKind, w.ScopeID, w.Name, w.Preset, w.URLTemplate, mustJSON(w.Headers), w.BodyTemplate, mustJSON(w.Events), w.BranchFilter, w.Method, now())
42
res, err := s.db.ExecContext(ctx, `INSERT INTO webhooks (scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, method, fields_json, created_at)
43
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?)`,
44
w.ScopeKind, w.ScopeID, w.Name, w.Preset, w.URLTemplate, mustJSON(w.Headers), w.BodyTemplate, mustJSON(w.Events), w.BranchFilter, w.Method, w.Fields, now())
44
45
if err != nil {
45
46
return 0, err
46
47
}
@@ -49,7 +50,7 @@ func (s *Store) CreateWebhook(ctx context.Context, w Webhook) (int64, error) {
49
50
50
51
// ListWebhooks geeft de webhooks van een repository of groep.
51
52
func (s *Store) ListWebhooks(ctx context.Context, scopeKind string, scopeID int64) ([]Webhook, error) {
52
rows, err := s.db.QueryContext(ctx, `SELECT id, scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, method FROM webhooks WHERE scope_kind = ? AND scope_id = ? ORDER BY id`, scopeKind, scopeID)
53
rows, err := s.db.QueryContext(ctx, `SELECT `+webhookCols+` FROM webhooks WHERE scope_kind = ? AND scope_id = ? ORDER BY id`, scopeKind, scopeID)
53
54
if err != nil {
54
55
return nil, err
55
56
}
@@ -65,11 +66,45 @@ func (s *Store) ListWebhooks(ctx context.Context, scopeKind string, scopeID int6
65
66
return out, rows.Err()
66
67
}
67
68
68
func scanWebhook(rows *sql.Rows) (Webhook, error) {
69
const webhookCols = `id, scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, method, fields_json`
70
71
// Webhook leest één webhook in dit scope.
72
func (s *Store) Webhook(ctx context.Context, scopeKind string, scopeID, id int64) (Webhook, error) {
73
w, err := scanWebhook(s.db.QueryRowContext(ctx, `SELECT `+webhookCols+` FROM webhooks WHERE id = ? AND scope_kind = ? AND scope_id = ?`, id, scopeKind, scopeID))
74
if errors.Is(err, sql.ErrNoRows) {
75
return Webhook{}, errNotFound
76
}
77
return w, err
78
}
79
80
// UpdateWebhook werkt een webhook in dit scope bij.
81
func (s *Store) UpdateWebhook(ctx context.Context, w Webhook) error {
82
if w.Headers == nil {
83
w.Headers = map[string]string{}
84
}
85
if w.Preset == "" {
86
w.Preset = "generic"
87
}
88
if w.Method == "" {
89
w.Method = "POST"
90
}
91
res, err := s.db.ExecContext(ctx, `UPDATE webhooks SET name = ?, preset = ?, url_template = ?, headers_json = ?, body_template = ?, events_json = ?, branch_filter = ?, method = ?, fields_json = ? WHERE id = ? AND scope_kind = ? AND scope_id = ?`,
92
w.Name, w.Preset, w.URLTemplate, mustJSON(w.Headers), w.BodyTemplate, mustJSON(w.Events), w.BranchFilter, w.Method, w.Fields, w.ID, w.ScopeKind, w.ScopeID)
93
if err != nil {
94
return err
95
}
96
n, _ := res.RowsAffected()
97
if n == 0 {
98
return errNotFound
99
}
100
return nil
101
}
102
103
func scanWebhook(row interface{ Scan(...any) error }) (Webhook, error) {
69
104
var w Webhook
70
105
var headers, events string
71
106
var active int
72
if err := rows.Scan(&w.ID, &w.ScopeKind, &w.ScopeID, &w.Name, &w.Preset, &w.URLTemplate, &headers, &w.BodyTemplate, &events, &w.BranchFilter, &active, &w.Method); err != nil {
107
if err := row.Scan(&w.ID, &w.ScopeKind, &w.ScopeID, &w.Name, &w.Preset, &w.URLTemplate, &headers, &w.BodyTemplate, &events, &w.BranchFilter, &active, &w.Method, &w.Fields); err != nil {
73
108
return Webhook{}, err
74
109
}
75
110
w.Active = active == 1
@@ -25,6 +25,7 @@ type Webhook struct {25
BranchFilter string25
BranchFilter string26
Active bool26
Active bool27
Method string27
Method string28
Fields string28
}29
}29
30
30
// CreateWebhook bewaart een webhook.31
// CreateWebhook bewaart een webhook.@@ -38,9 +39,9 @@ func (s *Store) CreateWebhook(ctx context.Context, w Webhook) (int64, error) {38
if w.Method == "" {39
if w.Method == "" {39
w.Method = "POST"40
w.Method = "POST"40
}41
}41
res, err := s.db.ExecContext(ctx, `INSERT INTO webhooks (scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, method, created_at)42
res, err := s.db.ExecContext(ctx, `INSERT INTO webhooks (scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, method, fields_json, created_at)42
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?)`,43
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?, ?, ?)`,43
w.ScopeKind, w.ScopeID, w.Name, w.Preset, w.URLTemplate, mustJSON(w.Headers), w.BodyTemplate, mustJSON(w.Events), w.BranchFilter, w.Method, now())44
w.ScopeKind, w.ScopeID, w.Name, w.Preset, w.URLTemplate, mustJSON(w.Headers), w.BodyTemplate, mustJSON(w.Events), w.BranchFilter, w.Method, w.Fields, now())44
if err != nil {45
if err != nil {45
return 0, err46
return 0, err46
}47
}@@ -49,7 +50,7 @@ func (s *Store) CreateWebhook(ctx context.Context, w Webhook) (int64, error) {49
50
50
// ListWebhooks geeft de webhooks van een repository of groep.51
// ListWebhooks geeft de webhooks van een repository of groep.51
func (s *Store) ListWebhooks(ctx context.Context, scopeKind string, scopeID int64) ([]Webhook, error) {52
func (s *Store) ListWebhooks(ctx context.Context, scopeKind string, scopeID int64) ([]Webhook, error) {52
rows, err := s.db.QueryContext(ctx, `SELECT id, scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, method FROM webhooks WHERE scope_kind = ? AND scope_id = ? ORDER BY id`, scopeKind, scopeID)53
rows, err := s.db.QueryContext(ctx, `SELECT `+webhookCols+` FROM webhooks WHERE scope_kind = ? AND scope_id = ? ORDER BY id`, scopeKind, scopeID)53
if err != nil {54
if err != nil {54
return nil, err55
return nil, err55
}56
}@@ -65,11 +66,45 @@ func (s *Store) ListWebhooks(ctx context.Context, scopeKind string, scopeID int665
return out, rows.Err()66
return out, rows.Err()66
}67
}67
68
68
func scanWebhook(rows *sql.Rows) (Webhook, error) {69
const webhookCols = `id, scope_kind, scope_id, name, preset, url_template, headers_json, body_template, events_json, branch_filter, active, method, fields_json`70
71
// Webhook leest één webhook in dit scope.72
func (s *Store) Webhook(ctx context.Context, scopeKind string, scopeID, id int64) (Webhook, error) {73
w, err := scanWebhook(s.db.QueryRowContext(ctx, `SELECT `+webhookCols+` FROM webhooks WHERE id = ? AND scope_kind = ? AND scope_id = ?`, id, scopeKind, scopeID))74
if errors.Is(err, sql.ErrNoRows) {75
return Webhook{}, errNotFound76
}77
return w, err78
}79
80
// UpdateWebhook werkt een webhook in dit scope bij.81
func (s *Store) UpdateWebhook(ctx context.Context, w Webhook) error {82
if w.Headers == nil {83
w.Headers = map[string]string{}84
}85
if w.Preset == "" {86
w.Preset = "generic"87
}88
if w.Method == "" {89
w.Method = "POST"90
}91
res, err := s.db.ExecContext(ctx, `UPDATE webhooks SET name = ?, preset = ?, url_template = ?, headers_json = ?, body_template = ?, events_json = ?, branch_filter = ?, method = ?, fields_json = ? WHERE id = ? AND scope_kind = ? AND scope_id = ?`,92
w.Name, w.Preset, w.URLTemplate, mustJSON(w.Headers), w.BodyTemplate, mustJSON(w.Events), w.BranchFilter, w.Method, w.Fields, w.ID, w.ScopeKind, w.ScopeID)93
if err != nil {94
return err95
}96
n, _ := res.RowsAffected()97
if n == 0 {98
return errNotFound99
}100
return nil101
}102
103
func scanWebhook(row interface{ Scan(...any) error }) (Webhook, error) {69
var w Webhook104
var w Webhook70
var headers, events string105
var headers, events string71
var active int106
var active int72
if err := rows.Scan(&w.ID, &w.ScopeKind, &w.ScopeID, &w.Name, &w.Preset, &w.URLTemplate, &headers, &w.BodyTemplate, &events, &w.BranchFilter, &active, &w.Method); err != nil {107
if err := row.Scan(&w.ID, &w.ScopeKind, &w.ScopeID, &w.Name, &w.Preset, &w.URLTemplate, &headers, &w.BodyTemplate, &events, &w.BranchFilter, &active, &w.Method, &w.Fields); err != nil {73
return Webhook{}, err108
return Webhook{}, err74
}109
}75
w.Active = active == 1110
w.Active = active == 1@@ -585,10 +585,12 @@ func (s *Store) RemoveProtectedTag(ctx context.Context, repoID int64, pattern st
585
585
type SecretMeta struct {
586
586
Name string
587
587
Protected bool
588
Invisible bool
588
589
CreatedAt time.Time
589
590
}
590
591
591
592
// PutSecret bewaart een versleutelde waarde. De naam is een omgevingsvariabele.
593
// Bij een bestaande naam blijven waarde en protected bijgewerkt; invisible wordt nooit gewist.
592
594
func (s *Store) PutSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected bool) error {
593
595
if scopeKind != "repo" && scopeKind != "group" {
594
596
return i18n.E("err.scope")
@@ -611,13 +613,112 @@ func (s *Store) PutSecret(ctx context.Context, scopeKind string, scopeID int64,
611
613
612
614
// DeleteSecret verwijdert een geheim.
613
615
func (s *Store) DeleteSecret(ctx context.Context, scopeKind string, scopeID int64, name string) error {
614
_, err := s.db.ExecContext(ctx, `DELETE FROM secrets WHERE scope_kind = ? AND scope_id = ? AND name = ?`, scopeKind, scopeID, name)
616
res, err := s.db.ExecContext(ctx, `DELETE FROM secrets WHERE scope_kind = ? AND scope_id = ? AND name = ?`, scopeKind, scopeID, name)
617
if err != nil {
618
return err
619
}
620
n, _ := res.RowsAffected()
621
if n == 0 {
622
return errNotFound
623
}
624
return nil
625
}
626
627
// CreateSecret voegt een geheim toe. Een bestaande naam wordt niet overschreven.
628
func (s *Store) CreateSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected, invisible bool) error {
629
nonce, ct, err := s.secretCipher(scopeKind, name, value)
630
if err != nil {
631
return err
632
}
633
_, err = s.db.ExecContext(ctx, `INSERT INTO secrets (scope_kind, scope_id, name, ciphertext, nonce, protected, invisible, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
634
scopeKind, scopeID, name, ct, nonce, boolInt(protected), boolInt(invisible), now())
635
if err != nil && strings.Contains(err.Error(), "UNIQUE") {
636
return i18n.E("err.secretExists", name)
637
}
615
638
return err
616
639
}
617
640
641
// UpdateSecret wijzigt waarde en protected van een zichtbaar geheim.
642
func (s *Store) UpdateSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected bool) error {
643
return s.writeSecret(ctx, scopeKind, scopeID, name, value, protected, false)
644
}
645
646
// ReplaceSecret zet een nieuwe waarde op een onzichtbaar geheim. De vlag blijft aan.
647
func (s *Store) ReplaceSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected bool) error {
648
return s.writeSecret(ctx, scopeKind, scopeID, name, value, protected, true)
649
}
650
651
func (s *Store) writeSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected, invisible bool) error {
652
nonce, ct, err := s.secretCipher(scopeKind, name, value)
653
if err != nil {
654
return err
655
}
656
res, err := s.db.ExecContext(ctx, `UPDATE secrets SET ciphertext = ?, nonce = ?, protected = ? WHERE scope_kind = ? AND scope_id = ? AND name = ? AND invisible = ?`,
657
ct, nonce, boolInt(protected), scopeKind, scopeID, name, boolInt(invisible))
658
if err != nil {
659
return err
660
}
661
n, _ := res.RowsAffected()
662
if n == 1 {
663
return nil
664
}
665
return s.secretMiss(ctx, scopeKind, scopeID, name, invisible)
666
}
667
668
func (s *Store) secretCipher(scopeKind, name, value string) (nonce, ct []byte, err error) {
669
if scopeKind != "repo" && scopeKind != "group" {
670
return nil, nil, i18n.E("err.scope")
671
}
672
if err := access.ValidSecretName(name); err != nil {
673
return nil, nil, err
674
}
675
if strings.TrimSpace(value) == "" {
676
return nil, nil, i18n.E("err.emptyValue")
677
}
678
return s.encrypt(value)
679
}
680
681
func (s *Store) secretMiss(ctx context.Context, scopeKind string, scopeID int64, name string, wantInvisible bool) error {
682
var inv int
683
err := s.db.QueryRowContext(ctx, `SELECT invisible FROM secrets WHERE scope_kind = ? AND scope_id = ? AND name = ?`, scopeKind, scopeID, name).Scan(&inv)
684
if errors.Is(err, sql.ErrNoRows) {
685
return errNotFound
686
}
687
if err != nil {
688
return err
689
}
690
if wantInvisible && inv == 0 {
691
return i18n.E("err.secretVisible", name)
692
}
693
if !wantInvisible && inv == 1 {
694
return i18n.E("err.secretHidden", name)
695
}
696
return errNotFound
697
}
698
699
// RevealSecret geeft de waarde van een zichtbaar geheim.
700
func (s *Store) RevealSecret(ctx context.Context, scopeKind string, scopeID int64, name string) (string, error) {
701
if scopeKind != "repo" && scopeKind != "group" {
702
return "", i18n.E("err.scope")
703
}
704
var ct, nonce []byte
705
var inv int
706
err := s.db.QueryRowContext(ctx, `SELECT ciphertext, nonce, invisible FROM secrets WHERE scope_kind = ? AND scope_id = ? AND name = ?`, scopeKind, scopeID, name).Scan(&ct, &nonce, &inv)
707
if errors.Is(err, sql.ErrNoRows) {
708
return "", errNotFound
709
}
710
if err != nil {
711
return "", err
712
}
713
if inv == 1 {
714
return "", i18n.E("err.secretHidden", name)
715
}
716
return s.decrypt(nonce, ct)
717
}
718
618
719
// ListSecrets geeft namen, niet de waarden.
619
720
func (s *Store) ListSecrets(ctx context.Context, scopeKind string, scopeID int64) ([]SecretMeta, error) {
620
rows, err := s.db.QueryContext(ctx, `SELECT name, protected, created_at FROM secrets WHERE scope_kind = ? AND scope_id = ? ORDER BY name`, scopeKind, scopeID)
721
rows, err := s.db.QueryContext(ctx, `SELECT name, protected, invisible, created_at FROM secrets WHERE scope_kind = ? AND scope_id = ? ORDER BY name`, scopeKind, scopeID)
621
722
if err != nil {
622
723
return nil, err
623
724
}
@@ -625,12 +726,13 @@ func (s *Store) ListSecrets(ctx context.Context, scopeKind string, scopeID int64
625
726
var out []SecretMeta
626
727
for rows.Next() {
627
728
var m SecretMeta
628
var p int
729
var p, inv int
629
730
var created string
630
if err := rows.Scan(&m.Name, &p, &created); err != nil {
731
if err := rows.Scan(&m.Name, &p, &inv, &created); err != nil {
631
732
return nil, err
632
733
}
633
734
m.Protected = p == 1
735
m.Invisible = inv == 1
634
736
m.CreatedAt = parseTime(created)
635
737
out = append(out, m)
636
738
}
@@ -585,10 +585,12 @@ func (s *Store) RemoveProtectedTag(ctx context.Context, repoID int64, pattern st585
type SecretMeta struct {585
type SecretMeta struct {586
Name string586
Name string587
Protected bool587
Protected bool588
Invisible bool588
CreatedAt time.Time589
CreatedAt time.Time589
}590
}590
591
591
// PutSecret bewaart een versleutelde waarde. De naam is een omgevingsvariabele.592
// PutSecret bewaart een versleutelde waarde. De naam is een omgevingsvariabele.593
// Bij een bestaande naam blijven waarde en protected bijgewerkt; invisible wordt nooit gewist.592
func (s *Store) PutSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected bool) error {594
func (s *Store) PutSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected bool) error {593
if scopeKind != "repo" && scopeKind != "group" {595
if scopeKind != "repo" && scopeKind != "group" {594
return i18n.E("err.scope")596
return i18n.E("err.scope")@@ -611,13 +613,112 @@ func (s *Store) PutSecret(ctx context.Context, scopeKind string, scopeID int64,611
613
612
// DeleteSecret verwijdert een geheim.614
// DeleteSecret verwijdert een geheim.613
func (s *Store) DeleteSecret(ctx context.Context, scopeKind string, scopeID int64, name string) error {615
func (s *Store) DeleteSecret(ctx context.Context, scopeKind string, scopeID int64, name string) error {614
_, err := s.db.ExecContext(ctx, `DELETE FROM secrets WHERE scope_kind = ? AND scope_id = ? AND name = ?`, scopeKind, scopeID, name)616
res, err := s.db.ExecContext(ctx, `DELETE FROM secrets WHERE scope_kind = ? AND scope_id = ? AND name = ?`, scopeKind, scopeID, name)617
if err != nil {618
return err619
}620
n, _ := res.RowsAffected()621
if n == 0 {622
return errNotFound623
}624
return nil625
}626
627
// CreateSecret voegt een geheim toe. Een bestaande naam wordt niet overschreven.628
func (s *Store) CreateSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected, invisible bool) error {629
nonce, ct, err := s.secretCipher(scopeKind, name, value)630
if err != nil {631
return err632
}633
_, err = s.db.ExecContext(ctx, `INSERT INTO secrets (scope_kind, scope_id, name, ciphertext, nonce, protected, invisible, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,634
scopeKind, scopeID, name, ct, nonce, boolInt(protected), boolInt(invisible), now())635
if err != nil && strings.Contains(err.Error(), "UNIQUE") {636
return i18n.E("err.secretExists", name)637
}615
return err638
return err616
}639
}617
640
641
// UpdateSecret wijzigt waarde en protected van een zichtbaar geheim.642
func (s *Store) UpdateSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected bool) error {643
return s.writeSecret(ctx, scopeKind, scopeID, name, value, protected, false)644
}645
646
// ReplaceSecret zet een nieuwe waarde op een onzichtbaar geheim. De vlag blijft aan.647
func (s *Store) ReplaceSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected bool) error {648
return s.writeSecret(ctx, scopeKind, scopeID, name, value, protected, true)649
}650
651
func (s *Store) writeSecret(ctx context.Context, scopeKind string, scopeID int64, name, value string, protected, invisible bool) error {652
nonce, ct, err := s.secretCipher(scopeKind, name, value)653
if err != nil {654
return err655
}656
res, err := s.db.ExecContext(ctx, `UPDATE secrets SET ciphertext = ?, nonce = ?, protected = ? WHERE scope_kind = ? AND scope_id = ? AND name = ? AND invisible = ?`,657
ct, nonce, boolInt(protected), scopeKind, scopeID, name, boolInt(invisible))658
if err != nil {659
return err660
}661
n, _ := res.RowsAffected()662
if n == 1 {663
return nil664
}665
return s.secretMiss(ctx, scopeKind, scopeID, name, invisible)666
}667
668
func (s *Store) secretCipher(scopeKind, name, value string) (nonce, ct []byte, err error) {669
if scopeKind != "repo" && scopeKind != "group" {670
return nil, nil, i18n.E("err.scope")671
}672
if err := access.ValidSecretName(name); err != nil {673
return nil, nil, err674
}675
if strings.TrimSpace(value) == "" {676
return nil, nil, i18n.E("err.emptyValue")677
}678
return s.encrypt(value)679
}680
681
func (s *Store) secretMiss(ctx context.Context, scopeKind string, scopeID int64, name string, wantInvisible bool) error {682
var inv int683
err := s.db.QueryRowContext(ctx, `SELECT invisible FROM secrets WHERE scope_kind = ? AND scope_id = ? AND name = ?`, scopeKind, scopeID, name).Scan(&inv)684
if errors.Is(err, sql.ErrNoRows) {685
return errNotFound686
}687
if err != nil {688
return err689
}690
if wantInvisible && inv == 0 {691
return i18n.E("err.secretVisible", name)692
}693
if !wantInvisible && inv == 1 {694
return i18n.E("err.secretHidden", name)695
}696
return errNotFound697
}698
699
// RevealSecret geeft de waarde van een zichtbaar geheim.700
func (s *Store) RevealSecret(ctx context.Context, scopeKind string, scopeID int64, name string) (string, error) {701
if scopeKind != "repo" && scopeKind != "group" {702
return "", i18n.E("err.scope")703
}704
var ct, nonce []byte705
var inv int706
err := s.db.QueryRowContext(ctx, `SELECT ciphertext, nonce, invisible FROM secrets WHERE scope_kind = ? AND scope_id = ? AND name = ?`, scopeKind, scopeID, name).Scan(&ct, &nonce, &inv)707
if errors.Is(err, sql.ErrNoRows) {708
return "", errNotFound709
}710
if err != nil {711
return "", err712
}713
if inv == 1 {714
return "", i18n.E("err.secretHidden", name)715
}716
return s.decrypt(nonce, ct)717
}718
618
// ListSecrets geeft namen, niet de waarden.719
// ListSecrets geeft namen, niet de waarden.619
func (s *Store) ListSecrets(ctx context.Context, scopeKind string, scopeID int64) ([]SecretMeta, error) {720
func (s *Store) ListSecrets(ctx context.Context, scopeKind string, scopeID int64) ([]SecretMeta, error) {620
rows, err := s.db.QueryContext(ctx, `SELECT name, protected, created_at FROM secrets WHERE scope_kind = ? AND scope_id = ? ORDER BY name`, scopeKind, scopeID)721
rows, err := s.db.QueryContext(ctx, `SELECT name, protected, invisible, created_at FROM secrets WHERE scope_kind = ? AND scope_id = ? ORDER BY name`, scopeKind, scopeID)621
if err != nil {722
if err != nil {622
return nil, err723
return nil, err623
}724
}@@ -625,12 +726,13 @@ func (s *Store) ListSecrets(ctx context.Context, scopeKind string, scopeID int64625
var out []SecretMeta726
var out []SecretMeta626
for rows.Next() {727
for rows.Next() {627
var m SecretMeta728
var m SecretMeta628
var p int729
var p, inv int629
var created string730
var created string630
if err := rows.Scan(&m.Name, &p, &created); err != nil {731
if err := rows.Scan(&m.Name, &p, &inv, &created); err != nil {631
return nil, err732
return nil, err632
}733
}633
m.Protected = p == 1734
m.Protected = p == 1735
m.Invisible = inv == 1634
m.CreatedAt = parseTime(created)736
m.CreatedAt = parseTime(created)635
out = append(out, m)737
out = append(out, m)636
}738
}@@ -0,0 +1,133 @@
1
package store
2
3
import (
4
"context"
5
"database/sql"
6
"path/filepath"
7
"strings"
8
"testing"
9
10
_ "modernc.org/sqlite"
11
)
12
13
func TestInvisibleSecretRoundTrip(t *testing.T) {
14
s := openTest(t)
15
ctx := context.Background()
16
if err := s.CreateSecret(ctx, "repo", 1, "SHOWN", "zichtbaar", false, false); err != nil {
17
t.Fatal(err)
18
}
19
if err := s.CreateSecret(ctx, "repo", 1, "HIDDEN", "onzichtbaar", true, true); err != nil {
20
t.Fatal(err)
21
}
22
if err := s.CreateSecret(ctx, "repo", 1, "SHOWN", "nogmaals", false, false); err == nil || !strings.Contains(err.Error(), "already exists") {
23
t.Fatalf("dubbele naam: %v", err)
24
}
25
got, err := s.RevealSecret(ctx, "repo", 1, "SHOWN")
26
if err != nil || got != "zichtbaar" {
27
t.Fatalf("tonen: %q %v", got, err)
28
}
29
if _, err := s.RevealSecret(ctx, "repo", 1, "HIDDEN"); err == nil || !strings.Contains(err.Error(), "invisible") {
30
t.Fatalf("verborgen waarde lekt: %v", err)
31
}
32
if err := s.UpdateSecret(ctx, "repo", 1, "HIDDEN", "nieuw", false); err == nil || !strings.Contains(err.Error(), "invisible") {
33
t.Fatalf("bewerken van onzichtbaar: %v", err)
34
}
35
if err := s.ReplaceSecret(ctx, "repo", 1, "SHOWN", "x", false); err == nil || !strings.Contains(err.Error(), "is visible") {
36
t.Fatalf("vervangen van zichtbaar: %v", err)
37
}
38
if err := s.UpdateSecret(ctx, "repo", 1, "SHOWN", "anders", true); err != nil {
39
t.Fatal(err)
40
}
41
if err := s.ReplaceSecret(ctx, "repo", 1, "HIDDEN", "vervangen", false); err != nil {
42
t.Fatal(err)
43
}
44
if err := s.PutSecret(ctx, "repo", 1, "HIDDEN", "via-put", false); err != nil {
45
t.Fatal(err)
46
}
47
list, err := s.ListSecrets(ctx, "repo", 1)
48
if err != nil {
49
t.Fatal(err)
50
}
51
byName := map[string]SecretMeta{}
52
for _, m := range list {
53
byName[m.Name] = m
54
}
55
if !byName["SHOWN"].Protected || byName["SHOWN"].Invisible {
56
t.Fatalf("zichtbaar: %+v", byName["SHOWN"])
57
}
58
if !byName["HIDDEN"].Invisible || byName["HIDDEN"].Protected {
59
t.Fatalf("onzichtbaar blijft onzichtbaar: %+v", byName["HIDDEN"])
60
}
61
vals, err := s.SecretValues(ctx, "repo", 1, true)
62
if err != nil || vals["HIDDEN"] != "via-put" || vals["SHOWN"] != "anders" {
63
t.Fatalf("jobs krijgen de waarde: %#v %v", vals, err)
64
}
65
if _, err := s.RevealSecret(ctx, "repo", 1, "HIDDEN"); err == nil {
66
t.Fatal("put maakt een onzichtbaar geheim zichtbaar")
67
}
68
if err := s.DeleteSecret(ctx, "repo", 1, "HIDDEN"); err != nil {
69
t.Fatal(err)
70
}
71
if err := s.DeleteSecret(ctx, "repo", 1, "HIDDEN"); !Missing(err) {
72
t.Fatalf("weg: %v", err)
73
}
74
}
75
76
func TestSecretColumnMigrates(t *testing.T) {
77
dir := t.TempDir()
78
path := filepath.Join(dir, "bluegit.db")
79
key := make([]byte, 32)
80
for i := range key {
81
key[i] = byte(i + 1)
82
}
83
s, err := Open(path, key)
84
if err != nil {
85
t.Fatal(err)
86
}
87
ctx := context.Background()
88
if err := s.PutSecret(ctx, "repo", 1, "KEEP", "oud", true); err != nil {
89
t.Fatal(err)
90
}
91
if _, err := s.CreateWebhook(ctx, Webhook{
92
ScopeKind: "repo", ScopeID: 1, Name: "ping", Preset: "generic",
93
URLTemplate: "https://example.test/hook", Events: []string{"push"}, Fields: `{"url":"https://example.test/hook"}`,
94
}); err != nil {
95
t.Fatal(err)
96
}
97
if err := s.Close(); err != nil {
98
t.Fatal(err)
99
}
100
db, err := sql.Open("sqlite", "file:"+path)
101
if err != nil {
102
t.Fatal(err)
103
}
104
if _, err := db.Exec(`ALTER TABLE secrets DROP COLUMN invisible`); err != nil {
105
t.Fatal(err)
106
}
107
if _, err := db.Exec(`ALTER TABLE webhooks DROP COLUMN fields_json`); err != nil {
108
t.Fatal(err)
109
}
110
if err := db.Close(); err != nil {
111
t.Fatal(err)
112
}
113
s, err = Open(path, key)
114
if err != nil {
115
t.Fatal(err)
116
}
117
t.Cleanup(func() { _ = s.Close() })
118
list, err := s.ListSecrets(ctx, "repo", 1)
119
if err != nil || len(list) != 1 || list[0].Name != "KEEP" || list[0].Invisible || !list[0].Protected {
120
t.Fatalf("na migratie: %+v %v", list, err)
121
}
122
got, err := s.RevealSecret(ctx, "repo", 1, "KEEP")
123
if err != nil || got != "oud" {
124
t.Fatalf("waarde na migratie: %q %v", got, err)
125
}
126
hooks, err := s.ListWebhooks(ctx, "repo", 1)
127
if err != nil || len(hooks) != 1 || hooks[0].Fields != "" || hooks[0].URLTemplate != "https://example.test/hook" {
128
t.Fatalf("webhook na migratie: %+v %v", hooks, err)
129
}
130
if err := s.UpdateSecret(ctx, "repo", 1, "NOPE", "x", false); !Missing(err) {
131
t.Fatalf("ontbrekend geheim: %v", err)
132
}
133
}
@@ -0,0 +1,133 @@1
package store2
3
import (4
"context"5
"database/sql"6
"path/filepath"7
"strings"8
"testing"9
10
_ "modernc.org/sqlite"11
)12
13
func TestInvisibleSecretRoundTrip(t *testing.T) {14
s := openTest(t)15
ctx := context.Background()16
if err := s.CreateSecret(ctx, "repo", 1, "SHOWN", "zichtbaar", false, false); err != nil {17
t.Fatal(err)18
}19
if err := s.CreateSecret(ctx, "repo", 1, "HIDDEN", "onzichtbaar", true, true); err != nil {20
t.Fatal(err)21
}22
if err := s.CreateSecret(ctx, "repo", 1, "SHOWN", "nogmaals", false, false); err == nil || !strings.Contains(err.Error(), "already exists") {23
t.Fatalf("dubbele naam: %v", err)24
}25
got, err := s.RevealSecret(ctx, "repo", 1, "SHOWN")26
if err != nil || got != "zichtbaar" {27
t.Fatalf("tonen: %q %v", got, err)28
}29
if _, err := s.RevealSecret(ctx, "repo", 1, "HIDDEN"); err == nil || !strings.Contains(err.Error(), "invisible") {30
t.Fatalf("verborgen waarde lekt: %v", err)31
}32
if err := s.UpdateSecret(ctx, "repo", 1, "HIDDEN", "nieuw", false); err == nil || !strings.Contains(err.Error(), "invisible") {33
t.Fatalf("bewerken van onzichtbaar: %v", err)34
}35
if err := s.ReplaceSecret(ctx, "repo", 1, "SHOWN", "x", false); err == nil || !strings.Contains(err.Error(), "is visible") {36
t.Fatalf("vervangen van zichtbaar: %v", err)37
}38
if err := s.UpdateSecret(ctx, "repo", 1, "SHOWN", "anders", true); err != nil {39
t.Fatal(err)40
}41
if err := s.ReplaceSecret(ctx, "repo", 1, "HIDDEN", "vervangen", false); err != nil {42
t.Fatal(err)43
}44
if err := s.PutSecret(ctx, "repo", 1, "HIDDEN", "via-put", false); err != nil {45
t.Fatal(err)46
}47
list, err := s.ListSecrets(ctx, "repo", 1)48
if err != nil {49
t.Fatal(err)50
}51
byName := map[string]SecretMeta{}52
for _, m := range list {53
byName[m.Name] = m54
}55
if !byName["SHOWN"].Protected || byName["SHOWN"].Invisible {56
t.Fatalf("zichtbaar: %+v", byName["SHOWN"])57
}58
if !byName["HIDDEN"].Invisible || byName["HIDDEN"].Protected {59
t.Fatalf("onzichtbaar blijft onzichtbaar: %+v", byName["HIDDEN"])60
}61
vals, err := s.SecretValues(ctx, "repo", 1, true)62
if err != nil || vals["HIDDEN"] != "via-put" || vals["SHOWN"] != "anders" {63
t.Fatalf("jobs krijgen de waarde: %#v %v", vals, err)64
}65
if _, err := s.RevealSecret(ctx, "repo", 1, "HIDDEN"); err == nil {66
t.Fatal("put maakt een onzichtbaar geheim zichtbaar")67
}68
if err := s.DeleteSecret(ctx, "repo", 1, "HIDDEN"); err != nil {69
t.Fatal(err)70
}71
if err := s.DeleteSecret(ctx, "repo", 1, "HIDDEN"); !Missing(err) {72
t.Fatalf("weg: %v", err)73
}74
}75
76
func TestSecretColumnMigrates(t *testing.T) {77
dir := t.TempDir()78
path := filepath.Join(dir, "bluegit.db")79
key := make([]byte, 32)80
for i := range key {81
key[i] = byte(i + 1)82
}83
s, err := Open(path, key)84
if err != nil {85
t.Fatal(err)86
}87
ctx := context.Background()88
if err := s.PutSecret(ctx, "repo", 1, "KEEP", "oud", true); err != nil {89
t.Fatal(err)90
}91
if _, err := s.CreateWebhook(ctx, Webhook{92
ScopeKind: "repo", ScopeID: 1, Name: "ping", Preset: "generic",93
URLTemplate: "https://example.test/hook", Events: []string{"push"}, Fields: `{"url":"https://example.test/hook"}`,94
}); err != nil {95
t.Fatal(err)96
}97
if err := s.Close(); err != nil {98
t.Fatal(err)99
}100
db, err := sql.Open("sqlite", "file:"+path)101
if err != nil {102
t.Fatal(err)103
}104
if _, err := db.Exec(`ALTER TABLE secrets DROP COLUMN invisible`); err != nil {105
t.Fatal(err)106
}107
if _, err := db.Exec(`ALTER TABLE webhooks DROP COLUMN fields_json`); err != nil {108
t.Fatal(err)109
}110
if err := db.Close(); err != nil {111
t.Fatal(err)112
}113
s, err = Open(path, key)114
if err != nil {115
t.Fatal(err)116
}117
t.Cleanup(func() { _ = s.Close() })118
list, err := s.ListSecrets(ctx, "repo", 1)119
if err != nil || len(list) != 1 || list[0].Name != "KEEP" || list[0].Invisible || !list[0].Protected {120
t.Fatalf("na migratie: %+v %v", list, err)121
}122
got, err := s.RevealSecret(ctx, "repo", 1, "KEEP")123
if err != nil || got != "oud" {124
t.Fatalf("waarde na migratie: %q %v", got, err)125
}126
hooks, err := s.ListWebhooks(ctx, "repo", 1)127
if err != nil || len(hooks) != 1 || hooks[0].Fields != "" || hooks[0].URLTemplate != "https://example.test/hook" {128
t.Fatalf("webhook na migratie: %+v %v", hooks, err)129
}130
if err := s.UpdateSecret(ctx, "repo", 1, "NOPE", "x", false); !Missing(err) {131
t.Fatalf("ontbrekend geheim: %v", err)132
}133
}@@ -93,6 +93,8 @@ func (s *Store) migrate() error {
93
93
`ALTER TABLE merge_requests ADD COLUMN draft INTEGER NOT NULL DEFAULT 0`,
94
94
`ALTER TABLE merge_requests ADD COLUMN labels TEXT NOT NULL DEFAULT ''`,
95
95
`ALTER TABLE notes ADD COLUMN parent_id INTEGER NOT NULL DEFAULT 0`,
96
`ALTER TABLE secrets ADD COLUMN invisible INTEGER NOT NULL DEFAULT 0`,
97
`ALTER TABLE webhooks ADD COLUMN fields_json TEXT NOT NULL DEFAULT ''`,
96
98
}
97
99
for _, q := range alters {
98
100
if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
@@ -206,6 +208,7 @@ CREATE TABLE IF NOT EXISTS secrets (
206
208
ciphertext BLOB NOT NULL,
207
209
nonce BLOB NOT NULL,
208
210
protected INTEGER NOT NULL DEFAULT 0,
211
invisible INTEGER NOT NULL DEFAULT 0,
209
212
created_at TEXT NOT NULL,
210
213
UNIQUE(scope_kind, scope_id, name)
211
214
);
@@ -222,6 +225,7 @@ CREATE TABLE IF NOT EXISTS webhooks (
222
225
branch_filter TEXT NOT NULL DEFAULT '',
223
226
active INTEGER NOT NULL DEFAULT 1,
224
227
method TEXT NOT NULL DEFAULT 'POST',
228
fields_json TEXT NOT NULL DEFAULT '',
225
229
created_at TEXT NOT NULL
226
230
);
227
231
CREATE TABLE IF NOT EXISTS webhook_deliveries (
@@ -823,6 +827,12 @@ func boolInt(b bool) int {
823
827
824
828
var errNotFound = fmt.Errorf("niet gevonden")
825
829
830
// Missing meldt dat de gevraagde rij er niet is.
831
func Missing(err error) bool { return errors.Is(err, errNotFound) }
832
833
// NotFound is de fout voor een ontbrekende rij.
834
func NotFound() error { return errNotFound }
835
826
836
// ErrNotFound is het resultaat als een rij ontbreekt.
827
837
func ErrNotFound() error { return errNotFound }
828
838
@@ -93,6 +93,8 @@ func (s *Store) migrate() error {93
`ALTER TABLE merge_requests ADD COLUMN draft INTEGER NOT NULL DEFAULT 0`,93
`ALTER TABLE merge_requests ADD COLUMN draft INTEGER NOT NULL DEFAULT 0`,94
`ALTER TABLE merge_requests ADD COLUMN labels TEXT NOT NULL DEFAULT ''`,94
`ALTER TABLE merge_requests ADD COLUMN labels TEXT NOT NULL DEFAULT ''`,95
`ALTER TABLE notes ADD COLUMN parent_id INTEGER NOT NULL DEFAULT 0`,95
`ALTER TABLE notes ADD COLUMN parent_id INTEGER NOT NULL DEFAULT 0`,96
`ALTER TABLE secrets ADD COLUMN invisible INTEGER NOT NULL DEFAULT 0`,97
`ALTER TABLE webhooks ADD COLUMN fields_json TEXT NOT NULL DEFAULT ''`,96
}98
}97
for _, q := range alters {99
for _, q := range alters {98
if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {100
if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {@@ -206,6 +208,7 @@ CREATE TABLE IF NOT EXISTS secrets (206
ciphertext BLOB NOT NULL,208
ciphertext BLOB NOT NULL,207
nonce BLOB NOT NULL,209
nonce BLOB NOT NULL,208
protected INTEGER NOT NULL DEFAULT 0,210
protected INTEGER NOT NULL DEFAULT 0,211
invisible INTEGER NOT NULL DEFAULT 0,209
created_at TEXT NOT NULL,212
created_at TEXT NOT NULL,210
UNIQUE(scope_kind, scope_id, name)213
UNIQUE(scope_kind, scope_id, name)211
);214
);@@ -222,6 +225,7 @@ CREATE TABLE IF NOT EXISTS webhooks (222
branch_filter TEXT NOT NULL DEFAULT '',225
branch_filter TEXT NOT NULL DEFAULT '',223
active INTEGER NOT NULL DEFAULT 1,226
active INTEGER NOT NULL DEFAULT 1,224
method TEXT NOT NULL DEFAULT 'POST',227
method TEXT NOT NULL DEFAULT 'POST',228
fields_json TEXT NOT NULL DEFAULT '',225
created_at TEXT NOT NULL229
created_at TEXT NOT NULL226
);230
);227
CREATE TABLE IF NOT EXISTS webhook_deliveries (231
CREATE TABLE IF NOT EXISTS webhook_deliveries (@@ -823,6 +827,12 @@ func boolInt(b bool) int {823
827
824
var errNotFound = fmt.Errorf("niet gevonden")828
var errNotFound = fmt.Errorf("niet gevonden")825
829
830
// Missing meldt dat de gevraagde rij er niet is.831
func Missing(err error) bool { return errors.Is(err, errNotFound) }832
833
// NotFound is de fout voor een ontbrekende rij.834
func NotFound() error { return errNotFound }835
826
// ErrNotFound is het resultaat als een rij ontbreekt.836
// ErrNotFound is het resultaat als een rij ontbreekt.827
func ErrNotFound() error { return errNotFound }837
func ErrNotFound() error { return errNotFound }828
838
@@ -44,10 +44,21 @@ func KnownPreset(id string) bool {
44
44
45
45
// Input zijn de velden van het formulier. Prepare leest alleen wat bij de preset hoort.
46
46
type Input struct {
47
URL, Username, Avatar, Icon, Alias string
48
Token, Chat, Server, Topic string
49
Homeserver, Room string
50
Method, ContentType, Headers, Body string
47
URL string `json:"url"`
48
Username string `json:"username"`
49
Avatar string `json:"avatar"`
50
Icon string `json:"icon"`
51
Alias string `json:"alias"`
52
Token string `json:"token"`
53
Chat string `json:"chat"`
54
Server string `json:"server"`
55
Topic string `json:"topic"`
56
Homeserver string `json:"homeserver"`
57
Room string `json:"room"`
58
Method string `json:"method"`
59
ContentType string `json:"content_type"`
60
Headers string `json:"headers"`
61
Body string `json:"body"`
51
62
}
52
63
53
64
// Spec is wat er opgeslagen wordt. De body is een sjabloon; JSON-presets
@@ -44,10 +44,21 @@ func KnownPreset(id string) bool {44
44
45
// Input zijn de velden van het formulier. Prepare leest alleen wat bij de preset hoort.45
// Input zijn de velden van het formulier. Prepare leest alleen wat bij de preset hoort.46
type Input struct {46
type Input struct {47
URL, Username, Avatar, Icon, Alias string47
URL string `json:"url"`48
Token, Chat, Server, Topic string48
Username string `json:"username"`49
Homeserver, Room string49
Avatar string `json:"avatar"`50
Method, ContentType, Headers, Body string50
Icon string `json:"icon"`51
Alias string `json:"alias"`52
Token string `json:"token"`53
Chat string `json:"chat"`54
Server string `json:"server"`55
Topic string `json:"topic"`56
Homeserver string `json:"homeserver"`57
Room string `json:"room"`58
Method string `json:"method"`59
ContentType string `json:"content_type"`60
Headers string `json:"headers"`61
Body string `json:"body"`51
}62
}52
63
53
// Spec is wat er opgeslagen wordt. De body is een sjabloon; JSON-presets64
// Spec is wat er opgeslagen wordt. De body is een sjabloon; JSON-presets