Fix JSON output

nabla-c0d3 · Jan 3, 2025 · 79377bf · 79377bf
1 parent 863fa05
commit 79377bf
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 3 deletions.
diff --git a/json_output_schema.json b/json_output_schema.json
@@ -55,7 +55,7 @@
           "$ref": "#/$defs/HttpHeadersScanAttemptAsJson"
         },
         "tls_extended_master_secret": {
-          "$ref": "#/$defs/EmsExtensionScanResultAsJson"
+          "$ref": "#/$defs/EmsExtensionScanAttemptAsJson"
         }
       },
       "required": [
@@ -372,6 +372,53 @@
       "title": "EarlyDataScanResultAsJson",
       "type": "object"
     },
+    "EmsExtensionScanAttemptAsJson": {
+      "additionalProperties": false,
+      "properties": {
+        "status": {
+          "$ref": "#/$defs/ScanCommandAttemptStatusEnum"
+        },
+        "error_reason": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/ScanCommandErrorReasonEnum"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "error_trace": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "title": "Error Trace"
+        },
+        "result": {
+          "anyOf": [
+            {
+              "$ref": "#/$defs/EmsExtensionScanResultAsJson"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "required": [
+        "status",
+        "error_reason",
+        "error_trace",
+        "result"
+      ],
+      "title": "EmsExtensionScanAttemptAsJson",
+      "type": "object"
+    },
     "EmsExtensionScanResultAsJson": {
       "additionalProperties": false,
       "properties": {

diff --git a/sslyze/json/json_output.py b/sslyze/json/json_output.py
@@ -21,7 +21,7 @@
 from sslyze.plugins.compression_plugin import CompressionScanAttemptAsJson
 from sslyze.plugins.early_data_plugin import EarlyDataScanAttemptAsJson
 from sslyze.plugins.elliptic_curves_plugin import SupportedEllipticCurvesScanAttemptAsJson
-from sslyze.plugins.ems_extension_plugin import EmsExtensionScanResultAsJson
+from sslyze.plugins.ems_extension_plugin import EmsExtensionScanAttemptAsJson
 from sslyze.plugins.fallback_scsv_plugin import FallbackScsvScanAttemptAsJson
 from sslyze.plugins.heartbleed_plugin import HeartbleedScanAttemptAsJson
 from sslyze.plugins.http_headers_plugin import HttpHeadersScanAttemptAsJson
@@ -66,7 +66,7 @@ class AllScanCommandsAttemptsAsJson(BaseModelWithOrmModeAndForbid):
     session_resumption: SessionResumptionSupportScanAttemptAsJson
     elliptic_curves: SupportedEllipticCurvesScanAttemptAsJson
     http_headers: HttpHeadersScanAttemptAsJson
-    tls_extended_master_secret: EmsExtensionScanResultAsJson
+    tls_extended_master_secret: EmsExtensionScanAttemptAsJson
 
     @model_validator(mode="before")
     @classmethod