aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console
Commit message (Collapse)AuthorAgeFilesLines
* Fix app in mitmproxy console, update to bootstrap 3.Aldo Cortesi2014-01-032-17/+32
|
* Small workaround to make mitmproxy work again.Aldo Cortesi2013-12-091-2/+2
| | | | Further work is required to make scripts work again, though.
* Merge branch 'master' into 0.10Maximilian Hils2013-12-081-1/+1
|\
| * Merge pull request #134 from mhils/scripts_improvementsAldo Cortesi2013-12-081-1/+1
| |\ | | | | | | Support multiple scripts and script arguments. refs #76
| * | Fix divide by zero issue when timestamp start and end are the sameRich Somerfield2013-11-261-1/+1
| | |
* | | Merge pull request #161 from mitmproxy/external_webappAldo Cortesi2013-12-081-1/+1
|\ \ \ | | | | | | | | External webapp
| * | | add option to expose webapp externally, remove distinct ip settingMaximilian Hils2013-08-181-1/+1
| | | |
* | | | Merge branch 'master' into 0.10Maximilian Hils2013-09-141-1/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Tweak timing displayAldo Cortesi2013-08-232-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove elapsed time. Space is at a premium here, and this is somewhat redundant with the rate figure. We should display complete timing information somewhere in the detailed flow view. - Tone down the colour. Reserve highlights for stuff that should really pop out to the user. - Make rate calculation more acurate. Include header sizes. Use response start and end time, rather than request end and response end. This means that we show actual transfer rates, not including DNS requests and so forth.
| * | console: Add support for displaying transfer rateKyle Manna2013-08-131-0/+3
| | | | | | | | | | | | | | | * Display the rate in the the response row. * Very handy for passive performance analysis.
| * | console: Add support for displaying elapsed timeKyle Manna2013-08-132-1/+9
| | | | | | | | | | | | | | | * Display the elapsed time in the the response row. * Very handy for passive performance analysis.
* | | Merge branch 'master' into 0.10Maximilian Hils2013-08-178-153/+41
|\| |
| * | Remove GPL notices left in source files after our change to the MIT license.Aldo Cortesi2013-08-018-120/+0
| | | | | | | | | | | | Thanks to Roy Shamir for reporting this.
| * | Show an error when attempting to decode invalid data.Aldo Cortesi2013-07-291-1/+2
| | |
| * | Repair minor user interface issue that caused brief flashes of duplicate ↵Aldo Cortesi2013-07-291-0/+2
| | | | | | | | | | | | flows in the flow list.
| * | Fix startup with no state.Aldo Cortesi2013-07-281-1/+4
| | | | | | | | | | | | Bug introduced in previous patch.
| * | Some refactoring of the console inteface.Aldo Cortesi2013-07-284-33/+29
| | | | | | | | | | | | | | | | | | Reduce some state duplication, by removing currentflow variable. Fixes #141
| * | Move app instantiation out of proxy.py.Aldo Cortesi2013-07-241-0/+6
| | |
* | | Merge remote-tracking branch 'origin/scripts_improvements' into 0.10Maximilian Hils2013-06-161-1/+1
|\ \ \ | |/ / |/| / | |/
| * add support for multiple scripts and script arguments. refs #76Maximilian Hils2013-06-131-1/+1
| |
* | always read files in binary modeMaximilian Hils2013-06-162-3/+3
|/
* Massage content-type before sending it to mime detectionAldo Cortesi2013-06-091-0/+1
| | | | Fixes #67
* Fix creation of new response when none existed before.Aldo Cortesi2013-06-091-2/+7
| | | | Fixes #133
* Add error checking to ViewProtobufJason A. Novak2013-04-211-2/+5
| | | | | | | | There are protobufs that protoc can't parse. When protoc --decode_raw fails, it returns nothing to stdin, and writes "Failed to parse input." to stderr. Before this commit, if protoc --decode_raw couldn't parse the protobuf, the blank stdout output would get returned to the view; with this commit stderr gets caught and returned to the view.
* Merge pull request #112 from hamstah/protobuf-viewAldo Cortesi2013-04-191-1/+36
|\ | | | | Adds a new view for protocol buffers
| * Adds a new view for protocol buffersNicolas Esteves2013-04-061-1/+36
| | | | | | | | | | | | | | | | | | The view uses protoc from the Google protocol buffer tools. If the tool isn't installed, the view isn't shown. Google protobuf repo: https://code.google.com/p/protobuf/
* | Correct display mode highlight keysAlexis Hildebrandt2013-04-163-3/+11
|/ | | | | | Add html display mode to the help documentation. Correct html and hex display mode highlight keys (help used 'h' for hex). Correct json display mode highlight keys.
* Fix crash on intercept.Aldo Cortesi2013-03-231-2/+2
| | | | Fixes #106
* Add the --host option, which uses the value in the Host header for dispaly URLs.Aldo Cortesi2013-03-175-5/+18
| | | | | - Can be toggled with "o" then "h" in mitmproxy - Useful for transparent mode
* Introduce a filtered flow writer, and use it in dump.pyAldo Cortesi2013-03-141-1/+1
| | | | Fixes #104
* Remove __slots__ to make it possible to inherit from Options classes.Aldo Cortesi2013-03-031-2/+2
|
* Revert "show current filepath in status bar"Aldo Cortesi2013-03-031-3/+0
| | | | | | This reverts commit bf8367d6cf3e6b5b1e916453c9cf114194174a1a. This just doesn't work. We need a better solution, probably in the next release.
* Significantly refactor the master/slave message passing interface.Aldo Cortesi2013-02-172-5/+5
|
* Fixed a bug in format_flow in common.py. Changed the reference from ↵Chris Neasbitt2013-01-181-1/+1
| | | | timestamp to timestamp_start.
* Merge pull request #82 from kanzure/show-filepath-in-statusbarAldo Cortesi2012-12-301-0/+3
|\ | | | | Show current filepath in status bar
| * show current filepath in status barBryan Bishop2012-12-261-0/+3
| | | | | | | | | | Showing the filename is useful when looking at multiple .mitm files simultaneously.
* | fix external viewer using shlexBryan Bishop2012-12-222-10/+18
|/ | | | | | | | | | | | | | This makes spawn_external_viewer not crash when $EDITOR or $PAGER have spaces or multiple arguments. In addition, spawn_external_viewer now chmods the file to read-only to remind users who use only an $EDITOR that this function does not read the file when the user returns. Also, some of the redundant exception case handling for editing has been consolidated. fixes #79
* Show an error when $EDITOR/$PAGER are unset.Bryan Bishop2012-12-051-1/+4
| | | | | | This catches an exception that otherwise crashes mitmproxy. fixes cortesi/mitmproxy#71
* Substantially rewrite AMF decoding.Aldo Cortesi2012-11-261-24/+68
| | | | This is tricky, but we should now handle a lot more corner-cases.
* Workaround for PIL's ambiguious import method and/or easy_install PIL ↵Mathieu Mitchell2012-11-231-2/+7
| | | | | | | | | | packaging problem. PIL documents two different way to import it's modules: * import Image (http://www.pythonware.com/library/pil/handbook/introduction.htm) * from PIL import Image (http://www.pythonware.com/library/pil/handbook/image.htm) The same problem was noted in Django at https://code.djangoproject.com/ticket/6054
* Move eventlog to new Urwid container API.Aldo Cortesi2012-11-231-4/+2
|
* Urwid 1.1 compatibility.Aldo Cortesi2012-10-292-4/+4
|
* Improve error reporting for one-shot scripts.Aldo Cortesi2012-10-111-4/+15
|
* Move cleanBin and hexdump into netutils.Aldo Cortesi2012-09-241-4/+5
|
* Add help entry for H global header shortcut.Aldo Cortesi2012-09-021-2/+1
|
* Add U shortcut to add user-agent strings to global Headers editor.Aldo Cortesi2012-09-021-1/+32
|
* Fix a crash when re-editing a path prompt after an error.Aldo Cortesi2012-08-311-0/+1
|
* Make grid editor file reading more robust.Aldo Cortesi2012-08-311-4/+8
|
* Add a shortcut to header editor to add standard User-Agent strings.Aldo Cortesi2012-08-313-29/+68
|
* Display "No Content" instead of a parse error when there is no content.Aldo Cortesi2012-08-301-0/+2
|