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

fix #1620

Browse Source
This commit is contained in:
Maximilian Hils 2016-10-25 21:56:13 -07:00
parent a0ad0b06a0
commit f11b289c39
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mitmproxy/flow.py
View File

@ -2,6 +2,7 @@ import time
import copy import copy
import uuid import uuid
from mitmproxy import controller # noqa
from mitmproxy import stateobject from mitmproxy import stateobject
from mitmproxy import connections from mitmproxy import connections
from mitmproxy import version from mitmproxy import version
@ -80,7 +81,7 @@ class Flow(stateobject.StateObject):
self.error = None # type: Optional[Error] self.error = None # type: Optional[Error]
self.intercepted = False # type: bool self.intercepted = False # type: bool
self._backup = None # type: Optional[Flow] self._backup = None # type: Optional[Flow]
self.reply = None self.reply = None # type: Optional[controller.Reply]
self.marked = False # type: bool self.marked = False # type: bool
_stateobject_attributes = dict( _stateobject_attributes = dict(

9
mitmproxy/tools/console/master.py
View File

@ -659,11 +659,10 @@ class ConsoleMaster(master.Master):
) )
def process_flow(self, f): def process_flow(self, f):
should_intercept = any( should_intercept = (
[ self.state.intercept and flowfilter.match(self.state.intercept, f)
self.state.intercept and flowfilter.match(self.state.intercept, f) and not f.request.is_replay, and not f.request.is_replay
f.intercepted, and f.reply.state == "handled"
]
) )
if should_intercept: if should_intercept:
f.intercept(self) f.intercept(self)

9
mitmproxy/tools/web/master.py
View File

@ -9,6 +9,7 @@ from typing import Optional
from mitmproxy import addons from mitmproxy import addons
from mitmproxy import controller from mitmproxy import controller
from mitmproxy import exceptions from mitmproxy import exceptions
from mitmproxy import flowfilter
from mitmproxy.addons import state from mitmproxy.addons import state
from mitmproxy import options from mitmproxy import options
from mitmproxy import master from mitmproxy import master
@ -179,8 +180,12 @@ class WebMaster(master.Master):
self.shutdown() self.shutdown()
def _process_flow(self, f): def _process_flow(self, f):
if self.state.intercept and self.state.intercept( should_intercept = (
f) and not f.request.is_replay: self.state.intercept and flowfilter.match(self.state.intercept, f)
and not f.request.is_replay
and f.reply.state == "handled"
)
if should_intercept:
f.intercept(self) f.intercept(self)
return f return f