oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-09-15 18:57:01 +00:00
Code Wiki Activity

fix: valueMasker concurrent map write (#5026)

Browse source 
* valueMasker create secrets copy

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 7ed767c23a554eefb0a7563c674e7a406393b60f)
This commit is contained in:
ChristopherHX 2025-06-11 20:06:25 +02:00 • committed by Earl Warren
parent e22d12ae53
commit 7209a6be39
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
act/runner/logger.go
View file

@ -158,6 +158,10 @@ func withStepLogger(ctx context.Context, stepNumber int, stepID, stepName, stage
type entryProcessor func(entry *logrus.Entry) *logrus.Entry
func valueMasker(insecureSecrets bool, secrets map[string]string) entryProcessor {
ssecrets := []string{}
for _, v := range secrets {
ssecrets = append(ssecrets, v)
}
return func(entry *logrus.Entry) *logrus.Entry {
if insecureSecrets {
return entry
@ -165,7 +169,7 @@ func valueMasker(insecureSecrets bool, secrets map[string]string) entryProcessor
masks := Masks(entry.Context)
for _, v := range secrets {
for _, v := range ssecrets {
if v != "" {
entry.Message = strings.ReplaceAll(entry.Message, v, "***")
}