diff --git a/Cargo.lock b/Cargo.lock index 3aed6407b5..72927295c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -157,7 +157,7 @@ dependencies = [ "http", "httparse", "indexmap", - "itoa", + "itoa 0.4.7", "language-tags 0.2.2", "lazy_static", "log", @@ -185,7 +185,7 @@ dependencies = [ "actix-service 2.0.1", "actix-tls 3.0.0-beta.7", "actix-utils 3.0.0", - "ahash 0.7.4", + "ahash", "base64 0.13.0", "bitflags", "brotli2", @@ -200,7 +200,7 @@ dependencies = [ "http", "httparse", "httpdate 1.0.1", - "itoa", + "itoa 0.4.7", "language-tags 0.3.2", "local-channel", "log", @@ -507,7 +507,7 @@ dependencies = [ "actix-service 2.0.1", "actix-utils 3.0.0", "actix-web-codegen 0.5.0-beta.5", - "ahash 0.7.4", + "ahash", "bytes 1.0.1", "cfg-if 1.0.0", "cookie 0.15.1", @@ -516,7 +516,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "itoa", + "itoa 0.4.7", "language-tags 0.3.2", "log", "mime", @@ -529,7 +529,7 @@ dependencies = [ "serde_urlencoded", "smallvec 1.6.1", "socket2 0.4.0", - "time 0.3.4", + "time 0.3.14", "url 2.2.2", ] @@ -600,12 +600,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "ahash" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" - [[package]] name = "ahash" version = "0.7.4" @@ -707,9 +701,9 @@ dependencies = [ [[package]] name = "attohttpc" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69e13a99a7e6e070bb114f7ff381e58c7ccc188630121fc4c2fe4bcf24cd072" +checksum = "262c3f7f5d61249d8c00e5546e2685cd15ebeeb1bc0f3cc5449350a1cb07319e" dependencies = [ "http", "log", @@ -770,27 +764,27 @@ dependencies = [ [[package]] name = "aws-creds" -version = "0.27.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460a75eac8f3cb7683e0a9a588a83c3ff039331ea7bfbfbfcecf1dacab276e11" +checksum = "5aeeee1a5defa63cba39097a510dfe63ef53658fc8995202a610f6a8a4d03639" dependencies = [ - "anyhow", "attohttpc", "dirs", "rust-ini", "serde", "serde-xml-rs", - "serde_derive", + "thiserror", + "time 0.3.14", "url 2.2.2", ] [[package]] name = "aws-region" -version = "0.23.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1efb67b8f201dd0deea4e1240bce7da0366f8df90509a7df054973604b20b34" +checksum = "f92a8af5850d0ea0916ca3e015ab86951ded0bf4b70fd27896e81ae1dfb0af37" dependencies = [ - "anyhow", + "thiserror", ] [[package]] @@ -851,6 +845,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + [[package]] name = "block-cipher" version = "0.8.0" @@ -1188,6 +1191,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + [[package]] name = "crc" version = "2.1.0" @@ -1301,20 +1313,20 @@ dependencies = [ ] [[package]] -name = "crypto-mac" -version = "0.10.0" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "subtle", + "typenum", ] [[package]] name = "crypto-mac" -version = "0.11.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" dependencies = [ "generic-array", "subtle", @@ -1408,6 +1420,17 @@ dependencies = [ "generic-array", ] +[[package]] +name = "digest" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +dependencies = [ + "block-buffer 0.10.3", + "crypto-common", + "subtle", +] + [[package]] name = "dirs" version = "4.0.0" @@ -1447,12 +1470,9 @@ dependencies = [ [[package]] name = "dlv-list" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b" -dependencies = [ - "rand 0.8.4", -] +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" [[package]] name = "dotenv" @@ -1860,9 +1880,6 @@ name = "hashbrown" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -dependencies = [ - "ahash 0.4.7", -] [[package]] name = "hashbrown" @@ -1870,7 +1887,16 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash 0.7.4", + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", ] [[package]] @@ -1912,18 +1938,17 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" dependencies = [ - "crypto-mac 0.10.0", - "digest", + "crypto-mac", + "digest 0.9.0", ] [[package]] name = "hmac" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "crypto-mac 0.11.1", - "digest", + "digest 0.10.3", ] [[package]] @@ -1945,7 +1970,7 @@ checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" dependencies = [ "bytes 1.0.1", "fnv", - "itoa", + "itoa 0.4.7", ] [[package]] @@ -2039,7 +2064,7 @@ dependencies = [ "http-body 0.3.1", "httparse", "httpdate 0.3.2", - "itoa", + "itoa 0.4.7", "pin-project 1.0.7", "socket2 0.3.19", "tokio 0.2.25", @@ -2063,7 +2088,7 @@ dependencies = [ "http-body 0.4.4", "httparse", "httpdate 1.0.1", - "itoa", + "itoa 0.4.7", "pin-project-lite 0.2.6", "socket2 0.4.0", "tokio 1.13.0", @@ -2169,7 +2194,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha2", + "sha2 0.9.5", "sqlx", "storage_buckets_common", "subprocess", @@ -2244,6 +2269,12 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +[[package]] +name = "itoa" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" + [[package]] name = "jobs_common" version = "0.0.1" @@ -2282,12 +2313,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86e46349d67dc03bdbdb28da0337a355a53ca1d5156452722c36fe21d0e6389b" dependencies = [ "base64 0.13.0", - "crypto-mac 0.10.0", - "digest", + "crypto-mac", + "digest 0.9.0", "hmac 0.10.1", "serde", "serde_json", - "sha2", + "sha2 0.9.5", ] [[package]] @@ -2462,9 +2493,9 @@ dependencies = [ "block-modes", "crc-any", "des", - "digest", + "digest 0.9.0", "md-5", - "sha2", + "sha2 0.9.5", "tiger", ] @@ -2509,8 +2540,8 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" dependencies = [ - "block-buffer", - "digest", + "block-buffer 0.9.0", + "digest 0.9.0", "opaque-debug", ] @@ -2565,11 +2596,11 @@ dependencies = [ [[package]] name = "minidom" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332592c2149fc7dd40a64fc9ef6f0d65607284b474cef9817d1fc8c7e7b3608e" +checksum = "9dddfe21863f8d600ed2bd1096cb9b5cd6ff984be6185cf9d563fb4a107bffc5" dependencies = [ - "quick-xml", + "rxml", ] [[package]] @@ -2806,6 +2837,15 @@ dependencies = [ "libc", ] +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + [[package]] name = "once_cell" version = "1.9.0" @@ -2853,12 +2893,12 @@ dependencies = [ [[package]] name = "ordered-multimap" -version = "0.3.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" dependencies = [ "dlv-list", - "hashbrown 0.9.1", + "hashbrown 0.12.3", ] [[package]] @@ -3050,15 +3090,6 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-xml" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26aab6b48e2590e4a64d1ed808749ba06257882b461d01ca71baeb747074a6dd" -dependencies = [ - "memchr", -] - [[package]] name = "quote" version = "1.0.9" @@ -3223,7 +3254,7 @@ dependencies = [ "combine 3.8.1", "dtoa", "futures 0.1.31", - "itoa", + "itoa 0.4.7", "percent-encoding 2.1.0", "sha1", "tokio-codec", @@ -3244,7 +3275,7 @@ dependencies = [ "async-trait", "combine 4.6.3", "dtoa", - "itoa", + "itoa 0.4.7", "percent-encoding 2.1.0", "sha1", "url 2.2.2", @@ -3261,7 +3292,7 @@ dependencies = [ "combine 4.6.3", "dtoa", "futures-util", - "itoa", + "itoa 0.4.7", "percent-encoding 2.1.0", "pin-project-lite 0.2.6", "sha1", @@ -3438,7 +3469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b0aeddcca1082112a6eeb43bf25fd7820b066aaf6eaef776e19d0a1febe38fe" dependencies = [ "byteorder", - "digest", + "digest 0.9.0", "lazy_static", "num-bigint-dig", "num-integer", @@ -3453,9 +3484,9 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" dependencies = [ "cfg-if 1.0.0", "ordered-multimap", @@ -3463,19 +3494,17 @@ dependencies = [ [[package]] name = "rust-s3" -version = "0.28.0" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c58d4682844a5d6301efbf915dd7a9d3d638006f9bb821527a0bbbf2a4cfc2" +checksum = "b6009d9d4cf910505534d62d380a0aa305805a2af0b5c3ad59a3024a0715b847" dependencies = [ - "anyhow", "async-trait", "aws-creds", "aws-region", "base64 0.13.0", "cfg-if 1.0.0", - "chrono", "hex", - "hmac 0.11.0", + "hmac 0.12.1", "http", "log", "maybe-async", @@ -3486,7 +3515,9 @@ dependencies = [ "serde", "serde-xml-rs", "serde_derive", - "sha2", + "sha2 0.10.5", + "thiserror", + "time 0.3.14", "tokio 1.13.0", "tokio-stream", "url 2.2.2", @@ -3526,6 +3557,25 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rxml" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c4cd1e0a04c48f953473383a60143884515b7a8eb7ca7d9b1baa9c05dee75" +dependencies = [ + "bytes 1.0.1", + "pin-project-lite 0.2.6", + "rxml_validation", + "smartstring", + "tokio 1.13.0", +] + +[[package]] +name = "rxml_validation" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8633dff4bb93061867c8411c6e99068c5f59d9f890c87384169004b0fbb929a" + [[package]] name = "ryu" version = "1.0.5" @@ -3644,7 +3694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e466864e431129c7e0d3476b92f20458e5879919a0596c6472738d9fa2d342f8" dependencies = [ "indexmap", - "itoa", + "itoa 0.4.7", "ryu", "serde", ] @@ -3676,7 +3726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" dependencies = [ "form_urlencoded", - "itoa", + "itoa 0.4.7", "ryu", "serde", ] @@ -3687,10 +3737,10 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures", - "digest", + "cpufeatures 0.1.1", + "digest 0.9.0", "opaque-debug", ] @@ -3706,13 +3756,24 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures", - "digest", + "cpufeatures 0.1.1", + "digest 0.9.0", "opaque-debug", ] +[[package]] +name = "sha2" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures 0.2.5", + "digest 0.10.3", +] + [[package]] name = "signal-hook-registry" version = "1.3.0" @@ -3755,6 +3816,15 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +[[package]] +name = "smartstring" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e714dff2b33f2321fdcd475b71cec79781a692d846f37f415fb395a1d2bcd48e" +dependencies = [ + "static_assertions", +] + [[package]] name = "socket2" version = "0.3.19" @@ -3811,7 +3881,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec28b91a01e1fe286d6ba66f68289a2286df023fc97444e1fd86c2fd6d5dc026" dependencies = [ - "ahash 0.7.4", + "ahash", "atoi", "base64 0.13.0", "bitflags", @@ -3822,7 +3892,7 @@ dependencies = [ "crossbeam-channel", "crossbeam-queue", "crossbeam-utils 0.8.5", - "digest", + "digest 0.9.0", "either", "futures-channel", "futures-core", @@ -3831,7 +3901,7 @@ dependencies = [ "generic-array", "hashlink", "hex", - "itoa", + "itoa 0.4.7", "libc", "log", "memchr", @@ -3843,7 +3913,7 @@ dependencies = [ "rsa", "serde", "sha-1", - "sha2", + "sha2 0.9.5", "smallvec 1.6.1", "sqlformat", "sqlx-rt", @@ -3870,7 +3940,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2", + "sha2 0.9.5", "sqlx-core", "sqlx-rt", "syn", @@ -4028,7 +4098,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha2", + "sha2 0.9.5", "sqlx", "storage_buckets_common", "subprocess", @@ -4183,9 +4253,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "443e531cbcf9de83258cfef70bcd56c91188de5819ebd4b19c85f589e0617005" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "byteorder", - "digest", + "digest 0.9.0", ] [[package]] @@ -4209,19 +4279,22 @@ dependencies = [ "libc", "standback", "stdweb", - "time-macros", + "time-macros 0.1.1", "version_check", "winapi 0.3.9", ] [[package]] name = "time" -version = "0.3.4" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99beeb0daeac2bd1e86ac2c21caddecb244b39a093594da1a661ec2060c7aedd" +checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" dependencies = [ - "itoa", + "itoa 1.0.3", "libc", + "num_threads", + "serde", + "time-macros 0.2.4", ] [[package]] @@ -4234,6 +4307,12 @@ dependencies = [ "time-macros-impl", ] +[[package]] +name = "time-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" + [[package]] name = "time-macros-impl" version = "0.1.1" @@ -4728,7 +4807,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha2", + "sha2 0.9.5", "sqlx", "time 0.2.26", "tokio 1.13.0", @@ -4824,9 +4903,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "unchecked-index" @@ -4960,7 +5039,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha2", + "sha2 0.9.5", "sqlx", "time 0.2.26", "toml", @@ -5239,7 +5318,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha2", + "sha2 0.9.5", "sqlx", "time 0.2.26", "tokio 1.13.0",