diff --git a/scanners/sslyze/Chart.yaml b/scanners/sslyze/Chart.yaml index 6bbe59eef6..52876a5741 100644 --- a/scanners/sslyze/Chart.yaml +++ b/scanners/sslyze/Chart.yaml @@ -8,7 +8,7 @@ description: A Helm chart for the SSLyze security scanner that integrates with t type: application # version - gets automatically set to the secureCodeBox release version when the helm charts gets published version: v3.1.0-alpha1 -appVersion: "6.0.0" +appVersion: "6.1.0" kubeVersion: ">=v1.11.0-0" annotations: versionApi: https://api.github.com/repos/nabla-c0d3/sslyze/releases/latest diff --git a/scanners/sslyze/README.md b/scanners/sslyze/README.md index daa6854da4..83467309d2 100644 --- a/scanners/sslyze/README.md +++ b/scanners/sslyze/README.md @@ -3,7 +3,7 @@ title: "SSLyze" category: "scanner" type: "SSL" state: "released" -appVersion: "6.0.0" +appVersion: "6.1.0" usecase: "SSL/TLS Configuration Scanner" --- diff --git a/scanners/sslyze/parser/__testFiles__/expired.badssl.com.json b/scanners/sslyze/parser/__testFiles__/expired.badssl.com.json index a167ff0ecd..e6fc2bc1f8 100644 --- a/scanners/sslyze/parser/__testFiles__/expired.badssl.com.json +++ b/scanners/sslyze/parser/__testFiles__/expired.badssl.com.json @@ -4825,8 +4825,8 @@ } } ], - "date_scans_started": "2024-09-02T16:59:51.321383", - "date_scans_completed": "2024-09-02T17:00:21.006750", + "date_scans_started": "2024-09-02T16:59:51.321383Z", + "date_scans_completed": "2024-09-02T17:00:21.006750Z", "sslyze_version": "6.0.0", "sslyze_url": "https://github.com/nabla-c0d3/sslyze" } diff --git a/scanners/sslyze/parser/__testFiles__/google.com.json b/scanners/sslyze/parser/__testFiles__/google.com.json index d1da704641..531dd2d797 100644 --- a/scanners/sslyze/parser/__testFiles__/google.com.json +++ b/scanners/sslyze/parser/__testFiles__/google.com.json @@ -10223,8 +10223,8 @@ } } ], - "date_scans_started": "2024-09-02T16:49:24.314457", - "date_scans_completed": "2024-09-02T16:49:27.875541", + "date_scans_started": "2024-09-02T16:49:24.314457Z", + "date_scans_completed": "2024-09-02T16:49:27.875541Z", "sslyze_version": "6.0.0", "sslyze_url": "https://github.com/nabla-c0d3/sslyze" } diff --git a/scanners/sslyze/parser/__testFiles__/no-certificate_deployments.json b/scanners/sslyze/parser/__testFiles__/no-certificate_deployments.json index fa7594c438..3f4d611d38 100644 --- a/scanners/sslyze/parser/__testFiles__/no-certificate_deployments.json +++ b/scanners/sslyze/parser/__testFiles__/no-certificate_deployments.json @@ -4049,8 +4049,8 @@ } } ], - "date_scans_started": "2024-09-09T11:58:10.192252", - "date_scans_completed": "2024-09-09T11:58:19.094409", + "date_scans_started": "2024-09-09T11:58:10.192252Z", + "date_scans_completed": "2024-09-09T11:58:19.094409Z", "sslyze_version": "6.0.0", "sslyze_url": "https://github.com/nabla-c0d3/sslyze" } diff --git a/scanners/sslyze/parser/__testFiles__/revoked.badssl.com.json b/scanners/sslyze/parser/__testFiles__/revoked.badssl.com.json index 2e47d5e631..2b35d6210d 100644 --- a/scanners/sslyze/parser/__testFiles__/revoked.badssl.com.json +++ b/scanners/sslyze/parser/__testFiles__/revoked.badssl.com.json @@ -1,6 +1,6 @@ { - "date_scans_completed": "2021-12-22T12:56:13.259283", - "date_scans_started": "2021-12-22T12:55:23.830874", + "date_scans_completed": "2021-12-22T12:56:13.259283Z", + "date_scans_started": "2021-12-22T12:55:23.830874Z", "server_scan_results": [ { "connectivity_error_trace": null, diff --git a/scanners/sslyze/parser/__testFiles__/self-signed.badssl.com.json b/scanners/sslyze/parser/__testFiles__/self-signed.badssl.com.json index de68dc318f..d8f1e1110a 100644 --- a/scanners/sslyze/parser/__testFiles__/self-signed.badssl.com.json +++ b/scanners/sslyze/parser/__testFiles__/self-signed.badssl.com.json @@ -4609,8 +4609,8 @@ } } ], - "date_scans_started": "2024-09-02T17:12:09.830072", - "date_scans_completed": "2024-09-02T17:12:40.417711", + "date_scans_started": "2024-09-02T17:12:09.830072Z", + "date_scans_completed": "2024-09-02T17:12:40.417711Z", "sslyze_version": "6.0.0", "sslyze_url": "https://github.com/nabla-c0d3/sslyze" } diff --git a/scanners/sslyze/parser/__testFiles__/tls-v1-0.badssl.com_1010.json b/scanners/sslyze/parser/__testFiles__/tls-v1-0.badssl.com_1010.json index a5e220ff1c..60b75a1e0d 100644 --- a/scanners/sslyze/parser/__testFiles__/tls-v1-0.badssl.com_1010.json +++ b/scanners/sslyze/parser/__testFiles__/tls-v1-0.badssl.com_1010.json @@ -6161,8 +6161,8 @@ } } ], - "date_scans_started": "2024-09-02T16:56:57.661483", - "date_scans_completed": "2024-09-02T16:57:27.742230", + "date_scans_started": "2024-09-02T16:56:57.661483Z", + "date_scans_completed": "2024-09-02T16:57:27.742230Z", "sslyze_version": "6.0.0", "sslyze_url": "https://github.com/nabla-c0d3/sslyze" } diff --git a/scanners/sslyze/parser/__testFiles__/unavailable-host.json b/scanners/sslyze/parser/__testFiles__/unavailable-host.json index daf77cab8d..d819c2b5d8 100644 --- a/scanners/sslyze/parser/__testFiles__/unavailable-host.json +++ b/scanners/sslyze/parser/__testFiles__/unavailable-host.json @@ -25,8 +25,8 @@ "scan_result": null } ], - "date_scans_started": "2024-09-03T11:16:28.459875", - "date_scans_completed": "2024-09-03T11:16:33.493072", + "date_scans_started": "2024-09-03T11:16:28.459875Z", + "date_scans_completed": "2024-09-03T11:16:33.493072Z", "sslyze_version": "6.0.0", "sslyze_url": "https://github.com/nabla-c0d3/sslyze" } diff --git a/scanners/sslyze/parser/__testFiles__/untrusted-root.badssl.com.json b/scanners/sslyze/parser/__testFiles__/untrusted-root.badssl.com.json index 7639038bf7..4ba81725ad 100644 --- a/scanners/sslyze/parser/__testFiles__/untrusted-root.badssl.com.json +++ b/scanners/sslyze/parser/__testFiles__/untrusted-root.badssl.com.json @@ -4729,8 +4729,8 @@ } } ], - "date_scans_started": "2024-09-02T17:08:17.745208", - "date_scans_completed": "2024-09-02T17:08:47.154682", + "date_scans_started": "2024-09-02T17:08:17.745208Z", + "date_scans_completed": "2024-09-02T17:08:47.154682Z", "sslyze_version": "6.0.0", "sslyze_url": "https://github.com/nabla-c0d3/sslyze" } diff --git a/scanners/sslyze/parser/__testFiles__/wrong.host.badssl.com.json b/scanners/sslyze/parser/__testFiles__/wrong.host.badssl.com.json index a9f2a6c920..40cc310987 100644 --- a/scanners/sslyze/parser/__testFiles__/wrong.host.badssl.com.json +++ b/scanners/sslyze/parser/__testFiles__/wrong.host.badssl.com.json @@ -4649,8 +4649,8 @@ } } ], - "date_scans_started": "2024-09-02T17:05:34.041854", - "date_scans_completed": "2024-09-02T17:06:04.108674", + "date_scans_started": "2024-09-02T17:05:34.041854Z", + "date_scans_completed": "2024-09-02T17:06:04.108674Z", "sslyze_version": "6.0.0", "sslyze_url": "https://github.com/nabla-c0d3/sslyze" } diff --git a/scanners/sslyze/parser/__testFiles__/www.securecodebox.io.json b/scanners/sslyze/parser/__testFiles__/www.securecodebox.io.json index 1b1b45da2f..8e051377bb 100644 --- a/scanners/sslyze/parser/__testFiles__/www.securecodebox.io.json +++ b/scanners/sslyze/parser/__testFiles__/www.securecodebox.io.json @@ -5953,8 +5953,8 @@ } } ], - "date_scans_started": "2024-09-02T16:51:10.448915", - "date_scans_completed": "2024-09-02T16:51:14.980658", + "date_scans_started": "2024-09-02T16:51:10.448915Z", + "date_scans_completed": "2024-09-02T16:51:14.980658Z", "sslyze_version": "6.0.0", "sslyze_url": "https://github.com/nabla-c0d3/sslyze" } diff --git a/scanners/sslyze/parser/parser.js b/scanners/sslyze/parser/parser.js index 1817d0a887..0fe6237cf2 100644 --- a/scanners/sslyze/parser/parser.js +++ b/scanners/sslyze/parser/parser.js @@ -21,15 +21,9 @@ function parse(fileContent) { console.log("Parsing Result File"); console.log(JSON.stringify(fileContent)); } - + if (fileContent.date_scans_completed) { - // I ran into an issue where the time coverted to ISO String was dependant from the timezone of the machine running the test. - // This means that if GitHub Actions CI time and local time are different the test will fail. - // To fix this we need to enforce the timezone in the date string. - // sslyze uses UTC time internally for the date_scans_completed field. - // https://github.com/nabla-c0d3/sslyze/blob/8ad73ec3d698c826bf3682aacbee2d91e4a2cdbc/sslyze/__main__.py#L83 - // To enforce UTC time, we can just add a Z to the end of the date string. - serverScanResult.identified_at = new Date(fileContent.date_scans_completed+ "Z").toISOString(); + serverScanResult.identified_at = new Date(fileContent.date_scans_completed).toISOString(); } const partialFindings = [