From ca0a0d8e9fa836331c13b1f872fa57689edb5c90 Mon Sep 17 00:00:00 2001 From: "Aode (lion)" Date: Sun, 23 Jan 2022 23:03:00 -0600 Subject: [PATCH] Update actix web --- Cargo.lock | 189 +++++++++++++++++++++++++++------------------------ Cargo.toml | 4 +- src/error.rs | 4 +- 3 files changed, 104 insertions(+), 93 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51cd5ae..1c0f029 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,9 +11,9 @@ dependencies = [ "activitystreams-kinds", "iri-string", "mime", - "serde 1.0.133", + "serde 1.0.135", "serde_json", - "time 0.3.5", + "time 0.3.6", ] [[package]] @@ -23,7 +23,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb8e19a0810cc25df3535061a08b7d8f8a734d309ea4411c57a9767e4a2ffa0e" dependencies = [ "activitystreams", - "serde 1.0.133", + "serde 1.0.135", "serde_json", ] @@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a762e3441050b51cd0695c1413735cd04195950f50dba8f5da5d7201628fcfc" dependencies = [ "iri-string", - "serde 1.0.133", + "serde 1.0.135", ] [[package]] @@ -56,9 +56,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.0.0-beta.18" +version = "3.0.0-beta.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b95871724d27ac9a23d6db3246b23e4e42cd44a23145e1c6b04b78fb5271da" +checksum = "ae58d21721388ea9b2cd0d4c11756b0f34424cdcd6e5cc74c3ce37b4641c8af0" dependencies = [ "actix-codec", "actix-rt", @@ -100,16 +100,16 @@ dependencies = [ [[package]] name = "actix-router" -version = "0.5.0-rc.1" +version = "0.5.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bdca166b1041184e2108ef05bd9909ec18cc6abc41152d31d30224cebfaac75" +checksum = "5e0b59ad08167ffbb686ddb495846707231e96908b829b1fc218198ec581e2ad" dependencies = [ "bytestring", "firestorm", "http", "log", "regex", - "serde 1.0.133", + "serde 1.0.135", ] [[package]] @@ -125,9 +125,9 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.0.0-rc.4" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdbff45cad841b3b20d9fa8ba0df99d1a80f69f397f5b6fad827e5032458bce" +checksum = "d9e7472ac180abb0a8e592b653744345983a7a14f44691c8394a799d0df4dbbf" dependencies = [ "actix-rt", "actix-service", @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.0.0-beta.20" +version = "4.0.0-beta.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8ba5081e9f8d0016cf34df516c699198158fd8c77990aa284115b055ead61b" +checksum = "606fc29a9bde2907243086ceb93ce56df7584276c2c46abc64a524f645c63c5e" dependencies = [ "actix-codec", "actix-http", @@ -211,12 +211,12 @@ dependencies = [ "once_cell", "pin-project-lite", "regex", - "serde 1.0.133", + "serde 1.0.135", "serde_json", "serde_urlencoded", "smallvec", "socket2", - "time 0.3.5", + "time 0.3.6", "url", ] @@ -241,7 +241,7 @@ dependencies = [ "actix-rt", "actix-web", "awc", - "serde 1.0.133", + "serde 1.0.135", "serde_derive", "thiserror", ] @@ -274,9 +274,9 @@ dependencies = [ [[package]] name = "ammonia" -version = "3.1.2" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e445c26125ff80316eaea16e812d717b147b82a68682bd4730f74d4845c8b35" +checksum = "b74b175af97d1aecc1add0878b1cbfcbf3bd4c22d7713eeb6d597da23e29bc0d" dependencies = [ "html5ever", "lazy_static", @@ -298,13 +298,13 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.52" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3" +checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" [[package]] name = "ap-relay" -version = "0.3.14" +version = "0.3.15" dependencies = [ "activitystreams", "activitystreams-ext", @@ -331,7 +331,7 @@ dependencies = [ "rsa", "rsa-magic-public-key", "ructe", - "serde 1.0.133", + "serde 1.0.135", "serde_json", "sha2", "sled", @@ -431,9 +431,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "awc" -version = "3.0.0-beta.18" +version = "3.0.0-beta.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e43f507fc706cf150b5a923655c96101692db9360148038678700fc4172e0a" +checksum = "4a4cf9b623ee9974723a10c77a3b8c1060ac2d6cfe6d3326512bbc50fe36fad8" dependencies = [ "actix-codec", "actix-http", @@ -457,7 +457,7 @@ dependencies = [ "pin-project-lite", "rand 0.8.4", "rustls", - "serde 1.0.133", + "serde 1.0.135", "serde_json", "serde_urlencoded", "tokio", @@ -485,7 +485,7 @@ dependencies = [ "async-trait", "background-jobs-core", "num_cpus", - "serde 1.0.133", + "serde 1.0.135", "serde_json", "thiserror", "tokio", @@ -504,10 +504,10 @@ dependencies = [ "anyhow", "async-mutex", "async-trait", - "serde 1.0.133", + "serde 1.0.135", "serde_json", "thiserror", - "time 0.3.5", + "time 0.3.6", "tracing", "tracing-futures", "uuid", @@ -621,7 +621,7 @@ dependencies = [ "lazy_static", "nom 5.1.2", "rust-ini", - "serde 1.0.133", + "serde 1.0.135", "serde-hjson", "serde_json", "toml", @@ -630,9 +630,9 @@ dependencies = [ [[package]] name = "console-api" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033fddce299c93dd44ae21d5f5a6e749baa5d103784bcdde65701c07272a9fde" +checksum = "14f67643a7d716307ad10b3e3aef02826382acbe349a3e7605ac57556148bc87" dependencies = [ "prost 0.9.0", "prost-types 0.9.0", @@ -643,15 +643,16 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2380cc150266375aeda8f9aeadc5527395c1a8807ecf9fa97a46d1bb760ec5b" +checksum = "829835c211a0247cd11e65e13cec8696b879374879c35ce162ce8098b23c90d4" dependencies = [ "console-api", + "crossbeam-channel", "futures", "hdrhistogram", "humantime", - "serde 1.0.133", + "serde 1.0.135", "serde_json", "thread_local", "tokio", @@ -685,9 +686,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" +checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3" dependencies = [ "cfg-if", ] @@ -822,15 +823,15 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" +checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" [[package]] name = "fastrand" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" dependencies = [ "instant", ] @@ -1143,9 +1144,9 @@ dependencies = [ [[package]] name = "http-signature-normalization-actix" -version = "0.6.0-beta.1" +version = "0.6.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a8231e1fc2e8e80eb81f41e37f1a26f25ac5c96716b158583100f66d625db8" +checksum = "3580657f3ad5b1e4f5c79861b66f3f4be4a9bc62c7f19ea210da8ef4b0ae3528" dependencies = [ "actix-http", "actix-rt", @@ -1248,11 +1249,11 @@ dependencies = [ [[package]] name = "iri-string" -version = "0.5.0-beta.2" +version = "0.5.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08b57553d1be311c9e979117451952d55f1b33366abe5a07f07899dc2f11a4d9" +checksum = "c4b6441947fa91e8defdfcc0cf2e7d5d2c424e30efb11e97eb80a6bde58d778d" dependencies = [ - "serde 1.0.133", + "serde 1.0.135", ] [[package]] @@ -1278,9 +1279,9 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] name = "js-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" dependencies = [ "wasm-bindgen", ] @@ -1315,9 +1316,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.112" +version = "0.2.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" +checksum = "eef78b64d87775463c549fbd80e19249ef436ea3bf1de2a1eb7e717ec7fab1e9" [[package]] name = "libm" @@ -1599,7 +1600,7 @@ dependencies = [ "num-iter", "num-traits 0.2.14", "rand 0.8.4", - "serde 1.0.133", + "serde 1.0.135", "smallvec", "zeroize", ] @@ -1665,6 +1666,15 @@ dependencies = [ "libc", ] +[[package]] +name = "num_threads" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71a1eb3a36534514077c1e079ada2fb170ef30c47d203aa6916138cf882ecd52" +dependencies = [ + "libc", +] + [[package]] name = "once_cell" version = "1.9.0" @@ -2018,9 +2028,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" dependencies = [ "proc-macro2", ] @@ -2307,9 +2317,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.133" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" +checksum = "2cf9235533494ea2ddcdb794665461814781c53f19d87b76e571a1c35acbad2b" dependencies = [ "serde_derive", ] @@ -2328,9 +2338,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.133" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" +checksum = "8dcde03d87d4c973c04be249e7d8f0b35db1c848c487bd43032808e59dd8328d" dependencies = [ "proc-macro2", "quote", @@ -2339,13 +2349,13 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.75" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c059c05b48c5c0067d4b4b2b4f0732dd65feb52daf7e0ea09cd87e7dadc1af79" +checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" dependencies = [ "itoa 1.0.1", "ryu", - "serde 1.0.133", + "serde 1.0.135", ] [[package]] @@ -2357,7 +2367,7 @@ dependencies = [ "form_urlencoded", "itoa 1.0.1", "ryu", - "serde 1.0.133", + "serde 1.0.135", ] [[package]] @@ -2436,9 +2446,9 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "socket2" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +checksum = "0f82496b90c36d70af5fcd482edaa2e0bd16fade569de1330405fecbbdac736b" dependencies = [ "libc", "winapi", @@ -2476,7 +2486,7 @@ dependencies = [ "parking_lot", "phf_shared", "precomputed-hash", - "serde 1.0.133", + "serde 1.0.135", ] [[package]] @@ -2529,9 +2539,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ "proc-macro2", "quote", @@ -2612,9 +2622,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ "once_cell", ] @@ -2631,13 +2641,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad" +checksum = "c8d54b9298e05179c335de2b9645d061255bcd5155f843b3e328d2cfe0a5b413" dependencies = [ - "itoa 0.4.8", + "itoa 1.0.1", "libc", - "serde 1.0.133", + "num_threads", + "serde 1.0.135", ] [[package]] @@ -2738,7 +2749,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ - "serde 1.0.133", + "serde 1.0.135", ] [[package]] @@ -2875,9 +2886,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.5.0-beta.10" +version = "0.5.0-beta.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7a869b021f8cdb87c26ac58fa596db601931134cc7e727e9b15ba9f5c295881" +checksum = "71f2dfaaf009c5e9786e2f2dfbde63d5fa44409434d64190abfef5ade67d89b1" dependencies = [ "actix-web", "pin-project", @@ -2899,9 +2910,9 @@ dependencies = [ [[package]] name = "tracing-awc" -version = "0.1.0-beta.19" +version = "0.1.0-beta.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090336ea058d2d4bb913295ef68bc4cdf116efcf5895344b185b56b7ac5d5ee5" +checksum = "ff704c1995cdf9178e6252f560823147f51f1bb2f81de3941acfcb0827a6dd90" dependencies = [ "actix-http", "actix-service", @@ -3059,7 +3070,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ "getrandom 0.2.4", - "serde 1.0.133", + "serde 1.0.135", ] [[package]] @@ -3098,9 +3109,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3108,9 +3119,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" dependencies = [ "bumpalo", "lazy_static", @@ -3123,9 +3134,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3133,9 +3144,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" dependencies = [ "proc-macro2", "quote", @@ -3146,15 +3157,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" [[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index c2e4cc6..13700ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ap-relay" description = "A simple activitypub relay" -version = "0.3.14" +version = "0.3.15" authors = ["asonix "] license-file = "LICENSE" readme = "README.md" @@ -63,7 +63,7 @@ features = [ ] [dependencies.http-signature-normalization-actix] -version = "0.6.0-beta.0" +version = "0.6.0-beta.2" default-features = false features = ["client", "server", "sha-2"] diff --git a/src/error.rs b/src/error.rs index 1cf9bd5..32ce4a1 100644 --- a/src/error.rs +++ b/src/error.rs @@ -59,8 +59,8 @@ pub(crate) enum ErrorKind { #[error("Couldn't parse IRI, {0}")] ParseIri(#[from] activitystreams::iri_string::validate::Error), - #[error("Couldn't resolve IRI, {0}")] - ResolveIri(#[from] activitystreams::iri_string::resolve::Error), + #[error("Couldn't normalize IRI, {0}")] + NormalizeIri(#[from] activitystreams::iri_string::normalize::Error), #[error("Couldn't perform IO, {0}")] Io(#[from] io::Error),