Fix 1566 (#1567)

* add test for WebSocketServerProtocol.sendServerStatus * fix string interpolation in _SERVER_STATUS_TEMPLATE (fixes #1566)
crossbario · May 11, 2022 · 31d36af · 31d36af
1 parent 2e2ee5f
commit 31d36af
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/autobahn/websocket/protocol.py b/autobahn/websocket/protocol.py
@@ -2499,16 +2499,16 @@ def prepareMessage(self, payload, isBinary=False, doNotCompress=False):
    <head>
       {}
       <style>
-         body {
+         body {{
             color: #fff;
             background-color: #027eae;
             font-family: "Segoe UI", "Lucida Grande", "Helvetica Neue", Helvetica, Arial, sans-serif;
             font-size: 16px;
-         }
+         }}
 
-         a, a:visited, a:hover {
+         a, a:visited, a:hover {{
             color: #fff;
-         }
+         }}
       </style>
    </head>
    <body>

diff --git a/autobahn/websocket/test/test_websocket_protocol.py b/autobahn/websocket/test/test_websocket_protocol.py
@@ -227,6 +227,12 @@ def test_sendClose_invalid_code_value(self):
         self.assertEqual(self.transport._written, b"")
         self.assertEqual(self.protocol.state, self.protocol.STATE_OPEN)
 
+    def test_interpolate_server_status_template(self):
+        from autobahn.websocket.protocol import _SERVER_STATUS_TEMPLATE
+        s = _SERVER_STATUS_TEMPLATE.format(None, '0.0.0')
+        self.assertEqual(type(s), str)
+        self.assertTrue(len(s) > 0)
+
 
 if os.environ.get('USE_TWISTED', False):
     class TwistedProtocolTests(unittest.TestCase):
@@ -270,3 +276,6 @@ def test_loseConnection(self):
             # that here
             self.protocol._connectionLost(txaio.create_failure(RuntimeError("testing")))
             self.assertTrue(self.protocol.openHandshakeTimeoutCall is None)
+
+        def test_send_server_status(self):
+            self.protocol.sendServerStatus()