Skip to content

Commit 719fc94

Browse files
trumanttrumant
committed
chore: integrate with latest gemara layer4
Signed-off-by: Travis Truman <trumant@gmail.com>
1 parent a4febdb commit 719fc94

File tree

23 files changed

+125
-121
lines changed

23 files changed

+125
-121
lines changed

‎evaluation_plans/osps/access_control/evaluations.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
func OSPS_AC_01() (evaluation *layer4.ControlEvaluation) {
1212
evaluation = &layer4.ControlEvaluation{
13-
ControlID: "OSPS-AC-01",
13+
ControlId: "OSPS-AC-01",
1414
}
1515

1616
evaluation.AddAssessment(
@@ -31,7 +31,7 @@ func OSPS_AC_01() (evaluation *layer4.ControlEvaluation) {
3131

3232
func OSPS_AC_02() (evaluation *layer4.ControlEvaluation) {
3333
evaluation = &layer4.ControlEvaluation{
34-
ControlID: "OSPS-AC-02",
34+
ControlId: "OSPS-AC-02",
3535
}
3636

3737
evaluation.AddAssessment(
@@ -52,7 +52,7 @@ func OSPS_AC_02() (evaluation *layer4.ControlEvaluation) {
5252

5353
func OSPS_AC_03() (evaluation *layer4.ControlEvaluation) {
5454
evaluation = &layer4.ControlEvaluation{
55-
ControlID: "OSPS-AC-03",
55+
ControlId: "OSPS-AC-03",
5656
}
5757

5858
evaluation.AddAssessment(
@@ -86,7 +86,7 @@ func OSPS_AC_03() (evaluation *layer4.ControlEvaluation) {
8686

8787
func OSPS_AC_04() (evaluation *layer4.ControlEvaluation) {
8888
evaluation = &layer4.ControlEvaluation{
89-
ControlID: "OSPS-AC-04",
89+
ControlId: "OSPS-AC-04",
9090
}
9191

9292
evaluation.AddAssessment(

‎evaluation_plans/osps/access_control/steps.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/revanite-io/pvtr-github-repo/evaluation_plans/reusable_steps"
77
)
88

9-
func orgRequiresMFA(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
9+
func orgRequiresMFA(payloadData any) (result layer4.Result, message string) {
1010
payload, message := reusable_steps.VerifyPayload(payloadData)
1111
if message != "" {
1212
return layer4.Unknown, message
@@ -22,7 +22,7 @@ func orgRequiresMFA(payloadData any, _ map[string]*layer4.Change) (result layer4
2222
return layer4.Failed, "Two-factor authentication is NOT configured as required by the parent organization"
2323
}
2424

25-
func branchProtectionRestrictsPushes(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
25+
func branchProtectionRestrictsPushes(payloadData any) (result layer4.Result, message string) {
2626
payload, message := reusable_steps.VerifyPayload(payloadData)
2727
if message != "" {
2828
return layer4.Unknown, message
@@ -42,7 +42,7 @@ func branchProtectionRestrictsPushes(payloadData any, _ map[string]*layer4.Chang
4242
return
4343
}
4444

45-
func branchProtectionPreventsDeletion(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
45+
func branchProtectionPreventsDeletion(payloadData any) (result layer4.Result, message string) {
4646
payload, message := reusable_steps.VerifyPayload(payloadData)
4747
if message != "" {
4848
return layer4.Unknown, message
@@ -60,7 +60,7 @@ func branchProtectionPreventsDeletion(payloadData any, _ map[string]*layer4.Chan
6060
return
6161
}
6262

63-
func workflowDefaultReadPermissions(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
63+
func workflowDefaultReadPermissions(payloadData any) (result layer4.Result, message string) {
6464
payload, message := reusable_steps.VerifyPayload(payloadData)
6565
if message != "" {
6666
return layer4.Unknown, message

‎evaluation_plans/osps/access_control/steps_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func Test_orgRequiresMFA(t *testing.T) {
6161

6262
for _, tt := range tests {
6363
t.Run(tt.name, func(t *testing.T) {
64-
gotResult, gotMessage := orgRequiresMFA(tt.payload, map[string]*layer4.Change{})
64+
gotResult, gotMessage := orgRequiresMFA(tt.payload)
6565
assert.Equal(t, tt.wantResult, gotResult)
6666
assert.Equal(t, tt.wantMessage, gotMessage)
6767
})

‎evaluation_plans/osps/build_release/evaluations.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
func OSPS_BR_01() (evaluation *layer4.ControlEvaluation) {
1212
evaluation = &layer4.ControlEvaluation{
13-
ControlID: "OSPS-BR-01",
13+
ControlId: "OSPS-BR-01",
1414
}
1515

1616
evaluation.AddAssessment(
@@ -44,7 +44,7 @@ func OSPS_BR_01() (evaluation *layer4.ControlEvaluation) {
4444

4545
func OSPS_BR_02() (evaluation *layer4.ControlEvaluation) {
4646
evaluation = &layer4.ControlEvaluation{
47-
ControlID: "OSPS-BR-02",
47+
ControlId: "OSPS-BR-02",
4848
}
4949

5050
evaluation.AddAssessment(
@@ -78,7 +78,7 @@ func OSPS_BR_02() (evaluation *layer4.ControlEvaluation) {
7878

7979
func OSPS_BR_03() (evaluation *layer4.ControlEvaluation) {
8080
evaluation = &layer4.ControlEvaluation{
81-
ControlID: "OSPS-BR-03",
81+
ControlId: "OSPS-BR-03",
8282
}
8383

8484
evaluation.AddAssessment(
@@ -113,7 +113,7 @@ func OSPS_BR_03() (evaluation *layer4.ControlEvaluation) {
113113

114114
func OSPS_BR_04() (evaluation *layer4.ControlEvaluation) {
115115
evaluation = &layer4.ControlEvaluation{
116-
ControlID: "OSPS-BR-04",
116+
ControlId: "OSPS-BR-04",
117117
}
118118

119119
evaluation.AddAssessment(
@@ -134,7 +134,7 @@ func OSPS_BR_04() (evaluation *layer4.ControlEvaluation) {
134134

135135
func OSPS_BR_05() (evaluation *layer4.ControlEvaluation) {
136136
evaluation = &layer4.ControlEvaluation{
137-
ControlID: "OSPS-BR-05",
137+
ControlId: "OSPS-BR-05",
138138
}
139139

140140
evaluation.AddAssessment(
@@ -154,7 +154,7 @@ func OSPS_BR_05() (evaluation *layer4.ControlEvaluation) {
154154

155155
func OSPS_BR_06() (evaluation *layer4.ControlEvaluation) {
156156
evaluation = &layer4.ControlEvaluation{
157-
ControlID: "OSPS-BR-06",
157+
ControlId: "OSPS-BR-06",
158158
}
159159

160160
evaluation.AddAssessment(
@@ -176,7 +176,7 @@ func OSPS_BR_06() (evaluation *layer4.ControlEvaluation) {
176176

177177
func OSPS_BR_07() (evaluation *layer4.ControlEvaluation) {
178178
evaluation = &layer4.ControlEvaluation{
179-
ControlID: "OSPS-BR-07",
179+
ControlId: "OSPS-BR-07",
180180
}
181181

182182
evaluation.AddAssessment(

‎evaluation_plans/osps/build_release/steps.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var untrustedVarsRegex = `.*(github\.event\.issue\.title|` +
3333
`github\.event\.pull_request\.head\.repo\.default_branch|` +
3434
`github\.head_ref).*`
3535

36-
func cicdSanitizedInputParameters(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
36+
func cicdSanitizedInputParameters(payloadData any) (result layer4.Result, message string) {
3737

3838
// parse the payload and see if we pass our checks
3939
data, message := reusable_steps.VerifyPayload(payloadData)
@@ -154,7 +154,7 @@ func pullVariablesFromScript(script string) []string {
154154

155155
}
156156

157-
func releaseHasUniqueIdentifier(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
157+
func releaseHasUniqueIdentifier(payloadData any) (result layer4.Result, message string) {
158158
data, message := reusable_steps.VerifyPayload(payloadData)
159159
if message != "" {
160160
return layer4.Unknown, message
@@ -232,7 +232,7 @@ func insecureURI(uri string) bool {
232232
return true
233233
}
234234

235-
func ensureInsightsLinksUseHTTPS(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
235+
func ensureInsightsLinksUseHTTPS(payloadData any) (result layer4.Result, message string) {
236236
data, message := reusable_steps.VerifyPayload(payloadData)
237237
if message != "" {
238238
return layer4.Unknown, message
@@ -251,7 +251,7 @@ func ensureInsightsLinksUseHTTPS(payloadData any, _ map[string]*layer4.Change) (
251251
return layer4.Passed, "All links use HTTPS"
252252
}
253253

254-
func ensureLatestReleaseHasChangelog(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
254+
func ensureLatestReleaseHasChangelog(payloadData any) (result layer4.Result, message string) {
255255
data, message := reusable_steps.VerifyPayload(payloadData)
256256
if message != "" {
257257
return layer4.Unknown, message
@@ -264,7 +264,7 @@ func ensureLatestReleaseHasChangelog(payloadData any, _ map[string]*layer4.Chang
264264
return layer4.Failed, "The latest release does not have mention of a changelog: \n" + releaseDescription
265265
}
266266

267-
func insightsHasSlsaAttestation(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
267+
func insightsHasSlsaAttestation(payloadData any) (result layer4.Result, message string) {
268268
data, message := reusable_steps.VerifyPayload(payloadData)
269269
if message != "" {
270270
return layer4.Unknown, message
@@ -280,7 +280,7 @@ func insightsHasSlsaAttestation(payloadData any, _ map[string]*layer4.Change) (r
280280
return layer4.Failed, "No SLSA attestation found in security insights"
281281
}
282282

283-
func distributionPointsUseHTTPS(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
283+
func distributionPointsUseHTTPS(payloadData any) (result layer4.Result, message string) {
284284
data, message := reusable_steps.VerifyPayload(payloadData)
285285
if message != "" {
286286
return layer4.Unknown, message
@@ -304,7 +304,7 @@ func distributionPointsUseHTTPS(payloadData any, _ map[string]*layer4.Change) (r
304304
return layer4.Passed, "All distribution points use HTTPS"
305305
}
306306

307-
func secretScanningInUse(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
307+
func secretScanningInUse(payloadData any) (result layer4.Result, message string) {
308308
data, message := reusable_steps.VerifyPayload(payloadData)
309309
if message != "" {
310310
return layer4.Unknown, message

‎evaluation_plans/osps/docs/evaluations.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
func OSPS_DO_01() (evaluation *layer4.ControlEvaluation) {
1212
evaluation = &layer4.ControlEvaluation{
13-
ControlID: "OSPS-DO-01",
13+
ControlId: "OSPS-DO-01",
1414
}
1515

1616
evaluation.AddAssessment(
@@ -33,7 +33,7 @@ func OSPS_DO_01() (evaluation *layer4.ControlEvaluation) {
3333

3434
func OSPS_DO_02() (evaluation *layer4.ControlEvaluation) {
3535
evaluation = &layer4.ControlEvaluation{
36-
ControlID: "OSPS-DO-02",
36+
ControlId: "OSPS-DO-02",
3737
}
3838

3939
evaluation.AddAssessment(
@@ -56,7 +56,7 @@ func OSPS_DO_02() (evaluation *layer4.ControlEvaluation) {
5656

5757
func OSPS_DO_03() (evaluation *layer4.ControlEvaluation) {
5858
evaluation = &layer4.ControlEvaluation{
59-
ControlID: "OSPS-DO-03",
59+
ControlId: "OSPS-DO-03",
6060
}
6161

6262
evaluation.AddAssessment(
@@ -90,7 +90,7 @@ func OSPS_DO_03() (evaluation *layer4.ControlEvaluation) {
9090

9191
func OSPS_DO_04() (evaluation *layer4.ControlEvaluation) {
9292
evaluation = &layer4.ControlEvaluation{
93-
ControlID: "OSPS-DO-04",
93+
ControlId: "OSPS-DO-04",
9494
}
9595

9696
evaluation.AddAssessment(
@@ -109,7 +109,7 @@ func OSPS_DO_04() (evaluation *layer4.ControlEvaluation) {
109109

110110
func OSPS_DO_05() (evaluation *layer4.ControlEvaluation) {
111111
evaluation = &layer4.ControlEvaluation{
112-
ControlID: "OSPS-DO-05",
112+
ControlId: "OSPS-DO-05",
113113
}
114114

115115
evaluation.AddAssessment(
@@ -128,7 +128,7 @@ func OSPS_DO_05() (evaluation *layer4.ControlEvaluation) {
128128

129129
func OSPS_DO_06() (evaluation *layer4.ControlEvaluation) {
130130
evaluation = &layer4.ControlEvaluation{
131-
ControlID: "OSPS-DO-06",
131+
ControlId: "OSPS-DO-06",
132132
}
133133

134134
evaluation.AddAssessment(

‎evaluation_plans/osps/docs/steps.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/revanite-io/pvtr-github-repo/evaluation_plans/reusable_steps"
77
)
88

9-
func hasSupportDocs(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
9+
func hasSupportDocs(payloadData any) (result layer4.Result, message string) {
1010
data, message := reusable_steps.VerifyPayload(payloadData)
1111
if message != "" {
1212
return layer4.Unknown, message
@@ -20,7 +20,7 @@ func hasSupportDocs(payloadData any, _ map[string]*layer4.Change) (result layer4
2020
return layer4.Failed, "A support.md file or support statements in the readme.md was NOT found"
2121
}
2222

23-
func hasUserGuides(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
23+
func hasUserGuides(payloadData any) (result layer4.Result, message string) {
2424
data, message := reusable_steps.VerifyPayload(payloadData)
2525
if message != "" {
2626
return layer4.Unknown, message
@@ -33,7 +33,7 @@ func hasUserGuides(payloadData any, _ map[string]*layer4.Change) (result layer4.
3333
return layer4.Passed, "User guide was specified in Security Insights data"
3434
}
3535

36-
func acceptsVulnReports(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
36+
func acceptsVulnReports(payloadData any) (result layer4.Result, message string) {
3737
data, message := reusable_steps.VerifyPayload(payloadData)
3838
if message != "" {
3939
return layer4.Unknown, message
@@ -46,7 +46,7 @@ func acceptsVulnReports(payloadData any, _ map[string]*layer4.Change) (result la
4646
return layer4.Failed, "Repository does not accept vulnerability reports"
4747
}
4848

49-
func hasSignatureVerificationGuide(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
49+
func hasSignatureVerificationGuide(payloadData any) (result layer4.Result, message string) {
5050
data, message := reusable_steps.VerifyPayload(payloadData)
5151
if message != "" {
5252
return layer4.Unknown, message
@@ -59,7 +59,7 @@ func hasSignatureVerificationGuide(payloadData any, _ map[string]*layer4.Change)
5959
return layer4.Passed, "Signature verification guide was specified in Security Insights data"
6060
}
6161

62-
func hasDependencyManagementPolicy(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
62+
func hasDependencyManagementPolicy(payloadData any) (result layer4.Result, message string) {
6363
data, message := reusable_steps.VerifyPayload(payloadData)
6464
if message != "" {
6565
return layer4.Unknown, message
@@ -72,7 +72,7 @@ func hasDependencyManagementPolicy(payloadData any, _ map[string]*layer4.Change)
7272
return layer4.Passed, "Dependency management policy was specified in Security Insights data"
7373
}
7474

75-
func hasIdentityVerificationGuide(payloadData any, _ map[string]*layer4.Change) (result layer4.Result, message string) {
75+
func hasIdentityVerificationGuide(payloadData any) (result layer4.Result, message string) {
7676
data, message := reusable_steps.VerifyPayload(payloadData)
7777
if message != "" {
7878
return layer4.Unknown, message
@@ -83,4 +83,4 @@ func hasIdentityVerificationGuide(payloadData any, _ map[string]*layer4.Change)
8383
}
8484

8585
return layer4.Passed, "Identity verification guide was specified in Security Insights data (found in signature-verification field)"
86-
}
86+
}

‎evaluation_plans/osps/governance/evaluations.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
func OSPS_GV_01() (evaluation *layer4.ControlEvaluation) {
1212
evaluation = &layer4.ControlEvaluation{
13-
ControlID: "OSPS-GV-01",
13+
ControlId: "OSPS-GV-01",
1414
}
1515

1616
evaluation.AddAssessment(
@@ -45,7 +45,7 @@ func OSPS_GV_01() (evaluation *layer4.ControlEvaluation) {
4545

4646
func OSPS_GV_02() (evaluation *layer4.ControlEvaluation) {
4747
evaluation = &layer4.ControlEvaluation{
48-
ControlID: "OSPS-GV-02",
48+
ControlId: "OSPS-GV-02",
4949
}
5050

5151
evaluation.AddAssessment(
@@ -66,7 +66,7 @@ func OSPS_GV_02() (evaluation *layer4.ControlEvaluation) {
6666

6767
func OSPS_GV_03() (evaluation *layer4.ControlEvaluation) {
6868
evaluation = &layer4.ControlEvaluation{
69-
ControlID: "OSPS-GV-03",
69+
ControlId: "OSPS-GV-03",
7070
}
7171

7272
evaluation.AddAssessment(
@@ -102,7 +102,7 @@ func OSPS_GV_03() (evaluation *layer4.ControlEvaluation) {
102102

103103
func OSPS_GV_04() (evaluation *layer4.ControlEvaluation) {
104104
evaluation = &layer4.ControlEvaluation{
105-
ControlID: "OSPS-GV-04",
105+
ControlId: "OSPS-GV-04",
106106
}
107107

108108
evaluation.AddAssessment(

0 commit comments

Comments
 (0)