From d558b74badec2b5df5c2b3e5499d45990262e646 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 9 Dec 2021 23:34:36 +0100 Subject: [PATCH] Upgrade dependencies --- Cargo.lock | 137 +++++++++++++++++++-------------- crates/cli/Cargo.toml | 6 +- crates/config/Cargo.toml | 4 +- crates/core/Cargo.toml | 12 +-- crates/data-model/Cargo.toml | 2 +- crates/oauth2-types/Cargo.toml | 6 +- crates/templates/Cargo.toml | 2 +- 7 files changed, 94 insertions(+), 75 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aa286285..513c84c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -70,9 +70,9 @@ checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203" [[package]] name = "argon2" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34f8cda1a0ecf6f19d2bf64b9349d86900fa9bf98c979e655347a9e9dbe588c1" +checksum = "f1574351abf0e4ef0de867b083a9f8e2f13618efcad6d3253c53554e4a887ed5" dependencies = [ "base64ct", "blake2", @@ -116,9 +116,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" +checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" dependencies = [ "proc-macro2", "quote", @@ -222,13 +222,11 @@ dependencies = [ [[package]] name = "blake2" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" +checksum = "a58bdf5134c5beae6fc382002c4d88950bad1feea20f8f7165494b6b43b049de" dependencies = [ - "crypto-mac 0.8.0", - "digest 0.9.0", - "opaque-debug 0.3.0", + "digest 0.10.0", ] [[package]] @@ -252,6 +250,15 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "block-buffer" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -397,9 +404,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c01c1c607d25c71bbaa67c113d6c6b36c434744b4fd66691d711b5b1bc0c8b" +checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552" dependencies = [ "chrono", "chrono-tz-build", @@ -428,9 +435,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.0.0-beta.5" +version = "3.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63" +checksum = "c068998524e6d40ea78c8d2a4b00398f0a8b818c2d484bcb3cbeb2cff2c105ae" dependencies = [ "atty", "bitflags", @@ -441,14 +448,13 @@ dependencies = [ "strsim", "termcolor", "textwrap", - "unicase", ] [[package]] name = "clap_derive" -version = "3.0.0-beta.5" +version = "3.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3" +checksum = "0152ba3ee01fa5a9133d4e15a1d9659c75d2270365768dd5a880cc7e68871874" dependencies = [ "heck", "proc-macro-error", @@ -590,13 +596,12 @@ dependencies = [ ] [[package]] -name = "crypto-mac" -version = "0.8.0" +name = "crypto-common" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +checksum = "567569e659735adb39ff2d4c20600f7cd78be5471f8c58ab162bce3c03fdbc5f" dependencies = [ "generic-array 0.14.4", - "subtle", ] [[package]] @@ -611,9 +616,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "757c0ded2af11d8e739c4daea1ac623dd1624b06c844cf3f5a39f1bdbd99bb12" +checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4" dependencies = [ "darling_core", "darling_macro", @@ -621,9 +626,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c34d8efb62d0c2d7f60ece80f75e5c63c1588ba68032740494b0b9a996466e3" +checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324" dependencies = [ "fnv", "ident_case", @@ -635,9 +640,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade7bff147130fe5e6d39f089c6bd49ec0250f35d70b2eebf72afdfc919f15cc" +checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" dependencies = [ "darling_core", "quote", @@ -694,6 +699,18 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "digest" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8549e6bfdecd113b7e221fe60b433087f6957387a20f8118ebca9b12af19143d" +dependencies = [ + "block-buffer 0.10.0", + "crypto-common", + "generic-array 0.14.4", + "subtle", +] + [[package]] name = "dirs" version = "3.0.2" @@ -777,9 +794,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.29" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" +checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" dependencies = [ "cfg-if 1.0.0", ] @@ -1030,9 +1047,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" +checksum = "8f072413d126e57991455e0a922b31e4c8ba7c2ffbebf6b78b4f8521397d65cd" dependencies = [ "bytes 1.1.0", "fnv", @@ -1121,9 +1138,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "c7a30908dbce072eca83216eab939d2290080e00ca71611b96a09e5cdce5f3fa" dependencies = [ "libc", ] @@ -1140,7 +1157,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ - "crypto-mac 0.11.1", + "crypto-mac", "digest 0.9.0", ] @@ -1192,9 +1209,9 @@ checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" [[package]] name = "hyper" -version = "0.14.15" +version = "0.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c" +checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" dependencies = [ "bytes 1.1.0", "futures-channel", @@ -1340,9 +1357,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" dependencies = [ "either", ] @@ -1378,7 +1395,7 @@ dependencies = [ "serde", "serde_cbor", "serde_json", - "sha2", + "sha2 0.9.8", "smallvec", "subtle", "zeroize", @@ -1393,7 +1410,7 @@ dependencies = [ "cfg-if 1.0.0", "ecdsa", "elliptic-curve", - "sha2", + "sha2 0.9.8", ] [[package]] @@ -1553,7 +1570,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "serde_with", - "sha2", + "sha2 0.10.0", "sqlx", "thiserror", "tokio", @@ -1827,7 +1844,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "sha2", + "sha2 0.10.0", "sqlx", "thiserror", "url", @@ -1967,9 +1984,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "4.2.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799" +checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" dependencies = [ "memchr", ] @@ -2569,7 +2586,7 @@ version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad22c7226e4829104deab21df575e995bfbc4adfad13a595e387477f238c1aec" dependencies = [ - "sha2", + "sha2 0.9.8", "walkdir", ] @@ -2763,9 +2780,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.130" +version = "1.0.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "b4ad69dfbd3e45369132cc64e6748c2d65cdfb001a2b1c232d128b4ad60561c1" dependencies = [ "serde_derive", ] @@ -2795,9 +2812,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "b710a83c4e0dff6a3d511946b95274ad9ca9e5d3ae497b63fda866ac955358d2" dependencies = [ "proc-macro2", "quote", @@ -2920,6 +2937,17 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha2" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900d964dd36bb15bcf2f2b35694c072feab74969a54f2bbeec7a2d725d2bdcb6" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.0", +] + [[package]] name = "sharded-slab" version = "0.1.4" @@ -3061,7 +3089,7 @@ dependencies = [ "serde", "serde_json", "sha-1 0.9.8", - "sha2", + "sha2 0.9.8", "smallvec", "sqlformat", "sqlx-rt", @@ -3089,7 +3117,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2", + "sha2 0.9.8", "sqlx-core", "sqlx-rt", "syn", @@ -3289,9 +3317,6 @@ name = "textwrap" version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" -dependencies = [ - "unicode-width", -] [[package]] name = "thiserror" @@ -3847,12 +3872,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - [[package]] name = "unicode-xid" version = "0.2.2" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index ae362528..d992a614 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -9,16 +9,16 @@ license = "Apache-2.0" tokio = { version = "1.14.0", features = ["full"] } futures = "0.3.18" anyhow = "1.0.51" -clap = "3.0.0-beta.5" +clap = { version = "3.0.0-rc.1", features = ["derive"] } dotenv = "0.15.0" schemars = { version = "0.8.8", features = ["url", "chrono"] } tower = { version = "0.4.11", features = ["full"] } tower-http = { version = "0.2.0", features = ["full"] } -hyper = { version = "0.14.15", features = ["full"] } +hyper = { version = "0.14.16", features = ["full"] } serde_yaml = "0.8.21" warp = "0.3.2" url = "2.2.2" -argon2 = { version = "0.3.1", features = ["password-hash"] } +argon2 = { version = "0.3.2", features = ["password-hash"] } reqwest = { version = "0.11.7", features = ["rustls-tls"], default-features = false, optional = true } tracing = "0.1.29" diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 8291ac4c..d72df355 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" [dependencies] tokio = { version = "1.14.0", features = [] } tracing = { version = "0.1.29", features = ["log"] } -async-trait = "0.1.51" +async-trait = "0.1.52" thiserror = "1.0.30" anyhow = "1.0.51" @@ -18,7 +18,7 @@ figment = { version = "0.10.6", features = ["env", "yaml", "test"] } chrono = { version = "0.4.19", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] } -serde = { version = "1.0.130", features = ["derive"] } +serde = { version = "1.0.131", features = ["derive"] } serde_with = { version = "1.11.0", features = ["hex", "chrono"] } serde_json = "1.0.72" sqlx = { version = "0.5.9", features = ["runtime-tokio-rustls", "postgres"] } diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 9b64fe83..269a847c 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -11,7 +11,7 @@ dev = ["mas-static-files/dev", "mas-templates/dev"] [dependencies] # Async runtime tokio = { version = "1.14.0", features = ["full"] } -async-trait = "0.1.51" +async-trait = "0.1.52" tokio-stream = "0.1.8" futures-util = "0.3.18" @@ -25,19 +25,19 @@ anyhow = "1.0.51" # Web server warp = "0.3.2" -hyper = { version = "0.14.15", features = ["full"] } +hyper = { version = "0.14.16", features = ["full"] } # Database access sqlx = { version = "0.5.9", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline"] } # Various structure (de)serialization -serde = { version = "1.0.130", features = ["derive"] } +serde = { version = "1.0.131", features = ["derive"] } serde_with = { version = "1.11.0", features = ["hex", "chrono"] } serde_json = "1.0.72" serde_urlencoded = "0.7.0" # Password hashing -argon2 = { version = "0.3.1", features = ["password-hash"] } +argon2 = { version = "0.3.2", features = ["password-hash"] } password-hash = { version = "0.3.2", features = ["std"] } # Crypto, hashing and signing stuff @@ -46,7 +46,7 @@ k256 = "0.9.6" pkcs8 = { version = "0.7.6", features = ["pem"] } elliptic-curve = { version = "0.10.6", features = ["pem"] } chacha20poly1305 = { version = "0.9.0", features = ["std"] } -sha2 = "0.9.8" +sha2 = "0.10.0" crc = "2.1.0" jwt-compact = { version = "0.5.0-beta.1", features = ["with_rsa", "k256"] } @@ -54,7 +54,7 @@ jwt-compact = { version = "0.5.0-beta.1", features = ["with_rsa", "k256"] } data-encoding = "2.3.2" chrono = { version = "0.4.19", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] } -itertools = "0.10.1" +itertools = "0.10.3" mime = "0.3.16" rand = "0.8.4" bincode = "1.3.3" diff --git a/crates/data-model/Cargo.toml b/crates/data-model/Cargo.toml index 4c57b5ee..242352e8 100644 --- a/crates/data-model/Cargo.toml +++ b/crates/data-model/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" [dependencies] chrono = "0.4.19" thiserror = "1.0.30" -serde = "1.0.130" +serde = "1.0.131" url = { version = "2.2.2", features = ["serde"] } oauth2-types = { path = "../oauth2-types" } diff --git a/crates/oauth2-types/Cargo.toml b/crates/oauth2-types/Cargo.toml index 657ede54..a21ebd2a 100644 --- a/crates/oauth2-types/Cargo.toml +++ b/crates/oauth2-types/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" [dependencies] http = "0.2.5" -serde = "1.0.130" +serde = "1.0.131" serde_json = "1.0.72" language-tags = { version = "0.3.2", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] } @@ -16,10 +16,10 @@ indoc = "1.0.3" serde_with = { version = "1.11.0", features = ["chrono"] } sqlx = { version = "0.5.9", default-features = false, optional = true } chrono = "0.4.19" -sha2 = "0.9.8" +sha2 = "0.10.0" data-encoding = "2.3.2" thiserror = "1.0.30" -itertools = "0.10.1" +itertools = "0.10.3" [features] sqlx_type = ["sqlx"] diff --git a/crates/templates/Cargo.toml b/crates/templates/Cargo.toml index 9045ab28..f5a8acbe 100644 --- a/crates/templates/Cargo.toml +++ b/crates/templates/Cargo.toml @@ -16,7 +16,7 @@ anyhow = "1.0.51" thiserror = "1.0.30" tera = "1.15.0" -serde = { version = "1.0.130", features = ["derive"] } +serde = { version = "1.0.131", features = ["derive"] } serde_json = "1.0.72" url = "2.2.2"