Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentsimon committed Jun 1, 2022
1 parent b10e454 commit bbba06a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 23 deletions.
18 changes: 1 addition & 17 deletions checks/evaluation/pinned_dependencies.go
Expand Up @@ -121,21 +121,14 @@ func PinningDependencies(name string, dl checker.DetailLogger,
return checker.CreateRuntimeErrorResult(name, err)
}

// Action script downloads.
actionScriptScore, err := createReturnForIsGitHubWorkflowScriptFreeOfInsecureDownloads(pr, dl)
if err != nil {
return checker.CreateRuntimeErrorResult(name, err)
}

// Scores may be inconclusive.
actionScore = maxScore(0, actionScore)
dockerFromScore = maxScore(0, dockerFromScore)
dockerDownloadScore = maxScore(0, dockerDownloadScore)
scriptScore = maxScore(0, scriptScore)
actionScriptScore = maxScore(0, actionScriptScore)

score := checker.AggregateScores(actionScore, dockerFromScore,
dockerDownloadScore, scriptScore, actionScriptScore)
dockerDownloadScore, scriptScore)

if score == checker.MaxResultScore {
return checker.CreateMaxScoreResult(name, "all dependencies are pinned")
Expand Down Expand Up @@ -234,15 +227,6 @@ func addWorkflowPinnedResult(w *worklowPinningResult, to, isGitHub bool) {
}
}

// Create the result for scripts in GH workflows.
func createReturnForIsGitHubWorkflowScriptFreeOfInsecureDownloads(pr map[checker.DependencyUseType]pinnedResult,
dl checker.DetailLogger,
) (int, error) {
return createReturnValues(pr, checker.DependencyUseTypeDownloadThenRun,
"no insecure (not pinned by hash) dependency downloads found in GitHub workflows",
dl)
}

// Create the result for scripts.
func createReturnForIsShellScriptFreeOfInsecureDownloads(pr map[checker.DependencyUseType]pinnedResult,
dl checker.DetailLogger,
Expand Down
12 changes: 6 additions & 6 deletions e2e/pinned_dependencies_test.go
Expand Up @@ -50,9 +50,9 @@ var _ = Describe("E2E TEST:"+checks.CheckPinnedDependencies, func() {
}
expected := scut.TestReturn{
Error: nil,
Score: 3,
Score: 2,
NumberOfWarn: 139,
NumberOfInfo: 2,
NumberOfInfo: 1,
NumberOfDebug: 0,
}
result := checks.PinningDependencies(&req)
Expand All @@ -75,9 +75,9 @@ var _ = Describe("E2E TEST:"+checks.CheckPinnedDependencies, func() {
}
expected := scut.TestReturn{
Error: nil,
Score: 3,
Score: 2,
NumberOfWarn: 139,
NumberOfInfo: 2,
NumberOfInfo: 1,
NumberOfDebug: 0,
}
result := checks.PinningDependencies(&req)
Expand Down Expand Up @@ -111,9 +111,9 @@ var _ = Describe("E2E TEST:"+checks.CheckPinnedDependencies, func() {
}
expected := scut.TestReturn{
Error: nil,
Score: 3,
Score: 2,
NumberOfWarn: 139,
NumberOfInfo: 2,
NumberOfInfo: 1,
NumberOfDebug: 0,
}
result := checks.PinningDependencies(&req)
Expand Down

0 comments on commit bbba06a

Please sign in to comment.