diff options
| -rw-r--r-- | libmproxy/exceptions.py | 9 | ||||
| -rw-r--r-- | libmproxy/models/__init__.py | 4 | ||||
| -rw-r--r-- | libmproxy/protocol/tls.py | 1 |
3 files changed, 4 insertions, 10 deletions
diff --git a/libmproxy/exceptions.py b/libmproxy/exceptions.py index 03ddcb3d..d916f457 100644 --- a/libmproxy/exceptions.py +++ b/libmproxy/exceptions.py @@ -11,15 +11,8 @@ from __future__ import (absolute_import, print_function, division) class ProxyException(Exception): """ Base class for all exceptions thrown by libmproxy. - - Args: - message: the error message - cause: (optional) an error object that caused this exception, e.g. an IOError. """ - def __init__(self, message): - """ - :param message: Error Message - """ + def __init__(self, message=None): super(ProxyException, self).__init__(message) diff --git a/libmproxy/models/__init__.py b/libmproxy/models/__init__.py index a54f305f..ff1bcbc1 100644 --- a/libmproxy/models/__init__.py +++ b/libmproxy/models/__init__.py @@ -1,14 +1,14 @@ from __future__ import (absolute_import, print_function, division) from .http import ( - HTTPFlow, HTTPRequest, HTTPResponse, decoded, + HTTPFlow, HTTPRequest, HTTPResponse, Headers, decoded, make_error_response, make_connect_request, make_connect_response ) from .connections import ClientConnection, ServerConnection from .flow import Flow, Error __all__ = [ - "HTTPFlow", "HTTPRequest", "HTTPResponse", "decoded", + "HTTPFlow", "HTTPRequest", "HTTPResponse", "Headers", "decoded", "make_error_response", "make_connect_request", "make_connect_response", "ClientConnection", "ServerConnection", diff --git a/libmproxy/protocol/tls.py b/libmproxy/protocol/tls.py index 4f7c9300..2935ca9f 100644 --- a/libmproxy/protocol/tls.py +++ b/libmproxy/protocol/tls.py @@ -227,6 +227,7 @@ class TlsLayer(Layer): def __init__(self, ctx, client_tls, server_tls): self.client_sni = None self.client_alpn_protocols = None + self.client_ciphers = [] super(TlsLayer, self).__init__(ctx) self._client_tls = client_tls |