basic file up and download working

mitmproxy · Jun 1, 2016 · de8af07 · de8af07
1 parent 248e0f9
commit de8af07
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/mitmproxy/web/app.py b/mitmproxy/web/app.py
@@ -176,6 +176,7 @@ def get(self):
         sio.close()
 
     def post(self):
+        # self.state.clear()
         sio = StringIO(self.request.body)
         self.state.load_flows(FlowReader(sio).stream())
         sio.close()

diff --git a/mitmproxy/web/static/app.js b/mitmproxy/web/static/app.js
diff --git a/web/src/js/actions.js b/web/src/js/actions.js
@@ -122,7 +122,7 @@ export var FlowActions = {
     upload: (file) => {
         var filereader = new FileReader();
         filereader.file = file;
-        filereader.onload = (e) => $.post("/flows/dump", e.target.result);
+        filereader.onload = (e) => {$.post("/flows/dump", e.target.result); e.preventDefault();};
         filereader.readAsBinaryString(file);
     }
 };

diff --git a/web/src/js/components/header.js b/web/src/js/components/header.js
@@ -344,11 +344,15 @@ var FileMenu = React.createClass({
         }
     },
     handleOpenClick: function (e) {
+        $('#uploadFileInput').trigger('click');
         e.preventDefault();
     },
-    handleOpenChange: function (e) {
+    handleOpenFile: function (e) {
+        if (e.target.files.length > 0) {
+            FlowActions.upload(e.target.files[0]);
+            $('#uploadFileInput').val("");
+        }
         e.preventDefault();
-         FlowActions.upload(e.target.files[0]);
     },
     handleSaveClick: function (e) {
         e.preventDefault();
@@ -372,7 +376,12 @@ var FileMenu = React.createClass({
                         </a>
                     </li>
                     <li>
-                         <input type="file" onChange={this.handleOpenChange}/>
+                        <a href="#" onClick={this.handleOpenClick}>
+                         <i className="fa fa-fw fa-folder-open"></i>
+                            Open...
+                        </a>
+                         <input id="uploadFileInput" className="hidden" type="file" onChange={this.handleOpenFile}/>
+
                     </li>
                     <li>
                         <a href="#" onClick={this.handleSaveClick}>