Upgrade dependencies (#86)

This commit is contained in:
Nutomic 2023-12-01 15:40:12 +01:00 committed by GitHub
parent 69b80aa6e1
commit 1f7de85a53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 25 deletions

View file

@ -8,42 +8,50 @@ license = "AGPL-3.0"
repository = "https://github.com/LemmyNet/activitypub-federation-rust" repository = "https://github.com/LemmyNet/activitypub-federation-rust"
documentation = "https://docs.rs/activitypub_federation/" documentation = "https://docs.rs/activitypub_federation/"
[features]
default = ["actix-web", "axum"]
actix-web = ["dep:actix-web"]
axum = ["dep:axum", "dep:tower", "dep:hyper", "dep:http-body-util"]
[dependencies] [dependencies]
chrono = { version = "0.4.31", features = ["clock"], default-features = false } chrono = { version = "0.4.31", features = ["clock"], default-features = false }
serde = { version = "1.0.189", features = ["derive"] } serde = { version = "1.0.193", features = ["derive"] }
async-trait = "0.1.74" async-trait = "0.1.74"
url = { version = "2.4.1", features = ["serde"] } url = { version = "2.5.0", features = ["serde"] }
serde_json = { version = "1.0.107", features = ["preserve_order"] } serde_json = { version = "1.0.108", features = ["preserve_order"] }
reqwest = { version = "0.11.22", features = ["json", "stream"] } reqwest = { version = "0.11.22", features = ["json", "stream"] }
reqwest-middleware = "0.2.3" reqwest-middleware = "0.2.4"
tracing = "0.1.40" tracing = "0.1.40"
base64 = "0.21.5" base64 = "0.21.5"
openssl = "0.10.57" openssl = "0.10.60"
once_cell = "1.18.0" once_cell = "1.18.0"
http = "0.2.9" http = "0.2.11"
sha2 = "0.10.8" sha2 = "0.10.8"
thiserror = "1.0.50" thiserror = "1.0.50"
derive_builder = "0.12.0" derive_builder = "0.12.0"
itertools = "0.10.5" itertools = "0.12.0"
dyn-clone = "1.0.14" dyn-clone = "1.0.16"
enum_delegate = "0.2.0" enum_delegate = "0.2.0"
httpdate = "1.0.3" httpdate = "1.0.3"
http-signature-normalization-reqwest = { version = "0.8.0", default-features = false, features = [ http-signature-normalization-reqwest = { version = "0.10.0", default-features = false, features = [
"sha-2", "sha-2",
"middleware", "middleware",
"default-spawner",
] } ] }
http-signature-normalization = "0.7.0" http-signature-normalization = "0.7.0"
bytes = "1.5.0" bytes = "1.5.0"
futures-core = { version = "0.3.28", default-features = false } futures-core = { version = "0.3.29", default-features = false }
pin-project-lite = "0.2.13" pin-project-lite = "0.2.13"
activitystreams-kinds = "0.3.0" activitystreams-kinds = "0.3.0"
regex = { version = "1.10.2", default-features = false, features = ["std", "unicode-case"] } regex = { version = "1.10.2", default-features = false, features = ["std", "unicode-case"] }
tokio = { version = "1.33.0", features = [ tokio = { version = "1.34.0", features = [
"sync", "sync",
"rt", "rt",
"rt-multi-thread", "rt-multi-thread",
"time", "time",
] } ] }
futures = "0.3.29"
moka = { version = "0.12.1", features = ["future"] }
# Actix-web # Actix-web
actix-web = { version = "4.4.0", default-features = false, optional = true } actix-web = { version = "4.4.0", default-features = false, optional = true }
@ -55,26 +63,20 @@ axum = { version = "0.6.20", features = [
], default-features = false, optional = true } ], default-features = false, optional = true }
tower = { version = "0.4.13", optional = true } tower = { version = "0.4.13", optional = true }
hyper = { version = "0.14", optional = true } hyper = { version = "0.14", optional = true }
futures = "0.3.28" http-body-util = {version = "0.1.0", optional = true }
moka = { version = "0.11.3", features = ["future"] }
[features]
default = ["actix-web", "axum"]
actix-web = ["dep:actix-web"]
axum = ["dep:axum", "dep:tower", "dep:hyper"]
[dev-dependencies] [dev-dependencies]
anyhow = "1.0.75" anyhow = "1.0.75"
rand = "0.8.5" rand = "0.8.5"
env_logger = "0.10.0" env_logger = "0.10.1"
tower-http = { version = "0.4.4", features = ["map-request-body", "util"] } tower-http = { version = "0.5.0", features = ["map-request-body", "util"] }
axum = { version = "0.6.20", features = [ axum = { version = "0.6.20", features = [
"http1", "http1",
"tokio", "tokio",
"query", "query",
], default-features = false } ], default-features = false }
axum-macros = "0.3.8" axum-macros = "0.3.8"
tokio = { version = "1.33.0", features = ["full"] } tokio = { version = "1.34.0", features = ["full"] }
[profile.dev] [profile.dev]
strip = "symbols" strip = "symbols"

View file

@ -13,11 +13,13 @@ use crate::{
use bytes::Bytes; use bytes::Bytes;
use futures::StreamExt; use futures::StreamExt;
use http::{header::HeaderName, HeaderMap, HeaderValue};
use httpdate::fmt_http_date; use httpdate::fmt_http_date;
use itertools::Itertools; use itertools::Itertools;
use openssl::pkey::{PKey, Private}; use openssl::pkey::{PKey, Private};
use reqwest::Request; use reqwest::{
header::{HeaderMap, HeaderName, HeaderValue},
Request,
};
use reqwest_middleware::ClientWithMiddleware; use reqwest_middleware::ClientWithMiddleware;
use serde::Serialize; use serde::Serialize;
use std::{ use std::{

View file

@ -15,7 +15,10 @@ use crate::{
use base64::{engine::general_purpose::STANDARD as Base64, Engine}; use base64::{engine::general_purpose::STANDARD as Base64, Engine};
use bytes::Bytes; use bytes::Bytes;
use http::{header::HeaderName, uri::PathAndQuery, HeaderValue, Method, Uri}; use http::{header::HeaderName, uri::PathAndQuery, HeaderValue, Method, Uri};
use http_signature_normalization_reqwest::prelude::{Config, SignExt}; use http_signature_normalization_reqwest::{
prelude::{Config, SignExt},
DefaultSpawner,
};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use openssl::{ use openssl::{
hash::MessageDigest, hash::MessageDigest,
@ -83,7 +86,8 @@ pub(crate) async fn sign_request(
private_key: PKey<Private>, private_key: PKey<Private>,
http_signature_compat: bool, http_signature_compat: bool,
) -> Result<Request, Error> { ) -> Result<Request, Error> {
static CONFIG: Lazy<Config> = Lazy::new(|| Config::new().set_expiration(EXPIRES_AFTER)); static CONFIG: Lazy<Config<DefaultSpawner>> =
Lazy::new(|| Config::new().set_expiration(EXPIRES_AFTER));
static CONFIG_COMPAT: Lazy<Config> = Lazy::new(|| { static CONFIG_COMPAT: Lazy<Config> = Lazy::new(|| {
Config::new() Config::new()
.mastodon_compat() .mastodon_compat()