Merge a2f994c into 19b273c

pshtt/cli.py

@@ -49,7 +49,7 @@ def to_csv(results, out_filename):
             row = [result[header] for header in pshtt.HEADERS]
             writer.writerow(row)
 
-    logging.warn("Wrote results to %s.", out_filename)
+    logging.warning("Wrote results to %s.", out_filename)
 
 
 def to_json(results, out_filename):
@@ -62,7 +62,7 @@ def to_json(results, out_filename):
         out_file.write(json_content + '\n')
 
         if out_file is not sys.stdout:
-            logging.warn("Wrote results to %s.", out_filename)
+            logging.warning("Wrote results to %s.", out_filename)
 
 
 def to_markdown(results, out_filename):

pshtt/models.py

@@ -55,7 +55,11 @@ def __init__(self, protocol, host, base_domain):
         # Only HTTPS endpoints have these.
         # Initialize all of them to None, so that it's
         # discernible if they don't get explicitly set.
+        self.https_full_connection = None
+        self.https_client_auth_required = False
         self.https_valid = None
+        self.https_public_trusted = None
+        self.https_custom_trusted = None
         self.https_bad_chain = None
         self.https_bad_hostname = None
         self.https_expired_cert = None
@@ -98,7 +102,11 @@ def to_object(self):
         }
 
         if self.protocol == "https":
+            obj['https_full_connection'] = self.https_full_connection
+            obj['https_client_auth_required'] = self.https_client_auth_required
             obj['https_valid'] = self.https_valid
+            obj['https_public_trusted'] = self.https_public_trusted
+            obj['https_custom_trusted'] = self.https_custom_trusted
             obj['https_bad_chain'] = self.https_bad_chain
             obj['https_bad_hostname'] = self.https_bad_hostname
             obj['https_expired_cert'] = self.https_expired_cert