Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow to accept websocket extensions #331

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,20 @@ should start with a slash, but not end with one; for example::
daphne --root-path=/forum django_project.asgi:application


Permessage compression
----------------------

Daphne supports and by default accepts ``permessage-deflate`` compression
(`permessage-deflate specification <http://tools.ietf.org/html/draft-ietf-hybi-permessage-compression>`_).
Additional ``permessage-bzip2``, ``permessage-snappy`` compressions will be also enabled by default if
``bz2`` and `snappy <https://snappy.math.uic.edu/>`_ python packages are available in daphne environment.
The compression implementation is provided by
`Autobahn|Python <https://github.com/crossbario/autobahn-python>`_ package, see:
`permessage-deflate <https://github.com/crossbario/autobahn-python/blob/master/autobahn/websocket/compress_deflate.py>`_,
`permessage-bzip2 <https://github.com/crossbario/autobahn-python/blob/master/autobahn/websocket/compress_bzip2.py>`_,
`permessage-snappy <https://github.com/crossbario/autobahn-python/blob/master/autobahn/websocket/compress_snappy.py>`_.


Python Support
--------------

Expand Down
25 changes: 25 additions & 0 deletions daphne/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from concurrent.futures import CancelledError
from functools import partial

from autobahn.websocket.compress import PERMESSAGE_COMPRESSION_EXTENSION as EXTENSIONS
from twisted.internet import defer, reactor
from twisted.internet.endpoints import serverFromString
from twisted.logger import STDLibLogObserver, globalLogBeginner
Expand All @@ -55,6 +56,11 @@ def __init__(
request_buffer_size=8192,
websocket_timeout=86400,
websocket_connect_timeout=20,
websocket_permessage_compression_extensions=(
"permessage-deflate",
"permessage-bzip2",
"permessage-snappy",
),
ping_interval=20,
ping_timeout=30,
root_path="",
Expand Down Expand Up @@ -83,6 +89,9 @@ def __init__(
self.websocket_timeout = websocket_timeout
self.websocket_connect_timeout = websocket_connect_timeout
self.websocket_handshake_timeout = websocket_handshake_timeout
self.websocket_permessage_compression_extensions = (
websocket_permessage_compression_extensions
)
self.application_close_timeout = application_close_timeout
self.root_path = root_path
self.verbosity = verbosity
Expand All @@ -104,6 +113,7 @@ def run(self):
autoPingTimeout=self.ping_timeout,
allowNullOrigin=True,
openHandshakeTimeout=self.websocket_handshake_timeout,
perMessageCompressionAccept=self.accept_permessage_compression_extension,
)
if self.verbosity <= 1:
# Redirect the Twisted log to nowhere
Expand Down Expand Up @@ -258,6 +268,21 @@ def check_headers_type(message):
)
)

def accept_permessage_compression_extension(self, offers):
"""
Accepts websocket compression extension as required by `autobahn` package.
"""
for offer in offers:
for ext in self.websocket_permessage_compression_extensions:
if ext in EXTENSIONS and isinstance(offer, EXTENSIONS[ext]["Offer"]):
return EXTENSIONS[ext]["OfferAccept"](offer)
elif ext not in EXTENSIONS:
logger.warning(
"Compression extension %s could not be accepted. "
"It is not supported or a dependency is missing.",
ext,
)

### Utility

def application_checker(self):
Expand Down
13 changes: 10 additions & 3 deletions daphne/ws_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,10 @@ def handle_reply(self, message):
if "type" not in message:
raise ValueError("Message has no type defined")
if message["type"] == "websocket.accept":
self.serverAccept(message.get("subprotocol", None))
self.serverAccept(
message.get("subprotocol", None), message.get("headers", None)
)

elif message["type"] == "websocket.close":
if self.state == self.STATE_CONNECTING:
self.serverReject()
Expand Down Expand Up @@ -214,11 +217,15 @@ def handle_exception(self, exception):
else:
self.sendCloseFrame(code=1011)

def serverAccept(self, subprotocol=None):
def serverAccept(self, subprotocol=None, headers=None):
"""
Called when we get a message saying to accept the connection.
"""
self.handshake_deferred.callback(subprotocol)
if headers is None:
self.handshake_deferred.callback(subprotocol)
else:
headers_dict = {key.decode(): value.decode() for key, value in headers}
self.handshake_deferred.callback((subprotocol, headers_dict))
del self.handshake_deferred
logger.debug("WebSocket %s accepted by application", self.client_addr)

Expand Down
54 changes: 54 additions & 0 deletions tests/test_websocket.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,60 @@ def test_subprotocols(self):
self.assert_valid_websocket_scope(scope, subprotocols=subprotocols)
self.assert_valid_websocket_connect_message(messages[0])

def test_accept_permessage_deflate_extension(self):
"""
Tests that permessage-deflate extension is successfuly accepted
by underlying `autobahn` package.
"""

headers = [
(
b"Sec-WebSocket-Extensions",
b"permessage-deflate; client_max_window_bits",
),
]

with DaphneTestingInstance() as test_app:
test_app.add_send_messages(
[
{
"type": "websocket.accept",
}
]
)

sock, subprotocol = self.websocket_handshake(
test_app,
headers=headers,
)
# Validate the scope and messages we got
scope, messages = test_app.get_received()
self.assert_valid_websocket_connect_message(messages[0])

def test_accept_custom_extension(self):
"""
Tests that custom headers can be accpeted during handshake.
"""
with DaphneTestingInstance() as test_app:
test_app.add_send_messages(
[
{
"type": "websocket.accept",
"headers": [(b"Sec-WebSocket-Extensions", b"custom-extension")],
}
]
)

sock, subprotocol = self.websocket_handshake(
test_app,
headers=[
(b"Sec-WebSocket-Extensions", b"custom-extension"),
],
)
# Validate the scope and messages we got
scope, messages = test_app.get_received()
self.assert_valid_websocket_connect_message(messages[0])

def test_xff(self):
"""
Tests that X-Forwarded-For headers get parsed right
Expand Down