Fixes links to the inline policies in case there are duplicate names. Fixes #63

Author: Kinnaird McQuade

cloudsplaining/command/scan.py

@@ -83,9 +83,25 @@ def scan(
         with open(input) as f:
             contents = f.read()
             account_authorization_details_cfg = json.loads(contents)
-        scan_account_authorization_details(
+        rendered_html_report = scan_account_authorization_details(
             account_authorization_details_cfg, exclusions, account_name, output, write_data_files=True
         )
+        html_output_file = os.path.join(output, f"iam-report-{account_name}.html")
+        logger.info("Saving the report to %s", html_output_file)
+        if os.path.exists(html_output_file):
+            os.remove(html_output_file)
+
+        with open(html_output_file, "w") as f:
+            f.write(rendered_html_report)
+
+        print(f"Wrote HTML results to: {html_output_file}")
+
+        # Open the report by default
+        if not skip_open_report:
+            print("Opening the HTML report")
+            url = "file://%s" % os.path.abspath(html_output_file)
+            webbrowser.open(url, new=2)
+
     if os.path.isdir(input):
         logger.info(
             "The path given is a directory. Scanning for account authorization files and generating report."
@@ -103,6 +119,9 @@ def scan(
                 account_authorization_details_cfg, exclusions, account_name, output, write_data_files=True
             )
             html_output_file = os.path.join(output, f"iam-report-{account_name}.html")
+            logger.info("Saving the report to %s", html_output_file)
+            if os.path.exists(html_output_file):
+                os.remove(html_output_file)
 
             with open(html_output_file, "w") as f:
                 f.write(rendered_html_report)

cloudsplaining/output/templates/analysis/finding-card/names.html

@@ -1,5 +1,5 @@
 <div class="card">
-  <h6 class="card-header" id="{{ finding['PolicyName'] }}">
+  <h6 class="card-header" id="{{ finding['PolicyName'] }}{% if finding['AttachedToPrincipal'] %}{{ finding['AttachedToPrincipal'] }}{% endif %}">
     Name: {{ finding["PolicyName"] }}
     <br>
     <br>

cloudsplaining/output/templates/summary/aws-managed.html

@@ -31,7 +31,7 @@
     {% if finding["ManagedBy"] == "AWS" %}
       <tr>
         <td></td>
-        <td><a href="#{{ finding['PolicyName'] }}">{{ finding['PolicyName'] }}</a></td>
+        <td><a href="#{{ finding['PolicyName'] }}{% if finding['AttachedToPrincipal'] %}{{ finding['AttachedToPrincipal'] }}{% endif %}">{{ finding['PolicyName'] }}</a></td>
         <td>{{ finding["ServicesCount"] }}</td>
         <td><p style="max-height: 100px; overflow: scroll;">{% for service in finding["Services"] %}{{ service }}{% if not loop.last %}, {% endif %}{% endfor %}</p></td>
         <td>{{ finding["ActionsCount"] }}</td>

cloudsplaining/output/templates/summary/customer-managed.html

@@ -39,7 +39,7 @@
       <tr>
         <td></td>
         <td>{% if finding["Type"] == "Policy" %}{{ finding["ManagedBy"] }}-Managed {{ finding["Type"] }}{% else %}Inline {{ finding["Type"] }} Policy{% endif %}</td>
-        <td><a href="#{{ finding['PolicyName'] }}">{{ finding['PolicyName'] }}</a></td>
+        <td><a href="#{{ finding['PolicyName'] }}{% if finding['AttachedToPrincipal'] %}{{ finding['AttachedToPrincipal'] }}{% endif %}">{{ finding['PolicyName'] }}</a></td>
         <td>{% if finding["Type"] == "Policy" %}{% else %}{{ finding['Name'] }}{% endif %}</td>
         <td>{{ finding["ServicesCount"] }}</td>
         <td><p style="max-height: 100px; overflow: scroll;">{% for service in finding["Services"] %}{{ service }}{% if not loop.last %}, {% endif %}{% endfor %}</p></td>