Add IP address to html report (column 2) (#201)

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+3.1.0 - 2024-04-10
+==================
+
+### Changed
+- Add IP address to html report (column 2) (#200)
+
+
 3.0.0 - 2024-04-02
 ==================
 

sample/summary.csv

@@ -1,4 +1,4 @@
-#Host,Grade,HasWarnings,Cert Expiry,Chain Status,Forward Secrecy,Heartbeat ext,Vuln Beast,Vuln Drown,Vuln Heartbleed,Vuln FREAK,Vuln openSsl Ccs,Vuln openSSL LuckyMinus20,Vuln POODLE,Vuln POODLE TLS,Support RC4,RC4 with modern protocols,RC4 Only,TLS 1.3,TLS 1.2,TLS 1.1,TLS 1.0,SSL 3.0 INSECURE,SSL 2.0 INSECURE
-duckduckgo.com,A+,False,2024-11-05,none,Yes (with most browsers) ROBUST,False,False,None,False,False,False,False,False,False,False,False,False,Yes,Yes,No,No,No,No
-google.com,B,False,2024-05-27,none,With modern browsers,False,True,None,False,False,False,False,False,False,False,False,False,Yes,Yes,Yes,Yes,No,No
-google.com,B,False,2024-05-27,none,With modern browsers,False,True,None,False,False,False,False,False,False,False,False,False,Yes,Yes,Yes,Yes,No,No
+#Host,IP,Grade,HasWarnings,Cert Expiry,Chain Status,Forward Secrecy,Heartbeat ext,Vuln Beast,Vuln Drown,Vuln Heartbleed,Vuln FREAK,Vuln openSsl Ccs,Vuln openSSL LuckyMinus20,Vuln POODLE,Vuln POODLE TLS,Support RC4,RC4 with modern protocols,RC4 Only,TLS 1.3,TLS 1.2,TLS 1.1,TLS 1.0,SSL 3.0 INSECURE,SSL 2.0 INSECURE
+duckduckgo.com,52.250.42.157,A+,False,2024-11-05,none,Yes (with most browsers) ROBUST,False,False,None,False,False,False,False,False,False,False,False,False,Yes,Yes,No,No,No,No
+google.com,142.250.72.174,B,False,2024-05-27,none,With modern browsers,False,True,None,False,False,False,False,False,False,False,False,False,Yes,Yes,Yes,Yes,No,No
+google.com,2607:f8b0:4007:815:0:0:0:200e,B,False,2024-05-27,none,With modern browsers,False,True,None,False,False,False,False,False,False,False,False,False,Yes,Yes,Yes,Yes,No,No

sample/summary.html

@@ -11,6 +11,7 @@ <h1>SSL Labs Analysis Summary Report</h1>
 <table class="tftable" border="1">
   <tr>
 	<th>#Host</th>
+	<th>IP</th>
 	<th>Grade</th>
 	<th>HasWarnings</th>
 	<th>Cert Expiry</th>
@@ -37,6 +38,7 @@ <h1>SSL Labs Analysis Summary Report</h1>
   </tr>
   <tr class="A">
 	<td>duckduckgo.com</td>
+	<td>52.250.42.157</td>
 	<td>A+</td>
 	<td>False</td>
 	<td>2024-11-05</td>
@@ -63,6 +65,7 @@ <h1>SSL Labs Analysis Summary Report</h1>
   </tr>
   <tr class="B">
 	<td>google.com</td>
+	<td>142.250.72.174</td>
 	<td>B</td>
 	<td>False</td>
 	<td>2024-05-27</td>
@@ -89,6 +92,7 @@ <h1>SSL Labs Analysis Summary Report</h1>
   </tr>
   <tr class="B">
 	<td>google.com</td>
+	<td>2607:f8b0:4007:815:0:0:0:200e</td>
 	<td>B</td>
 	<td>False</td>
 	<td>2024-05-27</td>

setup.py

@@ -1,7 +1,7 @@
 from setuptools import find_packages, setup
 
 __title__ = "ssllabsscan"
-__version__ = "3.0.0"
+__version__ = "3.1.0"
 __author__ = "Kay Hau"
 __email__ = "[email protected]"
 __uri__ = "https://github.com/kyhau/ssllabs-scan"

ssllabsscan/main.py

@@ -29,7 +29,7 @@ def output_summary_html(input_csv, output_html):
             if row[0].startswith("#"):
                 data += "  <tr>\n\t<th>{}</th>\n  </tr>".format('</th>\n\t<th>'.join(row))
             else:
-                data += '\n  <tr class="{}">\n\t<td>{}</td>\n  </tr>'.format(row[1][:1], '</td>\n\t<td>'.join(row))
+                data += '\n  <tr class="{}">\n\t<td>{}</td>\n  </tr>'.format(row[2][:1], '</td>\n\t<td>'.join(row))
 
     # Replace the target string
     content = REPORT_HTML

ssllabsscan/ssllabs_client.py

@@ -44,7 +44,7 @@
 ]
 
 SUMMARY_COL_NAMES = [
-    "Host", "Grade", "HasWarnings", "Cert Expiry", "Chain Status", "Forward Secrecy", "Heartbeat ext"
+    "Host", "IP", "Grade", "HasWarnings", "Cert Expiry", "Chain Status", "Forward Secrecy", "Heartbeat ext"
 ] + VULNERABLES + RC4 + PROTOCOLS
 
 
@@ -140,6 +140,7 @@ def append_summary_csv(self, summary_file, host, data):
                 # see SUMMARY_COL_NAMES
                 summary = [
                     host,
+                    ep.get("ipAddress"),
                     ep["grade"],
                     ep["hasWarnings"],
                     na,

ssllabsscan/tests/conftest.py

@@ -18,6 +18,7 @@
     "protocol": "HTTP",
     "endpoints": [
         {
+            "ipAddress": "142.250.72.174",
             "statusMessage": "Ready",
             "grade": "A+",
             "hasWarnings": False,