feat!: [#217] lowercase infohashes

torrust · Jun 27, 2023 · 7803d5a · 7803d5a
1 parent 9133910
commit 7803d5a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/migrations/mysql/20230627144318_torrust_covert_infohashes_to_lowercase.sql b/migrations/mysql/20230627144318_torrust_covert_infohashes_to_lowercase.sql
@@ -0,0 +1 @@
+UPDATE torrust_torrents SET info_hash = LOWER(info_hash);
diff --git a/migrations/sqlite3/20230627144318_torrust_covert_infohashes_to_lowercase.sql b/migrations/sqlite3/20230627144318_torrust_covert_infohashes_to_lowercase.sql
@@ -0,0 +1 @@
+UPDATE torrust_torrents SET info_hash = LOWER(info_hash);
diff --git a/src/databases/mysql.rs b/src/databases/mysql.rs
@@ -444,7 +444,7 @@ impl Database for Mysql {
         let torrent_id = query("INSERT INTO torrust_torrents (uploader_id, category_id, info_hash, size, name, pieces, piece_length, private, root_hash, date_uploaded) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, UTC_TIMESTAMP())")
             .bind(uploader_id)
             .bind(category_id)
-            .bind(info_hash.to_uppercase())
+            .bind(info_hash.to_lowercase())
             .bind(torrent.file_size())
             .bind(torrent.info.name.to_string())
             .bind(pieces)
@@ -582,7 +582,7 @@ impl Database for Mysql {
         query_as::<_, DbTorrentInfo>(
             "SELECT torrent_id, info_hash, name, pieces, piece_length, private, root_hash FROM torrust_torrents WHERE info_hash = ?",
         )
-        .bind(info_hash.to_hex_string().to_uppercase()) // `info_hash` is stored as uppercase hex string
+        .bind(info_hash.to_hex_string().to_lowercase())
         .fetch_one(&self.pool)
         .await
         .map_err(|_| database::Error::TorrentNotFound)
@@ -652,7 +652,7 @@ impl Database for Mysql {
             WHERE tt.info_hash = ?
             GROUP BY torrent_id"
         )
-            .bind(info_hash.to_hex_string().to_uppercase()) // `info_hash` is stored as uppercase hex string
+            .bind(info_hash.to_hex_string().to_lowercase())
             .fetch_one(&self.pool)
             .await
             .map_err(|_| database::Error::TorrentNotFound)

diff --git a/src/databases/sqlite.rs b/src/databases/sqlite.rs
@@ -434,7 +434,7 @@ impl Database for Sqlite {
         let torrent_id = query("INSERT INTO torrust_torrents (uploader_id, category_id, info_hash, size, name, pieces, piece_length, private, root_hash, date_uploaded) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, strftime('%Y-%m-%d %H:%M:%S',DATETIME('now', 'utc')))")
             .bind(uploader_id)
             .bind(category_id)
-            .bind(info_hash.to_uppercase())
+            .bind(info_hash.to_lowercase())
             .bind(torrent.file_size())
             .bind(torrent.info.name.to_string())
             .bind(pieces)
@@ -572,7 +572,7 @@ impl Database for Sqlite {
         query_as::<_, DbTorrentInfo>(
             "SELECT torrent_id, info_hash, name, pieces, piece_length, private, root_hash FROM torrust_torrents WHERE info_hash = ?",
         )
-        .bind(info_hash.to_hex_string().to_uppercase()) // `info_hash` is stored as uppercase hex string
+        .bind(info_hash.to_hex_string().to_lowercase())
         .fetch_one(&self.pool)
         .await
         .map_err(|_| database::Error::TorrentNotFound)
@@ -642,7 +642,7 @@ impl Database for Sqlite {
             WHERE tt.info_hash = ?
             GROUP BY ts.torrent_id"
         )
-            .bind(info_hash.to_string().to_uppercase()) // `info_hash` is stored as uppercase
+            .bind(info_hash.to_string().to_lowercase())
             .fetch_one(&self.pool)
             .await
             .map_err(|_| database::Error::TorrentNotFound)

diff --git a/src/models/torrent_file.rs b/src/models/torrent_file.rs
@@ -193,7 +193,7 @@ impl Torrent {
 
     #[must_use]
     pub fn info_hash(&self) -> String {
-        from_bytes(&self.calculate_info_hash_as_bytes())
+        from_bytes(&self.calculate_info_hash_as_bytes()).to_lowercase()
     }
 
     #[must_use]

diff --git a/src/web/api/v1/contexts/torrent/handlers.rs b/src/web/api/v1/contexts/torrent/handlers.rs
@@ -57,6 +57,12 @@ pub async fn upload_torrent_handler(
 #[derive(Deserialize)]
 pub struct InfoHashParam(pub String);
 
+impl InfoHashParam {
+    fn lowercase(&self) -> String {
+        self.0.to_lowercase()
+    }
+}
+
 /// Returns the torrent as a byte stream `application/x-bittorrent`.
 ///
 /// # Errors
@@ -68,7 +74,7 @@ pub async fn download_torrent_handler(
     Extract(maybe_bearer_token): Extract,
     Path(info_hash): Path<InfoHashParam>,
 ) -> Response {
-    let Ok(info_hash) = InfoHash::from_str(&info_hash.0) else { return ServiceError::BadRequest.into_response() };
+    let Ok(info_hash) = InfoHash::from_str(&info_hash.lowercase()) else { return ServiceError::BadRequest.into_response() };
 
     let opt_user_id = match get_optional_logged_in_user(maybe_bearer_token, app_data.clone()).await {
         Ok(opt_user_id) => opt_user_id,
@@ -114,7 +120,7 @@ pub async fn get_torrent_info_handler(
     Extract(maybe_bearer_token): Extract,
     Path(info_hash): Path<InfoHashParam>,
 ) -> Response {
-    let Ok(info_hash) = InfoHash::from_str(&info_hash.0) else { return ServiceError::BadRequest.into_response() };
+    let Ok(info_hash) = InfoHash::from_str(&info_hash.lowercase()) else { return ServiceError::BadRequest.into_response() };
 
     let opt_user_id = match get_optional_logged_in_user(maybe_bearer_token, app_data.clone()).await {
         Ok(opt_user_id) => opt_user_id,
@@ -143,7 +149,7 @@ pub async fn update_torrent_info_handler(
     Path(info_hash): Path<InfoHashParam>,
     extract::Json(update_torrent_info_form): extract::Json<UpdateTorrentInfoForm>,
 ) -> Response {
-    let Ok(info_hash) = InfoHash::from_str(&info_hash.0) else { return ServiceError::BadRequest.into_response() };
+    let Ok(info_hash) = InfoHash::from_str(&info_hash.lowercase()) else { return ServiceError::BadRequest.into_response() };
 
     let user_id = match app_data.auth.get_user_id_from_bearer_token(&maybe_bearer_token).await {
         Ok(user_id) => user_id,
@@ -182,7 +188,7 @@ pub async fn delete_torrent_handler(
     Extract(maybe_bearer_token): Extract,
     Path(info_hash): Path<InfoHashParam>,
 ) -> Response {
-    let Ok(info_hash) = InfoHash::from_str(&info_hash.0) else { return ServiceError::BadRequest.into_response() };
+    let Ok(info_hash) = InfoHash::from_str(&info_hash.lowercase()) else { return ServiceError::BadRequest.into_response() };
 
     let user_id = match app_data.auth.get_user_id_from_bearer_token(&maybe_bearer_token).await {
         Ok(user_id) => user_id,

diff --git a/tests/e2e/web/api/v1/contexts/torrent/contract.rs b/tests/e2e/web/api/v1/contexts/torrent/contract.rs
@@ -176,7 +176,7 @@ mod for_guests {
         let expected_torrent = TorrentDetails {
             torrent_id: uploaded_torrent.torrent_id,
             uploader: uploader.username,
-            info_hash: test_torrent.file_info.info_hash.to_uppercase(),
+            info_hash: test_torrent.file_info.info_hash.to_lowercase(),
             title: test_torrent.index_info.title.clone(),
             description: test_torrent.index_info.description,
             category: Category {
@@ -203,7 +203,7 @@ mod for_guests {
             magnet_link: format!(
                 // cspell:disable-next-line
                 "magnet:?xt=urn:btih:{}&dn={}&tr={}&tr={}",
-                test_torrent.file_info.info_hash.to_uppercase(),
+                test_torrent.file_info.info_hash.to_lowercase(),
                 urlencoding::encode(&test_torrent.index_info.title),
                 encoded_tracker_url,
                 encoded_tracker_url