chore: added some addition logging messages and converted gui to load from .py instead of .uic

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

Author: Timothy MacDonald

assets/mainwindow.ui

@@ -46,7 +46,7 @@
         <item>
          <widget class="QLabel" name="labelSelectReport">
           <property name="enabled">
-           <bool>false</bool>
+           <bool>true</bool>
           </property>
           <property name="text">
            <string>Select Report:</string>

modules/gui_main.py

@@ -4,6 +4,7 @@
 from PySide6.QtWebEngineWidgets import QWebEngineView
 from logzero import logger
 from modules.utils import LaceworkTime
+from modules.mainwindow import Ui_MainWindow
 from __feature__ import true_property
 import traceback
 import datetime
@@ -72,12 +73,16 @@ def __init__(self, args, pre_processed_args, available_reports, basedir):
             self.report_file_name = None
         self.report = None
         self.report_saved = True
-        loader = QUiLoader()
-        self.window = loader.load(f"{basedir}/assets/mainwindow.ui", None)
+        self.window = QMainWindow()
+        self.window.ui = Ui_MainWindow()
+        self.window.ui.setupUi(self.window)
+
+        # loader = QUiLoader()
+        # self.window = loader.load(f"{basedir}/assets/mainwindow.ui", None)
         if args.logo:
-            self.window.lineEditCustomLogo.text = args.logo
+            self.window.ui.lineEditCustomLogo.text = args.logo
         else:
-            self.window.lineEditCustomLogo.text = "None"
+            self.window.ui.lineEditCustomLogo.text = "None"
         self.report_preview = ReportPreview()
 
         self.populate_fields_from_args()
@@ -87,40 +92,40 @@ def __init__(self, args, pre_processed_args, available_reports, basedir):
         # Hide report selector widget for now due to bug in setting combobox index, set report based on command line argument instead
         selected_report_name = [report['report_name'] for report in self.available_reports if report['report_short_name'] == self.args.report][0]
         self.report_changed(selected_report_name)
-        self.window.labelSelectReport.hide()
-        self.window.comboBoxReportSelector.hide()
+        self.window.ui.labelSelectReport.hide()
+        self.window.ui.comboBoxReportSelector.hide()
 
         self.window.show()
 
 
     def connect_ui_elements(self):
         # Combobox disabled due to bug in setting current index
-        # self.window.comboBoxReportSelector.currentTextChanged.connect(self.report_changed)
-        self.window.pushButtonRunReport.clicked.connect(self.run_report)
-        self.window.pushButtonTogglePreview.clicked.connect( self.toggle_preview)
-        self.window.plainTextEditRecommendations.textChanged.connect(self.lineedits_changed)
-        self.window.pushButtonWriteHTML.clicked.connect(self.write_html)
-        self.window.pushButtonWritePDF.clicked.connect(self.write_pdf)
-        self.window.checkBoxUseCache.stateChanged.connect(self.use_cache)
-        self.window.lineEditCustomer.textChanged.connect(self.lineedits_changed)
-        self.window.lineEditAuthor.textChanged.connect(self.lineedits_changed)
-        self.window.pushButtonSelectCustomLogo.clicked.connect(self.set_custom_logo)
+        # self.window.ui.comboBoxReportSelector.currentTextChanged.connect(self.report_changed)
+        self.window.ui.pushButtonRunReport.clicked.connect(self.run_report)
+        self.window.ui.pushButtonTogglePreview.clicked.connect( self.toggle_preview)
+        self.window.ui.plainTextEditRecommendations.textChanged.connect(self.lineedits_changed)
+        self.window.ui.pushButtonWriteHTML.clicked.connect(self.write_html)
+        self.window.ui.pushButtonWritePDF.clicked.connect(self.write_pdf)
+        self.window.ui.checkBoxUseCache.stateChanged.connect(self.use_cache)
+        self.window.ui.lineEditCustomer.textChanged.connect(self.lineedits_changed)
+        self.window.ui.lineEditAuthor.textChanged.connect(self.lineedits_changed)
+        self.window.ui.pushButtonSelectCustomLogo.clicked.connect(self.set_custom_logo)
 
 
     def use_cache(self, state):
         self.report_generator.use_cache = bool(state)
 
     def lineedits_changed(self):
-        self.report_generator.recommendations = self.window.plainTextEditRecommendations.plainText
+        self.report_generator.recommendations = self.window.ui.plainTextEditRecommendations.plainText
 
         if self.report:
-            self.report = self.report_generator.render(self.window.lineEditCustomer.text, self.window.lineEditAuthor.text, custom_logo=self.window.lineEditCustomLogo.text)
+            self.report = self.report_generator.render(self.window.ui.lineEditCustomer.text, self.window.ui.lineEditAuthor.text, custom_logo=self.window.ui.lineEditCustomLogo.text)
             self.report_preview.reload_report(self.report)
 
     def write_html(self):
         if self.report:
             if not self.report_file_name:
-                self.report_file_name = f'{self.window.lineEditCustomer.text}_{self.window.lineEditAuthor.text}_{datetime.datetime.now().strftime("%Y%m%d")}.html'
+                self.report_file_name = f'{self.window.ui.lineEditCustomer.text}_{self.window.ui.lineEditAuthor.text}_{datetime.datetime.now().strftime("%Y%m%d")}.html'
             else:
                 self.report_file_name = str(self.report_file_name).replace(".pdf", ".html")
             filename, _ = QFileDialog.getSaveFileName(self.window, "Save HTML Location", self.report_file_name)
@@ -139,7 +144,7 @@ def write_html(self):
     def write_pdf(self):
         if self.report:
             if not self.report_file_name:
-                self.report_file_name = f'{self.window.lineEditCustomer.text}_{self.window.lineEditAuthor.text}_{datetime.datetime.now().strftime("%Y%m%d")}.pdf'
+                self.report_file_name = f'{self.window.ui.lineEditCustomer.text}_{self.window.ui.lineEditAuthor.text}_{datetime.datetime.now().strftime("%Y%m%d")}.pdf'
             else:
                 self.report_file_name = str(self.report_file_name).replace(".html", ".pdf")
             filename, _ = QFileDialog.getSaveFileName(self.window, "Save PDF Location", self.report_file_name)
@@ -156,7 +161,7 @@ def set_custom_logo(self):
         filename, _ = QFileDialog.getOpenFileName(self.window, "Open Custom Logo", filter="PNG File (*.png)")
         if filename:
             if os.access(filename, os.R_OK):
-                self.window.lineEditCustomLogo.text = filename
+                self.window.ui.lineEditCustomLogo.text = filename
             else:
                 dialog = ErrorDialog("Can't read that file. Check permissions?")
 
@@ -170,47 +175,47 @@ def toggle_preview(self):
     def populate_fields_from_args(self):
         # Combobox disabled due to bug in setting current index
         # for available_report in self.available_reports:
-        #    self.window.comboBoxReportSelector.addItem(available_report['report_name'])
+        #    self.window.ui.comboBoxReportSelector.addItem(available_report['report_name'])
         # selected_report_name = [report['report_name'] for report in self.available_reports if report['report_short_name'] == self.args.report][0]
-        # report_index = self.window.comboBoxReportSelector.findText(str(selected_report_name))
-        # self.window.comboBoxReportSelector.setCurrentIndex(report_index)
+        # report_index = self.window.ui.comboBoxReportSelector.findText(str(selected_report_name))
+        # self.window.ui.comboBoxReportSelector.setCurrentIndex(report_index)
 
 
         if self.args.cache_data:
-            self.window.checkBoxUseCache.setCheckState(Qt.Checked)
-        self.window.lineEditCustomer.text = self.args.customer
-        self.window.lineEditAuthor.text = self.args.author
-        self.window.spinBoxVulnStartTimeDays.value = int(self.args.vulns_start_time.split(":")[0])
-        self.window.spinBoxVulnStartTimeHours.value = int(self.args.vulns_start_time.split(":")[1])
-        self.window.spinBoxVulnEndTimeDays.value = int(self.args.vulns_end_time.split(":")[0])
-        self.window.spinBoxVulnEndTimeHours.value = int(self.args.vulns_end_time.split(":")[1])
-        self.window.spinBoxAlertStartTimeDays.value = int(self.args.alerts_start_time.split(":")[0])
-        self.window.spinBoxAlertStartTimeHours.value = int(self.args.alerts_start_time.split(":")[1])
-        self.window.spinBoxAlertEndTimeDays.value = int(self.args.alerts_end_time.split(":")[0])
-        self.window.spinBoxAlertEndTimeHours.value = int(self.args.alerts_end_time.split(":")[1])
+            self.window.ui.checkBoxUseCache.setCheckState(Qt.Checked)
+        self.window.ui.lineEditCustomer.text = self.args.customer
+        self.window.ui.lineEditAuthor.text = self.args.author
+        self.window.ui.spinBoxVulnStartTimeDays.value = int(self.args.vulns_start_time.split(":")[0])
+        self.window.ui.spinBoxVulnStartTimeHours.value = int(self.args.vulns_start_time.split(":")[1])
+        self.window.ui.spinBoxVulnEndTimeDays.value = int(self.args.vulns_end_time.split(":")[0])
+        self.window.ui.spinBoxVulnEndTimeHours.value = int(self.args.vulns_end_time.split(":")[1])
+        self.window.ui.spinBoxAlertStartTimeDays.value = int(self.args.alerts_start_time.split(":")[0])
+        self.window.ui.spinBoxAlertStartTimeHours.value = int(self.args.alerts_start_time.split(":")[1])
+        self.window.ui.spinBoxAlertEndTimeDays.value = int(self.args.alerts_end_time.split(":")[0])
+        self.window.ui.spinBoxAlertEndTimeHours.value = int(self.args.alerts_end_time.split(":")[1])
 
     def report_changed(self, report_name):
         self.report_to_run = [report['report_class'] for report in self.available_reports if report['report_name'] == report_name][0]
-        self.report_generator = self.report_to_run(self.basedir, use_cache=self.window.checkBoxUseCache.checked, api_key_file=self.pre_processed_args['api_key_file'])
+        self.report_generator = self.report_to_run(self.basedir, use_cache=self.window.ui.checkBoxUseCache.checked, api_key_file=self.pre_processed_args['api_key_file'])
         logger.debug(f"Currently Selected Report: {report_name}")
         self.report = None
         self.report_preview.hide()
         self.report_preview.clear_report()
-        self.window.plainTextEditRecommendations.plainText = self.report_to_run.default_recommendations
+        self.window.ui.plainTextEditRecommendations.plainText = self.report_to_run.default_recommendations
 
 
     def run_report(self):
         try:
-            vuln_start_time = LaceworkTime(f"{self.window.spinBoxVulnStartTimeDays.value}:{self.window.spinBoxVulnStartTimeHours.value}")
-            vuln_end_time = LaceworkTime(f"{self.window.spinBoxVulnEndTimeDays.value}:{self.window.spinBoxVulnEndTimeHours.value}")
-            alert_start_time = LaceworkTime(f"{self.window.spinBoxAlertStartTimeDays.value}:{self.window.spinBoxAlertStartTimeHours.value}")
-            alert_end_time = LaceworkTime(f"{self.window.spinBoxAlertEndTimeDays.value}:{self.window.spinBoxAlertEndTimeHours.value}")
-            if self.window.lineEditCustomLogo.text == "None":
+            vuln_start_time = LaceworkTime(f"{self.window.ui.spinBoxVulnStartTimeDays.value}:{self.window.ui.spinBoxVulnStartTimeHours.value}")
+            vuln_end_time = LaceworkTime(f"{self.window.ui.spinBoxVulnEndTimeDays.value}:{self.window.ui.spinBoxVulnEndTimeHours.value}")
+            alert_start_time = LaceworkTime(f"{self.window.ui.spinBoxAlertStartTimeDays.value}:{self.window.ui.spinBoxAlertStartTimeHours.value}")
+            alert_end_time = LaceworkTime(f"{self.window.ui.spinBoxAlertEndTimeDays.value}:{self.window.ui.spinBoxAlertEndTimeHours.value}")
+            if self.window.ui.lineEditCustomLogo.text == "None":
                 custom_logo = None
             else:
-                custom_logo = self.window.lineEditCustomLogo.text
-            self.report = self.report_generator.generate(self.window.lineEditCustomer.text,
-                                                         self.window.lineEditAuthor.text,
+                custom_logo = self.window.ui.lineEditCustomLogo.text
+            self.report = self.report_generator.generate(self.window.ui.lineEditCustomer.text,
+                                                         self.window.ui.lineEditAuthor.text,
                                                          vulns_start_time=vuln_start_time,
                                                          vulns_end_time=vuln_end_time,
                                                          alerts_start_time=alert_start_time,