From 7b5027a528ffbbe4966d53d9f87d2fdd2915eef7 Mon Sep 17 00:00:00 2001
From: AnonymousUser <you@example.com>
Date: Thu, 12 Nov 2020 22:54:34 +0800
Subject: [PATCH] Update: Replace java.util.regex with jregex

---
 .DS_Store              | Bin 8196 -> 0 bytes
 build.gradle           |   1 +
 burp/BurpExtender.java |  26 ++++++++++++++------------
 3 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index ce38e9128b4bd532bf7efa11ae83559bec0f811c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMPfrs;6n_I1TM=3Qlt1cWV`E}M53L|Q8JB`FjfoISumrH|woBQ#-Ko1<D%6^O
z3!@(W2*wZKQ4d}{dhiQ)@$Q?QX(_FELom)HGr!q4@6DU{+n3$GEdY>owU`8$0)Q}f
zhRPrgziDip^`6!zBm;;9?ZK#d6~m?mUVrY<mIBFuWI!??8ITM}2F?Qm_|9f6e8PL5
zugXy}AQ|{C8DP%`6+1&sV3T9;=)fT;0T4qd4jRrCHbGPcY66=aaRnRUrik2>h!TTv
zbCjz>PZQYW$jyO>;)4j!L{umw@Q(YdfjSV4qZ}mzl7U_ZSnVDH1FGOcrL%rFDz@eM
ziNsgZ*B`nta4{T-gd;<d?d%?{WqsYRdTHI=WLGP?zh{W~8l`r7t{dx?S<5Tqi`4OT
z%Q4-+*eaT+vh~<<inNxdRj23$`(*h-;3%(5*Xwhs`M8>#OE%(aJ(;*Y8&~IN=NpYk
zc=BfQZf2)^a9DrQc=?70MZ|*vhP#4%+Zmx%*cV?Y$op1=-xQ@C<E6pNLsy2Ck<qb{
z@sVgWIx!g?oxXZ4uZ$Ub;c3Zbr(L8rb<=j$%qznl#-AxrXT>%5G1i=KKKHZMAuf$}
z8LXPcCr6^Sg9_@59|?j@AGoIJY?fTBxV*dTnSPFWD7e(NSEy(C7Iii{RyVc+@4i{i
zIJ*=*vJ)&<n3}h4x*lSWeQw*<4bxtB($x29c|&(y-6@&rgPes?u#*Q4vK75xIi=XW
zADqlcOuNNr3dCCch7}T7bM&$q(;jhIOnWF6!!QF2kcBOH22FSc@8AP`gfH+Nev*DN
zL?*}$GDG6z4oMM>ERaRAL^5QRTlckY<@J^;j${+Doviy=*RiQnLK)K^01L{XLkUdq
zIuiL)>o%WNB2U%psl;4dO{M;v$FD_@t>C-!nC1DgAZ0H9>$!aFc6Q}6&jvY422PEE
ze!lY*tN-tx{Qdvb{L76c1CoKWXMlv3vP)?^N9(6Y_mNnwtzzH7&KlEeatusxIQAg`
luiJkZ;#@^lW}^vgazqKXzy2ZM9Q~G+@BbhL<ZuQI`~tVZpacK_

diff --git a/build.gradle b/build.gradle
index 099d4d1..821c6f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,6 +6,7 @@ repositories {
 
 dependencies {
     compile 'net.portswigger.burp.extender:burp-extender-api:1.7.13'
+    compile 'net.sourceforge.jregex:jregex:1.2_01'
     compile 'org.json:json:20200518'
 }
 
diff --git a/burp/BurpExtender.java b/burp/BurpExtender.java
index c0c340e..2c5c57e 100644
--- a/burp/BurpExtender.java
+++ b/burp/BurpExtender.java
@@ -4,11 +4,12 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.json.*;
 
+import jregex.Matcher;
+import jregex.Pattern;
+
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.DefaultCellEditor;
@@ -62,8 +63,8 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
     {
     	this.callbacks = callbacks;
         // 设置插件名字和版本
-    	String version = "1.4.1";
-    	
+    	String version = "1.4.2";
+
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
         
         // 定义输出
@@ -355,13 +356,13 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 					JSONObject jsonObj = matchRegex(content, "request", "extract");
 					if (jsonObj.length() != 0) {
 						String result = extractString(jsonObj);
-						 markInfoText.setText(result.getBytes());
+						markInfoText.setText(result.getBytes());
 					}
 				} else {
 					JSONObject jsonObj = matchRegex(content, "response", "extract");
 					if (jsonObj.length() != 0) {
 						String result = extractString(jsonObj);
-						 markInfoText.setText(result.getBytes());
+						markInfoText.setText(result.getBytes());
 					}
 				}
 			}
@@ -413,13 +414,14 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 				List<String> result = new ArrayList<String>();
 				
 				if(isLoaded && (scope.equals(scopeString) || scope.equals("any")) && (action.equals(actionString) || action.equals("any"))) {
-					Pattern pattern = Pattern.compile(regex);
+					Pattern pattern = new Pattern(regex);
 					Matcher matcher = pattern.matcher(contentString);
 					while (matcher.find()) {
 						// 添加匹配数据至list
 						// 强制用户使用()包裹正则
 						result.add(matcher.group(1));
 					}
+					
 					// 去除重复内容
 					HashSet tmpList = new HashSet(result);
 					result.clear();
@@ -435,11 +437,11 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 				}
 
 		    }
-		    return tabContent;
-		} catch (Exception e) {
-			return new JSONObject();
-		}
-
+		    
+		    
+		} catch (Exception e) {}
+		
+		return tabContent;
 	}
 
 	/*