From d568a7d653b4af76e2d69ae8c709614a2d56bd12 Mon Sep 17 00:00:00 2001
From: EvilOS <gh0stkey>
Date: Wed, 25 Mar 2020 17:50:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AE=8C=E6=95=B4=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E6=8A=A5=E6=96=87=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store  | Bin 0 -> 8196 bytes
 HaE/HaE.py |  18 ++++++------------
 2 files changed, 6 insertions(+), 12 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..0ba057a571988b9d7860b220e76e7df914a82c8a
GIT binary patch
literal 8196
zcmeHMOHUL_6g~y0J%dPtjN)T4adLA_U;z=Gm9ZH>op=)nO%MV)cFz<;$DXdSy9Y$X
zOpI%{MqT>)0p{-9_}JXd-RjPTf544vJ=In71g@JKW3(!%`cBt5r>f3ZeR`+@07#}%
z7zG#v01Ycgy&Iby3fJ?xt#rtq9z=rv5R`3~+4%I2UEXG`Iurwn0mXn~Krx^g_!$_$
z-)vsAU4Hk4R<()&#lUaL0RKKDv2rvdRs}|%4s4<$0Ad$*M+Ie_3y4XHhQz8s)L<dP
z6;ZendBh;X9s85g&X8CYDBOX_!v~Qw6L~@*(d;;WGBO8Z2vn_NKryhL0e*Jxgo|Lo
zl)c`3es`T992t2}Iy$@d?A@nnaV_2xzhbVkbu+ZWN|3SqCH^#Hg{!ud=NNPAvSrUZ
zbUmjJOfWCB9FO{uvs0jGvV7U`3T!>YDqbOo#xaFL(_&gIrw?v!j-^izC&x~uw}z9O
z>GTMf&uneQw8MXlp3Pn>ZQR<ty>;iIh=|Cq0`#^;_^1({lV6k96Xc~`7U6x=^;&?j
zc=!IE1HF1*|G~b2zC<E%=x}1N|LC!te$ck^*NZ-1>I8F{pK&WRr}qXJd^XR#8K16U
zpbH_r8Jf;5RQ0zx%+kWuM%Ua%8Epm{9nqi{d`i8gqVE)@S5^WVF7O%hK6Bj}7C529
zyu~K%;&L>5NK097h2e~R1=D427R*yWK-}iPuxR<d<rQgW<BDt9)SdP+EDTv`!NDl_
z%A*O)vXytdV(Q#yL1ipuoD`A{sT#YQPUbwTL{T{-`clRvsnlQy#=(STxB*po08ij=
zcn$x;C-?$iNe?+hPLLroOiq(DF~~TXAQwrN%nI+0+D0C)O(l>lA<FmEEsmObRw_4H
zNKJ`NPRbi7ZBKUUUOe$;yx~`3h5yi&S9cqA&GbE&c|{zFuWm0mP{MpE0)?O{XTH>4
zst-iw48Bsa?gQPi)~w0t$K|_z*(rppbJUx1=^FK>{lBb`ilq7<5~(>kwUm)FaOnWw
zOD^rmpXX<<R_@+^^!Vws=P%y8jl7_qUwz`a-o8Vrg^(RKr$yhqMV+tuZ_6!evuSM9
zZZ<n?SIZb}n^s@25)=c90l`40fI)u#pW6NYU(ux)Pz?OS43Mr#b25Vg*8ccvkCmUb
vlUT1|<%Qc-1x7B|v|I$>bNwHNC@0aB`xp|d0<i~+x(JA9P>o{XhcfUD;j&Gl

literal 0
HcmV?d00001

diff --git a/HaE/HaE.py b/HaE/HaE.py
index 32322cb..f276723 100644
--- a/HaE/HaE.py
+++ b/HaE/HaE.py
@@ -58,11 +58,9 @@ class BurpExtender(IBurpExtender, ITab,IHttpListener, IMessageEditorTabFactory):
         if messageIsRequest:
             return
         content = messageInfo.getResponse()
-        r = self._helpers.analyzeResponse(content)
-        msg = content[r.getBodyOffset():].tostring()
-        # msg 为响应正文信息
+        # content 为响应正文信息
         info = getConfig()
-        results = findContent(info, msg)
+        results = findContent(info, content)
         colorList = []
         if results != {}:
             for i in results:
@@ -205,13 +203,11 @@ class MarkINFOTab(IMessageEditorTab):
 
     # 非响应 没有匹配到不返回Tab标签页
     def isEnabled(self, content, isRequest):
-        r = self._helpers.analyzeResponse(content)
-        msg = content[r.getBodyOffset():].tostring()
         info = getConfig()
         if not isRequest:
-            content = findContent(info, msg)
-            if content != {}:
-                for i in content:
+            contents = findContent(info, content)
+            if contents != {}:
+                for i in contents:
                     if info[i]['extract'] == 1 :
                         return True
 
@@ -220,10 +216,8 @@ class MarkINFOTab(IMessageEditorTab):
         # 判断是否有内容
         if content:
             if not isRequest:
-                r = self._helpers.analyzeResponse(content)
-                msg = content[r.getBodyOffset():].tostring()
                 info = getConfig()
-                contents = findContent(info, msg)
+                contents = findContent(info, content)
                 result = ""
                 for i in contents:
                     if info[i]['extract'] == 1 :