Fix crash on invalid packet type. Add test

miguelgrinberg · Feb 13, 2017 · 7eacdd9 · 7eacdd9
1 parent c39a775
commit 7eacdd9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/engineio/socket.py b/engineio/socket.py
@@ -41,8 +41,10 @@ def poll(self):
 
     def receive(self, pkt):
         """Receive packet from the client."""
+        packet_name = packet.packet_names[pkt.packet_type] \
+            if pkt.packet_type < len(packet.packet_names) else 'UNKNOWN'
         self.server.logger.info('%s: Received packet %s data %s',
-                                self.sid, packet.packet_names[pkt.packet_type],
+                                self.sid, packet_name,
                                 pkt.data if not isinstance(pkt.data, bytes)
                                 else '<binary>')
         if pkt.packet_type == packet.PING:

diff --git a/tests/test_socket.py b/tests/test_socket.py
@@ -227,6 +227,12 @@ def test_upgrade_no_upgrade_packet(self):
         self.assertEqual(s.queue.get().packet_type, packet.NOOP)
         self.assertFalse(s.upgraded)
 
+    def test_invalid_packet_type(self):
+        mock_server = self._get_mock_server()
+        s = socket.Socket(mock_server, 'sid')
+        pkt = packet.Packet(packet_type=99)
+        self.assertRaises(ValueError, lambda: s.receive(pkt))
+
     def test_upgrade_not_supported(self):
         mock_server = self._get_mock_server()
         mock_server._async['websocket'] = None