Merge pull request #304 from ajmirsky/bug_fix_300

a connection without peer info should be rejected (#300)

Author: HerrMuellerluedenscheid

amqtt/adapters.py

@@ -176,8 +176,10 @@ async def drain(self) -> None:
         if not self.is_closed:
             await self._writer.drain()
 
-    def get_peer_info(self) -> tuple[str, int]:
+    def get_peer_info(self) -> tuple[str, int] | None:
         extra_info = self._writer.get_extra_info("peername")
+        if not extra_info or len(extra_info) < 2:
+            return None
         return extra_info[0], extra_info[1]
 
     def get_ssl_info(self) -> ssl.SSLObject | None:

amqtt/broker.py

@@ -444,6 +444,8 @@ async def _client_connected(self, listener_name: str, reader: ReaderAdapter, wri
         remote_info = writer.get_peer_info()
         if remote_info is None:
             self.logger.warning("Remote info could not be retrieved from peer info")
+            await writer.close() # python 3.10 needs explicit close
+            server.release_connection()
             return
 
         remote_address, remote_port = remote_info

tests/test_broker.py

@@ -1028,3 +1028,14 @@ async def test_broker_with_absent_auth_plugin_filter():
     await mqtt_client.connect()
 
     await broker.shutdown()
+
+
+@pytest.mark.asyncio
+async def test_client_without_peer_info(broker, mock_plugin_manager):
+    client = MQTTClient(config={'auto_reconnect':False})
+
+    # if the broker's stream writer for this client does not have peer info, the client should fail to connect
+    with patch.object(asyncio.streams.StreamWriter, 'get_extra_info', return_value=None) as mock_extra_info:
+        with pytest.raises(ConnectError):
+            await client.connect("mqtt://127.0.0.1/")
+            await asyncio.sleep(0.01)