Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ignore missing CN in certificates. fixes #169 | Maximilian Hils | 2013-12-12 | 1 | -1/+2 |
| | |||||
* | store resolved ip addresses, fixes #187 | Maximilian Hils | 2013-12-12 | 1 | -0/+3 |
| | |||||
* | ensure binary read on windows | Maximilian Hils | 2013-12-10 | 1 | -1/+2 |
| | |||||
* | remove code duplication in ProxyHandler by unifying read_transparent and ↵ | Maximilian Hils | 2013-12-09 | 1 | -25/+17 |
| | | | | read_reverse | ||||
* | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-12-08 | 1 | -24/+36 |
|\ | |||||
| * | Merge pull request #166 from ghjc/forward-proxy | Aldo Cortesi | 2013-12-08 | 1 | -2/+16 |
| |\ | | | | | | | Added -F http[s]://server:port option that allows MITM to forward traffi... | ||||
| | * | Added -F http[s]://server:port option that allows MITM to forward traffic to ↵ | JC | 2013-08-30 | 1 | -2/+16 |
| | | | | | | | | | | | | another http server upstream. | ||||
| * | | Merge pull request #170 from jsoriano/master | Aldo Cortesi | 2013-12-08 | 1 | -20/+17 |
| |\ \ | | | | | | | | | Reverse proxy works with SSL | ||||
| | * | | New method establish_ssl to avoid duplicated code | Jaime Soriano Pastor | 2013-09-26 | 1 | -29/+15 |
| | | | | |||||
| | * | | Reverse proxy works with SSL | Jaime Soriano Pastor | 2013-09-26 | 1 | -2/+13 |
| | |/ | |||||
| * | | Merge pull request #180 from mitmproxy/add_serverconnection_scripthook | Aldo Cortesi | 2013-12-08 | 1 | -0/+1 |
| |\ \ | | | | | | | | | Add serverconnection scripthook | ||||
| | * | | add serverconnect script hook | Maximilian Hils | 2013-11-18 | 1 | -0/+1 |
| | |/ | |||||
| * / | attempt to fix https://github.com/mitmproxy/netlib/issues/24 | Maximilian Hils | 2013-11-19 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-09-14 | 1 | -2/+5 |
|\| | |||||
| * | Tweak timing display | Aldo Cortesi | 2013-08-23 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | - Remove elapsed time. Space is at a premium here, and this is somewhat redundant with the rate figure. We should display complete timing information somewhere in the detailed flow view. - Tone down the colour. Reserve highlights for stuff that should really pop out to the user. - Make rate calculation more acurate. Include header sizes. Use response start and end time, rather than request end and response end. This means that we show actual transfer rates, not including DNS requests and so forth. | ||||
* | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-08-17 | 1 | -55/+15 |
|\| | |||||
| * | Revamp dummy cert store | Aldo Cortesi | 2013-08-12 | 1 | -18/+4 |
| | | | | | | | | | | | | We no longer keep these on disk. This is for a number of reasons, including some race conditions and the fact that some valid IDNA-encoded domain names are not valid file names on Windows. | ||||
| * | Better handling of cert errors on connection. | Aldo Cortesi | 2013-08-10 | 1 | -1/+1 |
| | | |||||
| * | Remove GPL notices left in source files after our change to the MIT license. | Aldo Cortesi | 2013-08-01 | 1 | -14/+0 |
| | | | | | | | | Thanks to Roy Shamir for reporting this. | ||||
| * | Make use of a change to netlib.tcp that clarifies error conditions for flush ↵ | Aldo Cortesi | 2013-07-30 | 1 | -5/+2 |
| | | | | | | | | | | | | and close. Should fix #144. | ||||
| * | fix #144 | Maximilian Hils | 2013-07-28 | 1 | -1/+1 |
| | | | | | | netlib wraps IOError in NetLibDisconnect, so we need to cover this as well. | ||||
| * | Terminate can be called on an unconnected server connection. | Aldo Cortesi | 2013-07-28 | 1 | -8/+9 |
| | | |||||
| * | 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 |
| | | |||||
* | | fix send_error behavior if there are no headers | Maximilian Hils | 2013-06-17 | 1 | -2/+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 |
| |