Merge branch 'cursor/var-expand' into 'stage'
@@ -0,0 +1,108 @@
1
package ci
2
3
import "strings"
4
5
// ExpandVariables vervangt $NAAM en ${NAAM} in de waarden van de variabelen
6
// in expand, met de waarden uit env (zoals GitLab "Expand variable
7
// reference"). $$ wordt een letterlijke $. Een onbekende naam blijft
8
// letterlijk staan, net als bij GitLab. Een variabele die zelf expand heeft,
9
// wordt eerst zelf uitgebreid; een cyclus laat de verwijzing letterlijk.
10
// Geeft de nieuwe waarden van de uitgebreide variabelen terug.
11
func ExpandVariables(env map[string]string, expand map[string]bool) map[string]string {
12
done := map[string]string{}
13
busy := map[string]bool{}
14
var resolve func(name string) (string, bool)
15
resolve = func(name string) (string, bool) {
16
if v, ok := done[name]; ok {
17
return v, true
18
}
19
raw, ok := env[name]
20
if !ok {
21
return "", false
22
}
23
if !expand[name] {
24
return raw, true
25
}
26
if busy[name] {
27
return "", false
28
}
29
busy[name] = true
30
out := expandRefs(raw, resolve)
31
busy[name] = false
32
done[name] = out
33
return out, true
34
}
35
out := map[string]string{}
36
for name, on := range expand {
37
if !on {
38
continue
39
}
40
if _, ok := env[name]; !ok {
41
continue
42
}
43
v, _ := resolve(name)
44
out[name] = v
45
}
46
return out
47
}
48
49
func expandRefs(s string, lookup func(string) (string, bool)) string {
50
var b strings.Builder
51
for i := 0; i < len(s); i++ {
52
c := s[i]
53
if c != '$' || i+1 >= len(s) {
54
b.WriteByte(c)
55
continue
56
}
57
if s[i+1] == '$' {
58
b.WriteByte('$')
59
i++
60
continue
61
}
62
if s[i+1] == '{' {
63
end := strings.IndexByte(s[i+2:], '}')
64
name := ""
65
if end >= 0 {
66
name = s[i+2 : i+2+end]
67
}
68
if end < 0 || !validName(name) {
69
b.WriteByte('$')
70
continue
71
}
72
if v, ok := lookup(name); ok {
73
b.WriteString(v)
74
} else {
75
b.WriteString(s[i : i+3+end])
76
}
77
i += 2 + end
78
continue
79
}
80
j := i + 1
81
for j < len(s) && isIdent(s[j]) {
82
j++
83
}
84
if j == i+1 {
85
b.WriteByte('$')
86
continue
87
}
88
if v, ok := lookup(s[i+1 : j]); ok {
89
b.WriteString(v)
90
} else {
91
b.WriteString(s[i:j])
92
}
93
i = j - 1
94
}
95
return b.String()
96
}
97
98
func validName(n string) bool {
99
if n == "" {
100
return false
101
}
102
for i := 0; i < len(n); i++ {
103
if !isIdent(n[i]) {
104
return false
105
}
106
}
107
return true
108
}
@@ -0,0 +1,108 @@1
package ci2
3
import "strings"4
5
// ExpandVariables vervangt $NAAM en ${NAAM} in de waarden van de variabelen6
// in expand, met de waarden uit env (zoals GitLab "Expand variable7
// reference"). $$ wordt een letterlijke $. Een onbekende naam blijft8
// letterlijk staan, net als bij GitLab. Een variabele die zelf expand heeft,9
// wordt eerst zelf uitgebreid; een cyclus laat de verwijzing letterlijk.10
// Geeft de nieuwe waarden van de uitgebreide variabelen terug.11
func ExpandVariables(env map[string]string, expand map[string]bool) map[string]string {12
done := map[string]string{}13
busy := map[string]bool{}14
var resolve func(name string) (string, bool)15
resolve = func(name string) (string, bool) {16
if v, ok := done[name]; ok {17
return v, true18
}19
raw, ok := env[name]20
if !ok {21
return "", false22
}23
if !expand[name] {24
return raw, true25
}26
if busy[name] {27
return "", false28
}29
busy[name] = true30
out := expandRefs(raw, resolve)31
busy[name] = false32
done[name] = out33
return out, true34
}35
out := map[string]string{}36
for name, on := range expand {37
if !on {38
continue39
}40
if _, ok := env[name]; !ok {41
continue42
}43
v, _ := resolve(name)44
out[name] = v45
}46
return out47
}48
49
func expandRefs(s string, lookup func(string) (string, bool)) string {50
var b strings.Builder51
for i := 0; i < len(s); i++ {52
c := s[i]53
if c != '$' || i+1 >= len(s) {54
b.WriteByte(c)55
continue56
}57
if s[i+1] == '$' {58
b.WriteByte('$')59
i++60
continue61
}62
if s[i+1] == '{' {63
end := strings.IndexByte(s[i+2:], '}')64
name := ""65
if end >= 0 {66
name = s[i+2 : i+2+end]67
}68
if end < 0 || !validName(name) {69
b.WriteByte('$')70
continue71
}72
if v, ok := lookup(name); ok {73
b.WriteString(v)74
} else {75
b.WriteString(s[i : i+3+end])76
}77
i += 2 + end78
continue79
}80
j := i + 181
for j < len(s) && isIdent(s[j]) {82
j++83
}84
if j == i+1 {85
b.WriteByte('$')86
continue87
}88
if v, ok := lookup(s[i+1 : j]); ok {89
b.WriteString(v)90
} else {91
b.WriteString(s[i:j])92
}93
i = j - 194
}95
return b.String()96
}97
98
func validName(n string) bool {99
if n == "" {100
return false101
}102
for i := 0; i < len(n); i++ {103
if !isIdent(n[i]) {104
return false105
}106
}107
return true108
}@@ -0,0 +1,41 @@
1
package ci
2
3
import "testing"
4
5
func TestExpandVariables(t *testing.T) {
6
env := map[string]string{
7
"HOST": "db.local", "PORT": "5432", "CI_PROJECT_NAME": "app",
8
"URL": "postgres://$HOST:${PORT}/${CI_PROJECT_NAME}",
9
"PASS": "pa$$w0rd$HOST",
10
"COST": "$$5 en $ONBEKEND en ${ONBEKEND2}",
11
"A": "x$B", "B": "y$A",
12
"NEST": "<$URL>",
13
}
14
got := ExpandVariables(env, map[string]bool{"URL": true, "COST": true, "A": true, "B": true, "NEST": true, "PASS": false})
15
if got["URL"] != "postgres://db.local:5432/app" {
16
t.Fatalf("URL=%q", got["URL"])
17
}
18
if got["NEST"] != "<postgres://db.local:5432/app>" {
19
t.Fatalf("NEST=%q", got["NEST"])
20
}
21
if got["COST"] != "$5 en $ONBEKEND en ${ONBEKEND2}" {
22
t.Fatalf("COST=%q", got["COST"])
23
}
24
if _, ok := got["PASS"]; ok {
25
t.Fatal("PASS zonder expand mag niet veranderen")
26
}
27
if env["PASS"] != "pa$$w0rd$HOST" {
28
t.Fatal("env aangepast")
29
}
30
// cyclus: geen hang, verwijzing blijft letterlijk
31
if got["A"] == "" || got["B"] == "" {
32
t.Fatalf("cyclus: %q %q", got["A"], got["B"])
33
}
34
}
35
36
func TestExpandVariablesOff(t *testing.T) {
37
env := map[string]string{"P": "a$b$$c", "b": "X"}
38
if got := ExpandVariables(env, nil); len(got) != 0 {
39
t.Fatalf("%v", got)
40
}
41
}
@@ -0,0 +1,41 @@1
package ci2
3
import "testing"4
5
func TestExpandVariables(t *testing.T) {6
env := map[string]string{7
"HOST": "db.local", "PORT": "5432", "CI_PROJECT_NAME": "app",8
"URL": "postgres://$HOST:${PORT}/${CI_PROJECT_NAME}",9
"PASS": "pa$$w0rd$HOST",10
"COST": "$$5 en $ONBEKEND en ${ONBEKEND2}",11
"A": "x$B", "B": "y$A",12
"NEST": "<$URL>",13
}14
got := ExpandVariables(env, map[string]bool{"URL": true, "COST": true, "A": true, "B": true, "NEST": true, "PASS": false})15
if got["URL"] != "postgres://db.local:5432/app" {16
t.Fatalf("URL=%q", got["URL"])17
}18
if got["NEST"] != "<postgres://db.local:5432/app>" {19
t.Fatalf("NEST=%q", got["NEST"])20
}21
if got["COST"] != "$5 en $ONBEKEND en ${ONBEKEND2}" {22
t.Fatalf("COST=%q", got["COST"])23
}24
if _, ok := got["PASS"]; ok {25
t.Fatal("PASS zonder expand mag niet veranderen")26
}27
if env["PASS"] != "pa$$w0rd$HOST" {28
t.Fatal("env aangepast")29
}30
// cyclus: geen hang, verwijzing blijft letterlijk31
if got["A"] == "" || got["B"] == "" {32
t.Fatalf("cyclus: %q %q", got["A"], got["B"])33
}34
}35
36
func TestExpandVariablesOff(t *testing.T) {37
env := map[string]string{"P": "a$b$$c", "b": "X"}38
if got := ExpandVariables(env, nil); len(got) != 0 {39
t.Fatalf("%v", got)40
}41
}@@ -26,6 +26,9 @@ var secretEN = map[string]string{
26
26
"action.show": "Show",
27
27
"action.replace": "Replace",
28
28
"set.invisible": "Invisible",
29
"set.expand": "Expand variables in the value ($NAME)",
30
"set.expandPill": "Variable expansion",
31
"set.expandTip": "Off by default. When on, $NAME and ${NAME} in the value are replaced at job time by other variables (group, project, job, CI_*). Write $$ for a literal $. Unknown names stay as written, like GitLab. Cycles are not expanded.",
29
32
"set.invisibleHint": "An invisible secret cannot be viewed or edited afterwards. You can only delete it or replace the value.",
30
33
"set.valuesHidden": "Values stay hidden until you choose Show. An invisible secret cannot be shown.",
31
34
"flash.secretReplaced": "Secret replaced",
@@ -50,6 +53,9 @@ var secretNL = map[string]string{
50
53
"action.show": "Toon",
51
54
"action.replace": "Vervangen",
52
55
"set.invisible": "Onzichtbaar",
56
"set.expand": "Variabelen in de waarde uitbreiden ($NAAM)",
57
"set.expandPill": "Variabelen uitbreiden",
58
"set.expandTip": "Standaard uit. Aan: $NAAM en ${NAAM} in de waarde worden bij de job vervangen door andere variabelen (groep, project, job, CI_*). Schrijf $$ voor een letterlijke $. Onbekende namen blijven staan zoals geschreven, net als bij GitLab. Kringverwijzingen worden niet uitgebreid.",
53
59
"set.invisibleHint": "Een onzichtbaar geheim is daarna niet meer te bekijken of te bewerken. Je kunt het alleen verwijderen of de waarde vervangen.",
54
60
"set.valuesHidden": "Waarden blijven verborgen tot je Toon kiest. Een onzichtbaar geheim kan niet getoond worden.",
55
61
"flash.secretReplaced": "Geheim vervangen",
@@ -74,6 +80,9 @@ var secretDE = map[string]string{
74
80
"action.show": "Anzeigen",
75
81
"action.replace": "Ersetzen",
76
82
"set.invisible": "Unsichtbar",
83
"set.expand": "Variablen im Wert erweitern ($NAME)",
84
"set.expandPill": "Variablenerweiterung",
85
"set.expandTip": "Standardmäßig aus. Wenn an, werden $NAME und ${NAME} im Wert zur Jobzeit durch andere Variablen ersetzt (Gruppe, Projekt, Job, CI_*). $$ ergibt ein wörtliches $. Unbekannte Namen bleiben unverändert, wie bei GitLab. Zyklen werden nicht erweitert.",
77
86
"set.invisibleHint": "Ein unsichtbares Geheimnis kann danach nicht mehr angesehen oder bearbeitet werden. Du kannst es nur löschen oder den Wert ersetzen.",
78
87
"set.valuesHidden": "Werte bleiben verborgen, bis du Anzeigen wählst. Ein unsichtbares Geheimnis kann nicht angezeigt werden.",
79
88
"flash.secretReplaced": "Geheimnis ersetzt",
@@ -98,6 +107,9 @@ var secretFR = map[string]string{
98
107
"action.show": "Afficher",
99
108
"action.replace": "Remplacer",
100
109
"set.invisible": "Invisible",
110
"set.expand": "Développer les variables dans la valeur ($NOM)",
111
"set.expandPill": "Expansion de variables",
112
"set.expandTip": "Désactivé par défaut. Activé : $NOM et ${NOM} dans la valeur sont remplacés au moment du job par d'autres variables (groupe, projet, job, CI_*). Écrivez $$ pour un $ littéral. Les noms inconnus restent tels quels, comme sur GitLab. Les cycles ne sont pas développés.",
101
113
"set.invisibleHint": "Un secret invisible ne peut plus être consulté ni modifié ensuite. Tu peux seulement le supprimer ou remplacer la valeur.",
102
114
"set.valuesHidden": "Les valeurs restent cachées jusqu'au choix Afficher. Un secret invisible ne peut pas être affiché.",
103
115
"flash.secretReplaced": "Secret remplacé",
@@ -26,6 +26,9 @@ var secretEN = map[string]string{26
"action.show": "Show",26
"action.show": "Show",27
"action.replace": "Replace",27
"action.replace": "Replace",28
"set.invisible": "Invisible",28
"set.invisible": "Invisible",29
"set.expand": "Expand variables in the value ($NAME)",30
"set.expandPill": "Variable expansion",31
"set.expandTip": "Off by default. When on, $NAME and ${NAME} in the value are replaced at job time by other variables (group, project, job, CI_*). Write $$ for a literal $. Unknown names stay as written, like GitLab. Cycles are not expanded.",29
"set.invisibleHint": "An invisible secret cannot be viewed or edited afterwards. You can only delete it or replace the value.",32
"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.",33
"set.valuesHidden": "Values stay hidden until you choose Show. An invisible secret cannot be shown.",31
"flash.secretReplaced": "Secret replaced",34
"flash.secretReplaced": "Secret replaced",@@ -50,6 +53,9 @@ var secretNL = map[string]string{50
"action.show": "Toon",53
"action.show": "Toon",51
"action.replace": "Vervangen",54
"action.replace": "Vervangen",52
"set.invisible": "Onzichtbaar",55
"set.invisible": "Onzichtbaar",56
"set.expand": "Variabelen in de waarde uitbreiden ($NAAM)",57
"set.expandPill": "Variabelen uitbreiden",58
"set.expandTip": "Standaard uit. Aan: $NAAM en ${NAAM} in de waarde worden bij de job vervangen door andere variabelen (groep, project, job, CI_*). Schrijf $$ voor een letterlijke $. Onbekende namen blijven staan zoals geschreven, net als bij GitLab. Kringverwijzingen worden niet uitgebreid.",53
"set.invisibleHint": "Een onzichtbaar geheim is daarna niet meer te bekijken of te bewerken. Je kunt het alleen verwijderen of de waarde vervangen.",59
"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.",60
"set.valuesHidden": "Waarden blijven verborgen tot je Toon kiest. Een onzichtbaar geheim kan niet getoond worden.",55
"flash.secretReplaced": "Geheim vervangen",61
"flash.secretReplaced": "Geheim vervangen",@@ -74,6 +80,9 @@ var secretDE = map[string]string{74
"action.show": "Anzeigen",80
"action.show": "Anzeigen",75
"action.replace": "Ersetzen",81
"action.replace": "Ersetzen",76
"set.invisible": "Unsichtbar",82
"set.invisible": "Unsichtbar",83
"set.expand": "Variablen im Wert erweitern ($NAME)",84
"set.expandPill": "Variablenerweiterung",85
"set.expandTip": "Standardmäßig aus. Wenn an, werden $NAME und ${NAME} im Wert zur Jobzeit durch andere Variablen ersetzt (Gruppe, Projekt, Job, CI_*). $$ ergibt ein wörtliches $. Unbekannte Namen bleiben unverändert, wie bei GitLab. Zyklen werden nicht erweitert.",77
"set.invisibleHint": "Ein unsichtbares Geheimnis kann danach nicht mehr angesehen oder bearbeitet werden. Du kannst es nur löschen oder den Wert ersetzen.",86
"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.",87
"set.valuesHidden": "Werte bleiben verborgen, bis du Anzeigen wählst. Ein unsichtbares Geheimnis kann nicht angezeigt werden.",79
"flash.secretReplaced": "Geheimnis ersetzt",88
"flash.secretReplaced": "Geheimnis ersetzt",@@ -98,6 +107,9 @@ var secretFR = map[string]string{98
"action.show": "Afficher",107
"action.show": "Afficher",99
"action.replace": "Remplacer",108
"action.replace": "Remplacer",100
"set.invisible": "Invisible",109
"set.invisible": "Invisible",110
"set.expand": "Développer les variables dans la valeur ($NOM)",111
"set.expandPill": "Expansion de variables",112
"set.expandTip": "Désactivé par défaut. Activé : $NOM et ${NOM} dans la valeur sont remplacés au moment du job par d'autres variables (groupe, projet, job, CI_*). Écrivez $$ pour un $ littéral. Les noms inconnus restent tels quels, comme sur GitLab. Les cycles ne sont pas développés.",101
"set.invisibleHint": "Un secret invisible ne peut plus être consulté ni modifié ensuite. Tu peux seulement le supprimer ou remplacer la valeur.",113
"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é.",114
"set.valuesHidden": "Les valeurs restent cachées jusqu'au choix Afficher. Un secret invisible ne peut pas être affiché.",103
"flash.secretReplaced": "Secret remplacé",115
"flash.secretReplaced": "Secret remplacé",@@ -0,0 +1,57 @@
1
package runner
2
3
import (
4
"context"
5
"path/filepath"
6
"testing"
7
8
"gitlab.com/Timfa/bluegit/internal/access"
9
"gitlab.com/Timfa/bluegit/internal/store"
10
)
11
12
func TestEnvironmentExpand(t *testing.T) {
13
s, err := store.Open(filepath.Join(t.TempDir(), "b.db"), make([]byte, 32))
14
if err != nil {
15
t.Fatal(err)
16
}
17
defer s.Close()
18
ctx := context.Background()
19
tim, _ := s.UpsertUser(ctx, 1, "tim", "", false)
20
g, _ := s.CreateGroup(ctx, tim.ID, "Team", "team", "", access.RoleReadonly)
21
repo, _ := s.CreateRepo(ctx, "group", g.ID, "app", "", "master", "private")
22
put := func(kind string, id int64, n, v string, on bool) {
23
if err := s.PutSecret(ctx, kind, id, n, v, false); err != nil {
24
t.Fatal(err)
25
}
26
_ = s.SetSecretExpand(ctx, kind, id, n, on)
27
}
28
put("group", g.ID, "HOST", "db.local", false)
29
put("group", g.ID, "URL", "http://$HOST/$CI_PROJECT_NAME", true)
30
put("group", g.ID, "OVR", "grp-$HOST", true)
31
put("repo", repo.ID, "OVR", "repo-$HOST", false) // project wint, ook vlag uit
32
put("repo", repo.ID, "PASS", "pa$$w$HOST", false)
33
put("repo", repo.ID, "LIT", "$$x-${NOPE}", true)
34
put("repo", repo.ID, "JOBV", "s-$HOST", true)
35
r := &Runner{Store: s}
36
job := store.Job{Name: "t", Variables: map[string]string{"JOBV": "job-$HOST"}}
37
env, mask, err := r.environment(ctx, repo, store.Pipeline{Ref: "feature"}, job, "")
38
if err != nil {
39
t.Fatal(err)
40
}
41
want := map[string]string{
42
"URL": "http://db.local/app", "OVR": "repo-$HOST", "PASS": "pa$$w$HOST",
43
"LIT": "$x-${NOPE}", "JOBV": "job-$HOST",
44
}
45
for k, v := range want {
46
if env[k] != v {
47
t.Errorf("%s=%q want %q", k, env[k], v)
48
}
49
}
50
found := false
51
for _, m := range mask {
52
found = found || m == "http://db.local/app"
53
}
54
if !found {
55
t.Error("uitgebreide waarde niet gemaskeerd")
56
}
57
}
@@ -0,0 +1,57 @@1
package runner2
3
import (4
"context"5
"path/filepath"6
"testing"7
8
"gitlab.com/Timfa/bluegit/internal/access"9
"gitlab.com/Timfa/bluegit/internal/store"10
)11
12
func TestEnvironmentExpand(t *testing.T) {13
s, err := store.Open(filepath.Join(t.TempDir(), "b.db"), make([]byte, 32))14
if err != nil {15
t.Fatal(err)16
}17
defer s.Close()18
ctx := context.Background()19
tim, _ := s.UpsertUser(ctx, 1, "tim", "", false)20
g, _ := s.CreateGroup(ctx, tim.ID, "Team", "team", "", access.RoleReadonly)21
repo, _ := s.CreateRepo(ctx, "group", g.ID, "app", "", "master", "private")22
put := func(kind string, id int64, n, v string, on bool) {23
if err := s.PutSecret(ctx, kind, id, n, v, false); err != nil {24
t.Fatal(err)25
}26
_ = s.SetSecretExpand(ctx, kind, id, n, on)27
}28
put("group", g.ID, "HOST", "db.local", false)29
put("group", g.ID, "URL", "http://$HOST/$CI_PROJECT_NAME", true)30
put("group", g.ID, "OVR", "grp-$HOST", true)31
put("repo", repo.ID, "OVR", "repo-$HOST", false) // project wint, ook vlag uit32
put("repo", repo.ID, "PASS", "pa$$w$HOST", false)33
put("repo", repo.ID, "LIT", "$$x-${NOPE}", true)34
put("repo", repo.ID, "JOBV", "s-$HOST", true)35
r := &Runner{Store: s}36
job := store.Job{Name: "t", Variables: map[string]string{"JOBV": "job-$HOST"}}37
env, mask, err := r.environment(ctx, repo, store.Pipeline{Ref: "feature"}, job, "")38
if err != nil {39
t.Fatal(err)40
}41
want := map[string]string{42
"URL": "http://db.local/app", "OVR": "repo-$HOST", "PASS": "pa$$w$HOST",43
"LIT": "$x-${NOPE}", "JOBV": "job-$HOST",44
}45
for k, v := range want {46
if env[k] != v {47
t.Errorf("%s=%q want %q", k, env[k], v)48
}49
}50
found := false51
for _, m := range mask {52
found = found || m == "http://db.local/app"53
}54
if !found {55
t.Error("uitgebreide waarde niet gemaskeerd")56
}57
}@@ -945,7 +945,13 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel
945
945
refProtected := access.BranchProtected(patterns, name)
946
946
env := map[string]string{}
947
947
var mask []string
948
expand := map[string]bool{}
948
949
if repo.OwnerKind == "group" {
950
if flags, err := r.Store.SecretExpandFlags(ctx, "group", repo.OwnerID); err == nil {
951
for k, on := range flags {
952
expand[k] = on
953
}
954
}
949
955
groupSecrets, err := r.Store.SecretValues(ctx, "group", repo.OwnerID, refProtected)
950
956
if err != nil {
951
957
return nil, nil, err
@@ -959,12 +965,16 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel
959
965
if err != nil {
960
966
return nil, nil, err
961
967
}
968
repoFlags, _ := r.Store.SecretExpandFlags(ctx, "repo", repo.ID)
962
969
for k, v := range repoSecrets {
963
970
env[k] = v
964
971
mask = append(mask, v)
972
// Het project wint, ook voor de expand-vlag.
973
expand[k] = repoFlags[k]
965
974
}
966
975
for k, v := range job.Variables {
967
976
env[k] = v
977
delete(expand, k)
968
978
}
969
979
base := strings.TrimRight(r.BaseURL, "/")
970
980
dir := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name)
@@ -1009,6 +1019,20 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel
1009
1019
env[k] = v
1010
1020
}
1011
1021
}
1022
// Variabelen met expand: na de volledige samenvoeging (groep, project,
1023
// job, CI_*). Alleen geheimen die in deze run bestaan doen mee, dus een
1024
// beschermd geheim lekt niet naar een onbeschermde ref.
1025
for k := range expand {
1026
if _, ok := env[k]; !ok || job.Variables[k] != "" {
1027
delete(expand, k)
1028
}
1029
}
1030
for k, v := range ci.ExpandVariables(env, expand) {
1031
env[k] = v
1032
if v != "" {
1033
mask = append(mask, v)
1034
}
1035
}
1012
1036
// Na de jobvariabelen, zodat een eigen GIT_CONFIG_COUNT blijft staan
1013
1037
// en safe.directory er alsnog bij komt.
1014
1038
markWorkspaceSafe(env)
@@ -945,7 +945,13 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel945
refProtected := access.BranchProtected(patterns, name)945
refProtected := access.BranchProtected(patterns, name)946
env := map[string]string{}946
env := map[string]string{}947
var mask []string947
var mask []string948
expand := map[string]bool{}948
if repo.OwnerKind == "group" {949
if repo.OwnerKind == "group" {950
if flags, err := r.Store.SecretExpandFlags(ctx, "group", repo.OwnerID); err == nil {951
for k, on := range flags {952
expand[k] = on953
}954
}949
groupSecrets, err := r.Store.SecretValues(ctx, "group", repo.OwnerID, refProtected)955
groupSecrets, err := r.Store.SecretValues(ctx, "group", repo.OwnerID, refProtected)950
if err != nil {956
if err != nil {951
return nil, nil, err957
return nil, nil, err@@ -959,12 +965,16 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel959
if err != nil {965
if err != nil {960
return nil, nil, err966
return nil, nil, err961
}967
}968
repoFlags, _ := r.Store.SecretExpandFlags(ctx, "repo", repo.ID)962
for k, v := range repoSecrets {969
for k, v := range repoSecrets {963
env[k] = v970
env[k] = v964
mask = append(mask, v)971
mask = append(mask, v)972
// Het project wint, ook voor de expand-vlag.973
expand[k] = repoFlags[k]965
}974
}966
for k, v := range job.Variables {975
for k, v := range job.Variables {967
env[k] = v976
env[k] = v977
delete(expand, k)968
}978
}969
base := strings.TrimRight(r.BaseURL, "/")979
base := strings.TrimRight(r.BaseURL, "/")970
dir := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name)980
dir := gitrepo.Dir(r.storage(), repo.OwnerPath, repo.Name)@@ -1009,6 +1019,20 @@ func (r *Runner) environment(ctx context.Context, repo store.Repo, p store.Pipel1009
env[k] = v1019
env[k] = v1010
}1020
}1011
}1021
}1022
// Variabelen met expand: na de volledige samenvoeging (groep, project,1023
// job, CI_*). Alleen geheimen die in deze run bestaan doen mee, dus een1024
// beschermd geheim lekt niet naar een onbeschermde ref.1025
for k := range expand {1026
if _, ok := env[k]; !ok || job.Variables[k] != "" {1027
delete(expand, k)1028
}1029
}1030
for k, v := range ci.ExpandVariables(env, expand) {1031
env[k] = v1032
if v != "" {1033
mask = append(mask, v)1034
}1035
}1012
// Na de jobvariabelen, zodat een eigen GIT_CONFIG_COUNT blijft staan1036
// Na de jobvariabelen, zodat een eigen GIT_CONFIG_COUNT blijft staan1013
// en safe.directory er alsnog bij komt.1037
// en safe.directory er alsnog bij komt.1014
markWorkspaceSafe(env)1038
markWorkspaceSafe(env)@@ -363,7 +363,7 @@ func (s *Server) apiDeleteProjectMember(w http.ResponseWriter, r *http.Request)
363
363
}
364
364
365
365
func secretJSON(m store.SecretMeta) map[string]any {
366
return map[string]any{"name": m.Name, "protected": m.Protected, "created_at": rfcTime(m.CreatedAt)}
366
return map[string]any{"name": m.Name, "protected": m.Protected, "expand": m.Expand, "created_at": rfcTime(m.CreatedAt)}
367
367
}
368
368
369
369
func (s *Server) apiSecrets(w http.ResponseWriter, r *http.Request, kind string, id int64) {
@@ -384,6 +384,7 @@ func (s *Server) apiSecrets(w http.ResponseWriter, r *http.Request, kind string,
384
384
Name string `json:"name"`
385
385
Value string `json:"value"`
386
386
Protected bool `json:"protected"`
387
Expand *bool `json:"expand"`
387
388
}
388
389
if err := readJSON(r, &body); err != nil {
389
390
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
@@ -392,6 +393,9 @@ func (s *Server) apiSecrets(w http.ResponseWriter, r *http.Request, kind string,
392
393
if !s.apiOK(w, r, s.opPutSecret(r.Context(), apiUser(r), kind, id, body.Name, body.Value, body.Protected)) {
393
394
return
394
395
}
396
if body.Expand != nil {
397
_ = s.Store.SetSecretExpand(r.Context(), kind, id, body.Name, *body.Expand)
398
}
395
399
writeJSON(w, http.StatusOK, map[string]any{"name": body.Name})
396
400
}
397
401
@@ -363,7 +363,7 @@ func (s *Server) apiDeleteProjectMember(w http.ResponseWriter, r *http.Request)363
}363
}364
364
365
func secretJSON(m store.SecretMeta) map[string]any {365
func secretJSON(m store.SecretMeta) map[string]any {366
return map[string]any{"name": m.Name, "protected": m.Protected, "created_at": rfcTime(m.CreatedAt)}366
return map[string]any{"name": m.Name, "protected": m.Protected, "expand": m.Expand, "created_at": rfcTime(m.CreatedAt)}367
}367
}368
368
369
func (s *Server) apiSecrets(w http.ResponseWriter, r *http.Request, kind string, id int64) {369
func (s *Server) apiSecrets(w http.ResponseWriter, r *http.Request, kind string, id int64) {@@ -384,6 +384,7 @@ func (s *Server) apiSecrets(w http.ResponseWriter, r *http.Request, kind string,384
Name string `json:"name"`384
Name string `json:"name"`385
Value string `json:"value"`385
Value string `json:"value"`386
Protected bool `json:"protected"`386
Protected bool `json:"protected"`387
Expand *bool `json:"expand"`387
}388
}388
if err := readJSON(r, &body); err != nil {389
if err := readJSON(r, &body); err != nil {389
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))390
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))@@ -392,6 +393,9 @@ func (s *Server) apiSecrets(w http.ResponseWriter, r *http.Request, kind string,392
if !s.apiOK(w, r, s.opPutSecret(r.Context(), apiUser(r), kind, id, body.Name, body.Value, body.Protected)) {393
if !s.apiOK(w, r, s.opPutSecret(r.Context(), apiUser(r), kind, id, body.Name, body.Value, body.Protected)) {393
return394
return394
}395
}396
if body.Expand != nil {397
_ = s.Store.SetSecretExpand(r.Context(), kind, id, body.Name, *body.Expand)398
}395
writeJSON(w, http.StatusOK, map[string]any{"name": body.Name})399
writeJSON(w, http.StatusOK, map[string]any{"name": body.Name})396
}400
}397
401
@@ -131,6 +131,10 @@ func apiBinds() []apiBind {
131
131
{path: "/groups/{path}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},
132
132
{path: "/projects/{owner}/{repo}/webhooks", method: "GET", code: "200", resp: "Webhook", array: true},
133
133
{path: "/projects/{owner}/{repo}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},
134
{path: "/projects/{owner}/{repo}/secrets", method: "GET", code: "200", resp: "Secret", array: true},
135
{path: "/projects/{owner}/{repo}/secrets", method: "POST", code: "200", body: "SecretWrite", resp: "SecretName"},
136
{path: "/groups/{path}/secrets", method: "GET", code: "200", resp: "Secret", array: true},
137
{path: "/groups/{path}/secrets", method: "POST", code: "200", body: "SecretWrite", resp: "SecretName"},
134
138
{path: "/projects/{owner}/{repo}/secrets/inherited", method: "GET", code: "200", resp: "InheritedSecret", array: true},
135
139
{path: "/groups/{path}/webhooks/{id}", method: "PATCH", code: "200", body: "WebhookUpdate", resp: "Webhook"},
136
140
{path: "/groups/{path}/webhooks/{id}", method: "DELETE", code: "204", empty: true},
@@ -383,6 +387,19 @@ func apiSchemas() map[string]any {
383
387
"headers": str("Extra headers. Empty keeps the current headers."),
384
388
"body": str("Body template."),
385
389
}),
390
"Secret": obj("A secret. Values are never returned.", map[string]any{
391
"name": str("Secret name."),
392
"protected": boolean("Only injected on protected refs."),
393
"expand": boolean("$NAME and ${NAME} in the value are expanded in the runner after group, project, job and CI_* variables are merged. $$ gives a literal $. Unknown names and cycles stay literal, like GitLab."),
394
"created_at": str("Creation time (RFC 3339)."),
395
}),
396
"SecretWrite": obj("Create or replace a secret.", map[string]any{
397
"name": str("Secret name."),
398
"value": str("Secret value. Never returned."),
399
"protected": boolean("Only injected on protected refs."),
400
"expand": boolean("Expand $NAME references in the value at job time. Default false; omitted on update keeps the stored setting."),
401
}),
402
"SecretName": obj("The stored secret name.", map[string]any{"name": str("Secret name.")}),
386
403
"InheritedSecret": obj("A group secret the project inherits. Values are never returned. Jobs get group secrets first; a project secret with the same name wins.", map[string]any{
387
404
"name": str("Secret name."),
388
405
"group": str("Path of the group it comes from."),
@@ -131,6 +131,10 @@ func apiBinds() []apiBind {131
{path: "/groups/{path}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},131
{path: "/groups/{path}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},132
{path: "/projects/{owner}/{repo}/webhooks", method: "GET", code: "200", resp: "Webhook", array: true},132
{path: "/projects/{owner}/{repo}/webhooks", method: "GET", code: "200", resp: "Webhook", array: true},133
{path: "/projects/{owner}/{repo}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},133
{path: "/projects/{owner}/{repo}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},134
{path: "/projects/{owner}/{repo}/secrets", method: "GET", code: "200", resp: "Secret", array: true},135
{path: "/projects/{owner}/{repo}/secrets", method: "POST", code: "200", body: "SecretWrite", resp: "SecretName"},136
{path: "/groups/{path}/secrets", method: "GET", code: "200", resp: "Secret", array: true},137
{path: "/groups/{path}/secrets", method: "POST", code: "200", body: "SecretWrite", resp: "SecretName"},134
{path: "/projects/{owner}/{repo}/secrets/inherited", method: "GET", code: "200", resp: "InheritedSecret", array: true},138
{path: "/projects/{owner}/{repo}/secrets/inherited", method: "GET", code: "200", resp: "InheritedSecret", array: true},135
{path: "/groups/{path}/webhooks/{id}", method: "PATCH", code: "200", body: "WebhookUpdate", resp: "Webhook"},139
{path: "/groups/{path}/webhooks/{id}", method: "PATCH", code: "200", body: "WebhookUpdate", resp: "Webhook"},136
{path: "/groups/{path}/webhooks/{id}", method: "DELETE", code: "204", empty: true},140
{path: "/groups/{path}/webhooks/{id}", method: "DELETE", code: "204", empty: true},@@ -383,6 +387,19 @@ func apiSchemas() map[string]any {383
"headers": str("Extra headers. Empty keeps the current headers."),387
"headers": str("Extra headers. Empty keeps the current headers."),384
"body": str("Body template."),388
"body": str("Body template."),385
}),389
}),390
"Secret": obj("A secret. Values are never returned.", map[string]any{391
"name": str("Secret name."),392
"protected": boolean("Only injected on protected refs."),393
"expand": boolean("$NAME and ${NAME} in the value are expanded in the runner after group, project, job and CI_* variables are merged. $$ gives a literal $. Unknown names and cycles stay literal, like GitLab."),394
"created_at": str("Creation time (RFC 3339)."),395
}),396
"SecretWrite": obj("Create or replace a secret.", map[string]any{397
"name": str("Secret name."),398
"value": str("Secret value. Never returned."),399
"protected": boolean("Only injected on protected refs."),400
"expand": boolean("Expand $NAME references in the value at job time. Default false; omitted on update keeps the stored setting."),401
}),402
"SecretName": obj("The stored secret name.", map[string]any{"name": str("Secret name.")}),386
"InheritedSecret": obj("A group secret the project inherits. Values are never returned. Jobs get group secrets first; a project secret with the same name wins.", map[string]any{403
"InheritedSecret": obj("A group secret the project inherits. Values are never returned. Jobs get group secrets first; a project secret with the same name wins.", map[string]any{387
"name": str("Secret name."),404
"name": str("Secret name."),388
"group": str("Path of the group it comes from."),405
"group": str("Path of the group it comes from."),@@ -15,6 +15,7 @@ type secretBody struct {
15
15
Value string `json:"value"`
16
16
Protected bool `json:"protected"`
17
17
Invisible bool `json:"invisible"`
18
Expand *bool `json:"expand"`
18
19
}
19
20
20
21
func (s *Server) repoSecretsAPI(w http.ResponseWriter, r *http.Request) {
@@ -192,6 +193,9 @@ func (s *Server) secretWriteAPI(w http.ResponseWriter, r *http.Request, kind str
192
193
s.writeSecretErr(w, r, err)
193
194
return
194
195
}
196
if body.Expand != nil {
197
_ = s.Store.SetSecretExpand(r.Context(), kind, scopeID, name, *body.Expand)
198
}
195
199
meta, err := s.secretMeta(r, kind, scopeID, name)
196
200
if err != nil {
197
201
s.writeSecretErr(w, r, err)
@@ -245,6 +249,7 @@ func secretMetaJSON(m store.SecretMeta) map[string]any {
245
249
"name": m.Name,
246
250
"protected": m.Protected,
247
251
"invisible": m.Invisible,
252
"expand": m.Expand,
248
253
"created_at": created,
249
254
}
250
255
}
@@ -15,6 +15,7 @@ type secretBody struct {15
Value string `json:"value"`15
Value string `json:"value"`16
Protected bool `json:"protected"`16
Protected bool `json:"protected"`17
Invisible bool `json:"invisible"`17
Invisible bool `json:"invisible"`18
Expand *bool `json:"expand"`18
}19
}19
20
20
func (s *Server) repoSecretsAPI(w http.ResponseWriter, r *http.Request) {21
func (s *Server) repoSecretsAPI(w http.ResponseWriter, r *http.Request) {@@ -192,6 +193,9 @@ func (s *Server) secretWriteAPI(w http.ResponseWriter, r *http.Request, kind str192
s.writeSecretErr(w, r, err)193
s.writeSecretErr(w, r, err)193
return194
return194
}195
}196
if body.Expand != nil {197
_ = s.Store.SetSecretExpand(r.Context(), kind, scopeID, name, *body.Expand)198
}195
meta, err := s.secretMeta(r, kind, scopeID, name)199
meta, err := s.secretMeta(r, kind, scopeID, name)196
if err != nil {200
if err != nil {197
s.writeSecretErr(w, r, err)201
s.writeSecretErr(w, r, err)@@ -245,6 +249,7 @@ func secretMetaJSON(m store.SecretMeta) map[string]any {245
"name": m.Name,249
"name": m.Name,246
"protected": m.Protected,250
"protected": m.Protected,247
"invisible": m.Invisible,251
"invisible": m.Invisible,252
"expand": m.Expand,248
"created_at": created,253
"created_at": created,249
}254
}250
}255
}@@ -342,6 +342,7 @@ func (s *Server) secretPost(w http.ResponseWriter, r *http.Request, kind string)
342
342
s.redirect(w, r, back, "", s.trErr(r, err))
343
343
return
344
344
}
345
_ = s.Store.SetSecretExpand(r.Context(), kind, scopeID, name, r.FormValue("expand") == "1")
345
346
s.redirect(w, r, back, s.tr(r, flash), "")
346
347
}
347
348
@@ -342,6 +342,7 @@ func (s *Server) secretPost(w http.ResponseWriter, r *http.Request, kind string)342
s.redirect(w, r, back, "", s.trErr(r, err))342
s.redirect(w, r, back, "", s.trErr(r, err))343
return343
return344
}344
}345
_ = s.Store.SetSecretExpand(r.Context(), kind, scopeID, name, r.FormValue("expand") == "1")345
s.redirect(w, r, back, s.tr(r, flash), "")346
s.redirect(w, r, back, s.tr(r, flash), "")346
}347
}347
348
@@ -683,6 +683,7 @@
683
683
<div class="evgrid">
684
684
<label><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>
685
685
<label><input type="checkbox" name="invisible" value="1"> {{t "set.invisible"}}</label>
686
<label data-tip="{{t "set.expandTip"}}"><input type="checkbox" name="expand" value="1"> {{t "set.expand"}}</label>
686
687
</div>
687
688
<p class="muted">{{t "set.invisibleHint"}}</p>
688
689
<button class="fit" type="submit">{{t "action.save"}}</button>
@@ -701,6 +702,7 @@
701
702
<td>
702
703
{{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}
703
704
{{if .Invisible}}<span class="pill">{{t "set.invisible"}}</span>{{end}}
705
{{if .Expand}}<span class="pill" data-tip="{{t "set.expandTip"}}">{{t "set.expandPill"}}</span>{{end}}
704
706
</td>
705
707
<td>
706
708
<div class="acts">
@@ -713,6 +715,7 @@
713
715
<input type="hidden" name="name" value="{{.Name}}">
714
716
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>
715
717
<label><input type="checkbox" name="protected" value="1" {{if .Protected}}checked{{end}}> {{t "set.protectedOnly"}}</label>
718
<label data-tip="{{t "set.expandTip"}}"><input type="checkbox" name="expand" value="1" {{if .Expand}}checked{{end}}> {{t "set.expand"}}</label>
716
719
<button class="tiny" type="submit">{{t "action.replace"}}</button>
717
720
</form>
718
721
</details>
@@ -726,6 +729,7 @@
726
729
<input type="hidden" name="name" value="{{.Name}}">
727
730
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>
728
731
<label><input type="checkbox" name="protected" value="1" {{if .Protected}}checked{{end}}> {{t "set.protectedOnly"}}</label>
732
<label data-tip="{{t "set.expandTip"}}"><input type="checkbox" name="expand" value="1" {{if .Expand}}checked{{end}}> {{t "set.expand"}}</label>
729
733
<button class="tiny" type="submit">{{t "action.save"}}</button>
730
734
</form>
731
735
</details>
@@ -683,6 +683,7 @@683
<div class="evgrid">683
<div class="evgrid">684
<label><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>684
<label><input type="checkbox" name="protected" value="1"> {{t "set.protectedOnly"}}</label>685
<label><input type="checkbox" name="invisible" value="1"> {{t "set.invisible"}}</label>685
<label><input type="checkbox" name="invisible" value="1"> {{t "set.invisible"}}</label>686
<label data-tip="{{t "set.expandTip"}}"><input type="checkbox" name="expand" value="1"> {{t "set.expand"}}</label>686
</div>687
</div>687
<p class="muted">{{t "set.invisibleHint"}}</p>688
<p class="muted">{{t "set.invisibleHint"}}</p>688
<button class="fit" type="submit">{{t "action.save"}}</button>689
<button class="fit" type="submit">{{t "action.save"}}</button>@@ -701,6 +702,7 @@701
<td>702
<td>702
{{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}703
{{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}703
{{if .Invisible}}<span class="pill">{{t "set.invisible"}}</span>{{end}}704
{{if .Invisible}}<span class="pill">{{t "set.invisible"}}</span>{{end}}705
{{if .Expand}}<span class="pill" data-tip="{{t "set.expandTip"}}">{{t "set.expandPill"}}</span>{{end}}704
</td>706
</td>705
<td>707
<td>706
<div class="acts">708
<div class="acts">@@ -713,6 +715,7 @@713
<input type="hidden" name="name" value="{{.Name}}">715
<input type="hidden" name="name" value="{{.Name}}">714
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>716
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>715
<label><input type="checkbox" name="protected" value="1" {{if .Protected}}checked{{end}}> {{t "set.protectedOnly"}}</label>717
<label><input type="checkbox" name="protected" value="1" {{if .Protected}}checked{{end}}> {{t "set.protectedOnly"}}</label>718
<label data-tip="{{t "set.expandTip"}}"><input type="checkbox" name="expand" value="1" {{if .Expand}}checked{{end}}> {{t "set.expand"}}</label>716
<button class="tiny" type="submit">{{t "action.replace"}}</button>719
<button class="tiny" type="submit">{{t "action.replace"}}</button>717
</form>720
</form>718
</details>721
</details>@@ -726,6 +729,7 @@726
<input type="hidden" name="name" value="{{.Name}}">729
<input type="hidden" name="name" value="{{.Name}}">727
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>730
<label>{{t "set.secretValue"}} <textarea name="value" required></textarea></label>728
<label><input type="checkbox" name="protected" value="1" {{if .Protected}}checked{{end}}> {{t "set.protectedOnly"}}</label>731
<label><input type="checkbox" name="protected" value="1" {{if .Protected}}checked{{end}}> {{t "set.protectedOnly"}}</label>732
<label data-tip="{{t "set.expandTip"}}"><input type="checkbox" name="expand" value="1" {{if .Expand}}checked{{end}}> {{t "set.expand"}}</label>729
<button class="tiny" type="submit">{{t "action.save"}}</button>733
<button class="tiny" type="submit">{{t "action.save"}}</button>730
</form>734
</form>731
</details>735
</details>@@ -450,9 +450,9 @@ func scanRepos(rows *sql.Rows) ([]Repo, error) {
450
450
if pushed != "" {
451
451
r.PushedAt = parseTime(pushed)
452
452
}
453
if pushed != "" {
454
r.PushedAt = parseTime(pushed)
455
}
453
if pushed != "" {
454
r.PushedAt = parseTime(pushed)
455
}
456
456
out = append(out, r)
457
457
}
458
458
return out, rows.Err()
@@ -703,6 +703,8 @@ type SecretMeta struct {
703
703
Name string
704
704
Protected bool
705
705
Invisible bool
706
// Expand: $NAAM en ${NAAM} in de waarde worden in de runner vervangen.
707
Expand bool
706
708
CreatedAt time.Time
707
709
}
708
710
@@ -835,7 +837,7 @@ func (s *Store) RevealSecret(ctx context.Context, scopeKind string, scopeID int6
835
837
836
838
// ListSecrets geeft namen, niet de waarden.
837
839
func (s *Store) ListSecrets(ctx context.Context, scopeKind string, scopeID int64) ([]SecretMeta, error) {
838
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)
840
rows, err := s.db.QueryContext(ctx, `SELECT name, protected, invisible, expand, created_at FROM secrets WHERE scope_kind = ? AND scope_id = ? ORDER BY name`, scopeKind, scopeID)
839
841
if err != nil {
840
842
return nil, err
841
843
}
@@ -843,13 +845,14 @@ func (s *Store) ListSecrets(ctx context.Context, scopeKind string, scopeID int64
843
845
var out []SecretMeta
844
846
for rows.Next() {
845
847
var m SecretMeta
846
var p, inv int
848
var p, inv, exp int
847
849
var created string
848
if err := rows.Scan(&m.Name, &p, &inv, &created); err != nil {
850
if err := rows.Scan(&m.Name, &p, &inv, &exp, &created); err != nil {
849
851
return nil, err
850
852
}
851
853
m.Protected = p == 1
852
854
m.Invisible = inv == 1
855
m.Expand = exp == 1
853
856
m.CreatedAt = parseTime(created)
854
857
out = append(out, m)
855
858
}
@@ -942,3 +945,28 @@ func SortGroupsByPush(list []Group, at map[int64]time.Time) {
942
945
return strings.ToLower(list[i].Name) < strings.ToLower(list[j].Name)
943
946
})
944
947
}
948
949
// SetSecretExpand zet of de waarde variabelen uitbreidt.
950
func (s *Store) SetSecretExpand(ctx context.Context, scopeKind string, scopeID int64, name string, on bool) error {
951
_, err := s.db.ExecContext(ctx, `UPDATE secrets SET expand = ? WHERE scope_kind = ? AND scope_id = ? AND name = ?`, boolInt(on), scopeKind, scopeID, name)
952
return err
953
}
954
955
// SecretExpandFlags geeft per geheimnaam of expand aan staat.
956
func (s *Store) SecretExpandFlags(ctx context.Context, scopeKind string, scopeID int64) (map[string]bool, error) {
957
rows, err := s.db.QueryContext(ctx, `SELECT name, expand FROM secrets WHERE scope_kind = ? AND scope_id = ?`, scopeKind, scopeID)
958
if err != nil {
959
return nil, err
960
}
961
defer rows.Close()
962
out := map[string]bool{}
963
for rows.Next() {
964
var name string
965
var e int
966
if err := rows.Scan(&name, &e); err != nil {
967
return nil, err
968
}
969
out[name] = e == 1
970
}
971
return out, rows.Err()
972
}
@@ -450,9 +450,9 @@ func scanRepos(rows *sql.Rows) ([]Repo, error) {450
if pushed != "" {450
if pushed != "" {451
r.PushedAt = parseTime(pushed)451
r.PushedAt = parseTime(pushed)452
}452
}453
if pushed != "" {453
if pushed != "" {454
r.PushedAt = parseTime(pushed)454
r.PushedAt = parseTime(pushed)455
}455
}456
out = append(out, r)456
out = append(out, r)457
}457
}458
return out, rows.Err()458
return out, rows.Err()@@ -703,6 +703,8 @@ type SecretMeta struct {703
Name string703
Name string704
Protected bool704
Protected bool705
Invisible bool705
Invisible bool706
// Expand: $NAAM en ${NAAM} in de waarde worden in de runner vervangen.707
Expand bool706
CreatedAt time.Time708
CreatedAt time.Time707
}709
}708
710
@@ -835,7 +837,7 @@ func (s *Store) RevealSecret(ctx context.Context, scopeKind string, scopeID int6835
837
836
// ListSecrets geeft namen, niet de waarden.838
// ListSecrets geeft namen, niet de waarden.837
func (s *Store) ListSecrets(ctx context.Context, scopeKind string, scopeID int64) ([]SecretMeta, error) {839
func (s *Store) ListSecrets(ctx context.Context, scopeKind string, scopeID int64) ([]SecretMeta, error) {838
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)840
rows, err := s.db.QueryContext(ctx, `SELECT name, protected, invisible, expand, created_at FROM secrets WHERE scope_kind = ? AND scope_id = ? ORDER BY name`, scopeKind, scopeID)839
if err != nil {841
if err != nil {840
return nil, err842
return nil, err841
}843
}@@ -843,13 +845,14 @@ func (s *Store) ListSecrets(ctx context.Context, scopeKind string, scopeID int64843
var out []SecretMeta845
var out []SecretMeta844
for rows.Next() {846
for rows.Next() {845
var m SecretMeta847
var m SecretMeta846
var p, inv int848
var p, inv, exp int847
var created string849
var created string848
if err := rows.Scan(&m.Name, &p, &inv, &created); err != nil {850
if err := rows.Scan(&m.Name, &p, &inv, &exp, &created); err != nil {849
return nil, err851
return nil, err850
}852
}851
m.Protected = p == 1853
m.Protected = p == 1852
m.Invisible = inv == 1854
m.Invisible = inv == 1855
m.Expand = exp == 1853
m.CreatedAt = parseTime(created)856
m.CreatedAt = parseTime(created)854
out = append(out, m)857
out = append(out, m)855
}858
}@@ -942,3 +945,28 @@ func SortGroupsByPush(list []Group, at map[int64]time.Time) {942
return strings.ToLower(list[i].Name) < strings.ToLower(list[j].Name)945
return strings.ToLower(list[i].Name) < strings.ToLower(list[j].Name)943
})946
})944
}947
}948
949
// SetSecretExpand zet of de waarde variabelen uitbreidt.950
func (s *Store) SetSecretExpand(ctx context.Context, scopeKind string, scopeID int64, name string, on bool) error {951
_, err := s.db.ExecContext(ctx, `UPDATE secrets SET expand = ? WHERE scope_kind = ? AND scope_id = ? AND name = ?`, boolInt(on), scopeKind, scopeID, name)952
return err953
}954
955
// SecretExpandFlags geeft per geheimnaam of expand aan staat.956
func (s *Store) SecretExpandFlags(ctx context.Context, scopeKind string, scopeID int64) (map[string]bool, error) {957
rows, err := s.db.QueryContext(ctx, `SELECT name, expand FROM secrets WHERE scope_kind = ? AND scope_id = ?`, scopeKind, scopeID)958
if err != nil {959
return nil, err960
}961
defer rows.Close()962
out := map[string]bool{}963
for rows.Next() {964
var name string965
var e int966
if err := rows.Scan(&name, &e); err != nil {967
return nil, err968
}969
out[name] = e == 1970
}971
return out, rows.Err()972
}@@ -0,0 +1,31 @@
1
package store
2
3
import (
4
"context"
5
"testing"
6
)
7
8
func TestSecretExpandFlag(t *testing.T) {
9
s := openStore(t)
10
ctx := context.Background()
11
if err := s.PutSecret(ctx, "repo", 1, "URL", "x$HOST", false); err != nil {
12
t.Fatal(err)
13
}
14
if f, _ := s.SecretExpandFlags(ctx, "repo", 1); f["URL"] {
15
t.Fatal("standaard moet uit zijn")
16
}
17
if err := s.SetSecretExpand(ctx, "repo", 1, "URL", true); err != nil {
18
t.Fatal(err)
19
}
20
// waarde bijwerken houdt de vlag
21
if err := s.PutSecret(ctx, "repo", 1, "URL", "y$HOST", false); err != nil {
22
t.Fatal(err)
23
}
24
if f, _ := s.SecretExpandFlags(ctx, "repo", 1); !f["URL"] {
25
t.Fatal("vlag kwijt na update")
26
}
27
list, _ := s.ListSecrets(ctx, "repo", 1)
28
if len(list) != 1 || !list[0].Expand {
29
t.Fatalf("%+v", list)
30
}
31
}
@@ -0,0 +1,31 @@1
package store2
3
import (4
"context"5
"testing"6
)7
8
func TestSecretExpandFlag(t *testing.T) {9
s := openStore(t)10
ctx := context.Background()11
if err := s.PutSecret(ctx, "repo", 1, "URL", "x$HOST", false); err != nil {12
t.Fatal(err)13
}14
if f, _ := s.SecretExpandFlags(ctx, "repo", 1); f["URL"] {15
t.Fatal("standaard moet uit zijn")16
}17
if err := s.SetSecretExpand(ctx, "repo", 1, "URL", true); err != nil {18
t.Fatal(err)19
}20
// waarde bijwerken houdt de vlag21
if err := s.PutSecret(ctx, "repo", 1, "URL", "y$HOST", false); err != nil {22
t.Fatal(err)23
}24
if f, _ := s.SecretExpandFlags(ctx, "repo", 1); !f["URL"] {25
t.Fatal("vlag kwijt na update")26
}27
list, _ := s.ListSecrets(ctx, "repo", 1)28
if len(list) != 1 || !list[0].Expand {29
t.Fatalf("%+v", list)30
}31
}@@ -64,6 +64,7 @@ func (s *Store) migrate() error {
64
64
`ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
65
65
`ALTER TABLE repos ADD COLUMN release_visibility TEXT NOT NULL DEFAULT 'inherit'`,
66
66
`ALTER TABLE repos ADD COLUMN pushed_at TEXT NOT NULL DEFAULT ''`,
67
`ALTER TABLE secrets ADD COLUMN expand INTEGER NOT NULL DEFAULT 0`,
67
68
`ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,
68
69
`ALTER TABLE notes ADD COLUMN file_path TEXT NOT NULL DEFAULT ''`,
69
70
`ALTER TABLE notes ADD COLUMN line_start INTEGER NOT NULL DEFAULT 0`,
@@ -64,6 +64,7 @@ func (s *Store) migrate() error {64
`ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,64
`ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,65
`ALTER TABLE repos ADD COLUMN release_visibility TEXT NOT NULL DEFAULT 'inherit'`,65
`ALTER TABLE repos ADD COLUMN release_visibility TEXT NOT NULL DEFAULT 'inherit'`,66
`ALTER TABLE repos ADD COLUMN pushed_at TEXT NOT NULL DEFAULT ''`,66
`ALTER TABLE repos ADD COLUMN pushed_at TEXT NOT NULL DEFAULT ''`,67
`ALTER TABLE secrets ADD COLUMN expand INTEGER NOT NULL DEFAULT 0`,67
`ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,68
`ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,68
`ALTER TABLE notes ADD COLUMN file_path TEXT NOT NULL DEFAULT ''`,69
`ALTER TABLE notes ADD COLUMN file_path TEXT NOT NULL DEFAULT ''`,69
`ALTER TABLE notes ADD COLUMN line_start INTEGER NOT NULL DEFAULT 0`,70
`ALTER TABLE notes ADD COLUMN line_start INTEGER NOT NULL DEFAULT 0`,