| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/scripts_improvements' into 0.10 | Maximilian Hils | 2013-06-16 | 1 | -1/+1 |
| |\ | |||||
| | * | add support for multiple scripts and script arguments. refs #76 | Maximilian Hils | 2013-06-13 | 1 | -1/+1 |
| | | | |||||
| * | | always read files in binary mode | Maximilian Hils | 2013-06-16 | 2 | -3/+3 |
| |/ | |||||
| * | Massage content-type before sending it to mime detection | Aldo Cortesi | 2013-06-09 | 1 | -0/+1 |
| | | | | | Fixes #67 | ||||
| * | Fix creation of new response when none existed before. | Aldo Cortesi | 2013-06-09 | 1 | -2/+7 |
| | | | | | Fixes #133 | ||||
| * | Add error checking to ViewProtobuf | Jason A. Novak | 2013-04-21 | 1 | -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-view | Aldo Cortesi | 2013-04-19 | 1 | -1/+36 |
| |\ | | | | | Adds a new view for protocol buffers | ||||
| | * | Adds a new view for protocol buffers | Nicolas Esteves | 2013-04-06 | 1 | -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 keys | Alexis Hildebrandt | 2013-04-16 | 3 | -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 Cortesi | 2013-03-23 | 1 | -2/+2 |
| | | | | | Fixes #106 | ||||
| * | Add the --host option, which uses the value in the Host header for dispaly URLs. | Aldo Cortesi | 2013-03-17 | 5 | -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.py | Aldo Cortesi | 2013-03-14 | 1 | -1/+1 |
| | | | | | Fixes #104 | ||||
| * | Remove __slots__ to make it possible to inherit from Options classes. | Aldo Cortesi | 2013-03-03 | 1 | -2/+2 |
| | | |||||
| * | Revert "show current filepath in status bar" | Aldo Cortesi | 2013-03-03 | 1 | -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 Cortesi | 2013-02-17 | 2 | -5/+5 |
| | | |||||
| * | Fixed a bug in format_flow in common.py. Changed the reference from ↵ | Chris Neasbitt | 2013-01-18 | 1 | -1/+1 |
| | | | | | timestamp to timestamp_start. | ||||
| * | Merge pull request #82 from kanzure/show-filepath-in-statusbar | Aldo Cortesi | 2012-12-30 | 1 | -0/+3 |
| |\ | | | | | Show current filepath in status bar | ||||
| | * | show current filepath in status bar | Bryan Bishop | 2012-12-26 | 1 | -0/+3 |
| | | | | | | | | | | | Showing the filename is useful when looking at multiple .mitm files simultaneously. | ||||
| * | | fix external viewer using shlex | Bryan Bishop | 2012-12-22 | 2 | -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 Bishop | 2012-12-05 | 1 | -1/+4 |
| | | | | | | | This catches an exception that otherwise crashes mitmproxy. fixes cortesi/mitmproxy#71 | ||||
| * | Substantially rewrite AMF decoding. | Aldo Cortesi | 2012-11-26 | 1 | -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 Mitchell | 2012-11-23 | 1 | -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 Cortesi | 2012-11-23 | 1 | -4/+2 |
| | | |||||
| * | Urwid 1.1 compatibility. | Aldo Cortesi | 2012-10-29 | 2 | -4/+4 |
| | | |||||
| * | Improve error reporting for one-shot scripts. | Aldo Cortesi | 2012-10-11 | 1 | -4/+15 |
| | | |||||
| * | Move cleanBin and hexdump into netutils. | Aldo Cortesi | 2012-09-24 | 1 | -4/+5 |
| | | |||||
| * | Add help entry for H global header shortcut. | Aldo Cortesi | 2012-09-02 | 1 | -2/+1 |
| | | |||||
| * | Add U shortcut to add user-agent strings to global Headers editor. | Aldo Cortesi | 2012-09-02 | 1 | -1/+32 |
| | | |||||
| * | Fix a crash when re-editing a path prompt after an error. | Aldo Cortesi | 2012-08-31 | 1 | -0/+1 |
| | | |||||
| * | Make grid editor file reading more robust. | Aldo Cortesi | 2012-08-31 | 1 | -4/+8 |
| | | |||||
| * | Add a shortcut to header editor to add standard User-Agent strings. | Aldo Cortesi | 2012-08-31 | 3 | -29/+68 |
| | | |||||
| * | Display "No Content" instead of a parse error when there is no content. | Aldo Cortesi | 2012-08-30 | 1 | -0/+2 |
| | | |||||
| * | Add a snippet to GridEditor help text explaining that we're using escaped ↵ | Aldo Cortesi | 2012-08-25 | 1 | -0/+8 |
| | | | | | strings. | ||||
| * | Add a "R" shortcut to GridEditor, letting the user read unescaped data from ↵ | Aldo Cortesi | 2012-08-25 | 1 | -11/+15 |
| | | | | | file. | ||||
| * | Do away with explicit encodings, and display an error message for invalid ↵ | Aldo Cortesi | 2012-08-25 | 1 | -15/+12 |
| | | | | | values. | ||||
| * | Use Python-style escaped strings in GridEditor. | Aldo Cortesi | 2012-08-25 | 1 | -14/+17 |
| | | |||||
| * | Add an "r" shortcut in grid editors to read value from file. | Aldo Cortesi | 2012-08-25 | 1 | -4/+23 |
| | | |||||
| * | Add a graphical editor for path components (e -> p shortcut from request ↵ | Aldo Cortesi | 2012-08-19 | 2 | -3/+19 |
| | | | | | view screen). | ||||
| * | Command-line options for header setting. | Aldo Cortesi | 2012-08-19 | 1 | -0/+4 |
| | | |||||
| * | Add SetHeaders, analogous to ReplaceHooks, with a graphical editor in ↵ | Aldo Cortesi | 2012-08-18 | 2 | -6/+24 |
| | | | | | | | | mitmproxy (H shortcut). SetHeaders defines headers that are set on flows, based on a matching pattern. Existing headers are over-ridden. | ||||
| * | Use the new ODict get_first convenience function in a bunch of places. | Aldo Cortesi | 2012-08-18 | 2 | -12/+10 |
| | | |||||
| * | Further content view cleaups. | Aldo Cortesi | 2012-08-18 | 1 | -9/+28 |
| | | |||||
| * | Send tracebacks from content viewers to event log. | Aldo Cortesi | 2012-08-18 | 2 | -3/+4 |
| | | | | | Also, 100% test coverage for content viewers. | ||||
| * | Further simplifcation and testing of contentviews. | Aldo Cortesi | 2012-08-18 | 2 | -27/+16 |
| | | |||||
| * | Huge cleanup of content viewers. | Aldo Cortesi | 2012-08-18 | 3 | -295/+301 |
| | | |||||
| * | Optional AMF decoding support | Sahn Lam | 2012-08-17 | 2 | -2/+30 |
| | | | | | If PyAMF is installed, enable AMF decoding. | ||||
| * | Add an HTML text outline view. | Aldo Cortesi | 2012-08-18 | 1 | -3/+20 |
| | | | | | | | Uses html2text, from here: https://github.com/aaronsw/html2text | ||||
| * | Stop server playback after current playback buffer is exhausted. | Aldo Cortesi | 2012-08-18 | 2 | -2/+2 |
| | | |||||
| * | Server replay from current buffer. | Aldo Cortesi | 2012-08-18 | 1 | -0/+44 |
| | | |||||
| * | Return from Flow View behaviour | Rob Wills | 2012-08-02 | 1 | -1/+5 |
| | | | | | Following focus trumps the re-focusing the "current" (or just-viewed) flow. | ||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |