aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #69 from mat128/masterAldo Cortesi2012-11-241-2/+7
|\ | | | | PIL imports -- packaging
| * 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
* We now require Urwid 1.1 or newer.Aldo Cortesi2012-11-231-1/+1
|
* 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-244-54/+8
|
* Stub out ctypes structures for OSX transparent mode.Aldo Cortesi2012-09-176-182/+90
|
* Doc stubs.Aldo Cortesi2012-09-178-16/+34
|
* Doc reorg.Aldo Cortesi2012-09-166-6/+154
|
* Expand Flow.match to accept either a string or a compiled filter expression.Aldo Cortesi2012-09-142-3/+13
|
* Catch a potential exception on connection finalization.Aldo Cortesi2012-09-141-1/+4
|
* Don't run replace or header hooks on error.Aldo Cortesi2012-09-021-2/+0
|
* 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
|
* Add application/javascript to ~a filter asset matcher.Aldo Cortesi2012-08-301-0/+2
|
* Add a snippet to GridEditor help text explaining that we're using escaped ↵Aldo Cortesi2012-08-251-0/+8
| | | | strings.
* Add a "R" shortcut to GridEditor, letting the user read unescaped data from ↵Aldo Cortesi2012-08-251-11/+15
| | | | file.
* Do away with explicit encodings, and display an error message for invalid ↵Aldo Cortesi2012-08-251-15/+12
| | | | values.
* Use Python-style escaped strings in GridEditor.Aldo Cortesi2012-08-251-14/+17
|
* Add an "r" shortcut in grid editors to read value from file.Aldo Cortesi2012-08-252-5/+24
|
* Add a graphical editor for path components (e -> p shortcut from request ↵Aldo Cortesi2012-08-192-3/+19
| | | | view screen).
* Getter and setter for path component on Requests.Aldo Cortesi2012-08-192-2/+40
|
* Little bit of love for the unit tests.Aldo Cortesi2012-08-192-1/+19
|
* Command-line options for header setting.Aldo Cortesi2012-08-195-28/+101
|
* Add SetHeaders, analogous to ReplaceHooks, with a graphical editor in ↵Aldo Cortesi2012-08-184-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 Cortesi2012-08-183-18/+16
|
* Further content view cleaups.Aldo Cortesi2012-08-182-44/+28
|
* Send tracebacks from content viewers to event log.Aldo Cortesi2012-08-183-8/+24
| | | | Also, 100% test coverage for content viewers.
* Further simplifcation and testing of contentviews.Aldo Cortesi2012-08-183-64/+37
|
* Huge cleanup of content viewers.Aldo Cortesi2012-08-185-341/+360
|
* Merge pull request #62 from slam/amfAldo Cortesi2012-08-175-2/+89
|\ | | | | Optional AMF decoding support
| * Optional AMF decoding supportSahn Lam2012-08-175-2/+89
|/ | | | If PyAMF is installed, enable AMF decoding.
* Fix unit tests after argparse conversion.Aldo Cortesi2012-08-181-3/+3
|
* Merge pull request #61 from mhils/upgrade_to_argparseAldo Cortesi2012-08-174-80/+66
|\ | | | | Replace optparse with argparse
| * add dummy cert dirMaximilian Hils2012-08-171-2/+2
| |
| * use argparse instead of optparseMaximilian Hils2012-08-174-78/+64
|/
* Add an HTML text outline view.Aldo Cortesi2012-08-183-3/+858
| | | | | | Uses html2text, from here: https://github.com/aaronsw/html2text
* Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2012-08-180-0/+0
|\
| * Merge pull request #60 from jimlloyd-st/preserve_dummy_certsAldo Cortesi2012-08-150-0/+0
| |\ | | | | | | Preserve the genenerated dummy certs directory
| | * Preserve the genenerated dummy certs directoryJim Lloyd2012-08-142-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 Cortesi2012-08-183-2/+4
| | |
* | | Server replay from current buffer.Aldo Cortesi2012-08-181-0/+44
|/ /
* | Merge branch 'certdir'Aldo Cortesi2012-08-162-6/+24
|\ \ | |/ |/|
| * Adds --dummy-certs option to specify certdirJim Lloyd2012-08-062-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/masterAldo Cortesi2012-08-102-2/+2
|\ \ | |/ |/| Updated readme docs with new PyOpenSSL dependency.