aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add tests for client certificate support.Aldo Cortesi2013-01-208-35/+101
|
* Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-01-191-1/+1
|\
| * Merge pull request #94 from cjneasbi/masterAldo Cortesi2013-01-181-1/+1
| |\ | | | | | | Fixed a bug in format_flow in common.py.
| | * Fixed a bug in format_flow in common.py. Changed the reference from ↵Chris Neasbitt2013-01-181-1/+1
| |/ | | | | | | timestamp to timestamp_start.
* / Rudimentary testing for client certs.Aldo Cortesi2013-01-185-2/+41
|/
* Speed up the test suite by reducing time sleeping in tests.Aldo Cortesi2013-01-181-3/+2
|
* Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-01-185-22/+137
|\ | | | | | | | | Conflicts: test/test_server.py
| * Merge pull request #93 from rouli/masterAldo Cortesi2013-01-173-20/+77
| |\ | | | | | | More precise timestamps
| | * fixes due to merge with masterRouli2013-01-171-1/+2
| | |
| | * Merge remote-tracking branch 'upstream/master'Rouli2013-01-1764-692/+5426
| | |\ | | |/ | |/|
| * | Merge pull request #91 from termie/patch-1Aldo Cortesi2013-01-141-3/+2
| |\ \ | | | | | | | | fix some syntax / formatting in the docs
| | * | fix some syntax / formatting in the docsAndy Smith2013-01-111-3/+2
| | | |
| * | | Merge pull request #92 from pielgrzym/injectorAldo Cortesi2013-01-141-0/+50
| |\ \ \ | | |/ / | |/| | New example - standalone proxy injecting iframes into responses
| | * | New example - standalone proxy injecting iframes into responsesJakub Nawalaniec2013-01-131-0/+50
| |/ /
| | * changing requests and responses to have two timestamps, one marking their ↵Rouli2013-01-173-19/+75
| | | | | | | | | | | | initiation, and the other their complete
* | | Unit tests and minor code refactoring for ServerConnection.Aldo Cortesi2013-01-054-16/+57
|/ /
* | Remove cert_wait_time flag.Aldo Cortesi2013-01-062-11/+1
| | | | | | | | | | We now cater for this by generating certs with a commencement date an hour in the past in netlib.
* | Use new netlib certificate store implementation.Aldo Cortesi2013-01-062-15/+6
| |
* | Unit test love - 100% for flow.py, dump.pyAldo Cortesi2013-01-053-5/+28
| |
* | Minor cleanups of proxy request handling.Aldo Cortesi2013-01-042-5/+7
| |
* | First draft of "How mitmproxy works", a complete guide to the mechanics of ↵Aldo Cortesi2013-01-0323-47/+3871
| | | | | | | | the proxy process
* | Docs: remove proxydroid instructions from Android.Aldo Cortesi2013-01-033-54/+4
| | | | | | | | The "official way" is now to just use transparent mode.
* | Docs: move features into their own directoryAldo Cortesi2013-01-0313-11/+16
| |
* | Docs: Set HeadersAldo Cortesi2013-01-031-1/+17
| |
* | Docs - features.Aldo Cortesi2013-01-027-34/+130
| |
* | Refactor proxy auth a bitAldo Cortesi2013-01-022-36/+14
| | | | | | | | | | | | - Remove authentication scheme option. We only support basic at the moment - we'll add the option back when we diversify. - Add some meta variables to make printout nicer
* | Documentation, setup.py updates, styling.Aldo Cortesi2013-01-0211-53/+62
| |
* | Docs and ReadmeAldo Cortesi2013-01-018-116/+33
| | | | | | | | | | | | - Don't keep a full duplicate readme just for pypi. Pypi really needs to learn to read markdown. - Style and content adjustments
* | Preliminary changelog.Aldo Cortesi2013-01-012-40/+80
| |
* | Docs: make nav sidebar workAldo Cortesi2013-01-012-31/+40
| |
* | Much-needed facelift for the docs.Aldo Cortesi2013-01-0110-230/+1017
| |
* | Better error handling for transparent mode remote address resolution.Aldo Cortesi2013-01-012-2/+8
| |
* | First draft of OSX transparent proxy mode.Aldo Cortesi2013-01-014-97/+47
| |
* | More work on proxy authAldo Cortesi2012-12-313-14/+56
| | | | | | | | | | | | - Strip auth header if auth succeeds, so it's not passed upstream - Actually use realm specification to BasicProxyAuth, and make it mandatory - Cleanups and unit tests
* | Test and robustify BasicProxyAuth.parse_auth_valueAldo Cortesi2012-12-312-6/+29
| | | | | | | | | | - This is partly in preparation for moving the implementation to netlib - Also add an unparse_auth_value for testing (and use in pathod once the move is done)
* | Start solidifying proxy authenticationAldo Cortesi2012-12-313-19/+46
| | | | | | | | | | | | - Add a unit test file - Remove some extraneous methods - Change the auth API to make the authenticate method take a header object.
* | Merge pull request #83 from rouli/masterAldo Cortesi2012-12-305-29/+288
|\| | | | | Adding some basic proxy authentication code
| * adding some simple authetication code to limit proxy accessisrael2012-12-304-38/+99
| |
| * adding some simple authetication code to limit proxy accessisrael2012-12-302-0/+198
|/
* Merge pull request #82 from kanzure/show-filepath-in-statusbarAldo Cortesi2012-12-301-0/+3
|\ | | | | Show current filepath in status bar
| * show current filepath in status barBryan Bishop2012-12-261-0/+3
| | | | | | | | | | Showing the filename is useful when looking at multiple .mitm files simultaneously.
* | Merge pull request #81 from kanzure/issue/79Aldo Cortesi2012-12-302-10/+18
|\ \ | |/ |/| Fix external viewer function by using shlex
| * fix external viewer using shlexBryan Bishop2012-12-222-10/+18
|/ | | | | | | | | | | | | | 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
* Merge pull request #75 from kanzure/whitespacefixingAldo Cortesi2012-12-117-31/+31
|\ | | | | Make trailing whitespace more consistent
| * remove trailing whitespaceBryan Bishop2012-12-097-31/+31
|/
* Merge pull request #74 from kanzure/editexceptionAldo Cortesi2012-12-051-1/+4
|\ | | | | Show an error when $EDITOR/$PAGER are unset.
| * Show an error when $EDITOR/$PAGER are unset.Bryan Bishop2012-12-051-1/+4
|/ | | | | | This catches an exception that otherwise crashes mitmproxy. fixes cortesi/mitmproxy#71
* Fix READMEs: we don't support Python 2.6Aldo Cortesi2012-11-302-2/+2
| | | | Fixes #70
* Substantially rewrite AMF decoding.Aldo Cortesi2012-11-265-33/+90
| | | | This is tricky, but we should now handle a lot more corner-cases.
* Merge pull request #69 from mat128/masterAldo Cortesi2012-11-241-2/+7
|\ | | | | PIL imports -- packaging
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-07 13:37:35 +0000