Return RESTResponse error for timed out metainfo request

src/tribler/core/components/metadata_store/restapi/channels_endpoint.py

@@ -404,7 +404,7 @@ async def add_torrent_to_channel(self, request):
 
                 meta_info = await self.download_manager.get_metainfo(xt, timeout=30, url=uri)
                 if not meta_info:
-                    raise RuntimeError("Metainfo timeout")
+                    return RESTResponse(f'Metainfo request for {uri} timed out.', status=HTTP_BAD_REQUEST)
                 tdef = TorrentDef.load_from_dict(meta_info)
             else:
                 return RESTResponse({"error": "unknown uri type"}, status=HTTP_BAD_REQUEST)

src/tribler/core/components/metadata_store/restapi/tests/test_channels_endpoint.py

@@ -1,10 +1,9 @@
 import base64
 import json
 from binascii import unhexlify
-from unittest.mock import Mock, patch
+from unittest.mock import AsyncMock, Mock, patch
 
 import pytest
-from aiohttp.web_app import Application
 from ipv8.keyvault.crypto import default_eccrypto
 from ipv8.util import succeed
 from pony.orm import db_session
@@ -18,7 +17,7 @@
 from tribler.core.components.metadata_store.restapi.channels_endpoint import ChannelsEndpoint, ERROR_INVALID_MAGNET_LINK
 from tribler.core.components.metadata_store.utils import RequestTimeoutException, tag_torrent
 from tribler.core.components.restapi.rest.base_api_test import do_request
-from tribler.core.components.restapi.rest.rest_manager import error_middleware
+from tribler.core.components.restapi.rest.rest_endpoint import HTTP_BAD_REQUEST
 from tribler.core.tests.tools.common import TORRENT_UBUNTU_FILE
 from tribler.core.utilities.simpledefs import CHANNEL_STATE
 from tribler.core.utilities.unicode import hexlify
@@ -386,7 +385,7 @@ async def test_copy_torrents_to_collection(rest_api, metadata_store):
         'collections/%s/%i/copy' % (hexlify(channel.public_key), channel.id_),
         post_data=request_data,
         request_type='POST',
-        expected_code=400,
+        expected_code=HTTP_BAD_REQUEST,
     )
 
 
@@ -400,7 +399,7 @@ async def test_copy_torrents_to_collection_bad_json(metadata_store, rest_api):
         'collections/%s/%i/copy' % (hexlify(channel.public_key), channel.id_),
         post_data='abc',
         request_type='POST',
-        expected_code=400,
+        expected_code=HTTP_BAD_REQUEST,
     )
 
 
@@ -445,7 +444,7 @@ async def test_add_torrents_no_dir(my_channel, rest_api):
         f'channels/{hexlify(my_channel.public_key)}/{my_channel.id_}/torrents',
         request_type='PUT',
         post_data=post_params,
-        expected_code=400,
+        expected_code=HTTP_BAD_REQUEST,
     )
 
 
@@ -459,7 +458,7 @@ async def test_add_torrents_recursive_no_dir(my_channel, rest_api):
         f'channels/{hexlify(my_channel.public_key)}/{my_channel.id_}/torrents',
         request_type='PUT',
         post_data=post_params,
-        expected_code=400,
+        expected_code=HTTP_BAD_REQUEST,
     )
 
 
@@ -486,7 +485,7 @@ async def test_add_torrent_missing_torrent(my_channel, rest_api):
         f'channels/{hexlify(my_channel.public_key)}/{my_channel.id_}/torrents',
         request_type='PUT',
         post_data=post_params,
-        expected_code=400,
+        expected_code=HTTP_BAD_REQUEST,
     )
 
 
@@ -551,7 +550,7 @@ async def test_add_torrent_invalid_uri(my_channel, rest_api):
         f'channels/{hexlify(my_channel.public_key)}/{my_channel.id_}/torrents',
         request_type='PUT',
         post_data=post_params,
-        expected_code=400,
+        expected_code=HTTP_BAD_REQUEST,
     )
 
 
@@ -613,7 +612,7 @@ def fake_get_metainfo(*_, **__):
         f'channels/{hexlify(my_channel.public_key)}/{my_channel.id_}/torrents',
         request_type='PUT',
         post_data=post_params,
-        expected_code=400,
+        expected_code=HTTP_BAD_REQUEST,
     )
     assert response['error'] == ERROR_INVALID_MAGNET_LINK.format(invalid_magnet_link)
 
@@ -700,7 +699,7 @@ async def test_get_channel_thumbnail(rest_api, metadata_store):
 
 
 async def test_get_my_channel_tags(metadata_store, mock_dlmgr_get_download, my_channel,
-                                   rest_api):  # pylint: disable=redefined-outer-name
+                                   rest_api):
     """
     Test whether tags are correctly returned over the REST API
     """
@@ -718,7 +717,7 @@ async def test_get_my_channel_tags(metadata_store, mock_dlmgr_get_download, my_c
 
 
 async def test_get_my_channel_tags_xxx(metadata_store, knowledge_db, mock_dlmgr_get_download, my_channel,
-                                       rest_api):  # pylint: disable=redefined-outer-name
+                                       rest_api):
     """
     Test whether XXX tags are correctly filtered
     """
@@ -743,3 +742,17 @@ async def test_get_my_channel_tags_xxx(metadata_store, knowledge_db, mock_dlmgr_
     print(json_dict)
     tag_statements = [s for s in json_dict["results"][0]["statements"] if s["predicate"] == ResourceType.TAG]
     assert len(tag_statements) == 1
+
+
+async def test_timeout_for_metainfo_request(my_channel, rest_api, mock_dlmgr):
+    """ Test that in the case of a timeout, the client receives HTTP_BAD_REQUEST """
+    mock_dlmgr.get_metainfo = AsyncMock(return_value=None)
+    await do_request(
+        rest_api,
+        f'channels/{hexlify(my_channel.public_key)}/{my_channel.id_}/torrents',
+        request_type='PUT',
+        post_data={'uri': 'magnet:?xt=urn:btih:1111111111111111111111111111111111111111'},
+        expected_code=HTTP_BAD_REQUEST,
+    )
+
+    assert mock_dlmgr.get_metainfo.called