chore: updated report to match Fortinet styling and branding

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

Author: Timothy MacDonald

assets/FortiCNAPP-Unified-Approach.png

@@ -25,9 +25,6 @@ def main():
     # Setup up log file, always write verbose logs
     logzero.logfile('lw_report_gen.log', loglevel=logzero.DEBUG)
 
-    # check github for updates
-    # alert_new_release()
-
     # Dynamically import report classes from "modules/reports" subdirectory
     available_reports: list = get_available_reports(basedir)
     if len(available_reports) == 0:
@@ -72,7 +69,7 @@ def main():
                                                 alerts_start_time=pre_processed_args['alerts_start_time'],
                                                 alerts_end_time=pre_processed_args['alerts_end_time'],
                                                 custom_logo=custom_logo,
-                                                pagesize='a2'
+                                                pagesize='a2',
                                                 )
 
         except Exception as e:

assets/FortiCNAPP-info.png

@@ -143,6 +143,15 @@ def write_html(self):
 
     def write_pdf(self):
         if self.report:
+            if self.window.ui.lineEditCustomLogo.text == "None":
+                custom_logo = None
+            else:
+                custom_logo = self.window.ui.lineEditCustomLogo.text
+            self.report = self.report_generator.render(self.window.ui.lineEditCustomer.text,
+                                                       self.window.ui.lineEditAuthor.text,
+                                                       custom_logo=custom_logo,
+                                                       pagesize="a3",
+                                                       pdf=True)
             if not self.report_file_name:
                 self.report_file_name = f'{self.window.ui.lineEditCustomer.text}_{self.window.ui.lineEditAuthor.text}_{datetime.datetime.now().strftime("%Y%m%d")}.pdf'
             else:

lw_report_gen.py

@@ -224,7 +224,7 @@ def gather_data(self,
                  alerts_end_time: LaceworkTime):
         pass
 
-    def render(self, customer, author, custom_logo=None, pagesize="a3"):
+    def render(self, customer, author, custom_logo=None, pagesize="a3", pdf=False):
         pass
 
     def generate(self,
@@ -238,7 +238,7 @@ def generate(self,
                          vulns_end_time,
                          alerts_start_time,
                          alerts_end_time)
-        return self.render(customer, author, custom_logo=None)
+        return self.render(customer, author, custom_logo=None, pdf=False)
 
 
 

modules/gui_main.py

@@ -21,7 +21,7 @@ def __init__(self, basedir, use_cache=False, api_key_file=None, graph_scale=1):
         self.recommendations = self.default_recommendations
         self.template = self.get_jinja2_template('csa_report.jinja2')
         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')
+        self.polygraph_graphic_html = self.file_to_image_tag('assets/FortiCNAPP-Unified-Approach.png', 'png')
 
     def gather_data(self,
                     vulns_start_time: LaceworkTime,

modules/reportgen.py

@@ -37,11 +37,12 @@ def gather_data(self,
         self.alerts_data=self.gather_alert_data(alerts_start_time.generate_time_string(), alerts_end_time.generate_time_string())
         self.secrets_data=self.gather_secrets(alerts_start_time.generate_time_string(), alerts_end_time.generate_time_string())
 
-    def render(self, customer, author, pagesize="a3", custom_logo=None):
+    def render(self, customer, author, pagesize="a3", custom_logo=None, pdf=False):
         if custom_logo and os.path.isfile(custom_logo):
             self.custom_logo_html = self.file_to_image_tag(custom_logo, 'png', align='right')
         else:
             self.custom_logo_html = None
+        self.template = self.get_jinja2_template('csa_detailed_report.jinja2')
         return self.template.render(
             customer=str(customer),
             date=self.get_current_date(),
@@ -57,7 +58,8 @@ def render(self, customer, author, pagesize="a3", custom_logo=None):
             alerts_data=self.alerts_data,
             secrets_data=self.secrets_data,
             recommendations=self.recommendations,
-            pagesize=pagesize
+            pagesize=pagesize,
+            pdf=pdf
         )
 
     def generate(self,
@@ -68,11 +70,12 @@ def generate(self,
                  alerts_start_time: LaceworkTime = LaceworkTime('7:0'),
                  alerts_end_time: LaceworkTime = LaceworkTime('0:0'),
                  custom_logo=None,
-                 pagesize="a3"):
+                 pagesize="a3",
+                 pdf=False):
         self.gather_data(vulns_start_time,
                          vulns_end_time,
                          alerts_start_time,
                          alerts_end_time)
-        return self.render(customer, author, custom_logo=custom_logo, pagesize=pagesize)
+        return self.render(customer, author, custom_logo=custom_logo, pagesize=pagesize, pdf=pdf)