feat: respect config.storage.store_files initial intent

Author: Psycojoker

src/aleph/handlers/content/store.py

@@ -107,9 +107,6 @@ async def fetch_related_content(
         # This check is essential to ensure that files are not added to the system
         # or the current node when the configuration disables storing of files.
         config = get_config()
-        if not config.storage.store_files.value:
-            return  # Ignore if files are not to be stored.
-
         content = message.parsed_content
         assert isinstance(content, StoreContent)
 
@@ -122,9 +119,14 @@ async def fetch_related_content(
         do_standard_lookup = True
 
         # Sentinel value, the code below always sets a value but mypy does not see it.
+        # otherwise if config.storage.store_files is False, this will be the database value
         size: int = -1
 
-        if engine == ItemType.ipfs and ipfs_enabled:
+        if (
+            config.storage.store_files.value
+            and engine == ItemType.ipfs
+            and ipfs_enabled
+        ):
             if item_type_from_hash(item_hash) != ItemType.ipfs:
                 LOGGER.warning("Invalid IPFS hash: '%s'", item_hash)
                 raise InvalidMessageFormat(
@@ -175,7 +177,7 @@ async def fetch_related_content(
                 )
                 do_standard_lookup = True
 
-        if do_standard_lookup:
+        if config.storage.store_files.value and do_standard_lookup:
             try:
                 file_content = await self.storage_service.get_hash_content(
                     item_hash,

tests/storage/test_store_message.py

@@ -154,3 +154,56 @@ async def test_handle_new_storage_directory(
     assert stored_file.type == FileType.DIRECTORY
 
     assert not storage_engine.called
+
+
+@pytest.mark.asyncio
+async def test_store_files_is_false(
+    mocker,
+    session_factory: DbSessionFactory,
+    mock_config: Config,
+    fixture_message_directory: MessageDb,
+):
+    mock_ipfs_client = mocker.MagicMock()
+    ipfs_stats = {
+        "Hash": "QmPZrod87ceK4yVvXQzRexDcuDgmLxBiNJ1ajLjLoMx9sU",
+        "Size": 0,
+        "CumulativeSize": 4560,
+        "Blocks": 2,
+        "Type": "file",
+    }
+    mock_ipfs_client.files.stat = mocker.AsyncMock(return_value=ipfs_stats)
+
+    mock_config.storage.store_files.value = False
+
+    message = fixture_message_directory
+    storage_engine = mocker.AsyncMock()
+
+    storage_service = StorageService(
+        storage_engine=storage_engine,
+        ipfs_service=IpfsService(ipfs_client=mock_ipfs_client),
+        node_cache=mocker.AsyncMock(),
+    )
+    get_hash_content_mock = mocker.patch.object(storage_service, "get_hash_content")
+    store_message_handler = StoreMessageHandler(
+        storage_service=storage_service, grace_period=24
+    )
+
+    with session_factory() as session:
+        await store_message_handler.fetch_related_content(
+            session=session, message=message
+        )
+        session.commit()
+
+    with session_factory() as session:
+        stored_files = list((session.execute(select(StoredFileDb))).scalars())
+
+    assert len(stored_files) == 1
+    stored_file = stored_files[0]
+
+    # Check the updates to the message content
+    assert stored_file.hash == ipfs_stats["Hash"]
+    assert stored_file.size == -1
+    assert stored_file.type == FileType.FILE
+
+    storage_engine.assert_not_called()
+    get_hash_content_mock.assert_not_called()