gh-111246: Don't remove stolen Unix socket address (#111246)

CendioOssman · CendioOssman · commit df3b74edfe09 · 2023-10-30T14:47:39.000+01:00
We only want to clean up *our* socket, so try to determine if we still
own this address or if something else has replaced it.
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
@@ -803,7 +803,8 @@ Creating network servers
    .. versionchanged:: 3.13
 
       The Unix socket will automatically be removed from the filesystem
-      when the server is closed.
+      when the server is closed, unless the socket has been replaced
+      after the server has been created.
 
 
 .. coroutinemethod:: loop.connect_accepted_socket(protocol_factory, \
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
@@ -64,6 +64,7 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop):
     def __init__(self, selector=None):
         super().__init__(selector)
         self._signal_handlers = {}
+        self._unix_server_sockets = {}
 
     def close(self):
         super().close()
@@ -340,6 +341,14 @@ async def create_unix_server(
                 raise ValueError(
                     f'A UNIX Domain Stream Socket was expected, got {sock!r}')
 
+        path = sock.getsockname()
+        # Check for abstract socket. `str` and `bytes` paths are supported.
+        if path[0] not in (0, '\x00'):
+            try:
+                self._unix_server_sockets[sock] = os.stat(path).st_ino
+            except FileNotFoundError:
+                pass
+
         sock.setblocking(False)
         server = base_events.Server(self, [sock], protocol_factory,
                                     ssl, backlog, ssl_handshake_timeout,
@@ -462,21 +471,19 @@ def cb(fut):
 
     def _stop_serving(self, sock):
         # Is this a unix socket that needs cleanup?
-        if sock.family == socket.AF_UNIX:
+        if sock in self._unix_server_sockets:
             path = sock.getsockname()
-            if path == '':
-                path = None
-            # Check for abstract socket. `str` and `bytes` paths are supported.
-            elif path[0] in (0, '\x00'):
-                path = None
         else:
             path = None
 
         super()._stop_serving(sock)
 
         if path is not None:
+            prev_ino = self._unix_server_sockets[sock]
+            del self._unix_server_sockets[sock]
             try:
-                os.unlink(path)
+                if os.stat(path).st_ino == prev_ino:
+                    os.unlink(path)
             except FileNotFoundError:
                 pass
             except OSError as err:
diff --git a/Lib/test/test_asyncio/test_server.py b/Lib/test/test_asyncio/test_server.py
@@ -190,6 +190,21 @@ async def serve(*args):
 
             srv.close()
 
+    @socket_helper.skip_unless_bind_unix_socket
+    async def test_unix_server_cleanup_replaced(self):
+        with test_utils.unix_socket_path() as addr:
+            async def serve(*args):
+                pass
+
+            srv = await asyncio.start_unix_server(serve, addr)
+
+            os.unlink(addr)
+            sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+            sock.bind(addr)
+
+            srv.close()
+            self.assertTrue(os.path.exists(addr))
+
 
 @unittest.skipUnless(hasattr(asyncio, 'ProactorEventLoop'), 'Windows only')
 class ProactorStartServerTests(BaseStartServer, unittest.TestCase):
