mirror of
https://github.com/python/cpython.git
synced 2025-10-17 12:18:23 +00:00
gh-97514: Authenticate the forkserver control socket. (GH-99309)
This adds authentication to the forkserver control socket. In the past only filesystem permissions protected this socket from code injection into the forkserver process by limiting access to the same UID, which didn't exist when Linux abstract namespace sockets were used (see issue) meaning that any process in the same system network namespace could inject code. We've since stopped using abstract namespace sockets by default, but protecting our control sockets regardless of type is a good idea. This reuses the HMAC based shared key auth already used by `multiprocessing.connection` sockets for other purposes. Doing this is useful so that filesystem permissions are not relied upon and trust isn't implied by default between all processes running as the same UID with access to the unix socket. ### pyperformance benchmarks No significant changes. Including `concurrent_imap` which exercises `multiprocessing.Pool.imap` in that suite. ### Microbenchmarks This does _slightly_ slow down forkserver use. How much so appears to depend on the platform. Modern platforms and simple platforms are less impacted. This PR adds additional IPC round trips to the control socket to tell forkserver to spawn a new process. Systems with potentially high latency IPC are naturally impacted more. Typically a 1-4% slowdown on a very targeted process creation microbenchmark, with a worst case overloaded system slowdown of 20%. No evidence that these slowdowns appear in practical sense. See the PR for details.
This commit is contained in:
parent
48c50ff1a2
commit
7191b7662e
6 changed files with 141 additions and 16 deletions
|
@ -846,8 +846,8 @@ class _TestProcess(BaseTestCase):
|
|||
finally:
|
||||
setattr(sys, stream_name, old_stream)
|
||||
|
||||
@classmethod
|
||||
def _sleep_and_set_event(self, evt, delay=0.0):
|
||||
@staticmethod
|
||||
def _sleep_and_set_event(evt, delay=0.0):
|
||||
time.sleep(delay)
|
||||
evt.set()
|
||||
|
||||
|
@ -898,6 +898,56 @@ class _TestProcess(BaseTestCase):
|
|||
if os.name != 'nt':
|
||||
self.check_forkserver_death(signal.SIGKILL)
|
||||
|
||||
def test_forkserver_auth_is_enabled(self):
|
||||
if self.TYPE == "threads":
|
||||
self.skipTest(f"test not appropriate for {self.TYPE}")
|
||||
if multiprocessing.get_start_method() != "forkserver":
|
||||
self.skipTest("forkserver start method specific")
|
||||
|
||||
forkserver = multiprocessing.forkserver._forkserver
|
||||
forkserver.ensure_running()
|
||||
self.assertTrue(forkserver._forkserver_pid)
|
||||
authkey = forkserver._forkserver_authkey
|
||||
self.assertTrue(authkey)
|
||||
self.assertGreater(len(authkey), 15)
|
||||
addr = forkserver._forkserver_address
|
||||
self.assertTrue(addr)
|
||||
|
||||
# Demonstrate that a raw auth handshake, as Client performs, does not
|
||||
# raise an error.
|
||||
client = multiprocessing.connection.Client(addr, authkey=authkey)
|
||||
client.close()
|
||||
|
||||
# That worked, now launch a quick process.
|
||||
proc = self.Process(target=sys.exit)
|
||||
proc.start()
|
||||
proc.join()
|
||||
self.assertEqual(proc.exitcode, 0)
|
||||
|
||||
def test_forkserver_without_auth_fails(self):
|
||||
if self.TYPE == "threads":
|
||||
self.skipTest(f"test not appropriate for {self.TYPE}")
|
||||
if multiprocessing.get_start_method() != "forkserver":
|
||||
self.skipTest("forkserver start method specific")
|
||||
|
||||
forkserver = multiprocessing.forkserver._forkserver
|
||||
forkserver.ensure_running()
|
||||
self.assertTrue(forkserver._forkserver_pid)
|
||||
authkey_len = len(forkserver._forkserver_authkey)
|
||||
with unittest.mock.patch.object(
|
||||
forkserver, '_forkserver_authkey', None):
|
||||
# With an incorrect authkey we should get an auth rejection
|
||||
# rather than the above protocol error.
|
||||
forkserver._forkserver_authkey = b'T' * authkey_len
|
||||
proc = self.Process(target=sys.exit)
|
||||
with self.assertRaises(multiprocessing.AuthenticationError):
|
||||
proc.start()
|
||||
del proc
|
||||
|
||||
# authkey restored, launching processes should work again.
|
||||
proc = self.Process(target=sys.exit)
|
||||
proc.start()
|
||||
proc.join()
|
||||
|
||||
#
|
||||
#
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue