Burp Issue 共通化

Author: isayan

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

libs/BurpExtensionCommons-v3.2.0.0-all.jar

@@ -65,7 +65,6 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -207,6 +206,23 @@ public void windowClosing(WindowEvent e) {
         }
     };
 
+    private void registerTemporaryProject() {
+        this.isTemporaryProject = BurpUtil.isTemporaryProject();
+
+        // MainFrame閉じる処理
+        if (BurpUtil.suiteFrame() instanceof JFrame burpFrame) {
+            //burpFrame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+            WindowListener[] wl = burpFrame.getWindowListeners();
+            for (WindowListener l : wl) {
+                burpFrame.removeWindowListener(l);
+            }
+            burpFrame.addWindowListener(windowPopupListener);
+            for (WindowListener l : wl) {
+                burpFrame.addWindowListener(l);
+            }
+        }
+    }
+
     /**
      * 古い Montoya API ではメソッド名をあやまっており ここにくる場合は必ず古いバージョン
      *
@@ -226,28 +242,15 @@ public void initialize(MontoyaApi api) {
             BurpVersion.showUnsupporttDlg(burpVersion, Version.getInstance().getProjectName());
             throw new UnsupportedOperationException("Unsupported burp version");
         }
-
-        this.isTemporaryProject = BurpUtil.isTemporaryProject();
-
         if (DEBUG) {
             api.logging().logToOutput("name:" + burpVersion.getProductName());
             api.logging().logToOutput("major:" + burpVersion.getMajor());
             api.logging().logToOutput("minor:" + burpVersion.getMinor());
             api.logging().logToOutput("build:" + burpVersion.getBuild());
         }
 
-        // MainFrame閉じる処理
-        if (BurpUtil.suiteFrame() instanceof JFrame burpFrame) {
-            //burpFrame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-            WindowListener[] wl = burpFrame.getWindowListeners();
-            for (WindowListener l : wl) {
-                burpFrame.removeWindowListener(l);
-            }
-            burpFrame.addWindowListener(windowPopupListener);
-            for (WindowListener l : wl) {
-                burpFrame.addWindowListener(l);
-            }
-        }
+        registerTemporaryProject();
+
         Version version = Version.getInstance();
         api.extension().setName(String.format("%s v%d.%d", version.getTabCaption(), version.getMajorVersion(), version.getMinorVersion()));
 
@@ -1357,9 +1360,6 @@ private void updateBurpCharsetUI(JMenu burpCharsetMenu) {
          */
         private void updateResultFilterUI(JMenu yaguraResultFilterMenu) {
             yaguraResultFilterMenu.removeAll();
-//            for (Enumeration<AbstractButton> e = this.menuBurpResultFilterGroup.getElements(); e.hasMoreElements();) {
-//                this.menuBurpResultFilterGroup.remove(e.nextElement());
-//            }
             Map<String, FilterProperty> filterMap = option.getResultFilterProperty().getFilterMap();
             for (String name : filterMap.keySet()) {
                 JMenuItem chkResultFilterItem = new JMenuItem();
@@ -1368,14 +1368,6 @@ private void updateResultFilterUI(JMenu yaguraResultFilterMenu) {
                 yaguraResultFilterMenu.add(chkResultFilterItem);
                 // this.menuBurpResultFilterGroup.add(chkResultFilterItem);
             }
-//            Enumeration<AbstractButton> rdoCheckGroup = this.menuBurpResultFilterGroup.getElements();
-//            while (rdoCheckGroup.hasMoreElements()) {
-//                AbstractButton rdoCheck = rdoCheckGroup.nextElement();
-//                String name = rdoCheck.getText();
-//                if (name.equals(option.getResultFilterProperty().getSelectedName())) {
-//                    rdoCheck.setSelected(true);
-//                }
-//            }
         }
     }
 

release/YaguraExtension-v3.1.jar

@@ -1,6 +1,5 @@
 package yagura.model;
 
-import burp.BurpExtension;
 import burp.api.montoya.core.ToolType;
 import burp.api.montoya.http.HttpService;
 import burp.api.montoya.http.message.HttpRequestResponse;

src/main/java/burp/BurpExtension.java

@@ -1,7 +1,6 @@
 package yagura.model;
 
 import com.google.gson.annotations.Expose;
-import extend.util.external.TransUtil;
 import extension.helpers.ConvertUtil;
 import extension.helpers.MatchUtil;
 import java.util.regex.Matcher;