Skip to content

fix: clone shared maps to prevent concurrent map read/write panics #6030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jun-mercury wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: clone shared maps to prevent concurrent map read/write panics #6030

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions pkg/runner/expression.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"context"
"fmt"
"maps"
"path"
"reflect"
"regexp"
Expand Down Expand Up @@ -49,7 +50,7 @@ func (rc *RunContext) NewExpressionEvaluatorWithEnv(ctx context.Context, env map

for _, needs := range jobNeeds {
using[needs] = exprparser.Needs{
Outputs: jobs[needs].Outputs,
Outputs: maps.Clone(jobs[needs].Outputs),
Result: jobs[needs].Result,
}
}
Expand Down Expand Up @@ -135,7 +136,7 @@ func (rc *RunContext) newStepExpressionEvaluator(ctx context.Context, step step,
using := make(map[string]exprparser.Needs)
for _, needs := range jobNeeds {
using[needs] = exprparser.Needs{
Outputs: jobs[needs].Outputs,
Outputs: maps.Clone(jobs[needs].Outputs),
Result: jobs[needs].Result,
}
}
Expand Down Expand Up @@ -569,10 +570,10 @@ func setupWorkflowInputs(ctx context.Context, inputs *map[string]interface{}, rc
func getWorkflowSecrets(ctx context.Context, rc *RunContext) map[string]string {
if rc.caller != nil {
job := rc.caller.runContext.Run.Job()
secrets := job.Secrets()
secrets := maps.Clone(job.Secrets())

if secrets == nil && job.InheritSecrets() {
secrets = rc.caller.runContext.Config.Secrets
secrets = maps.Clone(rc.caller.runContext.Config.Secrets)
}

if secrets == nil {
Expand All @@ -586,9 +587,9 @@ func getWorkflowSecrets(ctx context.Context, rc *RunContext) map[string]string {
return secrets
}

return rc.Config.Secrets
return maps.Clone(rc.Config.Secrets)
}

func getWorkflowVars(_ context.Context, rc *RunContext) map[string]string {
return rc.Config.Vars
return maps.Clone(rc.Config.Vars)
}