Fix to socket routing for self-voicing.

tests/unit/test_unix_remote_driver.py

@@ -1,3 +1,5 @@
+import socket
+import struct
 from unittest.mock import Mock, mock_open, patch
 
 import pytest
@@ -75,6 +77,19 @@ class FakeClientSocket:
         self.sent += data
 
 
+def test_get_peer_uid_from_unix_socket():
+    driver = unixDriver.driver()
+    client_sock = Mock()
+    client_sock.getsockopt.return_value = struct.pack("3i", 4321, 1000, 100)
+
+    assert driver._get_peer_uid(client_sock) == 1000
+    client_sock.getsockopt.assert_called_once_with(
+        socket.SOL_SOCKET,
+        socket.SO_PEERCRED,
+        struct.calcsize("3i"),
+    )
+
+
 def test_main_socket_routes_to_ancestor_private_socket(mock_environment):
     driver = unixDriver.driver()
     driver.env = mock_environment
@@ -148,6 +163,10 @@ def test_main_socket_handles_command_locally_without_available_target(
     event_queue = Mock()
 
     with patch.object(driver, "_get_peer_pid", return_value=1234), patch.object(
+        driver, "_get_peer_uid", return_value=1000
+    ), patch.object(
+        driver, "_get_socket_owner_uid", return_value=65534
+    ), patch.object(
         driver,
         "_find_available_private_socket",
         return_value="",
@@ -171,7 +190,11 @@ def test_vcsa_main_socket_owner_handles_command_locally(mock_environment):
     client_sock = FakeClientSocket(b"command say root")
     event_queue = Mock()
 
-    with patch.object(driver, "_find_available_private_socket") as find_available:
+    with patch.object(driver, "_get_peer_uid", return_value=1000), patch.object(
+        driver, "_get_socket_owner_uid", return_value=1000
+    ), patch.object(
+        driver, "_find_available_private_socket"
+    ) as find_available:
         driver._handle_client(
             client_sock, event_queue, unixDriver.MAIN_SOCKET_FILE
         )
@@ -185,6 +208,64 @@ def test_vcsa_main_socket_owner_handles_command_locally(mock_environment):
     )
 
 
+def test_vcsa_main_socket_routes_to_same_user_private_socket(
+    mock_environment,
+):
+    driver = unixDriver.driver()
+    driver.env = mock_environment
+    driver.bound_sockets = [(Mock(), unixDriver.MAIN_SOCKET_FILE)]
+    client_sock = FakeClientSocket(b"command say x session")
+    event_queue = Mock()
+
+    with patch.object(driver, "_get_peer_pid", return_value=1234), patch.object(
+        driver, "_get_peer_uid", return_value=1000
+    ), patch.object(
+        driver, "_get_socket_owner_uid", return_value=65534
+    ), patch.object(
+        driver, "_find_ancestor_private_socket", return_value=""
+    ), patch.object(
+        driver,
+        "_find_available_private_socket",
+        return_value="/tmp/fenrirscreenreader-222.sock",
+    ) as find_available, patch.object(
+        driver, "_forward_remote_to_socket", return_value=True
+    ) as forward:
+        driver._handle_client(
+            client_sock, event_queue, unixDriver.MAIN_SOCKET_FILE
+        )
+
+    find_available.assert_called_once_with("", owner_uid=1000)
+    forward.assert_called_once_with(
+        "command say x session", "/tmp/fenrirscreenreader-222.sock"
+    )
+    event_queue.put.assert_not_called()
+
+
+def test_vcsa_main_socket_stays_local_without_peer_credentials(
+    mock_environment,
+):
+    driver = unixDriver.driver()
+    driver.env = mock_environment
+    driver.bound_sockets = [(Mock(), unixDriver.MAIN_SOCKET_FILE)]
+    client_sock = FakeClientSocket(b"command say unknown")
+    event_queue = Mock()
+
+    with patch.object(driver, "_get_peer_uid", return_value=-1), patch.object(
+        driver, "_find_available_private_socket"
+    ) as find_available:
+        driver._handle_client(
+            client_sock, event_queue, unixDriver.MAIN_SOCKET_FILE
+        )
+
+    find_available.assert_not_called()
+    event_queue.put.assert_called_once_with(
+        {
+            "Type": unixDriver.FenrirEventType.remote_incomming,
+            "data": "command say unknown",
+        }
+    )
+
+
 def test_private_socket_handles_command_locally(mock_environment):
     driver = unixDriver.driver()
     driver.env = mock_environment
@@ -281,3 +362,33 @@ def test_find_available_private_socket_skips_main_socket(
             driver._find_available_private_socket()
             == "/tmp/fenrirscreenreader-111.sock"
         )
+
+
+def test_find_available_private_socket_filters_by_owner(mock_environment):
+    driver = unixDriver.driver()
+    driver.env = mock_environment
+
+    with patch(
+        "fenrirscreenreader.remoteDriver.unixDriver.remoteInstanceRegistry.list_instances",
+        return_value=[
+            {
+                "pid": 111,
+                "socket_files": ["/tmp/fenrirscreenreader-111.sock"],
+            },
+            {
+                "pid": 222,
+                "socket_files": ["/tmp/fenrirscreenreader-222.sock"],
+            },
+        ],
+    ), patch.object(
+        driver,
+        "_get_socket_owner_uid",
+        side_effect=lambda socket_file: {
+            "/tmp/fenrirscreenreader-111.sock": 1001,
+            "/tmp/fenrirscreenreader-222.sock": 1000,
+        }[socket_file],
+    ), patch.object(driver, "_is_socket_active", return_value=True):
+        assert (
+            driver._find_available_private_socket(owner_uid=1000)
+            == "/tmp/fenrirscreenreader-222.sock"
+        )