diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-09-25 18:24:18 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-25 18:24:18 +0200 |
commit | 45f2ea33b2fdb67ca89e7eedd860ebe683770497 (patch) | |
tree | 3d6be081914c3ab58d26e8bc82c494e159c17e30 /netlib/websockets | |
parent | c7b83225001505b32905376703ec7ddaf200af44 (diff) | |
download | mitmproxy-45f2ea33b2fdb67ca89e7eedd860ebe683770497.tar.gz mitmproxy-45f2ea33b2fdb67ca89e7eedd860ebe683770497.tar.bz2 mitmproxy-45f2ea33b2fdb67ca89e7eedd860ebe683770497.zip |
minor fixes
Diffstat (limited to 'netlib/websockets')
-rw-r--r-- | netlib/websockets/protocol.py | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/netlib/websockets/protocol.py b/netlib/websockets/protocol.py index e62f8df6..1e95fa1c 100644 --- a/netlib/websockets/protocol.py +++ b/netlib/websockets/protocol.py @@ -25,10 +25,6 @@ from ..http import Headers websockets_magic = b'258EAFA5-E914-47DA-95CA-C5AB0DC85B11' VERSION = "13" -HEADER_WEBSOCKET_KEY = 'sec-websocket-key' -HEADER_WEBSOCKET_ACCEPT = 'sec-websocket-accept' -HEADER_WEBSOCKET_VERSION = 'sec-websocket-version' - class Masker(object): @@ -81,37 +77,37 @@ class WebsocketsProtocol(object): """ if not key: key = base64.b64encode(os.urandom(16)).decode('ascii') - return Headers(**{ - HEADER_WEBSOCKET_KEY: key, - HEADER_WEBSOCKET_VERSION: version, - "Connection": "Upgrade", - "Upgrade": "websocket", - }) + return Headers( + sec_websocket_key=key, + sec_websocket_version=version, + connection="Upgrade", + upgrade="websocket", + ) @classmethod def server_handshake_headers(self, key): """ The server response is a valid HTTP 101 response. """ - return Headers(**{ - HEADER_WEBSOCKET_ACCEPT: self.create_server_nonce(key), - "connection": "Upgrade", - "upgrade": "websocket", - }) + return Headers( + sec_websocket_accept=self.create_server_nonce(key), + connection="Upgrade", + upgrade="websocket" + ) @classmethod def check_client_handshake(self, headers): if headers.get("upgrade") != "websocket": return - return headers.get(HEADER_WEBSOCKET_KEY) + return headers.get("sec-websocket-key") @classmethod def check_server_handshake(self, headers): if headers.get("upgrade") != "websocket": return - return headers.get(HEADER_WEBSOCKET_ACCEPT) + return headers.get("sec-websocket-accept") @classmethod |