refactoring Exception

raise-isayan · Mar 14, 2021 · cc6b5e2 · cc6b5e2
1 parent f5a73e4
commit cc6b5e2
Show file tree

Hide file tree

Showing 42 changed files with 527 additions and 548 deletions.
diff --git a/libs/BurpExtensionCommons-v0.4.4.0.jar b/libs/BurpExtensionCommons-v0.4.4.0.jar
diff --git a/release/YaguraExtender-v2.2.jar b/release/YaguraExtender-v2.2.jar
diff --git a/src/main/java/burp/BurpExtender.java b/src/main/java/burp/BurpExtender.java
@@ -106,7 +106,7 @@ public BurpExtender() {
             prop.store(bout, "");
             LogManager.getLogManager().readConfiguration(new ByteArrayInputStream(bout.toByteArray()));
         } catch (IOException ex) {
-            logger.log(Level.SEVERE, null, ex);
+            logger.log(Level.SEVERE, ex.getMessage(), ex);
         }
         JsonUtil.registerTypeHierarchyAdapter(MatchItem.class, new XMatchItemAdapter());
     }
@@ -197,8 +197,8 @@ public void registerExtenderCallbacks(IBurpExtenderCallbacks callbacks) {
         callbacks.setExtensionName(String.format("%s v%s", BUNDLE.getString("projname"), BUNDLE.getString("version")));
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
             @Override
-            public void uncaughtException(Thread t, Throwable e) {
-                logger.log(Level.SEVERE, null, e);
+            public void uncaughtException(Thread t, Throwable ex) {
+                logger.log(Level.SEVERE, ex.getMessage(), ex);
             }
         });
 
@@ -208,9 +208,9 @@ public void uncaughtException(Thread t, Throwable e) {
                 Config.loadFromJson(CONFIG_FILE, this.option);
             }
         } catch (IOException ex) {
-            logger.log(Level.SEVERE, null, ex);
+            logger.log(Level.SEVERE, ex.getMessage(), ex);
         } catch (RuntimeException ex) {
-            logger.log(Level.WARNING, null, ex);
+            logger.log(Level.SEVERE, ex.getMessage(), ex);
         }
 
         try {
@@ -219,7 +219,7 @@ public void uncaughtException(Thread t, Throwable e) {
                 this.setLogDir(mkLogDir(this.option.getLoggingProperty().getBaseDir(), this.option.getLoggingProperty().getLogDirFormat()));
             }
         } catch (IOException ex) {
-            logger.log(Level.SEVERE, null, ex);
+            logger.log(Level.SEVERE, ex.getMessage(), ex);
         }
 
         callbacks.registerHttpListener(this);
@@ -379,9 +379,9 @@ protected synchronized void writeProxyMessage(
                     }
                 } catch (IOException ex) {
                     getCallbacks().issueAlert(ex.getMessage());
-                    logger.log(Level.SEVERE, null, ex);
+                    logger.log(Level.SEVERE, ex.getMessage(), ex);
                 } catch (Exception ex) {
-                    logger.log(Level.SEVERE, null, ex);
+                    logger.log(Level.SEVERE, ex.getMessage(), ex);
                 }
             }
             // ログを出力したら消す
@@ -445,9 +445,9 @@ protected synchronized void writeToolMessage(
                 }
             }
         } catch (IOException ex) {
-            logger.log(Level.SEVERE, null, ex);
+            logger.log(Level.SEVERE, ex.getMessage(), ex);
         } catch (Exception ex) {
-            logger.log(Level.SEVERE, null, ex);
+            logger.log(Level.SEVERE, ex.getMessage(), ex);
         }
     }
 
@@ -579,7 +579,7 @@ private void matchAlertMessage(String toolName, boolean messageIsRequest, IHttpR
                     }
                 }
             } catch (Exception ex) {
-                logger.log(Level.SEVERE, null, ex);
+                logger.log(Level.SEVERE, ex.getMessage(), ex);
             }
         }
     }
@@ -733,9 +733,9 @@ protected void applyOptionProperty() {
         try {
             Config.saveToJson(CONFIG_FILE, this.option);
         } catch (IOException ex) {
-            logger.log(Level.SEVERE, null, ex);
+            logger.log(Level.SEVERE, ex.getMessage(), ex);
         } catch (Exception ex) {
-            logger.log(Level.SEVERE, null, ex);
+            logger.log(Level.SEVERE, ex.getMessage(), ex);
         }
     }
 
@@ -785,7 +785,7 @@ public void sendToMessageInfoCopy(IContextMenuInvocation contextMenu, IHttpReque
                 buff.append("\r\n");
             }
         } catch (ParseException ex) {
-            logger.log(Level.SEVERE, null, ex);
+            logger.log(Level.SEVERE, ex.getMessage(), ex);
         }
         SwingUtil.systemClipboardCopy(buff.toString());
     }
@@ -854,7 +854,7 @@ public void sendToAddHostIncludeToScope(IContextMenuInvocation contextMenu, IHtt
                 BurpExtender.getCallbacks().includeInScope(new URL(HttpUtil.toURL(url.getProtocol(), url.getHost(), url.getPort())));
             }
         } catch (MalformedURLException ex) {
-            logger.log(Level.SEVERE, null, ex);
+            logger.log(Level.SEVERE, ex.getMessage(), ex);
         }
     }
 
@@ -872,14 +872,13 @@ public void sendToAddHostToExcludeScope(IContextMenuInvocation contextMenu, IHtt
                 BurpExtender.getCallbacks().excludeFromScope(new URL(HttpUtil.toURL(url.getProtocol(), url.getHost(), url.getPort())));
             }
         } catch (MalformedURLException ex) {
-            logger.log(Level.SEVERE, null, ex);
+            logger.log(Level.SEVERE, ex.getMessage(), ex);
         }
     }
 
     public void sendToAddToExcludeScope(IContextMenuInvocation contextMenu, IHttpRequestResponse[] messageInfoList) {
         for (IHttpRequestResponse messageInfo : messageInfoList) {
-            IRequestInfo reqInfo = BurpExtender.getHelpers().analyzeRequest(messageInfo);
-            BurpExtender.getCallbacks().excludeFromScope(reqInfo.getUrl());
+            BurpExtender.getCallbacks().excludeFromScope(BurpExtender.getHelpers().getURL(messageInfo));
         }
     }