[Security] Authenticate shared-memory multimodal cache handles (#59357)
Signed-off-by: Clinton Thomas <1033162+KernelClint@users.noreply.github.com> Co-authored-by: Lucas Bourtoule <35483370+dhalf@users.noreply.github.com> Co-authored-by: Cyrus Leung <tlleungac@connect.ust.hk>
This commit is contained in:
co-authored by
Lucas Bourtoule
Cyrus Leung
parent
72e7874fa6
commit
3d5625cc3c
@@ -108,10 +108,10 @@ class TestSingleWriterShmRingBuffer(unittest.TestCase):
|
||||
# Clear the buffer
|
||||
self.ring_buffer.clear()
|
||||
|
||||
# Check that metadata is empty and IDs reset
|
||||
# Check that metadata is empty and IDs keep increasing
|
||||
self.assertEqual(len(self.ring_buffer.metadata), 0)
|
||||
self.assertEqual(self.ring_buffer.monotonic_id_start, 0)
|
||||
self.assertEqual(self.ring_buffer.monotonic_id_end, 0)
|
||||
self.assertEqual(self.ring_buffer.monotonic_id_start, 3)
|
||||
self.assertEqual(self.ring_buffer.monotonic_id_end, 3)
|
||||
self.assertEqual(self.ring_buffer.data_buffer_start, 0)
|
||||
self.assertEqual(self.ring_buffer.data_buffer_end, 0)
|
||||
|
||||
|
||||
@@ -227,10 +227,68 @@ class TestSingleWriterShmObjectStorage(unittest.TestCase):
|
||||
self.assertEqual(len(self.storage.id_index), 0)
|
||||
self.assertEqual(len(self.storage.ring_buffer.metadata), 0)
|
||||
|
||||
# Verify that new items can be added after clearing
|
||||
# Verify that new items can be added after clearing. IDs keep
|
||||
# increasing so handles issued before the clear cannot alias new data.
|
||||
address, monotonic_id = self.storage.put("new_item", "new_value")
|
||||
self.assertIn("new_item", self.storage.key_index)
|
||||
self.assertEqual((address, monotonic_id), (0, 0))
|
||||
self.assertEqual((address, monotonic_id), (0, 5))
|
||||
|
||||
def _open_reader(self) -> SingleWriterShmObjectStorage:
|
||||
reader = SingleWriterShmObjectStorage.create_from_handle(self.storage.handle())
|
||||
self.addCleanup(reader.close)
|
||||
return reader
|
||||
|
||||
def test_reader_get_and_touch_each_require_valid_signature(self):
|
||||
address, monotonic_id = self.storage.put("key", "value")
|
||||
signature = self.storage.get_signature("key")
|
||||
reader = self._open_reader()
|
||||
|
||||
reader.touch("key", address, monotonic_id, signature)
|
||||
self.assertEqual(reader.get(address, monotonic_id, signature, "key"), "value")
|
||||
|
||||
flipped = [signature[0] ^ 1, *signature[1:]]
|
||||
for bad in (None, flipped, [signature], signature[:-1], [256] * 32):
|
||||
with self.assertRaisesRegex(ValueError, "SHM handle signature"):
|
||||
reader.get(address, monotonic_id, bad, "key")
|
||||
with self.assertRaisesRegex(ValueError, "SHM handle signature"):
|
||||
reader.touch("key", address, monotonic_id, bad)
|
||||
|
||||
def test_signature_is_bound_to_key_and_address(self):
|
||||
address, monotonic_id = self.storage.put("key", "value")
|
||||
signature = self.storage.get_signature("key")
|
||||
reader = self._open_reader()
|
||||
|
||||
with self.assertRaisesRegex(ValueError, "SHM handle signature"):
|
||||
reader.get(address, monotonic_id, signature, "other_key")
|
||||
with self.assertRaisesRegex(ValueError, "SHM handle signature"):
|
||||
reader.get(address + 1, monotonic_id, signature, "key")
|
||||
|
||||
def test_writer_rejects_handle_no_longer_in_key_index(self):
|
||||
address, monotonic_id = self.storage.put("key", "value")
|
||||
signature = self.storage.get_signature("key")
|
||||
self.storage.verify_signature("key", address, monotonic_id, signature)
|
||||
|
||||
self.storage.clear()
|
||||
|
||||
with self.assertRaisesRegex(ValueError, "SHM handle signature"):
|
||||
self.storage.verify_signature("key", address, monotonic_id, signature)
|
||||
|
||||
def test_handle_issued_before_clear_reads_own_data_until_reused(self):
|
||||
address, monotonic_id = self.storage.put("key", "value")
|
||||
signature = self.storage.get_signature("key")
|
||||
reader = self._open_reader()
|
||||
|
||||
self.storage.clear()
|
||||
|
||||
# Requests still draining after a clear keep reading their own data.
|
||||
self.assertEqual(reader.get(address, monotonic_id, signature, "key"), "value")
|
||||
|
||||
self.storage.put("key", "new_value")
|
||||
|
||||
with self.assertRaisesRegex(ValueError, "modified or is invalid"):
|
||||
reader.get(address, monotonic_id, signature, "key")
|
||||
with self.assertRaisesRegex(ValueError, "modified or is invalid"):
|
||||
reader.touch("key", address, monotonic_id, signature)
|
||||
|
||||
|
||||
# Reader process function
|
||||
@@ -242,11 +300,11 @@ def reader_process(process_id, storage_handle, items_to_read):
|
||||
|
||||
errors = []
|
||||
|
||||
for key, original_value, address, monotonic_id in items_to_read:
|
||||
for key, original_value, address, monotonic_id, signature in items_to_read:
|
||||
time.sleep(random.random() / 100)
|
||||
try:
|
||||
# Read data from shared memory
|
||||
retrieved_value = reader_storage.get(address, monotonic_id)
|
||||
retrieved_value = reader_storage.get(address, monotonic_id, signature, key)
|
||||
|
||||
# Verify data integrity
|
||||
assert retrieved_value == original_value
|
||||
@@ -289,7 +347,8 @@ def run_multiprocess_example():
|
||||
for key, value in test_data:
|
||||
print(f"Storing {key}: {value}")
|
||||
address, monotonic_id = storage.put(key, value)
|
||||
stored_items.append((key, value, address, monotonic_id))
|
||||
signature = storage.get_signature(key)
|
||||
stored_items.append((key, value, address, monotonic_id, signature))
|
||||
print(f" -> Stored at address {address}, ID {monotonic_id}")
|
||||
|
||||
print("\n--- Retrieving Data ---")
|
||||
|
||||
Reference in New Issue
Block a user