aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 0.10Maximilian Hils2013-09-141-2/+5
|\
| * Tweak timing displayAldo Cortesi2013-08-231-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.10Maximilian Hils2013-08-171-55/+15
|\|
| * Revamp dummy cert storeAldo Cortesi2013-08-121-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 Cortesi2013-08-101-1/+1
| |
| * Remove GPL notices left in source files after our change to the MIT license.Aldo Cortesi2013-08-011-14/+0
| | | | | | | | Thanks to Roy Shamir for reporting this.
| * Make use of a change to netlib.tcp that clarifies error conditions for flush ↵Aldo Cortesi2013-07-301-5/+2
| | | | | | | | | | | | and close. Should fix #144.
| * fix #144Maximilian Hils2013-07-281-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 Cortesi2013-07-281-8/+9
| |
| * Properly terminate SSL server connections.Aldo Cortesi2013-07-281-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 Cortesi2013-07-241-17/+2
| |
| * Don't take minor version into account when checking serialized data ↵Aldo Cortesi2013-07-131-1/+1
| | | | | | | | compatiblity.
| * proxy.py: Catch channel.ask() returning None when terminatingMatthias Urlichs2013-06-281-1/+1
| |
| * Close connection when flush failsMatthias Urlichs2013-06-261-0/+3
| |
* | fix send_error behavior if there are no headersMaximilian Hils2013-06-171-2/+3
|/
* Merge pull request #107 from rouli/masterAldo Cortesi2013-04-191-0/+8
|\ | | | | Adding remote TCP and SSL setup timestamps
| * adding tcp and ssl setup timestamps to get better resolution on flows ↵Rouli2013-03-191-0/+8
| | | | | | | | performance
* | Add a basic built-in web app.Aldo Cortesi2013-03-251-3/+19
| |
* | Trim docs.Aldo Cortesi2013-03-231-0/+2
|/
* Fix bug that caused mis-identification of some HTTPS connections in ↵Aldo Cortesi2013-03-171-10/+11
| | | | transparent mode.
* Fuzzing, and fixes for errors found with fuzzing.Aldo Cortesi2013-03-031-1/+2
|
* 100% unit test coverage on proxy.py. Hallelujah!Aldo Cortesi2013-03-031-5/+2
|
* Unit test proxy option parsing.Aldo Cortesi2013-03-031-11/+11
|
* Move HTTP auth module to netlib.Aldo Cortesi2013-03-031-7/+6
|
* Extend unit tests for proxy.py to some tricky cases.Aldo Cortesi2013-03-021-24/+22
|
* Test cert generation errors.Aldo Cortesi2013-03-021-1/+1
|
* Test SNI for transparent mode.Aldo Cortesi2013-03-021-1/+7
|
* Test SNI for ordinary proxy connections.Aldo Cortesi2013-03-021-9/+10
|
* New SNI handling mechanism.Aldo Cortesi2013-03-011-18/+39
|
* Significantly simplify server connection handling, and test.Aldo Cortesi2013-02-241-31/+35
|
* Refactor to prepare for SNI fixes.Aldo Cortesi2013-02-241-50/+49
|
* Handle server disconnects better.Aldo Cortesi2013-02-241-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 Cortesi2013-02-231-1/+2
|
* Refactor proxy core communications to be clearer.Aldo Cortesi2013-02-231-20/+26
|
* Significantly refactor the master/slave message passing interface.Aldo Cortesi2013-02-171-22/+21
|
* Unit tests for ServerConnectionPoolAldo Cortesi2013-01-291-0/+1
|
* Stub implementation of a server connection pool.Aldo Cortesi2013-01-291-21/+27
|
* Unravel enormously long read_request into three distinct methods.Aldo Cortesi2013-01-281-80/+102
|
* Test suite, remove extraneous code.Aldo Cortesi2013-01-281-5/+2
|
* Add tests for client certificate support.Aldo Cortesi2013-01-201-2/+0
|
* Rudimentary testing for client certs.Aldo Cortesi2013-01-181-1/+1
|
* Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-01-181-5/+8
|\ | | | | | | | | Conflicts: test/test_server.py
| * Merge remote-tracking branch 'upstream/master'Rouli2013-01-171-36/+29
| |\
| * | changing requests and responses to have two timestamps, one marking their ↵Rouli2013-01-171-5/+8
| | | | | | | | | | | | initiation, and the other their complete
* | | Unit tests and minor code refactoring for ServerConnection.Aldo Cortesi2013-01-051-6/+6
| |/ |/|
* | Remove cert_wait_time flag.Aldo Cortesi2013-01-061-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 Cortesi2013-01-061-14/+5
| |
* | Minor cleanups of proxy request handling.Aldo Cortesi2013-01-041-3/+5
| |
* | Refactor proxy auth a bitAldo Cortesi2013-01-021-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 Cortesi2013-01-011-1/+4
| |
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-12 06:26:46 +0000