aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mitmproxy/flowfilter.py8
-rw-r--r--web/src/js/filt/filt.peg2
2 files changed, 7 insertions, 3 deletions
diff --git a/mitmproxy/flowfilter.py b/mitmproxy/flowfilter.py
index 7c4f95f7..2c7fc52f 100644
--- a/mitmproxy/flowfilter.py
+++ b/mitmproxy/flowfilter.py
@@ -319,10 +319,14 @@ class FDomain(_Rex):
code = "d"
help = "Domain"
flags = re.IGNORECASE
+ is_binary = False
@only(http.HTTPFlow)
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):
@@ -339,7 +343,7 @@ class FUrl(_Rex):
@only(http.HTTPFlow)
def __call__(self, f):
- return self.re.search(f.request.url)
+ return self.re.search(f.request.pretty_url)
class FSrc(_Rex):
diff --git a/web/src/js/filt/filt.peg b/web/src/js/filt/filt.peg
index b2576661..12959474 100644
--- a/web/src/js/filt/filt.peg
+++ b/web/src/js/filt/filt.peg
@@ -96,7 +96,7 @@ function responseBody(regex){
function domain(regex){
regex = new RegExp(regex, "i");
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;
return domainFilter;