Merge branch 'main' into issue_2098_documentation

Weltraumschaf · web-flow · commit d9232fdafcc4 · 2024-02-13T11:04:13.000+01:00
diff --git a/operator/controllers/execution/scans/job.go b/operator/controllers/execution/scans/job.go
@@ -29,7 +29,7 @@ func checkIfAllJobsCompleted(jobs *batch.JobList) jobCompletionType {
 	hasCompleted := true
 
 	for _, job := range jobs.Items {
-		if job.Status.Failed > 0 {
+		if job.Status.Failed >= *job.Spec.BackoffLimit {
 			return failed
 		} else if job.Status.Succeeded == 0 {
 			hasCompleted = false
diff --git a/scanners.mk b/scanners.mk
@@ -77,7 +77,8 @@ deploy-without-scanner:
 		--set="parser.image.repository=docker.io/$(IMG_NS)/$(parser-prefix)-$(name)" \
 		--set="parser.image.tag=$(IMG_TAG)" \
 		--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
-		--set-string="parser.env[0].value=true"
+		--set-string="parser.env[0].value=true" \
+		--set="scanner.backoffLimit=1"
 
 .PHONY: deploy-with-scanner
 deploy-with-scanner:
@@ -88,7 +89,8 @@ deploy-with-scanner:
 		--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
 		--set-string="parser.env[0].value=true" \
 		--set="scanner.image.repository=docker.io/$(IMG_NS)/$(scanner-prefix)-$(name)" \
-		--set="scanner.image.tag=$(IMG_TAG)"
+		--set="scanner.image.tag=$(IMG_TAG)" \
+		--set="scanner.backoffLimit=1"
 
 .PHONY: integration-tests
 integration-tests:
diff --git a/scanners/semgrep/Chart.yaml b/scanners/semgrep/Chart.yaml
@@ -22,7 +22,7 @@ version: "v3.1.0-alpha1"
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.59.1"
+appVersion: "1.60.1"
 annotations:
   versionApi: https://api.github.com/repos/returntocorp/semgrep/releases/latest
   supported-platforms: linux/amd64
diff --git a/scanners/semgrep/README.md b/scanners/semgrep/README.md
@@ -3,7 +3,7 @@ title: "Semgrep"
 category: "scanner"
 type: "Repository"
 state: "released"
-appVersion: "1.59.1"
+appVersion: "1.60.1"
 usecase: "Static Code Analysis"
 ---
 
diff --git a/scanners/semgrep/docs/README.DockerHub-Parser.md b/scanners/semgrep/docs/README.DockerHub-Parser.md
@@ -42,7 +42,7 @@ You can find resources to help you get started on our [documentation website](ht
 
 ## Supported Tags
 - `latest`  (represents the latest stable release build)
-- tagged releases, e.g. `1.59.1`
+- tagged releases, e.g. `1.60.1`
 
 ## How to use this image
 This `parser` image is intended to work in combination with the corresponding security scanner docker image to parse the `findings` results. For more information details please take a look at the documentation page: https://www.securecodebox.io/docs/scanners/semgrep.
diff --git a/scanners/typo3scan/Chart.yaml b/scanners/typo3scan/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the Typo3 security scanner that integrates with th
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
 version: v3.1.0-alpha1
-appVersion: "v1.1.3"
+appVersion: "v1.1.4"
 kubeVersion: ">=v1.11.0-0"
 annotations:
   versionApi: https://api.github.com/repos/whoot/Typo3Scan/releases/latest
diff --git a/scanners/typo3scan/README.md b/scanners/typo3scan/README.md
@@ -3,7 +3,7 @@ title: "Typo3Scan"
 category: "scanner"
 type: "CMS"
 state: "released"
-appVersion: "v1.1.3"
+appVersion: "v1.1.4"
 usecase: "Automation of the process of detecting the Typo3 CMS and its installed extensions"
 ---
 
diff --git a/scanners/typo3scan/docs/README.DockerHub-Parser.md b/scanners/typo3scan/docs/README.DockerHub-Parser.md
@@ -42,7 +42,7 @@ You can find resources to help you get started on our [documentation website](ht
 
 ## Supported Tags
 - `latest`  (represents the latest stable release build)
-- tagged releases, e.g. `v1.1.3`
+- tagged releases, e.g. `v1.1.4`
 
 ## How to use this image
 This `parser` image is intended to work in combination with the corresponding security scanner docker image to parse the `findings` results. For more information details please take a look at the documentation page: https://www.securecodebox.io/docs/scanners/typo3scan.
diff --git a/scanners/typo3scan/docs/README.DockerHub-Scanner.md b/scanners/typo3scan/docs/README.DockerHub-Scanner.md
@@ -42,7 +42,7 @@ You can find resources to help you get started on our [documentation website](ht
 
 ## Supported Tags
 - `latest`  (represents the latest stable release build)
-- tagged releases, e.g. `v1.1.3`
+- tagged releases, e.g. `v1.1.4`
 
 ## How to use this image
 This `scanner` image is intended to work in combination with the corresponding `parser` image to parse the scanner `findings` to generic secureCodeBox results. For more information details please take a look at the [project page][scb-docs] or [documentation page][https://www.securecodebox.io/docs/scanners/typo3scan].
diff --git a/scanners/typo3scan/integration-tests/typo3scan.test.js b/scanners/typo3scan/integration-tests/typo3scan.test.js
@@ -16,15 +16,15 @@ test(
       90
     );
 
-    expect(count).toBe(24);
+    expect(count).toBe(27);
     expect(categories).toMatchInlineSnapshot(`
       {
-        "Vulnerability": 24,
+        "Vulnerability": 27,
       }
     `);
     expect(severities).toMatchInlineSnapshot(`
       {
-        "high": 24,
+        "high": 27,
       }
     `);
   },

Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,15 @@ test(`
`16`	`16`	`90`
`17`	`17`	`);`
`18`	`18`
`19`		`- expect(count).toBe(24);`
	`19`	`+ expect(count).toBe(27);`
`20`	`20`	expect(categories).toMatchInlineSnapshot(`
`21`	`21`	`{`
`22`		`- "Vulnerability": 24,`
	`22`	`+ "Vulnerability": 27,`
`23`	`23`	`}`
`24`	`24`	`);
`25`	`25`	expect(severities).toMatchInlineSnapshot(`
`26`	`26`	`{`
`27`		`- "high": 24,`
	`27`	`+ "high": 27,`
`28`	`28`	`}`
`29`	`29`	`);
`30`	`30`	`},`