From bf62fbe644aafa6a9293cdebb2923cb82175694c Mon Sep 17 00:00:00 2001 From: Piotr Juszczyk <74842304+pijuszczyk@users.noreply.github.com> Date: Tue, 4 Jul 2023 12:14:37 +0200 Subject: [PATCH] Remove not needed anymore http-signature-normalization-actix dependency (#3458) --- Cargo.lock | 34 ++-------------------------------- crates/apub/Cargo.toml | 1 - crates/apub/src/http/routes.rs | 3 --- 3 files changed, 2 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0e6dc916..81a6ffb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,7 +31,7 @@ dependencies = [ "enum_delegate", "futures-core", "http", - "http-signature-normalization 0.7.0", + "http-signature-normalization", "http-signature-normalization-reqwest", "httpdate", "itertools", @@ -2219,15 +2219,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" -[[package]] -name = "http-signature-normalization" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f45adbef81d7ea3bd7e9bcc6734b7245dad05a14abdcc7ddc0988791d63515" -dependencies = [ - "httpdate", -] - [[package]] name = "http-signature-normalization" version = "0.7.0" @@ -2237,26 +2228,6 @@ dependencies = [ "httpdate", ] -[[package]] -name = "http-signature-normalization-actix" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7483d0ee4d093fa4bfe5956cd405492c07808a5064a29cfe3960d474f21f39c2" -dependencies = [ - "actix-http", - "actix-rt", - "actix-web", - "base64 0.13.1", - "futures-util", - "http-signature-normalization 0.6.0", - "sha2", - "thiserror", - "tokio", - "tracing", - "tracing-error", - "tracing-futures", -] - [[package]] name = "http-signature-normalization-reqwest" version = "0.8.0" @@ -2264,7 +2235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c382c69a07b21accae86298d520579403af6479b1cd1c389e3ee11f01d48627" dependencies = [ "base64 0.13.1", - "http-signature-normalization 0.7.0", + "http-signature-normalization", "httpdate", "reqwest", "reqwest-middleware", @@ -2661,7 +2632,6 @@ dependencies = [ "futures", "html2md", "http", - "http-signature-normalization-actix", "itertools", "lemmy_api_common", "lemmy_db_schema", diff --git a/crates/apub/Cargo.toml b/crates/apub/Cargo.toml index 8570541f..fe94cdc7 100644 --- a/crates/apub/Cargo.toml +++ b/crates/apub/Cargo.toml @@ -40,7 +40,6 @@ reqwest = { workspace = true } once_cell = { workspace = true } html2md = "0.2.14" serde_with = { workspace = true } -http-signature-normalization-actix = { version = "0.6.2", default-features = false, features = ["server", "sha-2"] } enum_delegate = "0.2.0" [dev-dependencies] diff --git a/crates/apub/src/http/routes.rs b/crates/apub/src/http/routes.rs index 4d4941f5..0012fccf 100644 --- a/crates/apub/src/http/routes.rs +++ b/crates/apub/src/http/routes.rs @@ -19,8 +19,6 @@ use actix_web::{ http::{header, Method}, web, }; -use http_signature_normalization_actix::digest::middleware::VerifyDigest; -use sha2::{Digest, Sha256}; pub fn config(cfg: &mut web::ServiceConfig) { cfg @@ -57,7 +55,6 @@ pub fn config(cfg: &mut web::ServiceConfig) { cfg.service( web::scope("") - .wrap(VerifyDigest::new(Sha256::new())) .guard(InboxRequestGuard) .route("/c/{community_name}/inbox", web::post().to(community_inbox)) .route("/u/{user_name}/inbox", web::post().to(person_inbox)) -- 2.44.1