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

minor fixes

Browse Source
This commit is contained in:
Maximilian Hils 2016-07-25 15:12:20 -07:00
parent 68e437a740
commit 3254595584
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mitmproxy/web/app.py
View File

@ -47,8 +47,8 @@ def convert_flow_to_json_dict(flow):
"path": flow.request.path, "path": flow.request.path,
"http_version": flow.request.http_version, "http_version": flow.request.http_version,
"headers": tuple(flow.request.headers.items(True)), "headers": tuple(flow.request.headers.items(True)),
"contentLength": len(flow.request.content) if flow.request.content is not None else None, "contentLength": len(flow.request.raw_content) if flow.request.raw_content is not None else None,
"contentHash": hashlib.sha256(flow.request.raw_content).hexdigest() if flow.request.content is not None else None, "contentHash": hashlib.sha256(flow.request.raw_content).hexdigest() if flow.request.raw_content is not None else None,
"timestamp_start": flow.request.timestamp_start, "timestamp_start": flow.request.timestamp_start,
"timestamp_end": flow.request.timestamp_end, "timestamp_end": flow.request.timestamp_end,
"is_replay": flow.request.is_replay, "is_replay": flow.request.is_replay,
@ -59,8 +59,8 @@ def convert_flow_to_json_dict(flow):
"status_code": flow.response.status_code, "status_code": flow.response.status_code,
"reason": flow.response.reason, "reason": flow.response.reason,
"headers": tuple(flow.response.headers.items(True)), "headers": tuple(flow.response.headers.items(True)),
"contentLength": len(flow.response.content) if flow.response.content is not None else None, "contentLength": len(flow.response.raw_content) if flow.response.raw_content is not None else None,
"contentHash": hashlib.sha256(flow.response.raw_content).hexdigest() if flow.response.content is not None else None, "contentHash": hashlib.sha256(flow.response.raw_content).hexdigest() if flow.response.raw_content is not None else None,
"timestamp_start": flow.response.timestamp_start, "timestamp_start": flow.response.timestamp_start,
"timestamp_end": flow.response.timestamp_end, "timestamp_end": flow.response.timestamp_end,
"is_replay": flow.response.is_replay, "is_replay": flow.response.is_replay,
@ -304,11 +304,10 @@ class ReplayFlow(RequestHandler):
class FlowContent(RequestHandler): class FlowContent(RequestHandler):
def post(self, flow_id, message): def post(self, flow_id, message):
flow = self.flow self.flow.backup()
flow.backup() message = getattr(self.flow, message)
message = getattr(flow, message)
message.content = self.request.files.values()[0][0].body message.content = self.request.files.values()[0][0].body
self.state.update_flow(flow) self.state.update_flow(self.flow)
def get(self, flow_id, message): def get(self, flow_id, message):
message = getattr(self.flow, message) message = getattr(self.flow, message)