diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-03-02 22:15:53 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-03-02 22:15:53 +1300 |
| commit | 32af66881465ae98a53665c8ddd42c02aaf492f7 (patch) | |
| tree | 8984887a813e48cd0f64e8e9896f6889f27a9287 /libmproxy | |
| parent | 875f5f8cb65a254c40816e7cda0e4be96384ac16 (diff) | |
| download | mitmproxy-32af66881465ae98a53665c8ddd42c02aaf492f7.tar.gz mitmproxy-32af66881465ae98a53665c8ddd42c02aaf492f7.tar.bz2 mitmproxy-32af66881465ae98a53665c8ddd42c02aaf492f7.zip | |
Minor cleanups.
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/protocol/__init__.py | 5 | ||||
| -rw-r--r-- | libmproxy/protocol/tcp.py | 13 | ||||
| -rw-r--r-- | libmproxy/proxy.py | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/libmproxy/protocol/__init__.py b/libmproxy/protocol/__init__.py index 580d693c..2c2e7285 100644 --- a/libmproxy/protocol/__init__.py +++ b/libmproxy/protocol/__init__.py @@ -35,7 +35,6 @@ class TemporaryServerChangeMixin(object): This mixin allows safe modification of the target server, without any need to expose the ConnectionHandler to the Flow. """ - def change_server(self, address, ssl): if address == self.c.server_conn.address(): return @@ -98,4 +97,6 @@ def handle_messages(conntype, connection_handler): def handle_error(conntype, connection_handler, error): - return _handler(conntype, connection_handler).handle_error(error)
\ No newline at end of file + return _handler(conntype, connection_handler).handle_error(error) + + diff --git a/libmproxy/protocol/tcp.py b/libmproxy/protocol/tcp.py index df7e6692..1591eb04 100644 --- a/libmproxy/protocol/tcp.py +++ b/libmproxy/protocol/tcp.py @@ -32,12 +32,11 @@ class TCPHandler(ProtocolHandler): if d == "": # connection closed break data.write(d) - - """ - OpenSSL Connections have an internal buffer that might contain data altough everything is read - from the socket. Thankfully, connection.pending() returns the amount of bytes in this buffer, - so we can read it completely at once. - """ + # OpenSSL Connections have an internal buffer that might + # contain data altough everything is read from the socket. + # Thankfully, connection.pending() returns the amount of + # bytes in this buffer, so we can read it completely at + # once. if src.ssl_established: data.write(rfile.read(src.connection.pending())) else: # no data left, but not closed yet @@ -57,4 +56,4 @@ class TCPHandler(ProtocolHandler): self.c.log("%s %s\r\n%s" % (direction, dst_str,data)) dst.wfile.write(data) - dst.wfile.flush()
\ No newline at end of file + dst.wfile.flush() diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index b787386a..b0fb9449 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -387,7 +387,6 @@ class ConnectionHandler: if self.client_conn.ssl_established: raise ProxyError(502, "SSL to Client already established.") dummycert = self.find_cert() - print self.config.ciphers self.client_conn.convert_to_ssl( dummycert, self.config.keyfile or self.config.cacert, @@ -469,7 +468,6 @@ class ProxyServerError(Exception): class ProxyServer(tcp.TCPServer): allow_reuse_address = True bound = True - def __init__(self, config, port, host='', server_version=version.NAMEVERSION): """ Raises ProxyServerError if there's a startup problem. |