Burp Issue 共通化

raise-isayan · Jul 4, 2024 · 8b6198e · 8b6198e
1 parent 98d8416
commit 8b6198e
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 231 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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

diff --git a/libs/BurpExtensionCommons-v3.2.0.0-all.jar b/libs/BurpExtensionCommons-v3.2.0.0-all.jar
diff --git a/release/YaguraExtension-v3.1.jar b/release/YaguraExtension-v3.1.jar
diff --git a/src/main/java/burp/BurpExtension.java b/src/main/java/burp/BurpExtension.java
@@ -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);
-// }
-// }
  }
  }
 

diff --git a/src/main/java/extension/burp/IssueAlert.java b/src/main/java/extension/burp/IssueAlert.java
diff --git a/src/main/java/extension/burp/IssueAlertEvent.java b/src/main/java/extension/burp/IssueAlertEvent.java
diff --git a/src/main/java/extension/burp/IssueAlertFireEvent.java b/src/main/java/extension/burp/IssueAlertFireEvent.java
diff --git a/src/main/java/extension/burp/IssueAlertListener.java b/src/main/java/extension/burp/IssueAlertListener.java
diff --git a/src/main/java/yagura/model/Logging.java b/src/main/java/yagura/model/Logging.java
@@ -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;

diff --git a/src/main/java/yagura/model/MatchReplaceItem.java b/src/main/java/yagura/model/MatchReplaceItem.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;

diff --git a/src/main/java/yagura/model/ParamsViewModel.java b/src/main/java/yagura/model/ParamsViewModel.java
@@ -1,6 +1,5 @@
 package yagura.model;
 
-import burp.BurpExtension;
 import burp.api.montoya.http.message.ContentType;
 import burp.api.montoya.http.message.params.HttpParameterType;
 import java.nio.charset.StandardCharsets;

diff --git a/src/main/java/yagura/model/SendToExtend.java b/src/main/java/yagura/model/SendToExtend.java
@@ -1,6 +1,5 @@
 package yagura.model;
 
-import burp.BurpExtender;
 import burp.BurpExtension;
 import burp.api.montoya.http.message.HttpRequestResponse;
 import burp.api.montoya.http.message.requests.HttpRequest;

diff --git a/src/main/java/yagura/view/PopupMessage.java b/src/main/java/yagura/view/PopupMessage.java
@@ -6,7 +6,6 @@
 import java.awt.Frame;
 import javax.swing.Popup;
 import javax.swing.PopupFactory;
-//import javax.swing.Timer;
 import java.util.Timer;
 import java.util.TimerTask;
 

diff --git a/src/main/java/yagura/view/ResultFilterDlg.java b/src/main/java/yagura/view/ResultFilterDlg.java
@@ -1,12 +1,10 @@
 package yagura.view;
 
 import burp.BurpExtension;
-import burp.api.montoya.MontoyaApi;
 import burp.api.montoya.http.message.params.HttpParameterType;
 import burp.api.montoya.proxy.ProxyHttpRequestResponse;
 import extension.burp.BurpConfig;
 import extension.burp.BurpExtensionImpl;
-import static extension.burp.BurpExtensionImpl.api;
 import extension.burp.BurpUtil;
 import extension.burp.FilterProperty;
 import extension.burp.MessageHighlightColor;

diff --git a/src/main/java/yagura/view/ipv4.java b/src/main/java/yagura/view/ipv4.java
diff --git a/src/test/java/extend/util/external/BoncyUtilTest.java b/src/test/java/extend/util/external/BoncyUtilTest.java
@@ -2,15 +2,11 @@
 
 import extension.helpers.CertUtil;
 import java.io.File;
-import java.nio.charset.StandardCharsets;
 import java.security.Key;
-import java.security.NoSuchAlgorithmException;
 import java.security.Security;
 import java.security.cert.X509Certificate;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/src/test/java/yagura/model/LogfgingTest.java b/src/test/java/yagura/model/LogfgingTest.java
@@ -1,17 +1,13 @@
 package yagura.model;
 
-import extension.helpers.FileUtil;
 import java.io.File;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.FileStore;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
 import java.util.Map;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;