aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/filt.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-07-15 22:50:33 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-07-15 22:50:33 -0700
commita3c7c84d49c3e6563e7f37ef60c989f99ed96788 (patch)
tree578d596bb630f44cf0f6a26078d1070977f8a53d /mitmproxy/filt.py
parentca9de786fd7ed3edf7a485f7c019ac83d5abfc7f (diff)
downloadmitmproxy-a3c7c84d49c3e6563e7f37ef60c989f99ed96788.tar.gz
mitmproxy-a3c7c84d49c3e6563e7f37ef60c989f99ed96788.tar.bz2
mitmproxy-a3c7c84d49c3e6563e7f37ef60c989f99ed96788.zip
improve message content semantics
Diffstat (limited to 'mitmproxy/filt.py')
-rw-r--r--mitmproxy/filt.py28
1 files changed, 8 insertions, 20 deletions
diff --git a/mitmproxy/filt.py b/mitmproxy/filt.py
index e8687b9f..a42988f1 100644
--- a/mitmproxy/filt.py
+++ b/mitmproxy/filt.py
@@ -194,17 +194,11 @@ class FBod(_Rex):
def __call__(self, f):
if f.request and f.request.raw_content:
- try:
- if self.re.search(f.request.content):
- return True
- except ValueError:
- pass
+ if self.re.search(f.request.get_content(strict=False)):
+ return True
if f.response and f.response.raw_content:
- try:
- if self.re.search(f.response.content):
- return True
- except ValueError:
- pass
+ if self.re.search(f.response.get_content(strict=False)):
+ return True
return False
@@ -214,11 +208,8 @@ class FBodRequest(_Rex):
def __call__(self, f):
if f.request and f.request.raw_content:
- try:
- if self.re.search(f.request.content):
- return True
- except ValueError:
- pass
+ if self.re.search(f.request.get_content(strict=False)):
+ return True
class FBodResponse(_Rex):
@@ -227,11 +218,8 @@ class FBodResponse(_Rex):
def __call__(self, f):
if f.response and f.response.raw_content:
- try:
- if self.re.search(f.response.content):
- return True
- except ValueError:
- pass
+ if self.re.search(f.response.get_content(strict=False)):
+ return True
class FMethod(_Rex):