move blocking library to lib, rename to blowocking

kitsune-soc · Feb 11, 2024 · abcd006 · abcd006
1 parent 67252a0
commit abcd006
Show file tree

Hide file tree

Showing 21 changed files with 44 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,6 @@ opt-level = "z"
 [workspace]
 members = [
     "crates/kitsune-activitypub",
-    "crates/kitsune-blocking",
     "crates/kitsune-cache",
     "crates/kitsune-captcha",
     "crates/kitsune-config",
@@ -47,6 +46,7 @@ members = [
     "kitsune-cli",
     "kitsune-job-runner",
     "lib/athena",
+    "lib/blowocking",
     "lib/cursiv",
     "lib/http-compat",
     "lib/http-signatures",

diff --git a/crates/kitsune-blocking/LICENSE-AGPL-3.0 b/crates/kitsune-blocking/LICENSE-AGPL-3.0
diff --git a/crates/kitsune-db/Cargo.toml b/crates/kitsune-db/Cargo.toml
@@ -7,6 +7,7 @@ license.workspace = true
 build = "build.rs"
 
 [dependencies]
+blowocking = { path = "../../lib/blowocking" }
 diesel = { version = "2.1.4", features = ["uuid"] }
 diesel-async = { version = "0.4.1", features = [
     "async-connection-wrapper",
@@ -20,7 +21,6 @@ futures-util = { version = "0.3.30", default-features = false, features = [
     "alloc",
 ] }
 iso8601-timestamp = { version = "0.2.17", features = ["diesel-pg"] }
-kitsune-blocking = { path = "../kitsune-blocking" }
 kitsune-config = { path = "../kitsune-config" }
 kitsune-language = { path = "../kitsune-language" }
 kitsune-type = { path = "../kitsune-type" }

diff --git a/crates/kitsune-db/src/error.rs b/crates/kitsune-db/src/error.rs
@@ -40,7 +40,7 @@ impl StdError for IsoCodeConversionError {}
 #[derive(Debug, Diagnostic, Error)]
 pub enum Error {
     #[error(transparent)]
-    Blocking(#[from] kitsune_blocking::Error),
+    Blocking(#[from] blowocking::Error),
 
     #[error(transparent)]
     Diesel(#[from] diesel::result::Error),

diff --git a/crates/kitsune-db/src/lib.rs b/crates/kitsune-db/src/lib.rs
@@ -35,7 +35,7 @@ pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!();
 pub async fn connect(config: &DatabaseConfig) -> Result<PgPool> {
     LogTracer::init().ok();
 
-    kitsune_blocking::io({
+    blowocking::io({
         let conn_str = config.url.clone();
 
         move || {

diff --git a/crates/kitsune-db/src/tls.rs b/crates/kitsune-db/src/tls.rs
@@ -34,7 +34,7 @@ async fn load_certs() -> rustls::RootCertStore {
     // Load certificates on a background thread to avoid blocking the runtime
     //
     // TODO(aumetra): Maybe add a fallback to `webpki-roots`?
-    let certs = kitsune_blocking::io(rustls_native_certs::load_native_certs)
+    let certs = blowocking::io(rustls_native_certs::load_native_certs)
         .await
         .unwrap()
         .expect("Failed to load native certificates");

diff --git a/crates/kitsune-http-signatures/Cargo.toml b/crates/kitsune-http-signatures/Cargo.toml
@@ -7,9 +7,9 @@ license.workspace = true
 
 [dependencies]
 base64-simd = "0.8.0"
+blowocking = { path = "../../lib/blowocking" }
 derive_builder = "0.13.0"
 http = "1.0.0"
-kitsune-blocking = { path = "../kitsune-blocking" }
 itertools = { version = "0.12.1", default-features = false }
 ring = { version = "0.17.7", features = ["std"] }
 time = { version = "0.3.34", default-features = false, features = [

diff --git a/crates/kitsune-http-signatures/src/error.rs b/crates/kitsune-http-signatures/src/error.rs
@@ -12,7 +12,7 @@ pub enum Error {
     Base64(#[from] base64_simd::Error),
 
     #[error(transparent)]
-    Blocking(#[from] kitsune_blocking::Error),
+    Blocking(#[from] blowocking::Error),
 
     #[error("Signature is expired")]
     ExpiredSignature,

diff --git a/crates/kitsune-http-signatures/src/lib.rs b/crates/kitsune-http-signatures/src/lib.rs
@@ -222,7 +222,7 @@ impl HttpSigner {
         let stringified_signature_string: String = signature_string.try_into()?;
 
         let signature =
-            kitsune_blocking::crypto(move || key.key.sign(stringified_signature_string.as_bytes()))
+            blowocking::crypto(move || key.key.sign(stringified_signature_string.as_bytes()))
                 .await?;
 
         let signature_header = SignatureHeader {
@@ -309,7 +309,7 @@ impl HttpVerifier {
         };
         let stringified_signature_string: String = signature_string.try_into()?;
 
-        kitsune_blocking::crypto(move || {
+        blowocking::crypto(move || {
             public_key.verify(
                 stringified_signature_string.as_bytes(),
                 &signature_header.signature,

diff --git a/crates/kitsune-service/Cargo.toml b/crates/kitsune-service/Cargo.toml
@@ -10,6 +10,7 @@ ahash = "0.8.8"
 argon2 = "0.5.3"
 async-stream = "0.3.5"
 athena = { path = "../../lib/athena" }
+blowocking = { path = "../../lib/blowocking" }
 bytes = "1.5.0"
 deadpool-redis = "0.14.0"
 derive_builder = "0.13.0"
@@ -26,7 +27,6 @@ garde = { version = "0.18.0", default-features = false, features = [
 http = "1.0.0"
 img-parts = "0.3.0"
 iso8601-timestamp = "0.2.17"
-kitsune-blocking = { path = "../kitsune-blocking" }
 kitsune-cache = { path = "../kitsune-cache" }
 kitsune-captcha = { path = "../kitsune-captcha" }
 kitsune-config = { path = "../kitsune-config" }

diff --git a/crates/kitsune-service/src/error.rs b/crates/kitsune-service/src/error.rs
@@ -45,7 +45,7 @@ pub enum Error {
     Attachment(#[from] AttachmentError),
 
     #[error(transparent)]
-    Blocking(#[from] kitsune_blocking::Error),
+    Blocking(#[from] blowocking::Error),
 
     #[error(transparent)]
     Cache(#[from] kitsune_cache::Error),

diff --git a/crates/kitsune-service/src/user.rs b/crates/kitsune-service/src/user.rs
@@ -143,7 +143,7 @@ impl UserService {
         }
 
         let hashed_password_fut = OptionFuture::from(register.password.map(|password| {
-            kitsune_blocking::crypto(move || {
+            blowocking::crypto(move || {
                 let salt = SaltString::generate(rand::thread_rng());
                 let argon2 = Argon2::default();
 
@@ -153,7 +153,7 @@ impl UserService {
             })
         }));
         let private_key_fut =
-            kitsune_blocking::crypto(|| RsaPrivateKey::new(&mut rand::thread_rng(), 4096));
+            blowocking::crypto(|| RsaPrivateKey::new(&mut rand::thread_rng(), 4096));
 
         let (hashed_password, private_key) = tokio::join!(hashed_password_fut, private_key_fut);
         let hashed_password = hashed_password.transpose()?.transpose()?;

diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml
@@ -30,6 +30,7 @@ axum-extra = { version = "0.9.2", features = [
     "query",
 ] }
 axum-flash = "0.8.0"
+blowocking = { path = "../lib/blowocking" }
 bytes = "1.5.0"
 chrono = { version = "0.4.34", default-features = false }
 clap = { version = "4.5.0", features = ["derive", "wrap_help"] }
@@ -45,7 +46,6 @@ http-body-util = "0.1.0"
 iso8601-timestamp = "0.2.17"
 itertools = { version = "0.12.1", default-features = false }
 kitsune-activitypub = { path = "../crates/kitsune-activitypub" }
-kitsune-blocking = { path = "../crates/kitsune-blocking" }
 kitsune-cache = { path = "../crates/kitsune-cache" }
 kitsune-captcha = { path = "../crates/kitsune-captcha" }
 kitsune-config = { path = "../crates/kitsune-config" }

diff --git a/kitsune/src/error.rs b/kitsune/src/error.rs
@@ -23,7 +23,7 @@ pub enum Error {
     ActivityPub(#[from] kitsune_activitypub::error::Error),
 
     #[error(transparent)]
-    Blocking(#[from] kitsune_blocking::Error),
+    Blocking(#[from] blowocking::Error),
 
     #[error(transparent)]
     Cache(#[from] kitsune_cache::Error),

diff --git a/kitsune/src/http/handler/oauth/authorize.rs b/kitsune/src/http/handler/oauth/authorize.rs
@@ -150,7 +150,7 @@ pub async fn post(
         )));
     }
 
-    let is_valid = kitsune_blocking::crypto(move || {
+    let is_valid = blowocking::crypto(move || {
         let password_hash = PasswordHash::new(user.password.as_ref().unwrap())?;
         let argon2 = Argon2::default();
 

diff --git a/crates/kitsune-blocking/Cargo.toml → lib/blowocking/Cargo.toml b/crates/kitsune-blocking/Cargo.toml → lib/blowocking/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-name = "kitsune-blocking"
+name = "blowocking"
 authors.workspace = true
 edition.workspace = true
 version.workspace = true
-license.workspace = true
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 once_cell = "1.19.0"

diff --git a/lib/blowocking/LICENSE-APACHE-2.0 b/lib/blowocking/LICENSE-APACHE-2.0
@@ -0,0 +1 @@
+../../LICENSE-APACHE-2.0
diff --git a/lib/blowocking/LICENSE-MIT b/lib/blowocking/LICENSE-MIT
@@ -0,0 +1 @@
+../../LICENSE-MIT
diff --git a/crates/kitsune-blocking/src/lib.rs → lib/blowocking/src/lib.rs b/crates/kitsune-blocking/src/lib.rs → lib/blowocking/src/lib.rs
diff --git a/lib/http-signatures/Cargo.toml b/lib/http-signatures/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "kitsune-http-signatures-new"
+name = "http-signatures"
 authors.workspace = true
 edition.workspace = true
 version.workspace = true