diff --git a/Cargo.lock b/Cargo.lock index 7ef9d0cc..a6f5cb2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -276,9 +276,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.61" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1" dependencies = [ "proc-macro2", "quote", @@ -322,10 +322,11 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aws-config" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7688e1dfbb9f7804fab0a830820d7e827b8d973906763cf1a855ce4719292f5" +checksum = "3c3d1e2a1f1ab3ac6c4b884e37413eaa03eb9d901e4fc68ee8f5c1d49721680e" dependencies = [ + "aws-credential-types", "aws-http", "aws-sdk-sso", "aws-sdk-sts", @@ -349,10 +350,23 @@ dependencies = [ ] [[package]] -name = "aws-endpoint" -version = "0.52.0" +name = "aws-credential-types" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "253d7cd480bfa59a5323390e9e91885a8f06a275e0517d81eeb1070b6aa7d271" +checksum = "bb0696a0523a39a19087747e4dafda0362dc867531e3d72a3f195564c84e5e08" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-endpoint" +version = "0.54.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80a4f935ab6a1919fbfd6102a80c4fccd9ff5f47f94ba154074afe1051903261" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -364,10 +378,11 @@ dependencies = [ [[package]] name = "aws-http" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd1b83859383e46ea8fda633378f9f3f02e6e3a446fd89f0240b5c3662716c9" +checksum = "82976ca4e426ee9ca3ffcf919d9b2c8d14d0cd80d43cc02173737a8f07f28d4d" dependencies = [ + "aws-credential-types", "aws-smithy-http", "aws-smithy-types", "aws-types", @@ -382,10 +397,11 @@ dependencies = [ [[package]] name = "aws-sdk-sesv2" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a95ab75eb838c9466785d9aa47a4ba277e46582601f6f4178fc166cefd15d53" +checksum = "f15e41cd3b0aad7294a38fd498d74d3d2d69dead195326c690d75ec4d4edacdc" dependencies = [ + "aws-credential-types", "aws-endpoint", "aws-http", "aws-sig-auth", @@ -398,16 +414,18 @@ dependencies = [ "aws-types", "bytes 1.3.0", "http", + "regex", "tokio-stream", "tower", ] [[package]] name = "aws-sdk-sso" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf03342c2b3f52b180f484e60586500765474f2bfc7dcd4ffe893a7a1929db1d" +checksum = "ca0119bacf0c42f587506769390983223ba834e605f049babe514b2bd646dbb2" dependencies = [ + "aws-credential-types", "aws-endpoint", "aws-http", "aws-sig-auth", @@ -420,16 +438,18 @@ dependencies = [ "aws-types", "bytes 1.3.0", "http", + "regex", "tokio-stream", "tower", ] [[package]] name = "aws-sdk-sts" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa1de4e07ea87a30a317c7b563b3a40fd18a843ad794216dda81672b6e174bce" +checksum = "270b6a33969ebfcb193512fbd5e8ee5306888ad6c6d5d775cdbfb2d50d94de26" dependencies = [ + "aws-credential-types", "aws-endpoint", "aws-http", "aws-sig-auth", @@ -437,22 +457,25 @@ dependencies = [ "aws-smithy-client", "aws-smithy-http", "aws-smithy-http-tower", + "aws-smithy-json", "aws-smithy-query", "aws-smithy-types", "aws-smithy-xml", "aws-types", "bytes 1.3.0", "http", + "regex", "tower", "tracing", ] [[package]] name = "aws-sig-auth" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6126c4ff918e35fb9ae1bf2de71157fad36f0cc6a2b1d0f7197ee711713700fc" +checksum = "660a02a98ab1af83bd8d714afbab2d502ba9b18c49e7e4cddd6bf8837ff778cb" dependencies = [ + "aws-credential-types", "aws-sigv4", "aws-smithy-http", "aws-types", @@ -462,9 +485,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c7f88d7395f5411c6eef5889b6cd577ce6b677af461356cbfc20176c26c160" +checksum = "cdaf11005b7444e6cd66f600d09861a3aeb6eb89a0f003c7c9820dbab2d15297" dependencies = [ "aws-smithy-http", "form_urlencoded", @@ -481,9 +504,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6a895d68852dd1564328e63ef1583e5eb307dd2a5ebf35d862a5c402957d5e" +checksum = "075d87b46420b28b64140f2ba88fa6b158c2877466a2acdbeaf396c25e4b9b33" dependencies = [ "futures-util", "pin-project-lite", @@ -493,9 +516,9 @@ dependencies = [ [[package]] name = "aws-smithy-client" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f505bf793eb3e6d7c166ef1275c27b4b2cd5361173fe950ac8e2cfc08c29a7ef" +checksum = "17d44078855a64d757e5c1727df29ffa6679022c38cfc4ba4e63ee9567133141" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -514,9 +537,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e4b4304b7ea4af1af3e08535100eb7b6459d5a6264b92078bf85176d04ab85" +checksum = "b5bd86f48d7e36fb24ee922d04d79c8353e01724b1c38757ed92593179223aa7" dependencies = [ "aws-smithy-types", "bytes 1.3.0", @@ -534,9 +557,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-tower" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86072ecc4dc4faf3e2071144285cfd539263fe7102b701d54fb991eafb04af8" +checksum = "c8972d1b4ae3aba1a10e7106fed53a5a36bc8ef86170a84f6ddd33d36fac12ad" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -550,18 +573,18 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3ddd9275b167bc59e9446469eca56177ec0b51225632f90aaa2cd5f41c940e" +checksum = "18973f12721e27b54891386497a57e1ba09975df1c6cfeccafaf541198962aef" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b19d2e0b3ce20e460bad0d0d974238673100edebba6978c2c1aadd925602f7" +checksum = "2881effde104a2b0619badaad9f30ae67805e86fbbdb99e5fcc176e8bfbc1a85" dependencies = [ "aws-smithy-types", "urlencoding", @@ -569,9 +592,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987b1e37febb9bd409ca0846e82d35299e572ad8279bc404778caeb5fc05ad56" +checksum = "da7e499c4b15bab8eb6b234df31833cc83a1bdaa691ba72d5d81efc109d9d705" dependencies = [ "base64-simd", "itoa 1.0.5", @@ -582,19 +605,20 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ce3791e14eec75ffac851a5a559f1ce6b31843297f42cc8bfba82714a6a5d8" +checksum = "9a73082f023f4a361fe811954da0061076709198792a3d2ad3a7498e10b606a0" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c05adca3e2bcf686dd2c47836f216ab52ed7845c177d180c84b08522c1166a3" +checksum = "f8f15b34253b68cde08e39b0627cc6101bcca64351229484b4743392c035d057" dependencies = [ + "aws-credential-types", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http", @@ -602,14 +626,13 @@ dependencies = [ "http", "rustc_version", "tracing", - "zeroize", ] [[package]] name = "axum" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1304eab461cf02bd70b083ed8273388f9724c549b316ba3d1e213ce0e9e7fb7e" +checksum = "e5694b64066a2459918d8074c2ce0d5a88f409431994c2356617c8ae0c4721fc" dependencies = [ "async-trait", "axum-core", @@ -641,9 +664,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f487e40dc9daee24d8a1779df88522f159a54a980f99cfbe43db0be0bd3444a8" +checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" dependencies = [ "async-trait", "bytes 1.3.0", @@ -678,9 +701,9 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7d7c3e69f305217e317a28172aab29f275667f2e1c15b87451e134fe27c7b1" +checksum = "9dbcf61bed07d554bd5c225cd07bc41b793eab63e79c6f0ceac7e1aed2f1c670" dependencies = [ "heck", "proc-macro2", @@ -706,6 +729,12 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "base64-simd" version = "0.7.0" @@ -798,9 +827,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -819,10 +848,20 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.11.1" +name = "bstr" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -998,9 +1037,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.32" +version = "4.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" dependencies = [ "bitflags", "clap_derive", @@ -1013,9 +1052,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck", "proc-macro-error", @@ -1026,9 +1065,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" dependencies = [ "os_str_bytes", ] @@ -1045,23 +1084,23 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils", ] [[package]] name = "console" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -1254,9 +1293,9 @@ dependencies = [ [[package]] name = "crc-catalog" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" [[package]] name = "crc32fast" @@ -1325,7 +1364,7 @@ version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" dependencies = [ - "bstr", + "bstr 0.2.17", "csv-core", "itoa 0.4.8", "ryu", @@ -1352,9 +1391,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.85" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" +checksum = "322296e2f2e5af4270b54df9e85a02ff037e271af20ba3e7fe1575515dc840b8" dependencies = [ "cc", "cxxbridge-flags", @@ -1364,9 +1403,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.85" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" +checksum = "017a1385b05d631e7875b1f151c9f012d37b53491e2a87f65bff5c262b2111d8" dependencies = [ "cc", "codespan-reporting", @@ -1379,15 +1418,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.85" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" +checksum = "c26bbb078acf09bc1ecda02d4223f03bdd28bd4874edcb0379138efc499ce971" [[package]] name = "cxxbridge-macro" -version = "1.0.85" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" +checksum = "357f40d1f06a24b60ae1fe122542c1fb05d28d32acb2aed064e84bc2ad1e252e" dependencies = [ "proc-macro2", "quote", @@ -1439,7 +1478,7 @@ dependencies = [ "hashbrown", "lock_api", "once_cell", - "parking_lot_core 0.9.5", + "parking_lot_core 0.9.6", ] [[package]] @@ -1577,9 +1616,9 @@ checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" [[package]] name = "ecdsa" -version = "0.14.8" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +checksum = "12844141594ad74185a926d030f3b605f6a903b4e3fec351f3ea338ac5b7637e" dependencies = [ "der", "elliptic-curve", @@ -1589,9 +1628,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" dependencies = [ "serde", ] @@ -1651,12 +1690,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -1741,9 +1780,9 @@ dependencies = [ [[package]] name = "file-per-thread-logger" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f" +checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ "env_logger", "log", @@ -1987,12 +2026,12 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr", + "bstr 1.1.0", "fnv", "log", "regex", @@ -2344,11 +2383,10 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" dependencies = [ - "crossbeam-utils", "globset", "lazy_static", "log", @@ -2430,12 +2468,12 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "io-lifetimes" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" dependencies = [ "libc", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -2449,9 +2487,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "iri-string" @@ -2471,7 +2509,7 @@ dependencies = [ "hermit-abi 0.2.6", "io-lifetimes", "rustix", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -2527,14 +2565,16 @@ dependencies = [ [[package]] name = "k256" -version = "0.11.6" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" +checksum = "92a55e0ff3b72c262bcf041d9e97f1b84492b68f1c1a384de2323d3dc9403397" dependencies = [ "cfg-if", "ecdsa", "elliptic-curve", + "once_cell", "sha2", + "signature", ] [[package]] @@ -3204,9 +3244,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" @@ -3287,7 +3327,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -3316,14 +3356,23 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", ] +[[package]] +name = "nom8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +dependencies = [ + "memchr", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -3659,23 +3708,25 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "p256" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +checksum = "49c124b3cbce43bcbac68c58ec181d98ed6cc7e6d0aa7c3ba97b2563410b0e55" dependencies = [ "ecdsa", "elliptic-curve", + "primeorder", "sha2", ] [[package]] name = "p384" -version = "0.11.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" +checksum = "630a4a9b2618348ececfae61a4905f564b817063bf2d66cdfc2ced523fe1d2d4" dependencies = [ "ecdsa", "elliptic-curve", + "primeorder", "sha2", ] @@ -3703,7 +3754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.5", + "parking_lot_core 0.9.6", ] [[package]] @@ -3722,15 +3773,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -3843,9 +3894,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6e86fb9e7026527a0d46bc308b841d73170ef8f443e1807f6ef88526a816d4" +checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f" dependencies = [ "thiserror", "ucd-trie", @@ -3853,9 +3904,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96504449aa860c8dcde14f9fba5c58dc6658688ca1fe363589d6327b8662c603" +checksum = "8bf026e2d0581559db66d837fe5242320f525d85c76283c61f4d51a1238d65ea" dependencies = [ "pest", "pest_generator", @@ -3863,9 +3914,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "798e0220d1111ae63d66cb66a5dcb3fc2d986d520b98e49e1852bfdb11d7c5e7" +checksum = "2b27bd18aa01d91c8ed2b61ea23406a676b42d82609c6e2581fba42f0c15f17f" dependencies = [ "pest", "pest_meta", @@ -3876,13 +3927,13 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "984298b75898e30a843e278a9f2452c31e349a073a0ce6fd950a12a74464e065" +checksum = "9f02b677c1859756359fc9983c2e56a0237f18624a3789528804406b7e915e5d" dependencies = [ "once_cell", "pest", - "sha1", + "sha2", ] [[package]] @@ -4006,6 +4057,12 @@ dependencies = [ "spki", ] +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + [[package]] name = "poly1305" version = "0.8.0" @@ -4037,23 +4094,31 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8992a85d8e93a28bdf76137db888d3874e3b230dee5ed8bebac4c9f7617773" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" dependencies = [ "proc-macro2", "syn", ] [[package]] -name = "proc-macro-crate" -version = "1.2.1" +name = "primeorder" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "0b54f7131b3dba65a2f414cf5bd25b66d4682e4608610668eae785750ba4c5b2" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" dependencies = [ "once_cell", - "thiserror", - "toml", + "toml_edit", ] [[package]] @@ -4082,9 +4147,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" dependencies = [ "unicode-ident", ] @@ -4119,9 +4184,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c01db6702aa05baa3f57dec92b8eeeeb4cb19e894e73996b32a4093289e54592" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes 1.3.0", "prost-derive", @@ -4129,9 +4194,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5320c680de74ba083512704acb90fe00f28f79207286a848e730c45dd73ed6" +checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" dependencies = [ "bytes 1.3.0", "heck", @@ -4151,9 +4216,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8842bad1a5419bca14eac663ba798f6bc19c413c2fdceb5f3ba3b0932d96720" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", @@ -4164,9 +4229,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017f79637768cde62820bc2d4fe0e45daaa027755c323ad077767c6c5f173091" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes 1.3.0", "prost", @@ -4307,9 +4372,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -4342,11 +4407,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "bytes 1.3.0", "encoding_rs", "futures-core", @@ -4413,9 +4478,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c" +checksum = "89b3896c9b7790b70a9aa314a30e4ae114200992a19c96cbe0ca6070edd32ab8" dependencies = [ "byteorder", "digest", @@ -4427,16 +4492,15 @@ dependencies = [ "pkcs8", "rand_core 0.6.4", "signature", - "smallvec", "subtle", "zeroize", ] [[package]] name = "rust_decimal" -version = "1.27.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c321ee4e17d2b7abe12b5d20c1231db708dd36185c8a21e9de5fed6da4dbe9" +checksum = "7fe32e8c89834541077a5c5bbe5691aa69324361e27e6aeb3552a737db4a70c8" dependencies = [ "arrayvec", "num-traits", @@ -4459,23 +4523,23 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.6" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -4497,11 +4561,11 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", ] [[package]] @@ -4536,12 +4600,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] @@ -4620,9 +4683,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "7c4437699b6d34972de58652c68b98cb5b53a4199ab126db8e20ec8ded29a721" dependencies = [ "bitflags", "core-foundation", @@ -4633,9 +4696,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -4736,9 +4799,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" +checksum = "30d904179146de381af4c93d3af6ca4984b3152db687dacb9c3c35e86f39809c" dependencies = [ "base64 0.13.1", "chrono", @@ -4752,9 +4815,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa" +checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e" dependencies = [ "darling", "proc-macro2", @@ -4764,9 +4827,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.16" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b5b431e8907b50339b51223b97d102db8d987ced36f6e4d03621db9316c834" +checksum = "8fb06d4b6cdaef0e0c51fa881acb721bed3c924cfaa71d9c94a3b771dfdf6567" dependencies = [ "indexmap", "itoa 1.0.5", @@ -4817,9 +4880,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.4" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" dependencies = [ "digest", "rand_core 0.6.4", @@ -4916,9 +4979,9 @@ checksum = "dce67a1f173db2f623678dc914d20870090a4bc8d066e9812e59508af0159aef" [[package]] name = "sqlformat" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87e292b4291f154971a43c3774364e2cbcaec599d3f5bf6fa9d122885dbc38a" +checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" dependencies = [ "itertools", "nom", @@ -5141,9 +5204,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -5254,9 +5317,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.24.1" +version = "1.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" dependencies = [ "autocfg", "bytes 1.3.0", @@ -5269,7 +5332,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -5360,13 +5423,30 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" + +[[package]] +name = "toml_edit" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "729bfd096e40da9c001f778f5cdecbd2957929a24e10e5883d9392220a751581" +dependencies = [ + "indexmap", + "nom8", + "toml_datetime", +] + [[package]] name = "tonic" version = "0.8.3" @@ -5583,9 +5663,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "typed-builder" @@ -5690,9 +5770,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" @@ -5932,7 +6012,7 @@ dependencies = [ "wasmtime-fiber", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -5960,7 +6040,7 @@ dependencies = [ "serde", "sha2", "toml", - "windows-sys 0.42.0", + "windows-sys", "zstd", ] @@ -6014,7 +6094,7 @@ dependencies = [ "cfg-if", "rustix", "wasmtime-asm-macros", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -6037,7 +6117,7 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -6057,7 +6137,7 @@ checksum = "22d9c2e92b0fc124d2cad6cb497a4c840580a7dd2414a37109e8c7cfe699c0ea" dependencies = [ "cfg-if", "libc", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -6082,7 +6162,7 @@ dependencies = [ "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -6146,9 +6226,9 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -6157,11 +6237,10 @@ dependencies = [ [[package]] name = "whoami" -version = "1.2.3" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6631b6a2fd59b1841b622e8f1a7ad241ef0a46f2d580464ce8140ac94cbd571" +checksum = "45dbc71f0cdca27dc261a9bd37ddec174e4a0af2b900b890f378460f745426e3" dependencies = [ - "bumpalo", "wasm-bindgen", "web-sys", ] @@ -6197,19 +6276,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.42.0" @@ -6217,85 +6283,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" @@ -6308,9 +6344,9 @@ dependencies = [ [[package]] name = "wiremock" -version = "0.5.16" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631cafe37a030d8453218cf7c650abcc359be8fba4a2fbc5c27fdb9728635406" +checksum = "12316b50eb725e22b2f6b9c4cbede5b7b89984274d113a7440c86e5c3fc6f99b" dependencies = [ "assert-json-diff", "async-trait", @@ -6376,10 +6412,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.4+zstd.1.5.2" +version = "2.0.5+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0" +checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/crates/axum-utils/Cargo.toml b/crates/axum-utils/Cargo.toml index 24487a01..7a6296be 100644 --- a/crates/axum-utils/Cargo.toml +++ b/crates/axum-utils/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -async-trait = "0.1.61" -axum = { version = "0.6.2", features = ["headers"] } +async-trait = "0.1.63" +axum = { version = "0.6.4", features = ["headers"] } axum-extra = { version = "0.4.2", features = ["cookie-private"] } chrono = "0.4.23" data-encoding = "2.3.3" @@ -18,11 +18,11 @@ http-body = "0.4.5" mime = "0.3.16" rand = "0.8.5" serde = "1.0.152" -serde_with = "2.1.0" +serde_with = "2.2.0" serde_urlencoded = "0.7.1" serde_json = "1.0.91" thiserror = "1.0.38" -tokio = "1.24.1" +tokio = "1.24.2" tower = { version = "0.4.13", features = ["util"] } tracing = "0.1.37" url = "2.3.1" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 1ae92c18..cfd99144 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -8,20 +8,20 @@ license = "Apache-2.0" [dependencies] anyhow = "1.0.68" atty = "0.2.14" -axum = "0.6.2" +axum = "0.6.4" camino = "1.1.2" -clap = { version = "4.0.32", features = ["derive"] } +clap = { version = "4.1.4", features = ["derive"] } dotenv = "0.15.0" hyper = { version = "0.14.23", features = ["full"] } itertools = "0.10.5" listenfd = "1.0.0" rand = "0.8.5" rand_chacha = "0.3.1" -rustls = "0.20.7" +rustls = "0.20.8" serde_json = "1.0.91" -serde_yaml = "0.9.16" +serde_yaml = "0.9.17" sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "postgres"] } -tokio = { version = "1.24.1", features = ["full"] } +tokio = { version = "1.24.2", features = ["full"] } tower = { version = "0.4.13", features = ["full"] } tower-http = { version = "0.3.5", features = ["fs", "compression-full"] } url = "2.3.1" diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 5853208d..83a0af4d 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dependencies] -tokio = { version = "1.24.1", features = ["fs", "rt"] } +tokio = { version = "1.24.2", features = ["fs", "rt"] } tracing = { version = "0.1.37" } -async-trait = "0.1.61" +async-trait = "0.1.63" thiserror = "1.0.38" anyhow = "1.0.68" @@ -21,11 +21,11 @@ ulid = { version = "1.0.0", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] } serde = { version = "1.0.152", features = ["derive"] } -serde_with = { version = "2.1.0", features = ["hex", "chrono"] } +serde_with = { version = "2.2.0", features = ["hex", "chrono"] } serde_json = "1.0.91" pem-rfc7468 = "0.6.0" -rustls-pemfile = "1.0.1" +rustls-pemfile = "1.0.2" rand = "0.8.5" rand_chacha = "0.3.1" diff --git a/crates/email/Cargo.toml b/crates/email/Cargo.toml index 06dfed3f..1ab7d211 100644 --- a/crates/email/Cargo.toml +++ b/crates/email/Cargo.toml @@ -6,14 +6,14 @@ edition = "2021" license = "Apache-2.0" [dependencies] -async-trait = "0.1.61" +async-trait = "0.1.63" tracing = "0.1.37" thiserror = "1.0.38" -aws-sdk-sesv2 = { version = "0.22.0", default-features = false } -aws-config = { version = "0.52.0", default-features = false } -aws-smithy-client = { version = "0.52.0", default-features = false, features = ["client-hyper"] } -aws-smithy-async = { version = "0.52.0", default-features = false, features = ["rt-tokio"] } +aws-sdk-sesv2 = { version = "0.24.0", default-features = false } +aws-config = { version = "0.54.1", default-features = false } +aws-smithy-client = { version = "0.54.1", default-features = false, features = ["client-hyper"] } +aws-smithy-async = { version = "0.54.1", default-features = false, features = ["rt-tokio"] } mas-templates = { path = "../templates" } mas-http = { path = "../http", features = ["aws-sdk", "client"] } diff --git a/crates/graphql/Cargo.toml b/crates/graphql/Cargo.toml index f55b781e..86a1e3ef 100644 --- a/crates/graphql/Cargo.toml +++ b/crates/graphql/Cargo.toml @@ -10,7 +10,7 @@ anyhow = "1.0.68" async-graphql = { version = "5.0.5", features = ["chrono", "url"] } chrono = "0.4.23" serde = { version = "1.0.152", features = ["derive"] } -tokio = { version = "1.23.0", features = ["sync"] } +tokio = { version = "1.24.2", features = ["sync"] } thiserror = "1.0.38" tracing = "0.1.37" ulid = "1.0.0" diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml index e2d5a507..230d82fc 100644 --- a/crates/handlers/Cargo.toml +++ b/crates/handlers/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" [dependencies] # Async runtime -tokio = { version = "1.24.1", features = ["macros"] } +tokio = { version = "1.24.2", features = ["macros"] } futures-util = "0.3.25" # Logging and tracing @@ -21,8 +21,8 @@ anyhow = "1.0.68" hyper = { version = "0.14.23", features = ["full"] } tower = "0.4.13" tower-http = { version = "0.3.5", features = ["cors"] } -axum = "0.6.2" -axum-macros = "0.3.1" +axum = "0.6.4" +axum-macros = "0.3.2" axum-extra = { version = "0.4.2", features = ["cookie-private"] } async-graphql = { version = "5.0.5", features = ["tracing", "apollo_tracing"] } @@ -35,7 +35,7 @@ sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "postgres"] } # Various structure (de)serialization serde = { version = "1.0.152", features = ["derive"] } -serde_with = { version = "2.1.0", features = ["hex", "chrono"] } +serde_with = { version = "2.2.0", features = ["hex", "chrono"] } serde_json = "1.0.91" serde_urlencoded = "0.7.1" diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index 8cc8c454..4cde61ee 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dependencies] -aws-smithy-http = { version = "0.52.0", optional = true } -aws-types = { version = "0.52.0", optional = true } -axum = { version = "0.6.2", optional = true } +aws-smithy-http = { version = "0.54.1", optional = true } +aws-types = { version = "0.54.1", optional = true } +axum = { version = "0.6.4", optional = true } bytes = "1.3.0" futures-util = "0.3.25" headers = "0.3.8" @@ -20,13 +20,13 @@ once_cell = "1.17.0" opentelemetry = "0.18.0" opentelemetry-http = "0.7.0" opentelemetry-semantic-conventions = "0.10.0" -rustls = { version = "0.20.7", optional = true } +rustls = { version = "0.20.8", optional = true } rustls-native-certs = { version = "0.6.2", optional = true } serde = "1.0.152" serde_json = "1.0.91" serde_urlencoded = "0.7.1" thiserror = "1.0.38" -tokio = { version = "1.24.1", features = ["sync", "parking_lot"], optional = true } +tokio = { version = "1.24.2", features = ["sync", "parking_lot"], optional = true } tower = { version = "0.4.13", features = [] } tower-http = { version = "0.3.5", features = ["cors"] } tracing = "0.1.37" @@ -37,7 +37,7 @@ webpki-roots = { version = "0.22.6", optional = true } [dev-dependencies] anyhow = "1.0.68" serde = { version = "1.0.152", features = ["derive"] } -tokio = { version = "1.24.1", features = ["macros", "rt"] } +tokio = { version = "1.24.2", features = ["macros", "rt"] } tower = { version = "0.4.13", features = ["util"] } [features] diff --git a/crates/iana-codegen/Cargo.toml b/crates/iana-codegen/Cargo.toml index b75e0bd9..1b834529 100644 --- a/crates/iana-codegen/Cargo.toml +++ b/crates/iana-codegen/Cargo.toml @@ -7,13 +7,13 @@ license = "Apache-2.0" [dependencies] anyhow = "1.0.68" -async-trait = "0.1.61" +async-trait = "0.1.63" camino = "1.1.2" convert_case = "0.6.0" csv = "1.1.6" futures-util = "0.3.25" -reqwest = { version = "0.11.13", features = ["blocking", "rustls-tls"], default-features = false } +reqwest = { version = "0.11.14", features = ["blocking", "rustls-tls"], default-features = false } serde = { version = "1.0.152", features = ["derive"] } -tokio = { version = "1.24.1", features = ["full"] } +tokio = { version = "1.24.2", features = ["full"] } tracing = "0.1.37" tracing-subscriber = "0.3.16" diff --git a/crates/iana/Cargo.toml b/crates/iana/Cargo.toml index 484e113f..bf27b6b7 100644 --- a/crates/iana/Cargo.toml +++ b/crates/iana/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" license = "Apache-2.0" [dependencies] -serde_with = "2.1.0" +serde_with = "2.2.0" schemars = "0.8.11" parse-display = "0.8.0" diff --git a/crates/jose/Cargo.toml b/crates/jose/Cargo.toml index db13fe33..a9192b3e 100644 --- a/crates/jose/Cargo.toml +++ b/crates/jose/Cargo.toml @@ -9,22 +9,22 @@ license = "Apache-2.0" base64ct = { version = "1.5.3", features = ["std"] } chrono = { version = "0.4.23", features = ["serde"] } digest = "0.10.6" -ecdsa = { version = "0.14.8", features = ["sign", "verify"] } +ecdsa = { version = "0.15.1", features = ["signing", "verifying"] } elliptic-curve = "0.12.3" generic-array = "0.14.6" hmac = "0.12.1" -k256 = { version = "0.11.6", features = ["ecdsa"] } -p256 = { version = "0.11.1", features = ["ecdsa"] } -p384 = { version = "0.11.2", features = ["ecdsa"] } +k256 = { version = "0.12.0", features = ["ecdsa"] } +p256 = { version = "0.12.0", features = ["ecdsa"] } +p384 = { version = "0.12.0", features = ["ecdsa"] } rand = "0.8.5" -rsa = "0.7.2" +rsa = "0.8.1" schemars = "0.8.11" sec1 = "0.3.0" serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.91" -serde_with = { version = "2.1.0", features = ["base64"] } +serde_with = { version = "2.2.0", features = ["base64"] } sha2 = { version = "0.10.6", features = ["oid"] } -signature = "1.6.4" +signature = "2.0.0" thiserror = "1.0.38" tracing = "0.1.37" url = { version = "2.3.1", features = ["serde"] } diff --git a/crates/jose/src/jwa/asymmetric.rs b/crates/jose/src/jwa/asymmetric.rs index 8ac64b98..82ee9889 100644 --- a/crates/jose/src/jwa/asymmetric.rs +++ b/crates/jose/src/jwa/asymmetric.rs @@ -15,6 +15,7 @@ use digest::Digest; use mas_iana::jose::{JsonWebKeyEcEllipticCurve, JsonWebSignatureAlg}; use sha2::{Sha256, Sha384, Sha512}; +use signature::rand_core::CryptoRngCore; use thiserror::Error; use super::signature::Signature; @@ -215,7 +216,7 @@ impl From for AsymmetricSigningKey { impl signature::RandomizedSigner for AsymmetricSigningKey { fn try_sign_with_rng( &self, - rng: impl rand::CryptoRng + rand::RngCore, + rng: &mut impl CryptoRngCore, msg: &[u8], ) -> Result { match self { @@ -244,15 +245,15 @@ impl signature::RandomizedSigner for AsymmetricSigningKey { Ok(Signature::from_signature(&signature)) } Self::Es256(key) => { - let signature = key.try_sign_with_rng(rng, msg)?; + let signature: ecdsa::Signature<_> = key.try_sign_with_rng(rng, msg)?; Ok(Signature::from_signature(&signature)) } Self::Es384(key) => { - let signature = key.try_sign_with_rng(rng, msg)?; + let signature: ecdsa::Signature<_> = key.try_sign_with_rng(rng, msg)?; Ok(Signature::from_signature(&signature)) } Self::Es256K(key) => { - let signature = key.try_sign_with_rng(rng, msg)?; + let signature: ecdsa::Signature<_> = key.try_sign_with_rng(rng, msg)?; Ok(Signature::from_signature(&signature)) } } @@ -449,15 +450,15 @@ impl signature::Verifier for AsymmetricVerifyingKey { key.verify(msg, &signature) } Self::Es256(key) => { - let signature = signature.to_signature()?; + let signature: ecdsa::Signature<_> = signature.to_signature()?; key.verify(msg, &signature) } Self::Es384(key) => { - let signature = signature.to_signature()?; + let signature: ecdsa::Signature<_> = signature.to_signature()?; key.verify(msg, &signature) } Self::Es256K(key) => { - let signature = signature.to_signature()?; + let signature: ecdsa::Signature<_> = signature.to_signature()?; key.verify(msg, &signature) } } diff --git a/crates/jose/src/jwa/hmac.rs b/crates/jose/src/jwa/hmac.rs index ac949d26..9871f932 100644 --- a/crates/jose/src/jwa/hmac.rs +++ b/crates/jose/src/jwa/hmac.rs @@ -40,18 +40,37 @@ impl> std::fmt::Debug for Signature { } } -impl> signature::Signature for Signature { - fn from_bytes(bytes: &[u8]) -> Result { - if bytes.len() != S::to_usize() { - return Err(signature::Error::new()); +impl> Clone for Signature { + fn clone(&self) -> Self { + Self { + signature: self.signature.clone(), } - - Ok(Self { - signature: GenericArray::from_slice(bytes).clone(), - }) } } +impl> From> for GenericArray { + fn from(val: Signature) -> Self { + val.signature + } +} + +impl<'a, S: ArrayLength> TryFrom<&'a [u8]> for Signature { + type Error = InvalidLength; + + fn try_from(value: &'a [u8]) -> Result { + if value.len() != S::to_usize() { + return Err(InvalidLength); + } + let mut signature = GenericArray::default(); + signature.copy_from_slice(value); + Ok(Self { signature }) + } +} + +impl> signature::SignatureEncoding for Signature { + type Repr = GenericArray; +} + impl> AsRef<[u8]> for Signature { fn as_ref(&self) -> &[u8] { self.signature.as_ref() diff --git a/crates/jose/src/jwa/signature.rs b/crates/jose/src/jwa/signature.rs index 4a97a24b..10f2362a 100644 --- a/crates/jose/src/jwa/signature.rs +++ b/crates/jose/src/jwa/signature.rs @@ -12,45 +12,51 @@ // See the License for the specific language governing permissions and // limitations under the License. -use signature::Signature as _; +use signature::SignatureEncoding as _; -#[derive(Debug)] +#[derive(Debug, Clone)] pub struct Signature { - bytes: Vec, + bytes: Box<[u8]>, } -impl AsRef<[u8]> for Signature { - fn as_ref(&self) -> &[u8] { - &self.bytes +impl From for Box<[u8]> { + fn from(val: Signature) -> Self { + val.bytes } } -impl signature::Signature for Signature { - fn from_bytes(bytes: &[u8]) -> Result { - Ok(Self { - bytes: bytes.to_vec(), - }) +impl<'a> From<&'a [u8]> for Signature { + fn from(value: &'a [u8]) -> Self { + Self { + bytes: value.into(), + } } } +impl signature::SignatureEncoding for Signature { + type Repr = Box<[u8]>; +} + impl Signature { pub fn new(bytes: Vec) -> Self { - Self { bytes } + Self { + bytes: bytes.into(), + } } pub fn from_signature(signature: &S) -> Self where - S: signature::Signature, + S: signature::SignatureEncoding, { Self { - bytes: signature.as_bytes().to_vec(), + bytes: signature.to_vec().into(), } } pub fn to_signature(&self) -> Result where - S: signature::Signature, + S: signature::SignatureEncoding, { - S::from_bytes(self.as_bytes()) + S::try_from(&self.to_bytes()).map_err(|_| signature::Error::default()) } } diff --git a/crates/jose/src/jwa/symmetric.rs b/crates/jose/src/jwa/symmetric.rs index 973c56ac..90bfe7b6 100644 --- a/crates/jose/src/jwa/symmetric.rs +++ b/crates/jose/src/jwa/symmetric.rs @@ -82,7 +82,7 @@ impl From for SymmetricKey { impl signature::RandomizedSigner for SymmetricKey { fn try_sign_with_rng( &self, - _rng: impl rand::CryptoRng + rand::RngCore, + _rng: &mut (impl rand::CryptoRng + rand::RngCore), msg: &[u8], ) -> Result { // XXX: is that implementation alright? diff --git a/crates/jose/src/jwt/signed.rs b/crates/jose/src/jwt/signed.rs index ab526f0d..4568b80b 100644 --- a/crates/jose/src/jwt/signed.rs +++ b/crates/jose/src/jwt/signed.rs @@ -13,9 +13,9 @@ // limitations under the License. use base64ct::{Base64UrlUnpadded, Encoding}; -use rand::{thread_rng, CryptoRng, RngCore}; +use rand::thread_rng; use serde::{de::DeserializeOwned, Serialize}; -use signature::{RandomizedSigner, Signature, Verifier}; +use signature::{rand_core::CryptoRngCore, RandomizedSigner, SignatureEncoding, Verifier}; use thiserror::Error; use super::{header::JsonWebSignatureHeader, raw::RawJwt}; @@ -165,10 +165,7 @@ where #[derive(Debug, Error)] pub enum JwtVerificationError { #[error("failed to parse signature")] - ParseSignature { - #[source] - inner: signature::Error, - }, + ParseSignature, #[error("signature verification failed")] Verify { @@ -178,8 +175,9 @@ pub enum JwtVerificationError { } impl JwtVerificationError { - fn parse_signature(inner: signature::Error) -> Self { - Self::ParseSignature { inner } + #[allow(clippy::needless_pass_by_value)] + fn parse_signature(_inner: E) -> Self { + Self::ParseSignature } fn verify(inner: signature::Error) -> Self { @@ -214,10 +212,10 @@ impl<'a, T> Jwt<'a, T> { pub fn verify(&self, key: &K) -> Result<(), JwtVerificationError> where K: Verifier, - S: Signature, + S: SignatureEncoding, { let signature = - S::from_bytes(&self.signature).map_err(JwtVerificationError::parse_signature)?; + S::try_from(&self.signature).map_err(JwtVerificationError::parse_signature)?; key.verify(self.raw.signed_part().as_bytes(), &signature) .map_err(JwtVerificationError::verify) @@ -306,23 +304,23 @@ impl Jwt<'static, T> { ) -> Result where K: RandomizedSigner, - S: Signature, + S: SignatureEncoding, T: Serialize, { #[allow(clippy::disallowed_methods)] - Self::sign_with_rng(thread_rng(), header, payload, key) + Self::sign_with_rng(&mut thread_rng(), header, payload, key) } pub fn sign_with_rng( - rng: R, + rng: &mut R, header: JsonWebSignatureHeader, payload: T, key: &K, ) -> Result where - R: CryptoRng + RngCore, + R: CryptoRngCore, K: RandomizedSigner, - S: Signature, + S: SignatureEncoding, T: Serialize, { let header_ = serde_json::to_vec(&header).map_err(JwtSignatureError::encode_header)?; @@ -336,10 +334,7 @@ impl Jwt<'static, T> { let first_dot = header_.len(); let second_dot = inner.len(); - let signature = key - .try_sign_with_rng(rng, inner.as_bytes())? - .as_bytes() - .to_vec(); + let signature = key.try_sign_with_rng(rng, inner.as_bytes())?.to_vec(); let signature_ = Base64UrlUnpadded::encode_string(&signature); inner.reserve_exact(1 + signature_.len()); inner.push('.'); @@ -386,7 +381,9 @@ mod tests { let payload = serde_json::json!({"hello": "world"}); let key = ecdsa::SigningKey::::random(&mut thread_rng()); - let signed = Jwt::sign(header, payload, &key).unwrap(); - signed.verify(&key.verifying_key()).unwrap(); + let signed = Jwt::sign::<_, ecdsa::Signature<_>>(header, payload, &key).unwrap(); + signed + .verify::<_, ecdsa::Signature<_>>(key.verifying_key()) + .unwrap(); } } diff --git a/crates/jose/tests/jws.rs b/crates/jose/tests/jws.rs index 22dd13f7..54d72745 100644 --- a/crates/jose/tests/jws.rs +++ b/crates/jose/tests/jws.rs @@ -116,7 +116,7 @@ macro_rules! asymetric_jwt_test { #[test] fn sign_jwt() { - let rng = ChaCha8Rng::seed_from_u64(42); + let mut rng = ChaCha8Rng::seed_from_u64(42); let alg = JsonWebSignatureAlg::$alg; let payload = Payload { hello: "world".to_string(), @@ -129,7 +129,7 @@ macro_rules! asymetric_jwt_test { let key = mas_jose::jwa::AsymmetricSigningKey::from_jwk_and_alg(key.params(), &alg) .unwrap(); - let jwt: Jwt<'_, Payload> = Jwt::sign_with_rng(rng, header, payload, &key).unwrap(); + let jwt: Jwt<'_, Payload> = Jwt::sign_with_rng(&mut rng, header, payload, &key).unwrap(); insta::assert_snapshot!(jwt.as_str()); } diff --git a/crates/keystore/Cargo.toml b/crates/keystore/Cargo.toml index e28e22c6..dabe09bd 100644 --- a/crates/keystore/Cargo.toml +++ b/crates/keystore/Cargo.toml @@ -11,16 +11,16 @@ aead = { version = "0.5.1", features = ["std"] } const-oid = { version = "0.9.1", features = ["std"] } cookie = { version = "0.16.2", features = ["key-expansion", "private"] } der = { version = "0.6.1", features = ["std"] } -ecdsa = { version = "0.14.8", features = ["std"] } +ecdsa = { version = "0.15.1", features = ["std"] } elliptic-curve = { version = "0.12.3", features = ["std", "pem", "sec1"] } -k256 = { version = "0.11.6", features = ["std"] } -p256 = { version = "0.11.1", features = ["std"] } -p384 = { version = "0.11.2", features = ["std"] } +k256 = { version = "0.12.0", features = ["std"] } +p256 = { version = "0.12.0", features = ["std"] } +p384 = { version = "0.12.0", features = ["std"] } pem-rfc7468 = { version = "0.6.0", features = ["std"] } pkcs1 = { version = "0.4.1", features = ["std"] } pkcs8 = { version = "0.9.0", features = ["std", "pkcs5", "encryption"] } rand = "0.8.5" -rsa = { version = "0.7.2", features = ["std", "pem"] } +rsa = { version = "0.8.1", features = ["std", "pem"] } sec1 = { version = "0.3.0", features = ["std"] } spki = { version = "0.6.0", features = ["std"] } thiserror = "1.0.38" diff --git a/crates/listener/Cargo.toml b/crates/listener/Cargo.toml index 24215c72..012b9ec0 100644 --- a/crates/listener/Cargo.toml +++ b/crates/listener/Cargo.toml @@ -12,7 +12,7 @@ http-body = "0.4.5" hyper = { version = "0.14.23", features = ["server", "http1", "http2", "tcp"] } pin-project-lite = "0.2.9" thiserror = "1.0.38" -tokio = { version = "1.24.1", features = ["net", "rt", "macros", "signal", "time"] } +tokio = { version = "1.24.2", features = ["net", "rt", "macros", "signal", "time"] } tokio-rustls = "0.23.4" tower-http = { version = "0.3.5", features = ["add-extension"] } tower-service = "0.3.2" @@ -21,8 +21,8 @@ libc = "0.2.139" [dev-dependencies] anyhow = "1.0.68" -rustls-pemfile = "1.0.1" -tokio = { version = "1.24.1", features = ["net", "rt", "macros", "signal", "time", "rt-multi-thread"] } +rustls-pemfile = "1.0.2" +tokio = { version = "1.24.2", features = ["net", "rt", "macros", "signal", "time", "rt-multi-thread"] } tokio-test = "0.4.2" tracing-subscriber = "0.3.16" diff --git a/crates/oauth2-types/Cargo.toml b/crates/oauth2-types/Cargo.toml index 2c7047e9..81ee6421 100644 --- a/crates/oauth2-types/Cargo.toml +++ b/crates/oauth2-types/Cargo.toml @@ -13,7 +13,7 @@ language-tags = { version = "0.3.2", features = ["serde"] } url = { version = "2.3.1", features = ["serde"] } parse-display = "0.8.0" indoc = "1.0.8" -serde_with = { version = "2.1.0", features = ["chrono"] } +serde_with = { version = "2.2.0", features = ["chrono"] } chrono = "0.4.23" sha2 = "0.10.6" data-encoding = "2.3.3" diff --git a/crates/oidc-client/Cargo.toml b/crates/oidc-client/Cargo.toml index ebf2cece..84faa85f 100644 --- a/crates/oidc-client/Cargo.toml +++ b/crates/oidc-client/Cargo.toml @@ -33,9 +33,9 @@ rand = "0.8.5" serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.91" serde_urlencoded = "0.7.1" -serde_with = "2.1.0" +serde_with = "2.2.0" thiserror = "1.0.38" -tokio = { version = "1.24.1", features = ["rt", "macros", "rt-multi-thread"] } +tokio = { version = "1.24.2", features = ["rt", "macros", "rt-multi-thread"] } tower = { version = "0.4.13", features = ["full"] } tracing = "0.1.37" url = { version = "2.3.1", features = ["serde"] } @@ -48,7 +48,7 @@ oauth2-types = { path = "../oauth2-types" } # Default http service http-body = { version = "0.4.5", optional = true } -rustls = {version = "0.20.7", optional = true } +rustls = {version = "0.20.8", optional = true } [dependencies.hyper-rustls] version = "0.23.2" features = ["http1", "http2", "rustls-native-certs"] @@ -68,4 +68,4 @@ assert_matches = "1.5.0" bitflags = "1.3.2" mas-keystore = { path = "../keystore" } rand_chacha = "0.3.1" -wiremock = "0.5.16" +wiremock = "0.5.17" diff --git a/crates/policy/Cargo.toml b/crates/policy/Cargo.toml index 71e20fdb..3fca4246 100644 --- a/crates/policy/Cargo.toml +++ b/crates/policy/Cargo.toml @@ -11,7 +11,7 @@ opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" } serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.91" thiserror = "1.0.38" -tokio = { version = "1.24.1", features = ["io-util"] } +tokio = { version = "1.24.2", features = ["io-util"] } tracing = "0.1.37" wasmtime = { version = "4.0.0", default-features = false, features = ["async", "cranelift"] } @@ -19,7 +19,7 @@ mas-data-model = { path = "../data-model" } oauth2-types = { path = "../oauth2-types" } [dev-dependencies] -tokio = { version = "1.24.1", features = ["fs", "rt", "macros"] } +tokio = { version = "1.24.2", features = ["fs", "rt", "macros"] } [features] cache = ["wasmtime/cache"] diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 43299766..807605ac 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -axum = { version = "0.6.2", default-features = false } +axum = { version = "0.6.4", default-features = false } serde = { version = "1.0.152", features = ["derive"] } serde_urlencoded = "0.7.1" url = "2.3.1" diff --git a/crates/spa/Cargo.toml b/crates/spa/Cargo.toml index 2bbf0b64..ad1e309d 100644 --- a/crates/spa/Cargo.toml +++ b/crates/spa/Cargo.toml @@ -14,7 +14,7 @@ headers = "0.3.8" http = "0.2.8" tower-service = "0.3.2" tower-http = { version = "0.3.5", features = ["fs"] } -tokio = { version = "1.24.1", features = ["fs"] } +tokio = { version = "1.24.2", features = ["fs"] } [[bin]] name = "render" diff --git a/crates/storage-pg/Cargo.toml b/crates/storage-pg/Cargo.toml index 3373a21f..adfd6daf 100644 --- a/crates/storage-pg/Cargo.toml +++ b/crates/storage-pg/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -async-trait = "0.1.60" +async-trait = "0.1.63" sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline", "json", "uuid"] } chrono = { version = "0.4.23", features = ["serde"] } serde = { version = "1.0.152", features = ["derive"] } diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index cea7b03b..b13fb14c 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -async-trait = "0.1.60" +async-trait = "0.1.63" chrono = "0.4.23" thiserror = "1.0.38" futures-util = "0.3.25" diff --git a/crates/tasks/Cargo.toml b/crates/tasks/Cargo.toml index 9abf36f0..a290d0cc 100644 --- a/crates/tasks/Cargo.toml +++ b/crates/tasks/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" license = "Apache-2.0" [dependencies] -tokio = "1.24.1" -async-trait = "0.1.61" +tokio = "1.24.2" +async-trait = "0.1.63" tokio-stream = "0.1.11" futures-util = "0.3.25" tracing = "0.1.37" diff --git a/crates/templates/Cargo.toml b/crates/templates/Cargo.toml index e82e95fc..66723025 100644 --- a/crates/templates/Cargo.toml +++ b/crates/templates/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" [dependencies] tracing = "0.1.37" -tokio = { version = "1.24.1", features = ["macros", "rt"] } +tokio = { version = "1.24.2", features = ["macros", "rt"] } anyhow = "1.0.68" thiserror = "1.0.38"