Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the issue of passing the URL in bytes to the get_metainfo function. #7848

Merged
merged 1 commit into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ def update_ip_filter(self, lt_session, ip_addresses):
lt_session.set_ip_filter(ip_filter)

async def get_metainfo(self, infohash: bytes, timeout: float = 30, hops: Optional[int] = None,
url: Optional[Union[str, bytes]] = None, raise_errors: bool = False) -> Optional[Dict]:
url: Optional[str] = None, raise_errors: bool = False) -> Optional[Dict]:
"""
Lookup metainfo for a given infohash. The mechanism works by joining the swarm for the infohash connecting
to a few peers, and downloading the metadata for the torrent.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
from tribler.core.utilities.rest_utils import path_to_url
from tribler.core.utilities.unicode import hexlify

TARGET = 'tribler.core.components.libtorrent.restapi.torrentinfo_endpoint'

SAMPLE_CHANNEL_FILES_DIR = TESTS_DIR / "data" / "sample_channel"


Expand Down Expand Up @@ -96,7 +98,7 @@ async def mock_http_query(*_):
with open(tmp_path / "ubuntu.torrent", 'rb') as f:
return f.read()

with patch("tribler.core.components.libtorrent.restapi.torrentinfo_endpoint.query_http_uri", new=mock_http_query):
with patch(f"{TARGET}.query_http_uri", new=mock_http_query):
verify_valid_dict(await do_request(rest_api, url, params={'uri': path}, expected_code=200))

path = quote_plus(f'magnet:?xt=urn:btih:{hexlify(UBUNTU_1504_INFOHASH)}'
Expand Down Expand Up @@ -168,12 +170,30 @@ async def test_get_torrentinfo_invalid_magnet(rest_api):
mocked_query_http_uri = AsyncMock(return_value=b'magnet:?xt=urn:ed2k:' + b"any hash")
params = {'uri': 'http://any.uri'}

with patch('tribler.core.components.libtorrent.restapi.torrentinfo_endpoint.query_http_uri', mocked_query_http_uri):
with patch(f'{TARGET}.query_http_uri', mocked_query_http_uri):
result = await do_request(rest_api, 'torrentinfo', params=params, expected_code=HTTP_INTERNAL_SERVER_ERROR)

assert 'error' in result


@patch(f'{TARGET}.unshorten', new=AsyncMock(return_value='http://any.uri'))
@patch(f'{TARGET}.tdef_to_metadata_dict', new=MagicMock())
@patch.object(TorrentDef, 'load_from_dict', new=MagicMock())
async def test_get_torrentinfo_get_metainfo_from_downloaded_magnet(rest_api, download_manager: DownloadManager):
# Test that the `get_metainfo` function passes the correct arguments.
magnet = b'magnet:?xt=urn:btih:' + b'0' * 40
mocked_query_http_uri = AsyncMock(return_value=magnet)
params = {'uri': 'any non empty uri'}

download_manager.get_metainfo = AsyncMock(return_value={b'info': {}})

with patch(f'{TARGET}.query_http_uri', mocked_query_http_uri):
await do_request(rest_api, 'torrentinfo', params=params)

expected_url = magnet.decode('utf-8')
download_manager.get_metainfo.assert_called_with(b'\x00' * 20, timeout=60, hops=None, url=expected_url)


async def test_on_got_invalid_metainfo(rest_api):
"""
Test whether the right operations happen when we receive an invalid metainfo object
Expand All @@ -194,7 +214,7 @@ async def test_on_got_invalid_metainfo(rest_api):
]


@patch("tribler.core.components.libtorrent.restapi.torrentinfo_endpoint.query_http_uri")
@patch(f"{TARGET}.query_http_uri")
@pytest.mark.parametrize("exception", caught_exceptions)
async def test_torrentinfo_endpoint_timeout_error(mocked_query_http_uri: AsyncMock, exception: Exception):
# Test that in the case of exceptions related to querying HTTP URI specified in this tests,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ async def get_torrent_info(self, request):
{"error": f'Error while getting an infohash from magnet: {e.__class__.__name__}: {e}'},
status=HTTP_INTERNAL_SERVER_ERROR
)

metainfo = await self.download_manager.get_metainfo(infohash, timeout=60, hops=hops, url=response)
url = response.decode("utf-8")
metainfo = await self.download_manager.get_metainfo(infohash, timeout=60, hops=hops, url=url)
else:
metainfo = bdecode_compat(response)
elif scheme == MAGNET_SCHEME:
Expand All @@ -140,7 +140,8 @@ async def get_torrent_info(self, request):
return RESTResponse({"error": "invalid response"}, status=HTTP_INTERNAL_SERVER_ERROR)

# Add the torrent to metadata.db
metadata_dict = tdef_to_metadata_dict(TorrentDef.load_from_dict(metainfo))
torrent_def = TorrentDef.load_from_dict(metainfo)
metadata_dict = tdef_to_metadata_dict(torrent_def)
self.download_manager.notifier[notifications.torrent_metadata_added](metadata_dict)

infohash = metadata_dict['infohash']
Expand All @@ -151,7 +152,8 @@ async def get_torrent_info(self, request):
# Check if the torrent is already in the downloads
encoded_metainfo = deepcopy(metainfo)

encoded_metainfo = hexlify(json.dumps(recursive_unicode(
encoded_metainfo, ignore_errors=True), ensure_ascii=False).encode('utf-8'))
ready_for_unicode = recursive_unicode(encoded_metainfo, ignore_errors=True)
json_dump = json.dumps(ready_for_unicode, ensure_ascii=False)
encoded_metainfo = hexlify(json_dump.encode('utf-8'))
return RESTResponse({"metainfo": encoded_metainfo,
"download_exists": download and not download_is_metainfo_request})
Loading