Skip to content
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

Jump to bottom

[UPDATE] Update addAction to pin Harden Runner #1582

Merged
merged 1 commit into from
Dec 5, 2022
Merged

[UPDATE] Update addAction to pin Harden Runner #1582

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion remediation/workflow/hardenrunner/addaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (

metadata "github.com/step-security/secure-workflows/remediation/workflow/metadata"
"github.com/step-security/secure-workflows/remediation/workflow/permissions"
"github.com/step-security/secure-workflows/remediation/workflow/pin"
"gopkg.in/yaml.v3"
)

Expand All @@ -14,7 +15,7 @@ const (
HardenRunnerActionName = "Harden Runner"
)

func AddAction(inputYaml, action string) (string, bool, error) {
func AddAction(inputYaml, action string, pinActions bool) (string, bool, error) {
workflow := metadata.Workflow{}
updated := false
err := yaml.Unmarshal([]byte(inputYaml), &workflow)
Expand Down Expand Up @@ -45,6 +46,10 @@ func AddAction(inputYaml, action string) (string, bool, error) {
}
}

if updated && pinActions {
out, _ = pin.PinAction(action, out)
}

return out, updated, nil
}

Expand Down
2 changes: 1 addition & 1 deletion remediation/workflow/hardenrunner/addaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestAddAction(t *testing.T) {
if err != nil {
t.Fatalf("error reading test file")
}
got, gotUpdated, err := AddAction(string(input), tt.args.action)
got, gotUpdated, err := AddAction(string(input), tt.args.action, false)

if gotUpdated != tt.wantUpdated {
t.Errorf("AddAction() updated = %v, wantUpdated %v", gotUpdated, tt.wantUpdated)
Expand Down
6 changes: 3 additions & 3 deletions remediation/workflow/pin/pinactions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ func PinActions(inputYaml string) (string, bool, error) {

out := inputYaml

for jobName, job := range workflow.Jobs {
for _, job := range workflow.Jobs {

for _, step := range job.Steps {
if len(step.Uses) > 0 {
localUpdated := false
out, localUpdated = pinAction(step.Uses, jobName, out)
out, localUpdated = PinAction(step.Uses, out)
updated = updated || localUpdated
}
}
Expand All @@ -36,7 +36,7 @@ func PinActions(inputYaml string) (string, bool, error) {
return out, updated, nil
}

func pinAction(action, jobName, inputYaml string) (string, bool) {
func PinAction(action, inputYaml string) (string, bool) {

updated := false
if !strings.Contains(action, "@") || strings.HasPrefix(action, "docker://") {
Expand Down
8 changes: 4 additions & 4 deletions remediation/workflow/secureworkflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@ func SecureWorkflow(queryStringParams map[string]string, inputYaml string, svc d
addedPermissions = !secureWorkflowReponse.HasErrors
}

if addHardenRunner {
secureWorkflowReponse.FinalOutput, addedHardenRunner, _ = hardenrunner.AddAction(secureWorkflowReponse.FinalOutput, HardenRunnerActionPathWithTag)
}

if pinActions {
pinnedAction, pinnedDocker := false, false
secureWorkflowReponse.FinalOutput, pinnedAction, _ = pin.PinActions(secureWorkflowReponse.FinalOutput)
secureWorkflowReponse.FinalOutput, pinnedDocker, _ = pin.PinDocker(secureWorkflowReponse.FinalOutput)
pinnedActions = pinnedAction || pinnedDocker
}

if addHardenRunner {
secureWorkflowReponse.FinalOutput, addedHardenRunner, _ = hardenrunner.AddAction(secureWorkflowReponse.FinalOutput, HardenRunnerActionPathWithTag, pinActions)
}

// Setting appropriate flags
secureWorkflowReponse.PinnedActions = pinnedActions
secureWorkflowReponse.AddedHardenRunner = addedHardenRunner
Expand Down