aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * Updated readme files with new PyOpenSSL 0.13 dependency.Chris Neasbitt2012-08-082-2/+2
|/
* Add a size() method to flow.Request and flow.Response.Aldo Cortesi2012-08-042-29/+57
|
* Return from Flow View behaviourRob Wills2012-08-021-1/+5
| | | | Following focus trumps the re-focusing the "current" (or just-viewed) flow.
* Press "F" to FollowRob Wills2012-08-012-0/+16
| | | | | | | | | | | | 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()
* Handle invalid headers.Aldo Cortesi2012-07-301-0/+8
|
* Prevent mitmproxy from treating logged info as urwid markup.Aldo Cortesi2012-07-271-2/+2
|
* Fix mitmproxy file reading.Aldo Cortesi2012-07-271-1/+1
|
* Minor refactoring. Make stop_stream also close the associated file descriptor.Aldo Cortesi2012-07-271-1/+1
|
* Only log real errors in WSGI apps.Aldo Cortesi2012-07-241-1/+1
|
* Fix flow read unit test to accomodate more tolerant dumpfile parsing.Aldo Cortesi2012-07-241-4/+2
|
* Be more tolerant of corrupted or truncated flows.Aldo Cortesi2012-07-243-5/+8
| | | | | | 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.
* Merge pull request #54 from mhils/fix_r_optionAldo Cortesi2012-07-232-2/+2
|\ | | | | fix -r option, read file in binary mode
| * fix -r option, read file in binary modeMaximilian Hils2012-07-242-2/+2
|/
* Merge pull request #52 from cjneasbi/masterAldo Cortesi2012-07-231-1/+1
|\ | | | | Fixed a bug causing an AttributeError when request is set to false but response not None in ProxyHandler.handle_request
| * Fixed a bug causing an AttributeError when request is set to false but ↵Chris Neasbitt2012-07-171-1/+1
|/ | | | response not None in ProxyHandler.handle_request
* Merge pull request #51 from dnet/masterAldo Cortesi2012-07-168-21/+10
|\ | | | | Test cleanup and missing dependencies
| * removed assigned but unread variablesAndrás Veres-Szentkirályi2012-07-153-3/+3
| |
| * removed unused importsAndrás Veres-Szentkirályi2012-07-157-17/+4
| |
| * added testing dependencies human_curl and pathodAndrás Veres-Szentkirályi2012-07-151-1/+2
| |