diff options
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/controller.py | 2 | ||||
| -rw-r--r-- | libmproxy/flow.py | 21 | ||||
| -rw-r--r-- | libmproxy/proxy.py | 65 | ||||
| -rw-r--r-- | libmproxy/utils.py | 10 |
4 files changed, 97 insertions, 1 deletions
diff --git a/libmproxy/controller.py b/libmproxy/controller.py index 98d02c51..29e2f7a8 100644 --- a/libmproxy/controller.py +++ b/libmproxy/controller.py @@ -51,7 +51,7 @@ class Master: def tick(self, q): try: - # This endless loop is running until the 'Queue.Empty' + # This endless loop runs until the 'Queue.Empty' # exception is thrown. If more than one request is in # the queue, this speeds up every request by 0.1 seconds, # because get_input(..) function is not blocking. diff --git a/libmproxy/flow.py b/libmproxy/flow.py index bdca5ebd..41064829 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -31,6 +31,27 @@ class Flow: self.intercepting = False self._backup = None + def get_state(self): + return dict( + request = self.request.get_state() if self.request else None, + response = self.response.get_state() if self.response else None, + error = self.error.get_state() if self.error else None, + ) + + @classmethod + def from_state(klass, state): + f = Flow(ReplayConnection) + if state["request"]: + f.request = proxy.Request.from_state(state["request"]) + if state["response"]: + f.response = proxy.Response.from_state(f.request, state["response"]) + if state["error"]: + f.error = proxy.Error.from_state(state["error"]) + return f + + def __eq__(self, other): + return self.get_state() == other.get_state() + def backup(self): if not self._backup: self._backup = [ diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 9f87f80e..f3b9fe53 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -88,6 +88,33 @@ class Request(controller.Msg): self.kill = False controller.Msg.__init__(self) + def get_state(self): + return dict( + host = self.host, + port = self.port, + scheme = self.scheme, + method = self.method, + path = self.path, + headers = self.headers.get_state(), + content = self.content + ) + + @classmethod + def from_state(klass, state): + return klass( + None, + state["host"], + state["port"], + state["scheme"], + state["method"], + state["path"], + utils.Headers.from_state(state["headers"]), + state["content"] + ) + + def __eq__(self, other): + return self.get_state() == other.get_state() + def copy(self): c = copy.copy(self) c.headers = self.headers.copy() @@ -137,6 +164,29 @@ class Response(controller.Msg): self.kill = False controller.Msg.__init__(self) + def get_state(self): + return dict( + code = self.code, + proto = self.proto, + msg = self.msg, + headers = self.headers.get_state(), + content = self.content + ) + + @classmethod + def from_state(klass, request, state): + return klass( + request, + state["code"], + state["proto"], + state["msg"], + utils.Headers.from_state(state["headers"]), + state["content"] + ) + + def __eq__(self, other): + return self.get_state() == other.get_state() + def copy(self): c = copy.copy(self) c.headers = self.headers.copy() @@ -181,6 +231,21 @@ class Error(controller.Msg): def copy(self): return copy.copy(self) + def get_state(self): + return dict( + msg = self.msg, + ) + + @classmethod + def from_state(klass, state): + return klass( + None, + state["msg"], + ) + + def __eq__(self, other): + return self.get_state() == other.get_state() + class FileLike: def __init__(self, o): diff --git a/libmproxy/utils.py b/libmproxy/utils.py index 82ddf8fc..0614a464 100644 --- a/libmproxy/utils.py +++ b/libmproxy/utils.py @@ -156,6 +156,16 @@ class MultiDict: for j in self[i]: yield (i, j) + def get_state(self): + return list(self.itemPairs()) + + @classmethod + def from_state(klass, state): + md = klass() + for i in state: + md.append(*i) + return md + class Headers(MultiDict): """ |