Merge branch 'aumetra/relicense' of https://github.com/kitsune-soc/ki…

…tsune into aumetra/relicense
kitsune-soc · Feb 6, 2024 · 4fa680b · 4fa680b
2 parents 303f53c + 6709fc4
commit 4fa680b
Show file tree

Hide file tree

Showing 30 changed files with 543 additions and 523 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/kitsune-activitypub/Cargo.toml b/crates/kitsune-activitypub/Cargo.toml
@@ -53,7 +53,7 @@ kitsune-test = { path = "../kitsune-test" }
 kitsune-webfinger = { path = "../kitsune-webfinger" }
 pretty_assertions = "1.4.0"
 serial_test = "3.0.0"
-tokio = { version = "1.35.1", features = ["macros"] }
+tokio = { version = "1.36.0", features = ["macros"] }
 tower = { version = "0.4.13", default-features = false, features = ["util"] }
 
 [lints]

diff --git a/crates/kitsune-blocking/Cargo.toml b/crates/kitsune-blocking/Cargo.toml
@@ -9,7 +9,7 @@ license.workspace = true
 once_cell = "1.19.0"
 rayon = "1.8.1"
 thiserror = "1.0.56"
-tokio = { version = "1.35.1", features = ["rt", "sync"] }
+tokio = { version = "1.36.0", features = ["rt", "sync"] }
 tracing = "0.1.40"
 
 [lints]

diff --git a/crates/kitsune-cache/Cargo.toml b/crates/kitsune-cache/Cargo.toml
@@ -17,7 +17,7 @@ tracing = "0.1.40"
 typed-builder = "0.18.1"
 
 [dev-dependencies]
-tokio = { version = "1.35.1", features = ["macros", "rt"] }
+tokio = { version = "1.36.0", features = ["macros", "rt"] }
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-config/Cargo.toml b/crates/kitsune-config/Cargo.toml
@@ -7,11 +7,11 @@ license.workspace = true
 
 [dependencies]
 isolang = { version = "2.4.0", features = ["serde"] }
-miette = "5.10.0"
+miette = "7.0.0"
 serde = { version = "1.0.196", features = ["derive"] }
 smol_str = { version = "0.2.1", features = ["serde"] }
-tokio = { version = "1.35.1", features = ["fs"] }
-toml = { version = "0.8.8", default-features = false, features = ["parse"] }
+tokio = { version = "1.36.0", features = ["fs"] }
+toml = { version = "0.8.9", default-features = false, features = ["parse"] }
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-db/Cargo.toml b/crates/kitsune-db/Cargo.toml
@@ -24,7 +24,7 @@ kitsune-blocking = { path = "../kitsune-blocking" }
 kitsune-config = { path = "../kitsune-config" }
 kitsune-language = { path = "../kitsune-language" }
 kitsune-type = { path = "../kitsune-type" }
-miette = "5.10.0"
+miette = "7.0.0"
 num-derive = "0.4.1"
 num-traits = "0.2.17"
 rustls = "0.22.2"
@@ -33,7 +33,7 @@ serde = { version = "1.0.196", features = ["derive"] }
 simd-json = "0.13.8"
 speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] }
 thiserror = "1.0.56"
-tokio = { version = "1.35.1", features = ["rt"] }
+tokio = { version = "1.36.0", features = ["rt"] }
 tokio-postgres = "0.7.10"
 tokio-postgres-rustls = "0.11.1"
 tracing = "0.1.40"
@@ -43,7 +43,7 @@ typed-builder = "0.18.1"
 [dev-dependencies]
 kitsune-test = { path = "../kitsune-test" }
 serial_test = "3.0.0"
-tokio = { version = "1.35.1", features = ["macros"] }
+tokio = { version = "1.36.0", features = ["macros"] }
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-db/src/tls.rs b/crates/kitsune-db/src/tls.rs
@@ -11,8 +11,9 @@ pub fn pool_config() -> ManagerConfig<AsyncPgConnection> {
 fn establish_conn(config: &str) -> BoxFuture<'_, ConnectionResult<AsyncPgConnection>> {
     async {
         let rustls_config = rustls::ClientConfig::builder()
-            .with_root_certificates(load_certs())
+            .with_root_certificates(load_certs().await)
             .with_no_client_auth();
+
         let tls = tokio_postgres_rustls::MakeRustlsConnect::new(rustls_config);
         let (client, conn) = tokio_postgres::connect(config, tls)
             .await
@@ -29,10 +30,16 @@ fn establish_conn(config: &str) -> BoxFuture<'_, ConnectionResult<AsyncPgConnect
     .boxed()
 }
 
-fn load_certs() -> rustls::RootCertStore {
+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)
+        .await
+        .unwrap()
+        .expect("Failed to load native certificates");
+
     let mut roots = rustls::RootCertStore::empty();
-    let certs =
-        rustls_native_certs::load_native_certs().expect("Failed to load native certificates");
     roots.add_parsable_certificates(certs);
     roots
 }
diff --git a/crates/kitsune-email/Cargo.toml b/crates/kitsune-email/Cargo.toml
@@ -24,7 +24,7 @@ lettre = { version = "0.11.4", default-features = false, features = [
     "tokio1-rustls-tls",
     "tracing",
 ] }
-miette = "5.10.0"
+miette = "7.0.0"
 mrml = { version = "3.0.0", default-features = false, features = [
     "orderedmap",
     "parse",

diff --git a/crates/kitsune-federation-filter/Cargo.toml b/crates/kitsune-federation-filter/Cargo.toml
@@ -9,7 +9,7 @@ license.workspace = true
 globset = "0.4.14"
 kitsune-config = { path = "../kitsune-config" }
 kitsune-type = { path = "../kitsune-type" }
-miette = "5.10.0"
+miette = "7.0.0"
 thiserror = "1.0.56"
 url = "2.5.0"
 

diff --git a/crates/kitsune-http-client/Cargo.toml b/crates/kitsune-http-client/Cargo.toml
@@ -15,7 +15,7 @@ headers = "0.4.0"
 http-body = "1.0.0"
 http-body-util = "0.1.0"
 hyper = "1.1.0"
-hyper-util = { version = "0.1.2", features = [
+hyper-util = { version = "0.1.3", features = [
     "client-legacy",
     "http1",
     "http2",
@@ -41,7 +41,7 @@ tower-http = { version = "0.5.1", features = [
 ] }
 
 [dev-dependencies]
-tokio = { version = "1.35.1", features = ["macros", "rt"] }
+tokio = { version = "1.36.0", features = ["macros", "rt"] }
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-http-signatures/Cargo.toml b/crates/kitsune-http-signatures/Cargo.toml
@@ -10,9 +10,9 @@ base64-simd = "0.8.0"
 derive_builder = "0.13.0"
 http = "1.0.0"
 kitsune-blocking = { path = "../kitsune-blocking" }
-itertools = { version = "0.12.0", default-features = false }
+itertools = { version = "0.12.1", default-features = false }
 ring = { version = "0.17.7", features = ["std"] }
-time = { version = "0.3.31", default-features = false, features = [
+time = { version = "0.3.34", default-features = false, features = [
     "formatting",
     "parsing",
 ] }
@@ -22,7 +22,7 @@ typed-builder = "0.18.1"
 [dev-dependencies]
 pem = "3.0.3"
 pkcs8 = { version = "0.10.2", features = ["alloc"] }
-tokio = { version = "1.35.1", features = ["macros", "rt"] }
+tokio = { version = "1.36.0", features = ["macros", "rt"] }
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-jobs/Cargo.toml b/crates/kitsune-jobs/Cargo.toml
@@ -14,7 +14,7 @@ futures-util = "0.3.30"
 kitsune-core = { path = "../kitsune-core" }
 kitsune-db = { path = "../kitsune-db" }
 kitsune-email = { path = "../kitsune-email" }
-miette = "5.10.0"
+miette = "7.0.0"
 scoped-futures = "0.1.3"
 serde = { version = "1.0.196", features = ["derive"] }
 speedy-uuid = { path = "../../lib/speedy-uuid" }

diff --git a/crates/kitsune-mastodon/Cargo.toml b/crates/kitsune-mastodon/Cargo.toml
@@ -26,7 +26,7 @@ simd-json = "0.13.8"
 smol_str = "0.2.1"
 speedy-uuid = { path = "../../lib/speedy-uuid" }
 thiserror = "1.0.56"
-tokio = { version = "1.35.1", features = ["rt"] }
+tokio = { version = "1.36.0", features = ["rt"] }
 tracing = "0.1.40"
 typed-builder = "0.18.1"
 

diff --git a/crates/kitsune-messaging/Cargo.toml b/crates/kitsune-messaging/Cargo.toml
@@ -18,7 +18,7 @@ redis = { version = "0.24.0", features = [
 ] }
 serde = "1.0.196"
 simd-json = "0.13.8"
-tokio = { version = "1.35.1", features = ["macros", "rt", "sync"] }
+tokio = { version = "1.36.0", features = ["macros", "rt", "sync"] }
 tokio-stream = { version = "0.1.14", features = ["sync"] }
 tracing = "0.1.40"
 

diff --git a/crates/kitsune-observability/Cargo.toml b/crates/kitsune-observability/Cargo.toml
@@ -16,7 +16,7 @@ metrics = "0.22.0"
 metrics-opentelemetry = { git = "https://github.com/aumetra/metrics-opentelemetry.git", rev = "b2e2586da553ebd62abdcd3bfd04b5f41a32449a" }
 metrics-tracing-context = "0.15.0"
 metrics-util = "0.16.0"
-miette = "5.10.0"
+miette = "7.0.0"
 opentelemetry = { version = "0.21.0", default-features = false, features = [
     "trace",
 ] }

diff --git a/crates/kitsune-oidc/Cargo.toml b/crates/kitsune-oidc/Cargo.toml
@@ -12,7 +12,7 @@ http = "1.0.0"
 http-compat = { path = "../../lib/http-compat" }
 kitsune-config = { path = "../kitsune-config" }
 kitsune-http-client = { path = "../kitsune-http-client" }
-miette = "5.10.0"
+miette = "7.0.0"
 moka = { version = "0.12.5", features = ["sync"] }
 once_cell = "1.19.0"
 openidconnect = { version = "3.4.0", default-features = false, features = [

diff --git a/crates/kitsune-search/Cargo.toml b/crates/kitsune-search/Cargo.toml
@@ -17,7 +17,7 @@ futures-util = "0.3.30"
 kitsune-config = { path = "../kitsune-config" }
 kitsune-db = { path = "../kitsune-db" }
 kitsune-language = { path = "../kitsune-language" }
-miette = "5.10.0"
+miette = "7.0.0"
 serde = { version = "1.0.196", features = ["derive"] }
 speedy-uuid = { path = "../../lib/speedy-uuid" }
 strum = { version = "0.26.1", features = ["derive"] }

diff --git a/crates/kitsune-service/Cargo.toml b/crates/kitsune-service/Cargo.toml
@@ -43,7 +43,7 @@ kitsune-search = { path = "../kitsune-search" }
 kitsune-storage = { path = "../kitsune-storage" }
 kitsune-url = { path = "../kitsune-url" }
 kitsune-util = { path = "../kitsune-util" }
-miette = "5.10.0"
+miette = "7.0.0"
 mime = "0.3.17"
 password-hash = { version = "0.5.0", features = ["std"] }
 pkcs8 = "0.10.2"
@@ -57,7 +57,7 @@ simd-json = "0.13.8"
 smol_str = "0.2.1"
 speedy-uuid = { path = "../../lib/speedy-uuid" }
 thiserror = "1.0.56"
-tokio = { version = "1.35.1", features = ["macros"] }
+tokio = { version = "1.36.0", features = ["macros"] }
 tracing = "0.1.40"
 typed-builder = "0.18.1"
 url = "2.5.0"
@@ -78,7 +78,7 @@ kitsune-test = { path = "../kitsune-test" }
 kitsune-webfinger = { path = "../kitsune-webfinger" }
 pretty_assertions = "1.4.0"
 serial_test = "3.0.0"
-tempfile = "3.9.0"
+tempfile = "3.10.0"
 tower = { version = "0.4.13", default-features = false, features = ["util"] }
 
 [lints]

diff --git a/crates/kitsune-storage/Cargo.toml b/crates/kitsune-storage/Cargo.toml
@@ -12,12 +12,12 @@ futures-util = "0.3.30"
 http = "1.0.0"
 kitsune-http-client = { path = "../kitsune-http-client" }
 rusty-s3 = { version = "0.5.0", default-features = false }
-tokio = { version = "1.35.1", features = ["fs", "io-util"] }
+tokio = { version = "1.36.0", features = ["fs", "io-util"] }
 tokio-util = { version = "0.7.10", features = ["io"] }
 
 [dev-dependencies]
-tempfile = "3.9.0"
-tokio = { version = "1.35.1", features = ["macros", "rt"] }
+tempfile = "3.10.0"
+tokio = { version = "1.36.0", features = ["macros", "rt"] }
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-util/Cargo.toml b/crates/kitsune-util/Cargo.toml
@@ -6,16 +6,17 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-bubble-bath = "0.1.1"
+bubble-bath = "0.1.2"
 iso8601-timestamp = "0.2.17"
 kitsune-type = { path = "../kitsune-type" }
 once_cell = "1.19.0"
-pulldown-cmark = { version = "0.9.6", default-features = false, features = [
+pulldown-cmark = { version = "0.10.0", default-features = false, features = [
+    "html",
     "simd",
 ] }
 rand = "0.8.5"
 speedy-uuid = { path = "../../lib/speedy-uuid" }
-tokio = { version = "1.35.1", features = ["macros"] }
+tokio = { version = "1.36.0", features = ["macros"] }
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-webfinger/Cargo.toml b/crates/kitsune-webfinger/Cargo.toml
@@ -23,7 +23,7 @@ http-body-util = "0.1.0"
 hyper = "1.1.0"
 pretty_assertions = "1.4.0"
 simd-json = "0.13.8"
-tokio = { version = "1.35.1", features = ["macros"] }
+tokio = { version = "1.36.0", features = ["macros"] }
 tower = { version = "0.4.13", default-features = false, features = ["util"] }
 
 [lints]

diff --git a/flake.lock b/flake.lock
diff --git a/kitsune-cli/Cargo.toml b/kitsune-cli/Cargo.toml
@@ -20,10 +20,10 @@ dotenvy = "0.15.7"
 envy = "0.4.2"
 kitsune-config = { path = "../crates/kitsune-config" }
 kitsune-db = { path = "../crates/kitsune-db" }
-miette = { version = "5.10.0", features = ["fancy"] }
+miette = { version = "7.0.0", features = ["fancy"] }
 serde = { version = "1.0.196", features = ["derive"] }
 speedy-uuid = { path = "../lib/speedy-uuid" }
-tokio = { version = "1.35.1", features = ["full"] }
+tokio = { version = "1.36.0", features = ["full"] }
 tracing-subscriber = "0.3.18"
 
 [build-dependencies]

diff --git a/kitsune-fe/package.json b/kitsune-fe/package.json
@@ -13,24 +13,24 @@
   },
   "dependencies": {
     "@fluent/bundle": "^0.18.0",
-    "@formkit/core": "^1.5.2",
-    "@formkit/validation": "^1.5.2",
-    "@formkit/vue": "^1.5.2",
+    "@formkit/core": "^1.5.5",
+    "@formkit/validation": "^1.5.5",
+    "@formkit/vue": "^1.5.5",
     "@fortawesome/fontawesome-svg-core": "^6.5.1",
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
-    "@fortawesome/vue-fontawesome": "^3.0.5",
+    "@fortawesome/vue-fontawesome": "^3.0.6",
     "@hcaptcha/vue3-hcaptcha": "^1.3.0",
     "@mcaptcha/vanilla-glue": "^0.1.0-alpha-3",
-    "@tiptap/pm": "^2.2.0",
-    "@tiptap/starter-kit": "^2.2.0",
-    "@tiptap/vue-3": "^2.2.0",
-    "@urql/exchange-graphcache": "^6.4.0",
+    "@tiptap/pm": "^2.2.1",
+    "@tiptap/starter-kit": "^2.2.1",
+    "@tiptap/vue-3": "^2.2.1",
+    "@urql/exchange-graphcache": "^6.4.1",
     "@urql/vue": "^1.1.2",
     "@vueuse/core": "^10.7.2",
     "@zxcvbn-ts/core": "^3.0.4",
     "@zxcvbn-ts/language-common": "^3.0.4",
     "@zxcvbn-ts/language-en": "^3.0.2",
-    "floating-vue": "^5.2.1",
+    "floating-vue": "^5.2.2",
     "fluent-vue": "^3.5.0",
     "graphql": "^16.8.1",
     "lodash": "^4.17.21",
@@ -50,16 +50,16 @@
     "@parcel/watcher": "^2.4.0",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/lodash": "^4.14.202",
-    "@typescript-eslint/eslint-plugin": "^6.19.1",
-    "@typescript-eslint/parser": "^6.19.1",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
     "@vitejs/plugin-vue": "^5.0.3",
     "@vue/eslint-config-prettier": "^9.0.0",
     "@vue/eslint-config-typescript": "^12.0.0",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-vue": "^9.20.1",
-    "prettier": "^3.2.4",
+    "eslint-plugin-vue": "^9.21.1",
+    "prettier": "^3.2.5",
     "prettier-plugin-css-order": "^2.0.1",
     "sass": "^1.70.0",
     "typescript": "^5.3.3",