Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #69 from mat128/master | Aldo Cortesi | 2012-11-24 | 1 | -2/+7 |
|\ | | | | | PIL imports -- packaging | ||||
| * | 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 | ||||
* | We now require Urwid 1.1 or newer. | Aldo Cortesi | 2012-11-23 | 1 | -1/+1 |
| | |||||
* | 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 | 4 | -54/+8 |
| | |||||
* | Stub out ctypes structures for OSX transparent mode. | Aldo Cortesi | 2012-09-17 | 6 | -182/+90 |
| | |||||
* | Doc stubs. | Aldo Cortesi | 2012-09-17 | 8 | -16/+34 |
| | |||||
* | Doc reorg. | Aldo Cortesi | 2012-09-16 | 6 | -6/+154 |
| | |||||
* | Expand Flow.match to accept either a string or a compiled filter expression. | Aldo Cortesi | 2012-09-14 | 2 | -3/+13 |
| | |||||
* | Catch a potential exception on connection finalization. | Aldo Cortesi | 2012-09-14 | 1 | -1/+4 |
| | |||||
* | Don't run replace or header hooks on error. | Aldo Cortesi | 2012-09-02 | 1 | -2/+0 |
| | |||||
* | 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 application/javascript to ~a filter asset matcher. | 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 | 2 | -5/+24 |
| | |||||
* | Add a graphical editor for path components (e -> p shortcut from request ↵ | Aldo Cortesi | 2012-08-19 | 2 | -3/+19 |
| | | | | view screen). | ||||
* | Getter and setter for path component on Requests. | Aldo Cortesi | 2012-08-19 | 2 | -2/+40 |
| | |||||
* | Little bit of love for the unit tests. | Aldo Cortesi | 2012-08-19 | 2 | -1/+19 |
| | |||||
* | Command-line options for header setting. | Aldo Cortesi | 2012-08-19 | 5 | -28/+101 |
| | |||||
* | Add SetHeaders, analogous to ReplaceHooks, with a graphical editor in ↵ | Aldo Cortesi | 2012-08-18 | 4 | -22/+148 |
| | | | | | | | 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 | 3 | -18/+16 |
| | |||||
* | Further content view cleaups. | Aldo Cortesi | 2012-08-18 | 2 | -44/+28 |
| | |||||
* | Send tracebacks from content viewers to event log. | Aldo Cortesi | 2012-08-18 | 3 | -8/+24 |
| | | | | Also, 100% test coverage for content viewers. | ||||
* | Further simplifcation and testing of contentviews. | Aldo Cortesi | 2012-08-18 | 3 | -64/+37 |
| | |||||
* | Huge cleanup of content viewers. | Aldo Cortesi | 2012-08-18 | 5 | -341/+360 |
| | |||||
* | Merge pull request #62 from slam/amf | Aldo Cortesi | 2012-08-17 | 5 | -2/+89 |
|\ | | | | | Optional AMF decoding support | ||||
| * | Optional AMF decoding support | Sahn Lam | 2012-08-17 | 5 | -2/+89 |
|/ | | | | If PyAMF is installed, enable AMF decoding. | ||||
* | Fix unit tests after argparse conversion. | Aldo Cortesi | 2012-08-18 | 1 | -3/+3 |
| | |||||
* | Merge pull request #61 from mhils/upgrade_to_argparse | Aldo Cortesi | 2012-08-17 | 4 | -80/+66 |
|\ | | | | | Replace optparse with argparse | ||||
| * | add dummy cert dir | Maximilian Hils | 2012-08-17 | 1 | -2/+2 |
| | | |||||
| * | use argparse instead of optparse | Maximilian Hils | 2012-08-17 | 4 | -78/+64 |
|/ | |||||
* | Add an HTML text outline view. | Aldo Cortesi | 2012-08-18 | 3 | -3/+858 |
| | | | | | | Uses html2text, from here: https://github.com/aaronsw/html2text | ||||
* | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2012-08-18 | 0 | -0/+0 |
|\ | |||||
| * | Merge pull request #60 from jimlloyd-st/preserve_dummy_certs | Aldo Cortesi | 2012-08-15 | 0 | -0/+0 |
| |\ | | | | | | | Preserve the genenerated dummy certs directory | ||||
| | * | Preserve the genenerated dummy certs directory | Jim Lloyd | 2012-08-14 | 2 | -6/+24 |
| | | | | | | | | | | | | | | | | | | If --dummy-certs=CERTSDIR is provided, use CERTSDIR as the location for generating/finding the dummy certs. And in this case, preserve the CERTSDIR directory on exit. | ||||
* | | | Stop server playback after current playback buffer is exhausted. | Aldo Cortesi | 2012-08-18 | 3 | -2/+4 |
| | | | |||||
* | | | Server replay from current buffer. | Aldo Cortesi | 2012-08-18 | 1 | -0/+44 |
|/ / | |||||
* | | Merge branch 'certdir' | Aldo Cortesi | 2012-08-16 | 2 | -6/+24 |
|\ \ | |/ |/| | |||||
| * | Adds --dummy-certs option to specify certdir | Jim Lloyd | 2012-08-06 | 2 | -6/+24 |
| | | | | | | | | | | | | If --dummy-certs=CERTSDIR is provided, use CERTSDIR as the location for generating/finding the dummy certs. And in this case, preserve the CERTSDIR directory on exit. | ||||
* | | Merge pull request #57 from cjneasbi/master | Aldo Cortesi | 2012-08-10 | 2 | -2/+2 |
|\ \ | |/ |/| | Updated readme docs with new PyOpenSSL dependency. |