diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2017-12-18 21:31:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 21:31:00 +0100 |
| commit | 9faad6bc9c2ea42a81ead321f1e41383f63bd0f0 (patch) | |
| tree | 5ea6d6eed803f5bbf3b7f8fea20c9761af2568d7 /mitmproxy/flowfilter.py | |
| parent | 6ef6286d8e53a0a9045fa41956e65dae2e41ab6d (diff) | |
| parent | 05a8559dff7a04d8c4109f98357321031c0981f9 (diff) | |
| download | mitmproxy-9faad6bc9c2ea42a81ead321f1e41383f63bd0f0.tar.gz mitmproxy-9faad6bc9c2ea42a81ead321f1e41383f63bd0f0.tar.bz2 mitmproxy-9faad6bc9c2ea42a81ead321f1e41383f63bd0f0.zip | |
Merge pull request #2702 from Kriechi/fix-2640
improve websocket dumps
Diffstat (limited to 'mitmproxy/flowfilter.py')
| -rw-r--r-- | mitmproxy/flowfilter.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mitmproxy/flowfilter.py b/mitmproxy/flowfilter.py index 23e47e2b..d1fd8299 100644 --- a/mitmproxy/flowfilter.py +++ b/mitmproxy/flowfilter.py @@ -322,8 +322,10 @@ class FDomain(_Rex): flags = re.IGNORECASE is_binary = False - @only(http.HTTPFlow) + @only(http.HTTPFlow, websocket.WebSocketFlow) def __call__(self, f): + if isinstance(f, websocket.WebSocketFlow): + f = f.handshake_flow return bool( self.re.search(f.request.host) or self.re.search(f.request.pretty_host) @@ -342,9 +344,11 @@ class FUrl(_Rex): toks = toks[1:] return klass(*toks) - @only(http.HTTPFlow) + @only(http.HTTPFlow, websocket.WebSocketFlow) def __call__(self, f): - if not f.request: + if isinstance(f, websocket.WebSocketFlow): + f = f.handshake_flow + if not f or not f.request: return False return self.re.search(f.request.pretty_url) |