aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * added netlib dependencyAndrás Veres-Szentkirályi2012-07-151-0/+1
|/
* Add an ~a filter expression, matching an asset content type in responses.Aldo Cortesi2012-07-142-1/+32
| | | | | | Asset content types are Javascript, images, Flash and CSS. This is useful because doing a quick "!~a" while auditing an app will filter out the majority of the static asset cruft, letting you focus on what matters.
* Jump back to correct flow when limit is applied.Aldo Cortesi2012-07-141-1/+1
|
* Merge branch 'master' of github.com:cortesi/mitmproxyAldo Cortesi2012-07-112-8/+6
|\
| * Refine semantics of replay_request method.Aldo Cortesi2012-07-102-8/+6
| |
* | Fix a subtle termination condition when there's an error in a WSGI app.Aldo Cortesi2012-07-111-2/+8
|/
* Make WSGI apps work in transparent mode.Aldo Cortesi2012-07-102-1/+13
|
* Test replay corner cases. Fix discovered bugs.Aldo Cortesi2012-07-093-5/+16
|
* Unit test request replay thread.Aldo Cortesi2012-07-092-0/+11
| | | | | | This is a small patch, but is the culmination of lots of work: we can now unit test the deep innards of mitmproxy, with coverage. There's a lot more to come in this vein.
* Refator server tests to use flow.FlowMaster and flow.StateAldo Cortesi2012-07-093-43/+33
|
* Make mitmproxy "W" over-write, not append.Aldo Cortesi2012-07-091-1/+1
| | | | | The -w options in mitmdump and mitproxy should do the same thing. Append can have unexpected consequences if the existing file is not a mitmdump.
* Use FlowMaster stream from mitmdump.Aldo Cortesi2012-07-091-6/+1
|
* Use FlowMaster streaming for "W" in mitmproxy.Aldo Cortesi2012-07-091-10/+2
|
* Add streaming to FlowMasterAldo Cortesi2012-07-093-9/+51
|
* Remove ODict tests. ODict is now in netlib.Aldo Cortesi2012-07-091-111/+0
|