Display message on successful/failed ZAP import

nccgroup · Dec 5, 2023 · b630d53 · b630d53
1 parent 589e5f5
commit b630d53
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/com/nccgroup/loggerplusplus/exports/HARExporter.java b/src/main/java/com/nccgroup/loggerplusplus/exports/HARExporter.java
@@ -67,6 +67,7 @@ protected void done() {
 
         } catch (Exception e) {
             // Cancelled.
+            log.error(e);
         }
     }
 

diff --git a/src/main/java/com/nccgroup/loggerplusplus/imports/LoggerImport.java b/src/main/java/com/nccgroup/loggerplusplus/imports/LoggerImport.java
@@ -257,6 +257,7 @@ public static ArrayList<HttpRequestResponse> importFromExportedJson() {
         return requests;
     }
 
+    //TODO Integrate progress bar with SwingWorkerWithProgressDialog
     public static boolean loadImported(ArrayList<HttpRequestResponse> requests, Boolean sendToAutoExporters) {
         EntryImportWorker importWorker = LoggerPlusPlus.instance.getLogProcessor().createEntryImportBuilder()
                 .setOriginatingTool(ToolType.EXTENSIONS)

diff --git a/src/main/java/com/nccgroup/loggerplusplus/preferences/PreferencesPanel.java b/src/main/java/com/nccgroup/loggerplusplus/preferences/PreferencesPanel.java
@@ -202,7 +202,13 @@ public void actionPerformed(ActionEvent e) {
         importGroup.add(new JButton(new AbstractAction("Import From OWASP ZAP") {
             @Override
             public void actionPerformed(ActionEvent e) {
-                ArrayList<HttpRequestResponse> requests = LoggerImport.importZAP();
+                ArrayList<HttpRequestResponse> requests;
+                try{
+                    requests = LoggerImport.importZAP();
+                } catch (Exception ex){
+                    JOptionPane.showMessageDialog(LoggerPlusPlus.instance.getLoggerFrame(), "Could not import ZAP entries. Exception: \n" + ex.getMessage(), "ZAP Import Failed", JOptionPane.ERROR_MESSAGE);
+                    return;
+                }
 
                 if (LoggerPlusPlus.instance.getExportController().getEnabledExporters().size() > 0) {
                     int res = JOptionPane.showConfirmDialog(LoggerPlusPlus.instance.getLoggerFrame(),
@@ -213,6 +219,8 @@ public void actionPerformed(ActionEvent e) {
                 } else {
                     LoggerImport.loadImported(requests, false);
                 }
+
+                JOptionPane.showMessageDialog(LoggerPlusPlus.instance.getLoggerFrame(), requests.size() + " ZAP entries imported successfully", "ZAP Import", JOptionPane.INFORMATION_MESSAGE);
             }
         }));