diff --git a/Cargo.lock b/Cargo.lock index 0107434..a6fb639 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2562,11 +2562,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys", +] + [[package]] name = "rsa" version = "0.9.2" @@ -2653,7 +2667,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", - "ring", + "ring 0.16.20", "rustls-webpki", "sct", ] @@ -2669,12 +2683,12 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.3" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.3", + "untrusted 0.9.0", ] [[package]] @@ -2710,8 +2724,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -3698,6 +3712,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.0" @@ -3860,8 +3880,8 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] diff --git a/crates/database/src/sqlite.rs b/crates/database/src/sqlite.rs index 1d38124..2d39d68 100644 --- a/crates/database/src/sqlite.rs +++ b/crates/database/src/sqlite.rs @@ -421,7 +421,7 @@ mod tests { let user_id = "570DC079-664A-4496-BAA3-668C445A447"; // create fake user - used as FOREIGN KEY in media sqlx::query("INSERT INTO users (uuid, email, password, lastname, firstname) VALUES ($1, $2, $3, $4, $5)") - .bind(user_id.clone()) + .bind(user_id) .bind("info@photos.network") .bind("unsecure") .bind("Stuermer") @@ -436,9 +436,7 @@ mod tests { let date_taken = OffsetDateTime::now_utc(); // when - let media_item_result = db - .create_media_item(user_id.clone(), name, date_taken) - .await; + let media_item_result = db.create_media_item(user_id, name, date_taken).await; // then assert!(media_item_result.is_ok()); @@ -459,7 +457,7 @@ mod tests { // create fake user - used as FOREIGN KEY in media sqlx::query("INSERT INTO users (uuid, email, password, lastname, firstname) VALUES ($1, $2, $3, $4, $5)") - .bind(user_id.clone()) + .bind(user_id) .bind("info@photos.network") .bind("unsecure") .bind("Stuermer") @@ -467,8 +465,8 @@ mod tests { .execute(&pool).await?; sqlx::query("INSERT INTO media (uuid, owner, name, is_sensitive, added_at, taken_at) VALUES ($1, $2, $3, $4, $5, $6)") - .bind(media_id.clone()) - .bind(user_id.clone()) + .bind(media_id) + .bind(user_id) .bind("DSC_1234") .bind(false) .bind(added_at) @@ -481,7 +479,7 @@ mod tests { .await; // when - let media_item_result = db.create_media_item(user_id.clone(), name, taken_at).await; + let media_item_result = db.create_media_item(user_id, name, taken_at).await; // then assert!(media_item_result.is_ok()); @@ -501,7 +499,7 @@ mod tests { let taken_at = OffsetDateTime::parse("2023-01-01T13:37:01.234567Z", &Rfc3339).unwrap(); // create fake user - used as FOREIGN KEY in reference sqlx::query("INSERT INTO users (uuid, email, password, lastname, firstname) VALUES ($1, $2, $3, $4, $5)") - .bind(user_id.clone()) + .bind(user_id) .bind("info@photos.network") .bind("unsecure") .bind("Stuermer") @@ -509,8 +507,8 @@ mod tests { .execute(&pool).await?; // create fake media item - used as FOREIGN KEY in reference sqlx::query("INSERT INTO media (uuid, owner, name, is_sensitive, added_at, taken_at) VALUES ($1, $2, $3, $4, $5, $6)") - .bind(media_id.clone()) - .bind(user_id.clone()) + .bind(media_id) + .bind(user_id) .bind("DSC_1234") .bind(false) .bind(added_at) @@ -539,9 +537,7 @@ mod tests { }; // when - let add_reference_result = db - .add_reference(user_id.clone(), media_id.clone(), &reference) - .await; + let add_reference_result = db.add_reference(user_id, media_id, &reference).await; // then assert!(add_reference_result.is_ok()); diff --git a/crates/media/src/api/routes/post_media.rs b/crates/media/src/api/routes/post_media.rs index 1b54b29..b8a2185 100644 --- a/crates/media/src/api/routes/post_media.rs +++ b/crates/media/src/api/routes/post_media.rs @@ -121,7 +121,6 @@ mod tests { use crate::api::router::MediaApi; use axum::http::header::CONTENT_TYPE; - use hyper::header::CONNECTION; use std::io::Write; use std::path::PathBuf; use testdir::testdir; diff --git a/crates/media/src/repository.rs b/crates/media/src/repository.rs index a629beb..33bd9f3 100644 --- a/crates/media/src/repository.rs +++ b/crates/media/src/repository.rs @@ -178,7 +178,7 @@ mod tests { // given let user_id = "605EE8BE-BAF2-4499-B8D4-BA8C74E8B242"; sqlx::query("INSERT INTO users (uuid, email, password, lastname, firstname) VALUES ($1, $2, $3, $4, $5)") - .bind(user_id.clone()) + .bind(user_id) .bind("info@photos.network") .bind("unsecure") .bind("Stuermer") @@ -188,7 +188,7 @@ mod tests { sqlx::query("INSERT INTO media (uuid, name, owner) VALUES ($1, $2, $3)") .bind("6A92460C-53FB-4B42-AC1B-E6760A34E169") .bind("DSC_1234") - .bind(user_id.clone()) + .bind(user_id) .execute(&pool) .await?;