Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Properly terminate SSL server connections. | Aldo Cortesi | 2013-07-28 | 1 | -1/+3 |
| | | | | | | Before, we had dangling SSL server connections causing resource exhaustion. I believe this fixe #144 and #153 | ||||
* | Move app instantiation out of proxy.py. | Aldo Cortesi | 2013-07-24 | 1 | -17/+2 |
| | |||||
* | Don't take minor version into account when checking serialized data ↵ | Aldo Cortesi | 2013-07-13 | 1 | -1/+1 |
| | | | | compatiblity. | ||||
* | proxy.py: Catch channel.ask() returning None when terminating | Matthias Urlichs | 2013-06-28 | 1 | -1/+1 |
| | |||||
* | Close connection when flush fails | Matthias Urlichs | 2013-06-26 | 1 | -0/+3 |
| | |||||
* | Merge pull request #107 from rouli/master | Aldo Cortesi | 2013-04-19 | 1 | -0/+8 |
|\ | | | | | Adding remote TCP and SSL setup timestamps | ||||
| * | adding tcp and ssl setup timestamps to get better resolution on flows ↵ | Rouli | 2013-03-19 | 1 | -0/+8 |
| | | | | | | | | performance | ||||
* | | Add a basic built-in web app. | Aldo Cortesi | 2013-03-25 | 1 | -3/+19 |
| | | |||||
* | | Trim docs. | Aldo Cortesi | 2013-03-23 | 1 | -0/+2 |
|/ | |||||
* | Fix bug that caused mis-identification of some HTTPS connections in ↵ | Aldo Cortesi | 2013-03-17 | 1 | -10/+11 |
| | | | | transparent mode. | ||||
* | Fuzzing, and fixes for errors found with fuzzing. | Aldo Cortesi | 2013-03-03 | 1 | -1/+2 |
| | |||||
* | 100% unit test coverage on proxy.py. Hallelujah! | Aldo Cortesi | 2013-03-03 | 1 | -5/+2 |
| | |||||
* | Unit test proxy option parsing. | Aldo Cortesi | 2013-03-03 | 1 | -11/+11 |
| | |||||
* | Move HTTP auth module to netlib. | Aldo Cortesi | 2013-03-03 | 1 | -7/+6 |
| | |||||
* | Extend unit tests for proxy.py to some tricky cases. | Aldo Cortesi | 2013-03-02 | 1 | -24/+22 |
| | |||||
* | Test cert generation errors. | Aldo Cortesi | 2013-03-02 | 1 | -1/+1 |
| | |||||
* | Test SNI for transparent mode. | Aldo Cortesi | 2013-03-02 | 1 | -1/+7 |
| | |||||
* | Test SNI for ordinary proxy connections. | Aldo Cortesi | 2013-03-02 | 1 | -9/+10 |
| | |||||
* | New SNI handling mechanism. | Aldo Cortesi | 2013-03-01 | 1 | -18/+39 |
| | |||||
* | Significantly simplify server connection handling, and test. | Aldo Cortesi | 2013-02-24 | 1 | -31/+35 |
| | |||||
* | Refactor to prepare for SNI fixes. | Aldo Cortesi | 2013-02-24 | 1 | -50/+49 |
| | |||||
* | Handle server disconnects better. | Aldo Cortesi | 2013-02-24 | 1 | -10/+29 |
| | | | | | | | | Server connections can be closed for legitimate reasons, like timeouts. If we've already pumped data over a server connection, we reconnect on error. If not, we treat it as a legitimate error and pass it on to the client. Fixes #85 | ||||
* | Unit test dummy response functions. | Aldo Cortesi | 2013-02-23 | 1 | -1/+2 |
| | |||||
* | Refactor proxy core communications to be clearer. | Aldo Cortesi | 2013-02-23 | 1 | -20/+26 |
| | |||||
* | Significantly refactor the master/slave message passing interface. | Aldo Cortesi | 2013-02-17 | 1 | -22/+21 |
| | |||||
* | Unit tests for ServerConnectionPool | Aldo Cortesi | 2013-01-29 | 1 | -0/+1 |
| | |||||
* | Stub implementation of a server connection pool. | Aldo Cortesi | 2013-01-29 | 1 | -21/+27 |
| | |||||
* | Unravel enormously long read_request into three distinct methods. | Aldo Cortesi | 2013-01-28 | 1 | -80/+102 |
| | |||||
* | Test suite, remove extraneous code. | Aldo Cortesi | 2013-01-28 | 1 | -5/+2 |
| | |||||
* | Add tests for client certificate support. | Aldo Cortesi | 2013-01-20 | 1 | -2/+0 |
| | |||||
* | Rudimentary testing for client certs. | Aldo Cortesi | 2013-01-18 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2013-01-18 | 1 | -5/+8 |
|\ | | | | | | | | | Conflicts: test/test_server.py | ||||
| * | Merge remote-tracking branch 'upstream/master' | Rouli | 2013-01-17 | 1 | -36/+29 |
| |\ | |||||
| * | | changing requests and responses to have two timestamps, one marking their ↵ | Rouli | 2013-01-17 | 1 | -5/+8 |
| | | | | | | | | | | | | initiation, and the other their complete | ||||
* | | | Unit tests and minor code refactoring for ServerConnection. | Aldo Cortesi | 2013-01-05 | 1 | -6/+6 |
| |/ |/| | |||||
* | | Remove cert_wait_time flag. | Aldo Cortesi | 2013-01-06 | 1 | -6/+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 Cortesi | 2013-01-06 | 1 | -14/+5 |
| | | |||||
* | | Minor cleanups of proxy request handling. | Aldo Cortesi | 2013-01-04 | 1 | -3/+5 |
| | | |||||
* | | Refactor proxy auth a bit | Aldo Cortesi | 2013-01-02 | 1 | -11/+6 |
| | | | | | | | | | | | | - 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 | ||||
* | | Better error handling for transparent mode remote address resolution. | Aldo Cortesi | 2013-01-01 | 1 | -1/+4 |
| | | |||||
* | | More work on proxy auth | Aldo Cortesi | 2012-12-31 | 1 | -7/+10 |
| | | | | | | | | | | | | - 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 | ||||
* | | Start solidifying proxy authentication | Aldo Cortesi | 2012-12-31 | 1 | -2/+6 |
|/ | | | | | | - Add a unit test file - Remove some extraneous methods - Change the auth API to make the authenticate method take a header object. | ||||
* | adding some simple authetication code to limit proxy access | israel | 2012-12-30 | 1 | -28/+51 |
| | |||||
* | Stub out ctypes structures for OSX transparent mode. | Aldo Cortesi | 2012-09-17 | 1 | -1/+1 |
| | |||||
* | Catch a potential exception on connection finalization. | Aldo Cortesi | 2012-09-14 | 1 | -1/+4 |
| | |||||
* | Command-line options for header setting. | Aldo Cortesi | 2012-08-19 | 1 | -0/+5 |
| | |||||
* | use argparse instead of optparse | Maximilian Hils | 2012-08-17 | 1 | -7/+6 |
| | |||||
* | Adds --dummy-certs option to specify certdir | Jim Lloyd | 2012-08-06 | 1 | -6/+18 |
| | | | | | | 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. | ||||
* | Handle invalid headers. | Aldo Cortesi | 2012-07-30 | 1 | -0/+8 |
| | |||||
* | Only log real errors in WSGI apps. | Aldo Cortesi | 2012-07-24 | 1 | -1/+1 |
| |