| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | add advanced proxying options, add SSL-terminating capability to mitmproxy | Maximilian Hils | 2014-03-10 | 1 | -23/+2 |
| | | |||||
| * | remove redundant codeline | Sergey Chipiga | 2014-03-05 | 1 | -1/+0 |
| | | |||||
| * | Fix flow initialization order error | Aldo Cortesi | 2014-02-08 | 1 | -4/+0 |
| | | | | | Resolves #210 | ||||
| * | Better response when mitmproxy crashes. | Aldo Cortesi | 2014-02-08 | 1 | -2/+7 |
| | | |||||
| * | fix bugs, expose timestamp information to console ui | Maximilian Hils | 2014-02-06 | 1 | -1/+1 |
| | | |||||
| * | mock urwid to run console tests on windows, push failing testcases down to ↵ | Maximilian Hils | 2014-02-05 | 1 | -1/+1 |
| | | | | | 0. :-) | ||||
| * | fix all tests except those using set_url and get_url | Maximilian Hils | 2014-02-05 | 1 | -1/+1 |
| | | |||||
| * | Silence pyflakes | Aldo Cortesi | 2014-01-19 | 1 | -1/+1 |
| | | | | | And pick up one bug as a consequence. | ||||
| * | Script refactoring: move script command parsing into script module. | Aldo Cortesi | 2014-01-12 | 1 | -9/+9 |
| | | |||||
| * | Clean up and clarify script API | Aldo Cortesi | 2014-01-12 | 1 | -4/+6 |
| | | |||||
| * | Start refactoring scripts | Aldo Cortesi | 2014-01-12 | 1 | -1/+4 |
| | | | | | | - Move ScriptContext into script module - Use mock module instead of hand-rolled mock objects in tests | ||||
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-04 | 1 | -1/+1 |
| |\ | |||||
| | * | fix #195 | Maximilian Hils | 2014-01-03 | 1 | -1/+1 |
| | | | | | | | (untested) | ||||
| * | | Fix app in mitmproxy console, update to bootstrap 3. | Aldo Cortesi | 2014-01-03 | 1 | -17/+23 |
| |/ | |||||
| * | Small workaround to make mitmproxy work again. | Aldo Cortesi | 2013-12-09 | 1 | -2/+2 |
| | | | | | Further work is required to make scripts work again, though. | ||||
| * | add option to expose webapp externally, remove distinct ip setting | Maximilian Hils | 2013-08-18 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-08-17 | 1 | -42/+33 |
| |\ | |||||
| | * | Remove GPL notices left in source files after our change to the MIT license. | Aldo Cortesi | 2013-08-01 | 1 | -15/+0 |
| | | | | | | | | | Thanks to Roy Shamir for reporting this. | ||||
| | * | Repair minor user interface issue that caused brief flashes of duplicate ↵ | Aldo Cortesi | 2013-07-29 | 1 | -0/+2 |
| | | | | | | | | | flows in the flow list. | ||||
| | * | Fix startup with no state. | Aldo Cortesi | 2013-07-28 | 1 | -1/+4 |
| | | | | | | | | | Bug introduced in previous patch. | ||||
| | * | Some refactoring of the console inteface. | Aldo Cortesi | 2013-07-28 | 1 | -28/+23 |
| | | | | | | | | | | | | | Reduce some state duplication, by removing currentflow variable. Fixes #141 | ||||
| | * | Move app instantiation out of proxy.py. | Aldo Cortesi | 2013-07-24 | 1 | -0/+6 |
| | | | |||||
| * | | 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 | 1 | -2/+2 |
| |/ | |||||
| * | Massage content-type before sending it to mime detection | Aldo Cortesi | 2013-06-09 | 1 | -0/+1 |
| | | | | | Fixes #67 | ||||
| * | Add the --host option, which uses the value in the Host header for dispaly URLs. | Aldo Cortesi | 2013-03-17 | 1 | -0/+9 |
| | | | | | | - 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 | 1 | -3/+3 |
| | | |||||
| * | 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 | 1 | -9/+17 |
| |/ | | | | | | | | | | | | | | 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 | ||||
| * | Urwid 1.1 compatibility. | Aldo Cortesi | 2012-10-29 | 1 | -2/+2 |
| | | |||||
| * | Improve error reporting for one-shot scripts. | Aldo Cortesi | 2012-10-11 | 1 | -4/+15 |
| | | |||||
| * | Fix a crash when re-editing a path prompt after an error. | Aldo Cortesi | 2012-08-31 | 1 | -0/+1 |
| | | |||||
| * | Add a shortcut to header editor to add standard User-Agent strings. | Aldo Cortesi | 2012-08-31 | 1 | -1/+1 |
| | | |||||
| * | 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 | 1 | -6/+13 |
| | | | | | | | | mitmproxy (H shortcut). SetHeaders defines headers that are set on flows, based on a matching pattern. Existing headers are over-ridden. | ||||
| * | Further simplifcation and testing of contentviews. | Aldo Cortesi | 2012-08-18 | 1 | -1/+1 |
| | | |||||
| * | Huge cleanup of content viewers. | Aldo Cortesi | 2012-08-18 | 1 | -5/+5 |
| | | |||||
| * | Stop server playback after current playback buffer is exhausted. | Aldo Cortesi | 2012-08-18 | 1 | -1/+1 |
| | | |||||
| * | 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. | ||||
| * | Press "F" to Follow | Rob Wills | 2012-08-01 | 1 | -0/+13 |
| | | | | | | | | | | | | | Following of the flow list - ConsoleState now has a follow_focus property -- when True it will cause focus to follow added flows - ConsoleMaster implements toggle_follow_flows() -- when enabling follow, also jumps to most recent flow - StatusBar reports follow_focus state -- adds "following" to option list when true - Added "F" to FlowList keys -- implementation requests ConsoleMaster to toggle_follow_flows() | ||||
| * | Prevent mitmproxy from treating logged info as urwid markup. | Aldo Cortesi | 2012-07-27 | 1 | -2/+2 |
| | | |||||
| * | Fix mitmproxy file reading. | Aldo Cortesi | 2012-07-27 | 1 | -1/+1 |
| | | |||||
| * | Be more tolerant of corrupted or truncated flows. | Aldo Cortesi | 2012-07-24 | 1 | -2/+6 |
| | | | | | | | We load as far as possible. mitmproxy will only terminate if it was not able to recover any flows. mitmdump will stop loading as soon as an error is encountered, but not exit with an error. | ||||
| * | fix -r option, read file in binary mode | Maximilian Hils | 2012-07-24 | 1 | -1/+1 |
| | | |||||
| * | Jump back to correct flow when limit is applied. | Aldo Cortesi | 2012-07-14 | 1 | -1/+1 |
| | | |||||
