Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-29 11:03:13 +00:00
Code Issues Projects Releases Wiki Activity

Match ~d and ~u filters against pretty_host too

Browse Source 
Changed the ~u filter in the console UI to match the behavior of
mitmweb, which only matches against pretty_url, never against url.
This commit is contained in:
dequis 2017-03-14 01:54:31 -03:00
parent 1f37743549
commit f351d0a307
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mitmproxy/flowfilter.py
View File

@ -319,10 +319,14 @@ class FDomain(_Rex):
code = "d" code = "d"
help = "Domain" help = "Domain"
flags = re.IGNORECASE flags = re.IGNORECASE
is_binary = False
@only(http.HTTPFlow) @only(http.HTTPFlow)
def __call__(self, f): def __call__(self, f):
return bool(self.re.search(f.request.data.host)) return bool(
self.re.search(f.request.host) or
self.re.search(f.request.pretty_host)
)
class FUrl(_Rex): class FUrl(_Rex):
@ -339,7 +343,7 @@ class FUrl(_Rex):
@only(http.HTTPFlow) @only(http.HTTPFlow)
def __call__(self, f): def __call__(self, f):
return self.re.search(f.request.url) return self.re.search(f.request.pretty_url)
class FSrc(_Rex): class FSrc(_Rex):

2
web/src/js/filt/filt.peg
View File

@ -96,7 +96,7 @@ function responseBody(regex){
function domain(regex){ function domain(regex){
regex = new RegExp(regex, "i"); regex = new RegExp(regex, "i");
function domainFilter(flow){ function domainFilter(flow){
return flow.request && regex.test(flow.request.host); return flow.request && (regex.test(flow.request.host) || regex.test(flow.request.pretty_host));
} }
domainFilter.desc = "domain matches " + regex; domainFilter.desc = "domain matches " + regex;
return domainFilter; return domainFilter;