aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge pull request #103 from scone/masterMaximilian Hils2015-11-143-10/+11
| | |\ | | | | | | | | Utils port to 3.4 keeping py2 compatibility
| | | * Fixing test_wsgi to remove py.test warningsSam Cleveland2015-11-141-3/+5
| | | | | | | | | | | | | | | | | | | | Renamed TestApp class to ExampleApp to prevent py.test from trying to collect it as a test.
| | | * Porting to Python 3.4Sam Cleveland2015-11-112-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated wsgi to support Python 3.4 byte strings. Updated test_wsgi to remove py.test warning for TestApp having an __init__ constructor. samc$ sudo py.test netlib/test/test_wsgi.py -r w = test session starts = platform darwin -- Python 3.4.1, pytest-2.8.2, py-1.4.30, pluggy-0.3.1 rootdir: /Users/samc/src/python/netlib, inifile: collected 6 items netlib/test/test_wsgi.py ...... = 6 passed in 0.20 seconds =
| | | * Porting to Python 3.4Sam Cleveland2015-11-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed byte string formatting for hexdump. = test session starts = platform darwin -- Python 3.4.1, pytest-2.8.2, py-1.4.30, pluggy-0.3.1 rootdir: /Users/samc/src/python/netlib, inifile: collected 11 items netlib/test/test_utils.py ........... = 11 passed in 0.23 seconds =
| | | * Revert "Porting netlib to python3.4"Sam Cleveland2015-11-112-376/+8
| | | | | | | | | | | | | | | | This reverts commit 823718348598efb324298ca29ad4cb7d5097c084.
| | | * Porting netlib to python3.4Sam Cleveland2015-11-112-8/+376
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated utils.py using 2to3-3.4 Updated hexdump to use .format() with .encode() to support python 3.4 Python 3.5 supports .format() on bytes objects, but 3.4 is the current default on Ubuntu. samc$ py.test netlib/test/test_utils.py = test session starts = platform darwin -- Python 3.4.1, pytest-2.8.2, py-1.4.30, pluggy-0.3.1 rootdir: /Users/samc/src/python/netlib, inifile: collected 11 items netlib/test/test_utils.py ........... = 11 passed in 0.19 seconds =
| | * | be more conservative about dependency versionsMaximilian Hils2015-11-131-9/+9
| | |/
| | * Bump version for next release cycleAldo Cortesi2015-11-071-1/+1
| | |
| | * Add CONTRIBUTORSAldo Cortesi2015-11-061-0/+18
| | |
| | * Bump versionAldo Cortesi2015-11-061-1/+1
| | |
| | * Merge remote-tracking branch 'origin/hostname-validation'Maximilian Hils2015-11-0424-245/+304
| | |\
| | | * fix certificate verificationMaximilian Hils2015-11-014-33/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes netlib's optional (turned off by default) certificate verification, which previously did not validate the cert's host name. As it turns out, verifying the connection's host name on an intercepting proxy is not really straightforward - if we receive a connection in transparent mode without SNI, we have no clue which hosts the client intends to connect to. There are two basic approaches to solve this problem: 1. Exactly mirror the host names presented by the server in the spoofed certificate presented to the client. 2. Require the client to send the TLS Server Name Indication extension. While this does not work with older clients, we can validate the hostname on the proxy. Approach 1 is problematic in mitmproxy's use case, as we may want to deliberately divert connections without the client's knowledge. As a consequence, we opt for approach 2. While mitmproxy does now require a SNI value to be sent by the client if certificate verification is turned on, we retain our ability to present certificates to the client which are accepted with a maximum likelihood.
| | | * adjust test certificate generationMaximilian Hils2015-11-0111-190/+142
| | | |
| | | * add test certificate generatorMaximilian Hils2015-10-1622-212/+277
| | | |
| | * | Set default cert expiry to <39 monthsMaximilian Hils2015-11-041-1/+2
| | | | | | | | | | | | This sould fix mitmproxy/mitmproxy#815
| | * | minor fixesMaximilian Hils2015-11-012-2/+2
| | |/
| | * fix testsMaximilian Hils2015-09-281-6/+6
| | |
| | * Merge branch 'http-models'Maximilian Hils2015-09-2828-853/+1320
| | |\
| | | * test response model, push coverage to 100% branch covMaximilian Hils2015-09-2711-172/+208
| | | |
| | | * improve request tests, coverage++Maximilian Hils2015-09-2612-296/+455
| | | |
| | | * refactor response modelMaximilian Hils2015-09-2616-274/+293
| | | |
| | | * refactor request modelMaximilian Hils2015-09-2617-345/+598
| | | |
| | * | properly adjust tests for 87566da3baMaximilian Hils2015-09-281-5/+1
| | | |
| | * | fix mitmproxy/mitmproxy#784Maximilian Hils2015-09-283-7/+7
| | |/
| | * minor fixesMaximilian Hils2015-09-252-18/+14
| | |
| | * also accept bytes as argumentsMaximilian Hils2015-09-221-6/+6
| | |
| | * Headers: return str on all Python versionsMaximilian Hils2015-09-2215-418/+443
| | |
| | * revert websocket changes from 73586b1bMaximilian Hils2015-09-211-10/+12
| | | | | | | | | | | | | | | | | | | | | The DEFAULT construct is very weird, but with None we apparently break pathod in some difficult-to-debug ways. Revisit once we do more here.
| | * Merge pull request #98 from Kriechi/masterThomas Kriechbaumer2015-09-212-18/+19
| | |\ | | | | | | | | backport changes
| | | * backport changesThomas Kriechbaumer2015-09-212-18/+19
| | |/
| | * minor encoding fixesMaximilian Hils2015-09-212-12/+12
| | |
| | * remove nose referencesMaximilian Hils2015-09-213-198/+167
| | |
| | * update appveyorMaximilian Hils2015-09-211-1/+1
| | |
| | * remove nose as a dependencyMaximilian Hils2015-09-211-2/+0
| | |
| | * always use py.testMaximilian Hils2015-09-213-2/+12
| | |
| | * test on pypy3Maximilian Hils2015-09-211-0/+3
| | |
| | * python 3++Maximilian Hils2015-09-2113-206/+250
| | |
| | * python3++Maximilian Hils2015-09-205-81/+73
| | |
| | * make tests compatible with py.testMaximilian Hils2015-09-203-71/+79
| | |
| | * python3++Maximilian Hils2015-09-203-14/+16
| | |
| | * python3++Maximilian Hils2015-09-207-28/+36
| | |
| | * python3++Maximilian Hils2015-09-208-55/+60
| | |
| | * improve http error messagesMaximilian Hils2015-09-191-4/+12
| | |
| | * experimental: don't interfere with headersMaximilian Hils2015-09-184-46/+17
| | |
| | * python3++Maximilian Hils2015-09-181-20/+20
| | |
| | * properly handle SNI IPsMaximilian Hils2015-09-182-11/+23
| | | | | | | | | | | | | | | | | | fixes mitmproxy/mitmproxy#772 We must use the ipaddress package here, because that's what cryptography uses. If we opt for something else, we have nasty namespace conflicts.
| | * fix py3 testsMaximilian Hils2015-09-171-1/+1
| | |
| | * fix testsMaximilian Hils2015-09-172-2/+4
| | |
| | * python3++Maximilian Hils2015-09-1711-143/+105
| | |
| | * clean up http message modelsMaximilian Hils2015-09-178-148/+83
| | |