From c632782bc69f5c56778993fbe27d6c3a0f326ac9 Mon Sep 17 00:00:00 2001
From: AnonymousUser <you@example.com>
Date: Wed, 11 Nov 2020 23:59:27 +0800
Subject: [PATCH] Add Scope Column: any

---
 .DS_Store              | Bin 0 -> 8196 bytes
 README.md              |   2 +-
 README_zh.md           |   2 +-
 burp/BurpExtender.java |   6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ce38e9128b4bd532bf7efa11ae83559bec0f811c
GIT binary patch
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_

literal 0
HcmV?d00001

diff --git a/README.md b/README.md
index a287247..455dfd5 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ HaE supports three actions:
 3. Color upgrade algorithm: **Two regulars expression, the colors are both orange, if the request are matched these, it will be upgraded to red.**
 4. The configuration file format uses JSON format, the format is
     ```
-    {name: {"loaded": isLoaded,"regex": regexText, "scope": request/response, "action": extract/highlight/any, "color": colorText}}
+    {name: {"loaded": isLoaded,"regex": regexText, "scope": request/response/any, "action": extract/highlight/any, "color": colorText}}
     ```
 5. Built-in simple cache to reduce the stuttering phenomenon in the `multi-regular, big data scenario`.
 
diff --git a/README_zh.md b/README_zh.md
index 39ec296..ce05e39 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -37,7 +37,7 @@ HaE支持三个动作:
 3. 颜色升级算法: 利用下标的方式进行优先级排序，当满足2个同颜色条件则以优先级顺序上升颜色。（例如: **两个正则，颜色为橘黄色，该请求两个正则都匹配到了，那么将升级为红色**）
 4. 简单的配置文件格式选用JSON格式，格式为
     ```
-    {name: {"loaded": isLoaded,"regex": regexText, "scope": request/response, "action": extract/highlight/any, "color": colorText}}
+    {name: {"loaded": isLoaded,"regex": regexText, "scope": request/response/any, "action": extract/highlight/any, "color": colorText}}
     ```
 5. 内置简单缓存，在“多正则、大数据”的场景下减少卡顿现象。
 
diff --git a/burp/BurpExtender.java b/burp/BurpExtender.java
index be7d872..c0c340e 100644
--- a/burp/BurpExtender.java
+++ b/burp/BurpExtender.java
@@ -52,7 +52,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 	private static String initConfigContent = "{\"Email\":{\"loaded\":true,\"scope\":\"response\",\"regex\":\"([\\\\w-]+(?:\\\\.[\\\\w-]+)*@(?:[\\\\w](?:[\\\\w-]*[\\\\w])?\\\\.)+[\\\\w](?:[\\\\w-]*[\\\\w])?)\",\"action\":\"any\",\"color\":\"yellow\"}}";
 	private static String endColor = "";
 	private static String[] colorArray = new String[] {"red", "orange", "yellow", "green", "cyan", "blue", "pink", "magenta", "gray"};
-	private static String[] scopeArray = new String[] {"response", "request"};
+	private static String[] scopeArray = new String[] {"any", "response", "request"};
 	private static String[] actionArray = new String[] {"any", "extract", "highight"};
 	private static IMessageEditorTab HaETab;
 	private static PrintWriter stdout;
@@ -62,7 +62,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
     {
     	this.callbacks = callbacks;
         // 设置插件名字和版本
-    	String version = "1.4";
+    	String version = "1.4.1";
     	
         callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
         
@@ -412,7 +412,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
 				String color = jsonObj1.getString("color");
 				List<String> result = new ArrayList<String>();
 				
-				if(isLoaded && scope.equals(scopeString) && (action.equals(actionString) || action.equals("any"))) {
+				if(isLoaded && (scope.equals(scopeString) || scope.equals("any")) && (action.equals(actionString) || action.equals("any"))) {
 					Pattern pattern = Pattern.compile(regex);
 					Matcher matcher = pattern.matcher(contentString);
 					while (matcher.find()) {