Fix JSON serialization in Python 2; fixes #246

sslyze/cli/json_output.py

@@ -23,8 +23,8 @@ def __init__(self, file_to):
                            'sslyze_url': PROJECT_URL}
 
     def command_line_parsed(self, available_plugins, args_command_list):
-        self._json_dict.update({'network_timeout': str(args_command_list.timeout),
-                                'network_max_retries': str(args_command_list.nb_retries),
+        self._json_dict.update({'network_timeout': args_command_list.timeout,
+                                'network_max_retries': args_command_list.nb_retries,
                                 'invalid_targets': [],
                                 'accepted_targets': []})
 
@@ -40,7 +40,9 @@ def scans_started(self):
 
     def server_scan_completed(self, server_scan_result):
         # type: (CompletedServerScan) -> None
-        server_scan_dict = {'server_info': server_scan_result.server_info.__dict__}
+        server_scan_dict = {'server_info': server_scan_result.server_info.__dict__.copy()}
+        for key, value in server_scan_dict['server_info'].items():
+            server_scan_dict['server_info'][key] = _object_to_json_dict(value)
 
         dict_command_result = {}
         for plugin_result in server_scan_result.plugin_result_list:
@@ -53,6 +55,10 @@ def server_scan_completed(self, server_scan_result):
 
             if scan_command.get_cli_argument() in dict_command_result.keys():
                 raise ValueError('Received duplicate result for command {}'.format(scan_command))
+
+            for key, value in dict_result.items():
+                dict_result[key] = _object_to_json_dict(value)
+
             dict_command_result[scan_command.get_cli_argument()] = dict_result
 
         server_scan_dict['commands_results'] = dict_command_result
@@ -61,34 +67,38 @@ def server_scan_completed(self, server_scan_result):
     def scans_completed(self, total_scan_time):
         # type: (float) -> None
         self._json_dict['total_scan_time'] = total_scan_time
-        json_out = json.dumps(self._json_dict, default=self._object_to_json_dict, sort_keys=True, indent=4,
+        json_out = json.dumps(self._json_dict, default=_object_to_json_dict, sort_keys=True, indent=4,
                               ensure_ascii=True)
         if IS_PYTHON_2:
             json_out = unicode(json_out)
         self._file_to.write(json_out)
 
-    @staticmethod
-    def _object_to_json_dict(obj):
-        """Convert an object to a dictionary suitable for the JSON output.
-        """
-        if isinstance(obj, Enum):
-            # Properly serialize Enums (such as OpenSslVersionEnum)
-            result = obj.name
-        elif isinstance(obj, x509._Certificate):
-            # Properly serialize certificates; only return the PEM string
-            result = {'as_pem': obj.public_bytes(Encoding.PEM).decode('ascii'),
-                      'hpkp_pin': CertificateUtils.get_hpkp_pin(obj),
-                      'subject_name': CertificateUtils.get_name_as_short_text(obj.subject)}
-        elif isinstance(obj, object):
+
+def _object_to_json_dict(obj):
+    """Convert an object to a dictionary suitable for the JSON output.
+    """
+    if isinstance(obj, Enum):
+        # Properly serialize Enums (such as OpenSslVersionEnum)
+        result = obj.name
+    elif isinstance(obj, x509._Certificate):
+        # Properly serialize certificates; only return the PEM string
+        result = {'as_pem': obj.public_bytes(Encoding.PEM).decode('ascii'),
+                  'hpkp_pin': CertificateUtils.get_hpkp_pin(obj),
+                  'subject_name': CertificateUtils.get_name_as_short_text(obj.subject)}
+    elif isinstance(obj, object):
+        if hasattr(obj, '__dict__'):
             result = {}
             for key, value in obj.__dict__.items():
                 # Remove private attributes
                 if key.startswith('_'):
                     continue
 
-                result[key] = value
-
+                result[key] = _object_to_json_dict(value)
         else:
-            raise TypeError('Unknown type: {}'.format(repr(obj)))
+            # Simple object like a string
+            result = obj
+
+    else:
+        raise TypeError('Unknown type: {}'.format(repr(obj)))
 
-        return result
+    return result