Merge pull request 'Update crates' (#1115) from update-rocket_csrf into main

Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1115

Cargo.lock

@@ -1290,7 +1290,7 @@ dependencies = [
  "futures-sink",
  "nanorand",
  "pin-project",
- "spin",
+ "spin 0.9.3",
 ]
 
 [[package]]
@@ -2076,9 +2076,9 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
 
 [[package]]
 name = "iri-string"
-version = "0.5.4"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e76a2a488a2bce15f9e696e3b9b66a4e1412c13339344bba8a24b7eae30f91b"
+checksum = "bf071934ee7ee97e52fa1868a9540a7885eab75926bd70794030304a9797cea1"
 dependencies = [
  "serde 1.0.137",
 ]
@@ -2163,9 +2163,9 @@ dependencies = [
 
 [[package]]
 name = "ldap3"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef35dc747152dd47bdc6aaeb35a232f84cbc8d84ae4cb9673aea810a6570ab8f"
+checksum = "ce38dafca0608c64cc0146fb782b06abb8d946dae7a3af23c89a95da24f6b84d"
 dependencies = [
  "async-trait",
  "bytes 1.1.0",
@@ -2924,9 +2924,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.40"
+version = "0.10.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e"
+checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if 1.0.0",
@@ -2956,9 +2956,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.73"
+version = "0.9.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0"
+checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
 dependencies = [
  "autocfg 1.1.0",
  "cc",
@@ -3934,14 +3934,17 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.13.5"
+version = "0.16.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
 dependencies = [
  "cc",
- "lazy_static",
  "libc",
+ "once_cell",
+ "spin 0.5.2",
  "untrusted",
+ "web-sys",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3995,8 +3998,8 @@ dependencies = [
 
 [[package]]
 name = "rocket_csrf"
-version = "0.1.0"
+version = "0.1.1"
-source = "git+https://github.com/fdb-hiroshima/rocket_csrf?rev=29910f2829e7e590a540da3804336577b48c7b31#29910f2829e7e590a540da3804336577b48c7b31"
+source = "git+https://git.joinplu.me/plume/rocket_csrf?rev=0.1.1#e400909066fe57c1da7640bd086361e5233d8511"
 dependencies = [
  "data-encoding",
  "ring",
@@ -4398,6 +4401,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
 [[package]]
 name = "spin"
 version = "0.9.3"
@@ -5269,9 +5278,9 @@ dependencies = [
 
 [[package]]
 name = "untrusted"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"

Cargo.toml

@@ -19,7 +19,7 @@ rocket = "0.4.11"
 rocket_contrib = { version = "0.4.11", features = ["json"] }
 rocket_i18n = "0.4.1"
 scheduled-thread-pool = "0.2.6"
-serde = "1.0"
+serde = "=1.0.137"
 serde_json = "1.0.81"
 shrinkwraprs = "0.3.0"
 validator = { version = "0.15", features = ["derive"] }
@@ -27,7 +27,7 @@ webfinger = "0.4.1"
 tracing = "0.1.35"
 tracing-subscriber = "0.3.10"
 riker = "0.4.2"
-activitystreams = "0.7.0-alpha.18"
+activitystreams = "=0.7.0-alpha.20"
 
 [[bin]]
 name = "plume"
@@ -60,8 +60,8 @@ path = "plume-common"
 path = "plume-models"
 
 [dependencies.rocket_csrf]
-git = "https://github.com/fdb-hiroshima/rocket_csrf"
+git = "https://git.joinplu.me/plume/rocket_csrf"
-rev = "29910f2829e7e590a540da3804336577b48c7b31"
+rev = "0.1.1"
 
 [build-dependencies]
 ructe = "0.14.0"

plume-api/Cargo.toml

@@ -5,5 +5,5 @@ authors = ["Plume contributors"]
 edition = "2018"
 
 [dependencies]
-serde = "1.0"
+serde = "=1.0.137"
 serde_derive = "1.0"

plume-common/Cargo.toml

@@ -11,7 +11,7 @@ hex = "0.4"
 openssl = "0.10.40"
 rocket = "0.4.11"
 reqwest = { version = "0.11.11", features = ["blocking", "json", "socks"] }
-serde = "1.0"
+serde = "=1.0.137"
 serde_derive = "1.0"
 serde_json = "1.0.81"
 shrinkwraprs = "0.3.0"
@@ -19,7 +19,7 @@ syntect = "4.5.0"
 regex-syntax = { version = "0.6.26", default-features = false, features = ["unicode-perl"] }
 tracing = "0.1.35"
 askama_escape = "0.10.3"
-activitystreams = "0.7.0-alpha.18"
+activitystreams = "=0.7.0-alpha.20"
 activitystreams-ext = "0.1.0-alpha.2"
 url = "2.2.2"
 flume = "0.10.13"

plume-front/Cargo.toml

@@ -12,7 +12,7 @@ gettext = "0.4.0"
 gettext-macros = "0.6.1"
 gettext-utils = "0.1.0"
 lazy_static = "1.3"
-serde = "1.0"
+serde = "=1.0.137"
 serde_json = "1.0"
 wasm-bindgen = "0.2.81"
 js-sys = "0.3.58"

plume-models/Cargo.toml

@@ -17,7 +17,7 @@ rocket = "0.4.11"
 rocket_i18n = "0.4.1"
 reqwest = "0.11.11"
 scheduled-thread-pool = "0.2.6"
-serde = "1.0"
+serde = "=1.0.137"
 serde_derive = "1.0"
 serde_json = "1.0.81"
 tantivy = "0.13.3"
@@ -34,7 +34,7 @@ riker = "0.4.2"
 once_cell = "1.12.0"
 lettre = "0.9.6"
 native-tls = "0.2.10"
-activitystreams = "0.7.0-alpha.18"
+activitystreams = "=0.7.0-alpha.20"
 
 [dependencies.chrono]
 features = ["serde"]