diff options
author | Clemens <cle1000.cb@gmail.com> | 2016-07-13 20:18:04 +0200 |
---|---|---|
committer | Clemens <cle1000.cb@gmail.com> | 2016-07-13 20:18:04 +0200 |
commit | 121079934e705ae91a983c0ea5858b5483941d7f (patch) | |
tree | 8a7b843245913d7bb82e0ba749640ae57760a167 | |
parent | f84098554a3d50ec02255603bb0a145b3aa0c6b2 (diff) | |
download | mitmproxy-121079934e705ae91a983c0ea5858b5483941d7f.tar.gz mitmproxy-121079934e705ae91a983c0ea5858b5483941d7f.tar.bz2 mitmproxy-121079934e705ae91a983c0ea5858b5483941d7f.zip |
make file out ouf string to combine flow content updates via editor and fileupload
-rw-r--r-- | mitmproxy/web/app.py | 5 | ||||
-rw-r--r-- | web/src/js/ducks/flows.js | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mitmproxy/web/app.py b/mitmproxy/web/app.py index c2d46d30..b130a6f7 100644 --- a/mitmproxy/web/app.py +++ b/mitmproxy/web/app.py @@ -297,12 +297,9 @@ class FlowContent(RequestHandler): flow = self.flow flow.backup() - content = '' + content = 'Can not read file!' if (len(self.request.files.values()) > 0): content = self.request.files.values()[0][0]["body"] - elif (len(self.request.arguments) > 0): - content = self.request.arguments['file'] - flow.response.content = str(content) self.state.update_flow(flow) diff --git a/web/src/js/ducks/flows.js b/web/src/js/ducks/flows.js index 36274f39..8815db25 100644 --- a/web/src/js/ducks/flows.js +++ b/web/src/js/ducks/flows.js @@ -119,6 +119,8 @@ export function update(flow, data) { export function update_content(flow, file) { const body = new FormData() + if (typeof file !== File) + file = new Blob([file], {type: 'plain/text'}) body.append('file', file) fetchApi(`/flows/${flow.id}/response/content`, {method: 'post', body} ) return { type: REQUEST_ACTION } |