Fixed exception on bad torrent URL (#8403)

Tribler · Jan 21, 2025 · f2c7e4b · f2c7e4b
2 parents 3bd4f51 + cbab801
commit f2c7e4b
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 4 deletions.
diff --git a/src/tribler/core/libtorrent/restapi/torrentinfo_endpoint.py b/src/tribler/core/libtorrent/restapi/torrentinfo_endpoint.py
@@ -195,7 +195,15 @@ async def get_torrent_info(self, request: Request) -> RESTResponse:  # noqa: C90
                 metainfo = await self.download_manager.get_metainfo(infohash, timeout=60, hops=i_hops,
                                                                     url=response.decode())
             else:
-                metainfo = lt.bdecode(response)
+                try:
+                    metainfo = lt.bdecode(response)
+                except RuntimeError:
+                    return RESTResponse(
+                        {"error": {
+                            "handled": True,
+                            "message": f"Could not read torrent from {uri}"
+                        }}, status=HTTP_INTERNAL_SERVER_ERROR
+                    )
         elif scheme == "magnet":
             self._logger.info("magnet scheme detected")
 

diff --git a/src/tribler/test_unit/core/libtorrent/restapi/test_torrentinfo_endpoint.py b/src/tribler/test_unit/core/libtorrent/restapi/test_torrentinfo_endpoint.py
@@ -279,6 +279,22 @@ async def test_get_torrent_info_http_valueerror(self) -> None:
         self.assertEqual(HTTP_INTERNAL_SERVER_ERROR, response.status)
         self.assertEqual("test", response_body_json["error"]["message"])
 
+    async def test_get_torrent_info_http_no_torrent(self) -> None:
+        """
+        Test if a graceful error is returned when a valid HTTP address does not return a torrent.
+        """
+        request = MockRequest("/api/torrentinfo", query={"hops": 0, "uri": "http://127.0.0.1/file"})
+
+        with patch.dict(tribler.core.libtorrent.restapi.torrentinfo_endpoint.__dict__,
+                        {"unshorten": mock_unshorten}), \
+                patch("tribler.core.libtorrent.restapi.torrentinfo_endpoint.query_uri",
+                      AsyncMock(return_value=b"<html><body>404: Page not found.</body></html>")):
+            response = await self.endpoint.get_torrent_info(request)
+        response_body_json = await response_to_json(response)
+
+        self.assertEqual(HTTP_INTERNAL_SERVER_ERROR, response.status)
+        self.assertEqual("Could not read torrent from http://127.0.0.1/file", response_body_json["error"]["message"])
+
     async def test_get_torrent_info_https_serverconnectionerror(self) -> None:
         """
         Test if a graceful error is returned when a ServerConnectionError occurs when loading from an HTTPS link.
@@ -376,6 +392,22 @@ async def test_get_torrent_info_https_valueerror(self) -> None:
         self.assertEqual(HTTP_INTERNAL_SERVER_ERROR, response.status)
         self.assertEqual("test", response_body_json["error"]["message"])
 
+    async def test_get_torrent_info_https_no_torrent(self) -> None:
+        """
+        Test if a graceful error is returned when a valid HTTP address does not return a torrent.
+        """
+        request = MockRequest("/api/torrentinfo", query={"hops": 0, "uri": "https://127.0.0.1/file"})
+
+        with patch.dict(tribler.core.libtorrent.restapi.torrentinfo_endpoint.__dict__,
+                        {"unshorten": mock_unshorten}), \
+                patch("tribler.core.libtorrent.restapi.torrentinfo_endpoint.query_uri",
+                      AsyncMock(return_value=b"<html><body>404: Page not found.</body></html>")):
+            response = await self.endpoint.get_torrent_info(request)
+        response_body_json = await response_to_json(response)
+
+        self.assertEqual(HTTP_INTERNAL_SERVER_ERROR, response.status)
+        self.assertEqual("Could not read torrent from https://127.0.0.1/file", response_body_json["error"]["message"])
+
     async def test_get_torrent_info_https_certificate_error(self) -> None:
         """
         Test if it is returned that an invalid certificate for an HTTPS request was used.

diff --git a/src/tribler/ui/src/components/add-torrent.tsx b/src/tribler/ui/src/components/add-torrent.tsx
@@ -89,7 +89,16 @@ export function AddTorrent() {
                                 if (uriInput) {
                                     setTorrent(undefined);
                                     setUrlDialogOpen(false);
-                                    setSaveAsDialogOpen(true);
+                                    (async () => {
+                                        const response = await triblerService.getMetainfo(uriInput);
+                                        if (response === undefined) {
+                                            toast.error(`${t("ToastErrorDownloadStart")} ${t("ToastErrorGenNetworkErr")}`);
+                                        } else if (isErrorDict(response)){
+                                            toast.error(`${t("ToastErrorDownloadStart")} ${response.error.message}`);
+                                        } else {
+                                            setSaveAsDialogOpen(true);
+                                        }
+                                    })();
                                 }
                             }}>
                             {t('Add')}
@@ -136,9 +145,9 @@ export function AddTorrent() {
                             (async () => {
                                 const response = await triblerService.startDownloadFromFile(file);
                                 if (response === undefined) {
-                                    toast.error(`${t("ToastErrorStartDownload")} ${t("ToastErrorGenNetworkErr")}`);
+                                    toast.error(`${t("ToastErrorDownloadStart")} ${t("ToastErrorGenNetworkErr")}`);
                                 } else if (isErrorDict(response)){
-                                    toast.error(`${t("ToastErrorStartDownload")} ${response.error.message}`);
+                                    toast.error(`${t("ToastErrorDownloadStart")} ${response.error.message}`);
                                 }
                              })();
                         }