.flake8

@@ -1,11 +0,0 @@
-[flake8]
-exclude =
-    .venv,
-    .tox,
-    docs,
-    testproject,
-    js_client,
-    .eggs
-
-extend-ignore = E123, E128, E266, E402, W503, E731, W601, B036
-max-line-length = 120

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: github-actions
-  directory: "/"
-  schedule:
-    interval: weekly

.github/workflows/tests.yml

@@ -5,10 +5,6 @@ on:
     branches:
       - main
   pull_request:
-  workflow_dispatch:
-
-permissions:
-  contents: read
 
 jobs:
   tests:
@@ -20,24 +16,23 @@ jobs:
           - ubuntu
           - windows
         python-version:
+        - "3.7"
+        - "3.8"
         - "3.9"
         - "3.10"
-        - "3.11"
-        - "3.12"
-        - "3.13"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade tox
+          python -m pip install --upgrade tox tox-py
 
       - name: Run tox targets for ${{ matrix.python-version }}
-        run: tox run -f py$(echo ${{ matrix.python-version }} | tr -d .)
+        run: tox --py current

.gitignore

@@ -13,4 +13,3 @@ test_consumer*
 .python-version
 .pytest_cache/
 .vscode
-.coverage

.pre-commit-config.yaml

@@ -1,23 +1,21 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.1
+    rev: v2.38.2
     hooks:
       - id: pyupgrade
-        args: [--py39-plus]
+        args: [--py36-plus]
   - repo: https://github.com/psf/black
-    rev: 25.1.0
+    rev: 22.8.0
     hooks:
       - id: black
         language_version: python3
   - repo: https://github.com/pycqa/isort
-    rev: 6.0.1
+    rev: 5.10.1
     hooks:
       - id: isort
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.2.0
+    rev: 5.0.4
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-bugbear
-ci:
-  autoupdate_schedule: quarterly

CHANGELOG.txt

@@ -1,37 +1,3 @@
-4.2.0 (to be released)
-------------------
-
-* Added support for Python 3.13.
-
-* Drop support for EOL Python 3.8.
-
-* Removed unused pytest-runner
-
-* Fixed sdist file to ensure it includes all tests
-
-4.1.2 (2024-04-11)
-------------------
-
-* Fixed a setuptools configuration error in 4.1.1.
-
-4.1.1 (2024-04-10)
-------------------
-
-* Fixed a twisted.plugin packaging error in 4.1.0.
-
-  Thanks to sdc50.
-
-4.1.0 (2024-02-10)
-------------------
-
-* Added support for Python 3.12.
-
-* Dropped support for EOL Python 3.7.
-
-* Handled root path for websocket scopes.
-
-* Validate HTTP header names as per RFC 9110.
-
 4.0.0 (2022-10-07)
 ------------------
 

MANIFEST.in

@@ -1,2 +1 @@
 include LICENSE
-recursive-include tests *.py

README.rst

@@ -54,7 +54,7 @@ Daphne supports terminating HTTP/2 connections natively. You'll
 need to do a couple of things to get it working, though. First, you need to
 make sure you install the Twisted ``http2`` and ``tls`` extras::
 
-    pip install -U "Twisted[tls,http2]"
+    pip install -U 'Twisted[tls,http2]'
 
 Next, because all current browsers only support HTTP/2 when using TLS, you will
 need to start Daphne with TLS turned on, which can be done using the Twisted endpoint syntax::
@@ -108,7 +108,7 @@ should start with a slash, but not end with one; for example::
 Python Support
 --------------
 
-Daphne requires Python 3.9 or later.
+Daphne requires Python 3.7 or later.
 
 
 Contributing

daphne/__init__.py

@@ -1,6 +1,6 @@
 import sys
 
-__version__ = "4.1.3"
+__version__ = "4.0.0"
 
 
 # Windows on Python 3.8+ uses ProactorEventLoop, which is not compatible with

daphne/cli.py

@@ -270,16 +270,16 @@ class CommandLineInterface:
             websocket_connect_timeout=args.websocket_connect_timeout,
             websocket_handshake_timeout=args.websocket_connect_timeout,
             application_close_timeout=args.application_close_timeout,
-            action_logger=(
+            action_logger=AccessLogGenerator(access_log_stream)
-                AccessLogGenerator(access_log_stream) if access_log_stream else None
+            if access_log_stream
-            ),
+            else None,
             root_path=args.root_path,
             verbosity=args.verbosity,
             proxy_forwarded_address_header=self._get_forwarded_host(args=args),
             proxy_forwarded_port_header=self._get_forwarded_port(args=args),
-            proxy_forwarded_proto_header=(
+            proxy_forwarded_proto_header="X-Forwarded-Proto"
-                "X-Forwarded-Proto" if args.proxy_headers else None
+            if args.proxy_headers
-            ),
+            else None,
             server_name=args.server_name,
         )
         self.server.run()

daphne/http_protocol.py

@@ -9,7 +9,7 @@ from twisted.protocols.policies import ProtocolWrapper
 from twisted.web import http
 from zope.interface import implementer
 
-from .utils import HEADER_NAME_RE, parse_x_forwarded_for
+from .utils import parse_x_forwarded_for
 
 logger = logging.getLogger(__name__)
 
@@ -69,13 +69,6 @@ class WebRequest(http.Request):
     def process(self):
         try:
             self.request_start = time.time()
-
-            # Validate header names.
-            for name, _ in self.requestHeaders.getAllRawHeaders():
-                if not HEADER_NAME_RE.fullmatch(name):
-                    self.basic_error(400, b"Bad Request", "Invalid header name")
-                    return
-
             # Get upgrade header
             upgrade_header = None
             if self.requestHeaders.hasHeader(b"Upgrade"):
@@ -286,11 +279,9 @@ class WebRequest(http.Request):
                             "path": uri,
                             "status": self.code,
                             "method": self.method.decode("ascii", "replace"),
-                            "client": (
+                            "client": "%s:%s" % tuple(self.client_addr)
-                                "%s:%s" % tuple(self.client_addr)
                             if self.client_addr
-                                else None
+                            else None,
-                            ),
                             "time_taken": self.duration(),
                             "size": self.sentLength,
                         },

daphne/management/commands/runserver.py

@@ -73,18 +73,6 @@ class Command(RunserverCommand):
                 "seconds (default: 5)"
             ),
         )
-        parser.add_argument(
-            "--nostatic",
-            action="store_false",
-            dest="use_static_handler",
-            help="Tells Django to NOT automatically serve static files at STATIC_URL.",
-        )
-        parser.add_argument(
-            "--insecure",
-            action="store_true",
-            dest="insecure_serving",
-            help="Allows serving static files even if DEBUG is False.",
-        )
 
     def handle(self, *args, **options):
         self.http_timeout = options.get("http_timeout", None)

daphne/server.py

@@ -21,7 +21,6 @@ if current_reactor is not None:
             + "you can fix this warning by importing daphne.server early in your codebase or "
             + "finding the package that imports Twisted and importing it later on.",
             UserWarning,
-            stacklevel=2,
         )
         del sys.modules["twisted.internet.reactor"]
         asyncioreactor.install(twisted_loop)

daphne/testing.py

@@ -158,7 +158,7 @@ class DaphneProcess(multiprocessing.Process):
                 application=application,
                 endpoints=endpoints,
                 signal_handlers=False,
-                **self.kwargs,
+                **self.kwargs
             )
             # Set up a poller to look for the port
             reactor.callLater(0.1, self.resolve_port)

daphne/utils.py

@@ -1,12 +1,7 @@
 import importlib
-import re
 
 from twisted.web.http_headers import Headers
 
-# Header name regex as per h11.
-# https://github.com/python-hyper/h11/blob/a2c68948accadc3876dffcf979d98002e4a4ed27/h11/_abnf.py#L10-L21
-HEADER_NAME_RE = re.compile(rb"[-!#$%&'*+.^_`|~0-9a-zA-Z]+")
-
 
 def import_by_path(path):
     """

daphne/ws_protocol.py

@@ -31,20 +31,16 @@ class WebSocketProtocol(WebSocketServerProtocol):
         self.server.protocol_connected(self)
         self.request = request
         self.protocol_to_accept = None
-        self.root_path = self.server.root_path
         self.socket_opened = time.time()
         self.last_ping = time.time()
         try:
-            # Sanitize and decode headers, potentially extracting root path
+            # Sanitize and decode headers
             self.clean_headers = []
             for name, value in request.headers.items():
                 name = name.encode("ascii")
                 # Prevent CVE-2015-0219
                 if b"_" in name:
                     continue
-                if name.lower() == b"daphne-root-path":
-                    self.root_path = unquote(value)
-                else:
                 self.clean_headers.append((name.lower(), value.encode("latin1")))
             # Get client address if possible
             peer = self.transport.getPeer()
@@ -80,7 +76,6 @@ class WebSocketProtocol(WebSocketServerProtocol):
                     "type": "websocket",
                     "path": unquote(self.path.decode("ascii")),
                     "raw_path": self.path,
-                    "root_path": self.root_path,
                     "headers": self.clean_headers,
                     "query_string": self._raw_query_string,  # Passed by HTTP protocol
                     "client": self.client_addr,
@@ -115,9 +110,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
             "connecting",
             {
                 "path": self.request.path,
-                "client": (
+                "client": "%s:%s" % tuple(self.client_addr)
-                    "%s:%s" % tuple(self.client_addr) if self.client_addr else None
+                if self.client_addr
-                ),
+                else None,
             },
         )
 
@@ -138,9 +133,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
             "connected",
             {
                 "path": self.request.path,
-                "client": (
+                "client": "%s:%s" % tuple(self.client_addr)
-                    "%s:%s" % tuple(self.client_addr) if self.client_addr else None
+                if self.client_addr
-                ),
+                else None,
             },
         )
 
@@ -175,9 +170,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
             "disconnected",
             {
                 "path": self.request.path,
-                "client": (
+                "client": "%s:%s" % tuple(self.client_addr)
-                    "%s:%s" % tuple(self.client_addr) if self.client_addr else None
+                if self.client_addr
-                ),
+                else None,
             },
         )
 
@@ -242,9 +237,9 @@ class WebSocketProtocol(WebSocketServerProtocol):
             "rejected",
             {
                 "path": self.request.path,
-                "client": (
+                "client": "%s:%s" % tuple(self.client_addr)
-                    "%s:%s" % tuple(self.client_addr) if self.client_addr else None
+                if self.client_addr
-                ),
+                else None,
             },
         )
 

pyproject.toml

@@ -1,81 +0,0 @@
-[project]
-name = "daphne"
-dynamic = ["version"]
-description = "Django ASGI (HTTP/WebSocket) server"
-requires-python = ">=3.9"
-authors = [
-    { name = "Django Software Foundation", email = "foundation@djangoproject.com" },
-]
-
-license = { text = "BSD" }
-classifiers = [
-    "Development Status :: 4 - Beta",
-    "Environment :: Web Environment",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: BSD License",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-    "Topic :: Internet :: WWW/HTTP",
-]
-
-dependencies = ["asgiref>=3.5.2,<4", "autobahn>=22.4.2", "twisted[tls]>=22.4"]
-
-[project.optional-dependencies]
-tests = [
-    "django",
-    "hypothesis",
-    "pytest",
-    "pytest-asyncio",
-    "pytest-cov",
-    "black",
-    "tox",
-    "flake8",
-    "flake8-bugbear",
-    "mypy",
-]
-
-[project.urls]
-homepage = "https://github.com/django/daphne"
-documentation = "https://channels.readthedocs.io"
-repository = "https://github.com/django/daphne.git"
-changelog = "https://github.com/django/daphne/blob/main/CHANGELOG.txt"
-issues = "https://github.com/django/daphne/issues"
-
-[project.scripts]
-daphne = "daphne.cli:CommandLineInterface.entrypoint"
-
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools]
-packages = ["daphne"]
-
-[tool.setuptools.dynamic]
-version = { attr = "daphne.__version__" }
-readme = { file = "README.rst", content-type = "text/x-rst" }
-
-[tool.isort]
-profile = "black"
-
-[tool.pytest]
-testpaths = ["tests"]
-asyncio_mode = "strict"
-filterwarnings = ["ignore::pytest.PytestDeprecationWarning"]
-
-[tool.coverage.run]
-omit = ["tests/*"]
-concurrency = ["multiprocessing"]
-
-[tool.coverage.report]
-show_missing = "true"
-skip_covered = "true"
-
-[tool.coverage.html]
-directory = "reports/coverage_html_report"

setup.cfg

@@ -0,0 +1,11 @@
+[flake8]
+exclude = venv/*,tox/*,docs/*,testproject/*,js_client/*,.eggs/*
+extend-ignore = E123, E128, E266, E402, W503, E731, W601
+max-line-length = 120
+
+[isort]
+profile = black
+
+[tool:pytest]
+testpaths = tests
+asyncio_mode = strict

setup.py

@@ -0,0 +1,46 @@
+import os
+
+from setuptools import find_packages, setup
+
+from daphne import __version__
+
+# We use the README as the long_description
+readme_path = os.path.join(os.path.dirname(__file__), "README.rst")
+with open(readme_path) as fp:
+    long_description = fp.read()
+
+setup(
+    name="daphne",
+    version=__version__,
+    url="https://github.com/django/daphne",
+    author="Django Software Foundation",
+    author_email="foundation@djangoproject.com",
+    description="Django ASGI (HTTP/WebSocket) server",
+    long_description=long_description,
+    license="BSD",
+    zip_safe=False,
+    package_dir={"twisted": "daphne/twisted"},
+    packages=find_packages() + ["twisted.plugins"],
+    include_package_data=True,
+    install_requires=["twisted[tls]>=22.4", "autobahn>=22.4.2", "asgiref>=3.5.2,<4"],
+    python_requires=">=3.7",
+    setup_requires=["pytest-runner"],
+    extras_require={"tests": ["hypothesis", "pytest", "pytest-asyncio", "django"]},
+    entry_points={
+        "console_scripts": ["daphne = daphne.cli:CommandLineInterface.entrypoint"]
+    },
+    classifiers=[
+        "Development Status :: 4 - Beta",
+        "Environment :: Web Environment",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: BSD License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Topic :: Internet :: WWW/HTTP",
+    ],
+)

tests/test_http_request.py

@@ -304,21 +304,9 @@ class TestHTTPRequest(DaphneTestCase):
         response = self.run_daphne_raw(
             b"GET /\xc3\xa4\xc3\xb6\xc3\xbc HTTP/1.0\r\n\r\n"
         )
-        self.assertTrue(b"400 Bad Request" in response)
+        self.assertTrue(response.startswith(b"HTTP/1.0 400 Bad Request"))
         # Bad querystring
         response = self.run_daphne_raw(
             b"GET /?\xc3\xa4\xc3\xb6\xc3\xbc HTTP/1.0\r\n\r\n"
         )
-        self.assertTrue(b"400 Bad Request" in response)
+        self.assertTrue(response.startswith(b"HTTP/1.0 400 Bad Request"))
-
-    def test_invalid_header_name(self):
-        """
-        Tests that requests with invalid header names fail.
-        """
-        # Test cases follow those used by h11
-        # https://github.com/python-hyper/h11/blob/a2c68948accadc3876dffcf979d98002e4a4ed27/h11/tests/test_headers.py#L24-L35
-        for header_name in [b"foo bar", b"foo\x00bar", b"foo\xffbar", b"foo\x01bar"]:
-            response = self.run_daphne_raw(
-                f"GET / HTTP/1.0\r\n{header_name}: baz\r\n\r\n".encode("ascii")
-            )
-            self.assertTrue(b"400 Bad Request" in response)

tests/test_websocket.py

@@ -192,30 +192,6 @@ class TestWebsocket(DaphneTestCase):
         self.assertEqual(scope["path"], "/foo/bar")
         self.assertEqual(scope["raw_path"], b"/foo%2Fbar")
 
-    @given(daphne_path=http_strategies.http_path())
-    @settings(max_examples=5, deadline=2000)
-    def test_root_path(self, *, daphne_path):
-        """
-        Tests root_path handling.
-        """
-        headers = [("Daphne-Root-Path", parse.quote(daphne_path))]
-        with DaphneTestingInstance() as test_app:
-            test_app.add_send_messages([{"type": "websocket.accept"}])
-            self.websocket_handshake(
-                test_app,
-                path="/",
-                headers=headers,
-            )
-            # Validate the scope and messages we got
-            scope, _ = test_app.get_received()
-
-        # Daphne-Root-Path is not included in the returned 'headers' section.
-        self.assertNotIn(
-            "daphne-root-path", (header[0].lower() for header in scope["headers"])
-        )
-        # And what we're looking for, root_path being set.
-        self.assertEqual(scope["root_path"], daphne_path)
-
     def test_text_frames(self):
         """
         Tests we can send and receive text frames.

tox.ini

@@ -1,8 +1,8 @@
 [tox]
 envlist =
-    py{39,310,311,312,313}
+    py{37,38,39,310}
-
 [testenv]
+usedevelop = true
 extras = tests
 commands =
     pytest -v {posargs}