diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-03-14 14:31:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 14:31:12 +0100 |
| commit | 6bd2eb4ec62fc662dea817d0403a7adf400e5617 (patch) | |
| tree | 38af60d6d112a552846a7dd543722cd31c797213 | |
| parent | 1f377435495a7db9c888dd5ce10a51b6f3c3f8ad (diff) | |
| parent | f351d0a3079d88d98934b7e9a48c2ffb4a3018a0 (diff) | |
| download | mitmproxy-6bd2eb4ec62fc662dea817d0403a7adf400e5617.tar.gz mitmproxy-6bd2eb4ec62fc662dea817d0403a7adf400e5617.tar.bz2 mitmproxy-6bd2eb4ec62fc662dea817d0403a7adf400e5617.zip | |
Merge pull request #2150 from dequis/pretty-host-filter
Match ~d and ~u filters against pretty_host too
| -rw-r--r-- | mitmproxy/flowfilter.py | 8 | ||||
| -rw-r--r-- | web/src/js/filt/filt.peg | 2 |
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; |