更换依赖包

bit4woo · Apr 25, 2024 · 9ff79d8 · 9ff79d8
1 parent 8955a8b
commit 9ff79d8
Show file tree

Hide file tree

Showing 26 changed files with 113 additions and 489 deletions.
diff --git a/pom.xml b/pom.xml
@@ -52,6 +52,7 @@
 					<target>1.8</target>
 					<excludes>
 						<!-- 编译时排除Deprecated包及下面的资源 -->
+						<exclude>**/Deprecated/**</exclude>
 						<exclude>**/Requester/**</exclude>
 						<exclude>**/test/**</exclude>
 					</excludes>
@@ -81,11 +82,11 @@
 			<version>1.7.22</version>
 		</dependency>
 
-		<!-- https://github.com/bit4woo/burp-api-common -->
+		<!-- https://github.com/bit4woo/java_utilbox -->
 		<dependency>
 			<groupId>com.github.bit4woo</groupId>
-			<artifactId>burp-api-common</artifactId>
-			<version>master-SNAPSHOT</version>
+			<artifactId>java_utilbox</artifactId>
+			<version>main-SNAPSHOT</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec <dependency> 

diff --git a/src/base/RequestTask.java b/src/base/RequestTask.java
@@ -3,10 +3,10 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import com.bit4woo.utilbox.burp.HelperPlus;
 import com.github.kevinsawicki.http.HttpRequest;
 
 import burp.BurpExtender;
-import burp.HelperPlus;
 import burp.IBurpExtenderCallbacks;
 import burp.IHttpRequestResponse;
 import burp.IHttpService;

diff --git a/src/burp/BurpExtender.java b/src/burp/BurpExtender.java
@@ -10,6 +10,7 @@
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 
+import com.bit4woo.utilbox.burp.HelperPlus;
 import com.google.gson.Gson;
 
 import config.ConfigManager;
@@ -48,11 +49,15 @@ public class BurpExtender extends GUI implements IBurpExtender, IContextMenuFact
     private static final long serialVersionUID = 1L;
 
     public static IBurpExtenderCallbacks callbacks;
-    public IExtensionHelpers helpers;
+    public static IExtensionHelpers helpers;
+    private static HelperPlus helperPlus;
+
+
     public static PrintWriter stdout;
     public static PrintWriter stderr;
     public IContextMenuInvocation invocation;
 
+
     public static String ExtensionName = "Knife";
     public static String Version = bsh.This.class.getPackage().getImplementationVersion();
     public static String Author = "by bit4woo";
@@ -63,7 +68,9 @@ public class BurpExtender extends GUI implements IBurpExtender, IContextMenuFact
     @Override
     public void registerExtenderCallbacks(IBurpExtenderCallbacks callbacks) {
         BurpExtender.callbacks = callbacks;
-        this.helpers = callbacks.getHelpers();
+        BurpExtender.helpers = callbacks.getHelpers();
+        BurpExtender.helperPlus = new HelperPlus(helpers);
+
         flushStd();
         BurpExtender.stdout.println(getFullExtensionName());
         BurpExtender.stdout.println(github);
@@ -265,7 +272,12 @@ public static IBurpExtenderCallbacks getCallbacks() {
     }
 
 
-    public static boolean isInCheckBoxScope(int toolFlag, IHttpRequestResponse messageInfo) {
+    public static HelperPlus getHelperPlus() {
+		return helperPlus;
+	}
+
+
+	public static boolean isInCheckBoxScope(int toolFlag, IHttpRequestResponse messageInfo) {
         if (toolFlag == (toolFlag & configManager.getEnableStatus())) {
 
             IExtensionHelpers helpers = getCallbacks().getHelpers();

diff --git a/src/burp/RobotInput.java b/src/burp/RobotInput.java
@@ -9,6 +9,8 @@
 import java.awt.datatransfer.Transferable;
 import java.awt.event.KeyEvent;
 
+import com.bit4woo.utilbox.utils.SystemUtils;
+
 //https://bbs.51cto.com/thread-1097189-1.html
 public class RobotInput extends Robot {
 

diff --git a/src/config/ConfigEntry.java b/src/config/ConfigEntry.java
@@ -1,9 +1,7 @@
 package config;
 
-import burp.*;
-import com.google.gson.Gson;
-import org.apache.commons.lang3.StringUtils;
-import runcmd.MessagePart;
+import static burp.BurpExtender.isInCheckBoxScope;
+import static runcmd.MessagePart.getValueByPartType;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -12,8 +10,17 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
-import static burp.BurpExtender.isInCheckBoxScope;
-import static runcmd.MessagePart.getValueByPartType;
+import org.apache.commons.lang3.StringUtils;
+
+import com.bit4woo.utilbox.burp.HelperPlus;
+import com.bit4woo.utilbox.utils.TextUtils;
+import com.google.gson.Gson;
+
+import burp.BurpExtender;
+import burp.IBurpExtenderCallbacks;
+import burp.IHttpRequestResponse;
+import burp.IInterceptedProxyMessage;
+import runcmd.MessagePart;
 
 public class ConfigEntry {
 
@@ -250,8 +257,8 @@ public String[] listAllConfigType() {
     }
 
     public boolean isInRuleScope(int toolFlag, IHttpRequestResponse messageInfo) {
-        HelperPlus getter = new HelperPlus(BurpExtender.getCallbacks().getHelpers());
-        String baseUrl = HelperPlus.getShortURL(messageInfo).toString();
+        HelperPlus getter = BurpExtender.getHelperPlus();
+        String baseUrl = HelperPlus.getBaseURL(messageInfo).toString();
         String url = getter.getFullURL(messageInfo).toString();
         String host = HelperPlus.getHost(messageInfo);
         String configkey = getKey();

diff --git a/src/config/ProcessManager.java b/src/config/ProcessManager.java
@@ -8,6 +8,8 @@
 import burp.*;
 import org.apache.commons.lang3.StringUtils;
 
+import com.bit4woo.utilbox.burp.HelperPlus;
+
 public class ProcessManager {
 
     //////////////////////////////////////////common methods for cookie handle///////////////////////////////
@@ -44,21 +46,21 @@ public static IHttpRequestResponse[] Reverse(IHttpRequestResponse[] input) {
     }
 
     public static String getLatestHeaderFromHistory(IHttpRequestResponse messageInfo, String headerName) {
-        String sourceshorturl = HelperPlus.getShortURL(messageInfo).toString();
+        String sourceshorturl = HelperPlus.getBaseURL(messageInfo).toString();
         return getLatestHeaderFromHistory(sourceshorturl, headerName);
     }
 
     public static String getLatestHeaderFromHistory(String shortUrl, String headerName) {
         //还是草粉师傅说得对，直接从history里面拿最好
 
-        shortUrl = HelperPlus.removeDefaultPort(shortUrl);//url格式标准化，以保证后面比较的准确性。
+        shortUrl = HelperPlus.removeUrlDefaultPort(shortUrl);//url格式标准化，以保证后面比较的准确性。
         IHttpRequestResponse[] historyMessages = BurpExtender.callbacks.getProxyHistory();
         HelperPlus getter = new HelperPlus(BurpExtender.callbacks.getHelpers());
 
         for (int i = historyMessages.length - 1; i >= 0; i--) {
             IHttpRequestResponse historyMessage = historyMessages[i];
-            String hisShortUrl = HelperPlus.getShortURL(historyMessage).toString();
-            hisShortUrl = HelperPlus.removeDefaultPort(hisShortUrl);
+            String hisShortUrl = HelperPlus.getBaseURL(historyMessage).toString();
+            hisShortUrl = HelperPlus.removeUrlDefaultPort(hisShortUrl);
             if (hisShortUrl.equalsIgnoreCase(shortUrl)) {
                 String headerLine = getter.getHeaderLine(true, historyMessage, headerName);
                 return headerLine;
@@ -77,14 +79,14 @@ public static String getLatestHeaderFromHistory(String shortUrl, String headerNa
     public static String getLatestHeaderFromSiteMap(String shortUrl, String headerName) {
         //还是草粉师傅说得对，直接从history里面拿最好
 
-        shortUrl = HelperPlus.removeDefaultPort(shortUrl);//url格式标准化，以保证后面比较的准确性。
+        shortUrl = HelperPlus.removeUrlDefaultPort(shortUrl);//url格式标准化，以保证后面比较的准确性。
         IHttpRequestResponse[] historyMessages = BurpExtender.callbacks.getSiteMap(shortUrl);
         HelperPlus getter = new HelperPlus(BurpExtender.callbacks.getHelpers());
 
         for (int i = historyMessages.length - 1; i >= 0; i--) {
             IHttpRequestResponse historyMessage = historyMessages[i];
-            String hisShortUrl = HelperPlus.getShortURL(historyMessage).toString();
-            hisShortUrl = HelperPlus.removeDefaultPort(hisShortUrl);
+            String hisShortUrl = HelperPlus.getBaseURL(historyMessage).toString();
+            hisShortUrl = HelperPlus.removeUrlDefaultPort(hisShortUrl);
             if (hisShortUrl.equalsIgnoreCase(shortUrl)) {
                 String headerLine = getter.getHeaderLine(true, historyMessage, headerName);
                 return headerLine;
@@ -182,7 +184,7 @@ public static IHttpRequestResponse updateHeader(boolean messageIsRequest, IHttpR
 
     public static void addHandleRule(IHttpRequestResponse[] messages, String headerLine) {
         for (IHttpRequestResponse message : messages) {
-            String targetShortUrl = HelperPlus.getShortURL(message).toString();
+            String targetShortUrl = HelperPlus.getBaseURL(message).toString();
             ConfigEntry rule = new ConfigEntry(targetShortUrl, headerLine, ConfigEntry.Action_If_Base_URL_Matches_Add_Or_Replace_Header, true);
             delSameConditionRule(rule);
             GUI.tableModel.addNewConfigEntry(rule);

diff --git a/src/knife/AddHostToScopeMenu.java b/src/knife/AddHostToScopeMenu.java
@@ -7,8 +7,9 @@
 
 import javax.swing.JMenuItem;
 
+import com.bit4woo.utilbox.burp.HelperPlus;
+
 import burp.BurpExtender;
-import burp.HelperPlus;
 import burp.IBurpExtenderCallbacks;
 import burp.IContextMenuInvocation;
 import burp.IExtensionHelpers;
@@ -47,7 +48,7 @@ public void actionPerformed(ActionEvent e)
        try{
         	IHttpRequestResponse[] messages = invocation.getSelectedMessages();
         	for(IHttpRequestResponse message:messages) {
-        		String url = HelperPlus.getShortURL(message.getHttpService());
+        		String url = HelperPlus.getBaseURL(message.getHttpService());
 				URL shortUrl = new URL(url);
 	        	callbacks.includeInScope(shortUrl);
         	}

diff --git a/src/knife/ChangeToUploadRequest.java b/src/knife/ChangeToUploadRequest.java
@@ -6,8 +6,9 @@
 
 import javax.swing.JMenuItem;
 
+import com.bit4woo.utilbox.burp.HelperPlus;
+
 import burp.BurpExtender;
-import burp.HelperPlus;
 import burp.IHttpRequestResponse;
 
 /**

diff --git a/src/knife/ChunkedEncodingMenu.java b/src/knife/ChunkedEncodingMenu.java
@@ -9,8 +9,9 @@
 
 import javax.swing.JMenuItem;
 
+import com.bit4woo.utilbox.burp.HelperPlus;
+
 import burp.BurpExtender;
-import burp.Getter;
 import burp.IBurpExtenderCallbacks;
 import burp.IContextMenuInvocation;
 import burp.IExtensionHelpers;
@@ -23,13 +24,13 @@ public class ChunkedEncodingMenu extends JMenuItem {
 	//JMenuItem vs. JMenu
 	public BurpExtender burp;
 	public IContextMenuInvocation invocation;
-	public Getter getter;
+	public HelperPlus getter;
     public ChunkedEncodingMenu(BurpExtender burp){
 
     	try {
 			this.invocation = burp.invocation;
 			this.burp = burp;
-			this.getter = new Getter(burp.helpers);
+			this.getter = new HelperPlus(burp.helpers);
 			IHttpRequestResponse[] messages = this.invocation.getSelectedMessages();
 			if (messages == null || messages.length == 0) {
 				return;
@@ -70,7 +71,7 @@ public void actionPerformed(ActionEvent event) {
 		IHttpRequestResponse[] selectedItems = invocation.getSelectedMessages();
 		IHttpRequestResponse messageInfo = selectedItems[0];
 
-		Getter getter = new Getter(helpers);
+		HelperPlus getter = new HelperPlus(helpers);
 
     	List<String> headers = getter.getHeaderList(true, messageInfo);
     	byte[] body = getter.getBody(true, messageInfo);
@@ -120,6 +121,4 @@ public void actionPerformed(ActionEvent event) {
     	selectedItems[0].setRequest(newRequestBytes);
 	}
 
-
-
 }
diff --git a/src/knife/CopyJsOfThisSite.java b/src/knife/CopyJsOfThisSite.java
@@ -10,15 +10,16 @@
 import javax.swing.JMenuItem;
 
 import burp.BurpExtender;
-import burp.HelperPlus;
 import burp.IBurpExtenderCallbacks;
 import burp.IContextMenuInvocation;
 import burp.IExtensionHelpers;
 import burp.IHttpRequestResponse;
-import burp.SystemUtils;
 import burp.Utils;
 import org.apache.commons.lang3.StringUtils;
 
+import com.bit4woo.utilbox.burp.HelperPlus;
+import com.bit4woo.utilbox.utils.SystemUtils;
+
 
 public class CopyJsOfThisSite extends JMenuItem {
 	/**

diff --git a/src/knife/CustomPayloadForAllInsertpointMenu.java b/src/knife/CustomPayloadForAllInsertpointMenu.java
@@ -17,8 +17,9 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import com.bit4woo.utilbox.burp.HelperPlus;
+
 import burp.BurpExtender;
-import burp.Getter;
 import burp.IBurpExtenderCallbacks;
 import burp.IContextMenuInvocation;
 import burp.IExtensionHelpers;
@@ -88,8 +89,8 @@ public void actionPerformed(ActionEvent event) {
 		IHttpRequestResponse messageInfo = selectedItems[0];
 		byte[] newRequest = messageInfo.getRequest();//为了不影响原始request，通过final进行一次转换
 
-		Getter getter = new Getter(helpers);
-		List<IParameter> paras = getter.getParas(messageInfo);
+		HelperPlus getter = new HelperPlus(helpers);
+		List<IParameter> paras = getter.getParameters(messageInfo);
 
 		String charset = CharSetHelper.detectCharset(newRequest);
 		String xsspayload;

diff --git a/src/knife/DoPortScanMenu.java b/src/knife/DoPortScanMenu.java
@@ -8,13 +8,14 @@
 
 import javax.swing.JMenuItem;
 
+import com.bit4woo.utilbox.utils.SystemUtils;
+
 import burp.BurpExtender;
 import burp.IBurpExtenderCallbacks;
 import burp.IContextMenuInvocation;
 import burp.IExtensionHelpers;
 import burp.IHttpRequestResponse;
 import burp.RobotInput;
-import burp.SystemUtils;
 import config.GUI;
 
 

diff --git a/src/knife/DownloadResponseMenu.java b/src/knife/DownloadResponseMenu.java
@@ -14,8 +14,9 @@
 
 import org.apache.commons.io.FileUtils;
 
+import com.bit4woo.utilbox.burp.HelperPlus;
+
 import burp.BurpExtender;
-import burp.Getter;
 import burp.IBurpExtenderCallbacks;
 import burp.IContextMenuInvocation;
 import burp.IExtensionHelpers;
@@ -60,7 +61,7 @@ public void actionPerformed(ActionEvent event) {
 			public void run() {
 				try{
 					IHttpRequestResponse[] messages = invocation.getSelectedMessages();
-					Getter getter = new Getter(helpers);
+					HelperPlus getter = new HelperPlus(helpers);
 					if (messages == null) {
 						return;
 					}
@@ -154,11 +155,11 @@ public File selectPath() {
 	public File getFileName(IHttpRequestResponse message,File rootPath) throws IOException{
 		String canonicalFile = "KnifeSaved";
 		try {
-			Getter getter = new Getter(helpers);
+			HelperPlus getter = new HelperPlus(helpers);
 
 			String pathStr = null;
 			//1、从参数名中获取文件名称，任意文件读取多是这种情况
-			List<IParameter> paras = getter.getParas(message);
+			List<IParameter> paras = getter.getParameters(message);
 			for (IParameter para:paras) {
 				if (para.getType() == IParameter.PARAM_COOKIE) continue;
 				String value = para.getValue();

diff --git a/src/knife/FindUrlAndRequest.java b/src/knife/FindUrlAndRequest.java
@@ -19,7 +19,8 @@
 import base.RequestTask;
 import base.RequestType;
 import burp.*;
-import org.apache.commons.lang3.StringUtils;
+
+import com.bit4woo.utilbox.burp.HelperPlus;
 
 
 public class FindUrlAndRequest extends JMenuItem {