Use code when rejecting connection

Fixed django#486
daveisfera · Oct 6, 2023 · 7234cb1 · 7234cb1
1 parent 2d4dcbf
commit 7234cb1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/daphne/ws_protocol.py b/daphne/ws_protocol.py
@@ -185,7 +185,7 @@ def handle_reply(self, message):
             self.serverAccept(message.get("subprotocol", None))
         elif message["type"] == "websocket.close":
             if self.state == self.STATE_CONNECTING:
-                self.serverReject()
+                self.serverReject(code=message.get("code", 403))
             else:
                 self.serverClose(code=message.get("code", None))
         elif message["type"] == "websocket.send":
@@ -222,12 +222,12 @@ def serverAccept(self, subprotocol=None):
         del self.handshake_deferred
         logger.debug("WebSocket %s accepted by application", self.client_addr)
 
-    def serverReject(self):
+    def serverReject(self, code):
         """
         Called when we get a message saying to reject the connection.
         """
         self.handshake_deferred.errback(
-            ConnectionDeny(code=403, reason="Access denied")
+            ConnectionDeny(code=code, reason="Connection closed")
         )
         del self.handshake_deferred
         self.server.protocol_disconnected(self)
@@ -284,7 +284,7 @@ def check_timeouts(self):
         # If we're still connecting, deny the connection
         if self.state == self.STATE_CONNECTING:
             if self.duration() > self.server.websocket_connect_timeout:
-                self.serverReject()
+                self.serverReject(408)
         elif self.state == self.STATE_OPEN:
             if (time.time() - self.last_ping) > self.server.ping_interval:
                 self._sendAutoPing()