refactor: change to Fortinet messaging and branding

Signed-off-by: Timothy MacDonald <[email protected]>

Author: Timothy MacDonald

assets/FortiCNAPP-info.png

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Lacework Extensible Reporting</string>
+   <string>FortiCNAPP Extensible Reporting</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout_9">
@@ -22,7 +22,7 @@
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -56,7 +56,7 @@
         <item>
          <spacer name="horizontalSpacer_4">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -152,7 +152,7 @@
         <item>
          <widget class="Line" name="line">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
          </widget>
         </item>
@@ -217,7 +217,7 @@
         <item>
          <widget class="Line" name="line_2">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
          </widget>
         </item>
@@ -262,7 +262,7 @@
         <item>
          <spacer name="horizontalSpacer_3">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -303,7 +303,7 @@
         <item>
          <spacer name="horizontalSpacer_2">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -332,7 +332,7 @@
      <x>0</x>
      <y>0</y>
      <width>1049</width>
-     <height>29</height>
+     <height>24</height>
     </rect>
    </property>
   </widget>

assets/Fortinet_logo.png

@@ -12,6 +12,8 @@
 
 class ReportPreview(QMainWindow):
 
+
+
     def __init__(self):
         super().__init__()
         self.web_viewer = QWebEngineView()
@@ -40,7 +42,6 @@ def save_pdf(self, path):
         self.web_viewer.page().printToPdf(path)
 
 
-
 class ErrorDialog(QMessageBox):
     def __init__(self, message):
         super().__init__()
@@ -78,8 +79,9 @@ def __init__(self, args, pre_processed_args, available_reports, basedir):
         else:
             self.window.lineEditCustomLogo.text = "None"
         self.report_preview = ReportPreview()
-        self.connect_ui_elements()
+
         self.populate_fields_from_args()
+        self.connect_ui_elements()
         self.window.show()
 
 
@@ -159,6 +161,16 @@ def toggle_preview(self):
     def populate_fields_from_args(self):
         for available_report in self.available_reports:
             self.window.comboBoxReportSelector.addItem(available_report['report_name'])
+        #print(str(self.args.report))
+        selected_report_name = [report['report_name'] for report in self.available_reports if report['report_short_name'] == self.args.report][0]
+        #print(selected_report_name)
+        # Could not get comboBoxReportSelector.setCurrentIndex to work. Switching to setCurrentText
+        report_index = self.window.comboBoxReportSelector.findText(str(selected_report_name))
+        # print(report_index)
+        # print(type(self.window.comboBoxReportSelector))
+        self.window.comboBoxReportSelector.setCurrentIndex(report_index)
+        #self.window.comboBoxReportSelector.setCurrentText(selected_report_name)
+
         if self.args.cache_data:
             self.window.checkBoxUseCache.setCheckState(Qt.Checked)
         self.window.lineEditCustomer.text = self.args.customer

assets/mainwindow.ui

@@ -52,8 +52,8 @@ def get_arguments():
 
 
     parser.add_argument("--report-path", type=str, help="Filename to save report")
-    parser.add_argument("--author", help="Author of report", type=str, default="John Doe")
-    parser.add_argument("--customer", help="Customer Name (Company)", type=str, default="Some Company")
+    parser.add_argument("--author", help="Author of report", type=str, default="Fortinet")
+    parser.add_argument("--customer", help="Customer Name (Company)", type=str, default="customer")
     parser.add_argument("--cache-data", help="Create/use locally cached copies of Lacework data. This is mainly used for dev testing.", action='store_true')
     parser.add_argument("--vulns-start-time", type=str,
                         help="The number of days and hours in the past relative to NOW to start the vulnerability report. In the format <D:H>",
@@ -71,7 +71,7 @@ def get_arguments():
                         help="Read your credentials from an API key file downloaded from the Lacework UI (JSON formatted).")
     parser.add_argument("--v", help="Set Verbose Logging", action='store_true')
     parser.add_argument("--vv", help="Set Extremely Verbose Logging", action='store_true')
-    parser.add_argument("--report", help="Choose which report to execute. Default is 'CSA'", default="CSA")
+    parser.add_argument("--report", help="Choose which report to execute. Default is 'CSA_Detailed'", default="CSA_Detailed")
     parser.add_argument("--report-format", help="Specify output format, HTML or PDF. Default is HTML", default="HTML")
     parser.add_argument("--gui", help="Run this tool in GUI mode, which provides additional customization options.", action='store_true')
     parser.add_argument("--logo", type=str, help="Specify a custom logo (PNG file) to add to the report.")
@@ -133,7 +133,7 @@ def pre_process_args(args, available_reports):
     if args.list_reports:
         print(f'\nAvailable Reports (use the "ID" with the "--report" flag to specify one):\n')
         for available_report in available_reports:
-            print(f"{'(*Default) ' if available_report['report_short_name'] == 'CSA' else ''}ID:{available_report['report_short_name']}", end=" ")
+            print(f"{'(*Default) ' if available_report['report_short_name'] == 'CSA_Detailed' else ''}ID:{available_report['report_short_name']}", end=" ")
             print(f"Name:{available_report['report_name']}", end=" ")
             print(f"Description: {available_report['report_description']}")
         print('')

modules/gui_main.py

@@ -6,21 +6,22 @@ class ReportGenCSA(ReportGen):
 
     report_short_name = 'CSA'
     report_name = 'Cloud Security Assessment (CIS)'
-    report_description = "This is the Lacework provided Cloud Security Assessment with CIS compliance reporting."
+    report_description = "This is the FortiCNAPP provided Cloud Security Assessment with CIS compliance reporting."
     default_recommendations = """<h3>Recommendations</h3>
             <p>
-              Based on the findings of this assessment, Lacework recommends the following action plan and next steps:
+              Based on the findings of this assessment, Fortinet recommends the following action plan and next steps:
             </p>
             <ol>
-              <li>Engage with your Lacework account team and partner to review services offerings to prioritize and remediate the findings</li>
-              <li>Complete a recurring Cloud Security Assessment once a wider Lacework deployment has been completed to baseline and trend improvements to your cloud security posture.</li>
+              <li>Engage with your Fortinet account team and partner to review services offerings to prioritize and remediate the findings</li>
+              <li>Complete a recurring Cloud Security Assessment once a wider FortiCNAPP deployment has been completed to baseline and trend improvements to your cloud security posture.</li>
             </ol>"""
 
     def __init__(self, basedir, use_cache=False, api_key_file=None, graph_scale=1):
         super().__init__(basedir, use_cache=use_cache, api_key_file=api_key_file, graph_scale=graph_scale)
         self.recommendations = self.default_recommendations
         self.template = self.get_jinja2_template('csa_report.jinja2')
-        self.polygraph_graphic_html = self.file_to_image_tag('assets/polygraph-info.png', 'png')
+        self.company_logo_html = self.file_to_image_tag('assets/Fortinet_logo.png', 'png')
+        self.polygraph_graphic_html = self.file_to_image_tag('assets/FortiCNAPP-info.png', 'png')
 
     def gather_data(self,
                     vulns_start_time: LaceworkTime,

modules/process_args.py

@@ -6,29 +6,29 @@ class ReportGenCSADetailed(ReportGen):
 
     report_short_name = 'CSA_Detailed'
     report_name = 'Detailed Cloud Security Assessment (CIS)'
-    report_description = "This is the detailed version of the Lacework Cloud Security Assessment with CIS compliance reporting."
+    report_description = "This is the detailed version of the FortiCNAPP Cloud Security Assessment with CIS compliance reporting."
     default_recommendations = """<h2>Recommendations</h2>
             <p>
-              Based on the findings of this assessment, Lacework recommends the following action plan and next steps:
+              Based on the findings of this assessment, Fortinet recommends the following action plan and next steps:
             </p>
             <ol>
-              <li>Engage with your Lacework account team and partner to review services offerings to prioritize and remediate the findings</li>
-              <li>Complete a recurring Cloud Security Assessment once a wider Lacework deployment has been completed to baseline and trend improvements to your cloud security posture.</li>
+              <li>Engage with your Fortinet account team and partner to review services offerings to prioritize and remediate the findings</li>
+              <li>Complete a recurring Cloud Security Assessment once a wider FortiCNAPP deployment has been completed to baseline and trend improvements to your cloud security posture.</li>
             </ol>"""
 
     def __init__(self, basedir, use_cache=False, api_key_file=None, graph_scale=1):
         super().__init__(basedir, use_cache=use_cache, api_key_file=api_key_file, graph_scale=graph_scale)
         self.recommendations = self.default_recommendations
         self.template = self.get_jinja2_template('csa_detailed_report.jinja2')
-        self.polygraph_graphic_html = self.file_to_image_tag('assets/polygraph-info.png', 'png')
+        self.company_logo_html = self.file_to_image_tag('assets/Fortinet_logo.png', 'png')
+        self.polygraph_graphic_html = self.file_to_image_tag('assets/FortiCNAPP-info.png', 'png')
 
     def gather_data(self,
                     vulns_start_time: LaceworkTime,
                     vulns_end_time: LaceworkTime,
                     alerts_start_time: LaceworkTime,
                     alerts_end_time: LaceworkTime):
 
-
         self.aws_compliance_data=self.gather_compliance_data(cloud_provider='AWS')
         self.azure_compliance_data=self.gather_compliance_data(cloud_provider='AZURE')
         self.gcp_compliance_data=self.gather_compliance_data(cloud_provider='GCP')
@@ -46,6 +46,7 @@ def render(self, customer, author, pagesize="a3", custom_logo=None):
             customer=str(customer),
             date=self.get_current_date(),
             author=str(author),
+            company_logo_html=self.company_logo_html,
             custom_logo_html=self.custom_logo_html,
             polygraph_graphic_html=self.polygraph_graphic_html,
             aws_compliance_data=self.aws_compliance_data,