diff --git a/Cargo.lock b/Cargo.lock index c7cd809d..3eb00eef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,6 +28,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.18" @@ -66,9 +77,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" dependencies = [ "backtrace", ] @@ -94,7 +105,7 @@ dependencies = [ "asn1-rs-derive 0.1.0", "asn1-rs-impl", "displaydoc", - "nom 7.1.1", + "nom 7.1.3", "num-traits", "rusticata-macros", "thiserror", @@ -109,7 +120,7 @@ dependencies = [ "asn1-rs-derive 0.4.0", "asn1-rs-impl", "displaydoc", - "nom 7.1.1", + "nom 7.1.3", "num-traits", "rusticata-macros", "thiserror", @@ -180,9 +191,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", @@ -233,6 +244,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "base64ct" version = "1.5.0" @@ -575,7 +592,7 @@ checksum = "28a69d53c61ddd5611ad0203c60aa02074d67f91bfb98db2225833f6bdc2f1a4" dependencies = [ "anyhow", "async-trait", - "base64", + "base64 0.13.1", "cfg-if 0.1.10", "chrono", "http", @@ -632,7 +649,7 @@ dependencies = [ "rust-ini", "serde", "serde_json", - "toml", + "toml 0.5.9", "yaml-rust", ] @@ -788,12 +805,12 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac961631d66e80ac7ac2ac01320628ce214ad2b5ef0a88ceb86eae459069e2b4" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array 0.14.4", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -859,12 +876,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.2.3" +version = "3.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173" +checksum = "1631ca6e3c59112501a9d87fd86f21591ff77acd31331e8a73f8d80a65bbdd71" dependencies = [ "nix", - "winapi 0.3.9", + "windows-sys 0.42.0", ] [[package]] @@ -957,7 +974,7 @@ dependencies = [ "asn1-rs 0.3.1", "cookie-factory", "displaydoc", - "nom 7.1.1", + "nom 7.1.3", "num-bigint", "num-traits", "rusticata-macros", @@ -972,7 +989,7 @@ dependencies = [ "asn1-rs 0.5.1", "cookie-factory", "displaydoc", - "nom 7.1.1", + "nom 7.1.3", "num-bigint", "num-traits", "rusticata-macros", @@ -1017,9 +1034,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.1", "crypto-common", @@ -1083,7 +1100,7 @@ name = "distributor" version = "0.1.0" dependencies = [ "anyhow", - "base64", + "base64 0.21.0", "byte-strings", "ciborium", "clap 3.2.23", @@ -1094,11 +1111,11 @@ dependencies = [ "hyper-rustls", "hyper-trust-dns", "lazy_static", - "nom 7.1.1", + "nom 7.1.3", "percent-encoding 2.2.0", "regex", "rustls", - "rustls-pemfile 1.0.1", + "rustls-pemfile 1.0.2", "sha2 0.10.6", "sxg_rs", "thiserror", @@ -1125,9 +1142,9 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d9cefce9f137ab016f5092c54277988ffaa598dea9ab964828ade036df05692" +checksum = "12844141594ad74185a926d030f3b605f6a903b4e3fec351f3ea338ac5b7637e" dependencies = [ "der", "elliptic-curve", @@ -1143,19 +1160,19 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "elliptic-curve" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6664c6a37892ed55da8dda26a99e6ccc783f0c72fa3c2eeaa00ed30d8f4d9a" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", "crypto-bigint", "der", - "digest 0.10.5", + "digest 0.10.6", "ff", "generic-array 0.14.4", "group", "pkcs8", - "rand_core 0.6.3", + "rand_core 0.6.4", "sec1", "subtle", "zeroize", @@ -1250,9 +1267,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "fastly" -version = "0.8.9" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d14ee2f12a3191582449a2e080287eff8898fc52da61c437869d91c41b3ae2a" +checksum = "645e7a0c3782166bcab2c7f0704d51db0fed2d27093d5beea94cef878ba11bb9" dependencies = [ "anyhow", "bytes 0.5.6", @@ -1274,9 +1291,9 @@ dependencies = [ [[package]] name = "fastly-macros" -version = "0.8.9" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1b2980c09148cb84bfd18591943ee449a350dc1ff1ead69edbf012f7e2eef" +checksum = "6b5163881fe9bab8e865258351e931635d2d17ed88113e546db7c7e57f7249e9" dependencies = [ "proc-macro2", "quote", @@ -1285,9 +1302,9 @@ dependencies = [ [[package]] name = "fastly-shared" -version = "0.8.9" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f79939bdbbab8b1de759d584f386319454f8623681400675a07f9ad35f2b158" +checksum = "40d95b3a3816d17b02f3972d16fefddd164c0ec7c1b4e090b380177131a4a22d" dependencies = [ "bitflags", "http", @@ -1296,9 +1313,9 @@ dependencies = [ [[package]] name = "fastly-sys" -version = "0.8.9" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d01e98274a6b12c85c0eef22924871cc12c54b5322268947322463e59d09336" +checksum = "286a15f3231704bfadc3e2a739b04fdd6fadfa4706157d482f05c0539c681594" dependencies = [ "bitflags", "fastly-shared", @@ -1310,7 +1327,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "base64", + "base64 0.21.0", "fastly", "http", "log", @@ -1329,7 +1346,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df689201f395c6b90dfe87127685f8dbfc083a5e779e613575d8bd7314300c3e" dependencies = [ - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", ] @@ -1443,9 +1460,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" dependencies = [ "futures-channel", "futures-core", @@ -1458,9 +1475,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -1468,15 +1485,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" dependencies = [ "futures-core", "futures-task", @@ -1485,15 +1502,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", @@ -1502,21 +1519,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures-channel", "futures-core", @@ -1608,7 +1625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d" dependencies = [ "ff", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", ] @@ -1643,7 +1660,16 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" dependencies = [ - "ahash", + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", ] [[package]] @@ -1652,7 +1678,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" dependencies = [ - "base64", + "base64 0.13.1", "bitflags", "bytes 1.0.1", "headers-core", @@ -1707,7 +1733,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -1916,7 +1942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.0", ] [[package]] @@ -2051,9 +2077,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.127" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libz-sys" @@ -2102,9 +2128,9 @@ dependencies = [ [[package]] name = "log-fastly" -version = "0.8.9" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fdbb044b93f30315c1f340a8b0890ab5e919bd443ee4a3d973997b919499556" +checksum = "6033f42b6c8ca6e46966073065312ac3d371fc8cac323dd76cf479093730f71f" dependencies = [ "fastly", "log", @@ -2113,15 +2139,15 @@ dependencies = [ [[package]] name = "lol_html" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ff2adf9c54f4de7d66a9177ea7d27d5b8108503bb03d5b719869b8f4bc2ab2" +checksum = "b16d7d17063591adf0017a068a8ce2ed29a4f5402b9e6cac01888ff9c0527ff7" dependencies = [ "bitflags", "cfg-if 1.0.0", "cssparser", "encoding_rs", - "hashbrown", + "hashbrown 0.12.0", "lazy_static", "lazycell", "memchr", @@ -2132,11 +2158,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" +checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" dependencies = [ - "hashbrown", + "hashbrown 0.13.2", ] [[package]] @@ -2296,14 +2322,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "autocfg", "bitflags", "cfg-if 1.0.0", "libc", + "static_assertions", ] [[package]] @@ -2325,14 +2351,23 @@ dependencies = [ [[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 = "normalize-line-endings" version = "0.3.0" @@ -2424,7 +2459,7 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80e47cfc4c0a1a519d9a025ebfbac3a2439d1b5cdf397d72dcb79b11d9920dab" dependencies = [ - "base64", + "base64 0.13.1", "chrono", "getrandom 0.2.8", "http", @@ -2455,9 +2490,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "opaque-debug" @@ -2534,12 +2569,13 @@ checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" [[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 0.10.6", ] @@ -2592,11 +2628,11 @@ checksum = "3cacbb3c4ff353b534a67fb8d7524d00229da4cb1dc8c79f4db96e375ab5b619" [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -2719,7 +2755,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a38d026d73eeaf2ade76309d0c65db5a35ecf649e3cec428db316243ea9d6711" dependencies = [ - "base64", + "base64 0.13.1", "chrono", "indexmap", "line-wrap", @@ -2773,6 +2809,15 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "primeorder" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b54f7131b3dba65a2f414cf5bd25b66d4682e4608610668eae785750ba4c5b2" +dependencies = [ + "elliptic-curve", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2849,7 +2894,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -2869,7 +2914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -2883,9 +2928,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom 0.2.8", ] @@ -2946,9 +2991,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", @@ -2982,7 +3027,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525" dependencies = [ - "base64", + "base64 0.13.1", "bytes 1.0.1", "encoding_rs", "futures-core", @@ -3020,9 +3065,9 @@ dependencies = [ [[package]] name = "rfc6979" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c0788437d5ee113c49af91d3594ebc4fcdcc962f8b6df5aa1c3eeafd8ad95de" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ "crypto-bigint", "hmac", @@ -3050,7 +3095,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ - "base64", + "base64 0.13.1", "blake2b_simd", "constant_time_eq", "crossbeam-utils", @@ -3083,14 +3128,14 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65c52377bb2288aa522a0c8208947fada1e0c76397f108cc08f57efe6077b50d" dependencies = [ - "nom 7.1.1", + "nom 7.1.3", ] [[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", @@ -3116,16 +3161,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" dependencies = [ - "base64", + "base64 0.13.1", ] [[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", + "base64 0.21.0", ] [[package]] @@ -3252,9 +3297,9 @@ checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" [[package]] name = "serde" -version = "1.0.149" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] @@ -3272,9 +3317,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.149" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -3283,9 +3328,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa 1.0.1", "ryu", @@ -3313,6 +3358,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c68e921cef53841b8925c2abadd27c9b891d9613bdc43d6b823062866df38e8" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.0" @@ -3350,9 +3404,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.14" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d232d893b10de3eb7258ff01974d6ee20663d8e833263c99409d4b13a0209da" +checksum = "8fb06d4b6cdaef0e0c51fa881acb721bed3c924cfaa71d9c94a3b771dfdf6567" dependencies = [ "indexmap", "itoa 1.0.1", @@ -3404,7 +3458,7 @@ checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ "cfg-if 1.0.0", "cpufeatures 0.2.1", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -3415,7 +3469,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if 1.0.0", "cpufeatures 0.2.1", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -3439,7 +3493,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if 1.0.0", "cpufeatures 0.2.1", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -3453,12 +3507,12 @@ dependencies = [ [[package]] name = "signature" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" +checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" dependencies = [ - "digest 0.10.5", - "rand_core 0.6.3", + "digest 0.10.6", + "rand_core 0.6.4", ] [[package]] @@ -3565,7 +3619,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "base64", + "base64 0.21.0", "chrono", "der-parser 8.1.0", "futures", @@ -3573,7 +3627,7 @@ dependencies = [ "http", "js-sys", "lol_html", - "nom 7.1.1", + "nom 7.1.3", "once_cell", "p256", "pem", @@ -3728,18 +3782,18 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -3802,9 +3856,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tls-listener" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d4ff21187d434ac7709bfc7441ca88f63681247e5ad99f0f08c8c91ddc103d" +checksum = "97abcaa5d5850d3b469898d1e0939b57c3afb4475122e792cdd1c82b07f5de06" dependencies = [ "futures-util", "hyper", @@ -3964,6 +4018,27 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f560bc7fb3eb31f5eee1340c68a2160cad39605b7b9c9ec32045ddbdee13b85" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.0", +] + +[[package]] +name = "toml_datetime" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "886f31a9b85b6182cabd4d8b07df3b451afcc216563748201490940d2a28ed36" +dependencies = [ + "serde", +] + [[package]] name = "toml_edit" version = "0.2.1" @@ -3975,13 +4050,26 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "toml_edit" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d8716cdc5d20ec88a18a839edaf545edc71efa4a5ff700ef4a102c26cd8fa" +dependencies = [ + "indexmap", + "nom8", + "serde", + "serde_spanned", + "toml_datetime", +] + [[package]] name = "tools" version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "base64", + "base64 0.21.0", "clap 3.2.23", "ctrlc", "der-parser 7.0.0", @@ -3995,7 +4083,7 @@ dependencies = [ "serde_yaml", "sxg_rs", "tokio", - "toml", + "toml 0.7.0", "url", "warp", "wrangler", @@ -4095,7 +4183,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fe8dada8c1a3aeca77d6b51a4f1314e0f4b8e438b7b1b71e3ddaca8080e4093" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes 1.0.1", "http", @@ -4116,7 +4204,7 @@ version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes 1.0.1", "http", @@ -4275,9 +4363,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" @@ -4659,7 +4747,7 @@ dependencies = [ "anyhow", "atty", "backtrace", - "base64", + "base64 0.13.1", "billboard", "binary-install", "chrome-devtools-rs", @@ -4714,8 +4802,8 @@ dependencies = [ "tokio-rustls", "tokio-stream", "tokio-tungstenite 0.14.0", - "toml", - "toml_edit", + "toml 0.5.9", + "toml_edit 0.2.1", "twox-hash", "url", "uuid", @@ -4739,11 +4827,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" dependencies = [ "asn1-rs 0.5.1", - "base64", + "base64 0.13.1", "data-encoding", "der-parser 8.1.0", "lazy_static", - "nom 7.1.1", + "nom 7.1.3", "oid-registry", "rusticata-macros", "thiserror", diff --git a/distributor/Cargo.toml b/distributor/Cargo.toml index d5b73801..e8eae330 100644 --- a/distributor/Cargo.toml +++ b/distributor/Cargo.toml @@ -21,28 +21,28 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = { version = "1.0.66", features = ["backtrace"] } -base64 = "0.13.1" +anyhow = { version = "1.0.68", features = ["backtrace"] } +base64 = "0.21.0" byte-strings = { version = "0.2.2", features = ["const-friendly"] } ciborium = "0.2.0" clap = { version = "3.2.23", features = ["derive"] } form_urlencoded = "1.1.0" -futures = "0.3.25" +futures = "0.3.26" http = "0.2.8" hyper-rustls = "0.23.2" hyper-trust-dns = { version = "0.5.0", default-features = false, features = ["rustls-webpki", "rustls-http1", "rustls-tls-12"] } hyper = { version = "0.14.23", features = ["http1", "http2", "server", "stream", "tcp"] } lazy_static = "1.4.0" -nom = { version = "7.1.1" } +nom = { version = "7.1.3" } percent-encoding = "2.2.0" -regex = "1.7.0" -rustls = "0.20.7" -rustls-pemfile = "1.0.1" +regex = "1.7.1" +rustls = "0.20.8" +rustls-pemfile = "1.0.2" sha2 = "0.10.6" # TODO: Determine if I can remove strip_id_headers because it's default. sxg_rs = { path = "../sxg_rs", features = ["strip_id_headers", "rust_signer", "srcset"] } -thiserror = "1.0.37" -tls-listener = { version = "0.5.1", features = ["hyper-h1", "hyper-h2", "rustls"] } +thiserror = "1.0.38" +tls-listener = { version = "0.6.0", features = ["hyper-h1", "hyper-h2", "rustls"] } tokio = { version = "1.23.0", features = ["rt-multi-thread", "macros", "sync", "time"] } tokio-rustls = "0.23.4" url = "2.3.1" diff --git a/fastly_compute/Cargo.toml b/fastly_compute/Cargo.toml index 2c9ca34b..b96a7432 100644 --- a/fastly_compute/Cargo.toml +++ b/fastly_compute/Cargo.toml @@ -23,16 +23,16 @@ publish = false debug = false [dependencies] -anyhow = "1.0.66" -async-trait = "0.1.59" -base64 = "0.13.1" -fastly = "^0.8.9" +anyhow = "1.0.68" +async-trait = "0.1.64" +base64 = "0.21.0" +fastly = "^0.9.1" http = "0.2.8" log = "0.4.17" -log-fastly = "0.8.9" -pem = "1.1.0" -serde = { version = "1.0.149", features = ["derive"] } -serde_yaml = "0.9.14" +log-fastly = "0.9.1" +pem = "1.1.1" +serde = { version = "1.0.152", features = ["derive"] } +serde_yaml = "0.9.17" sxg_rs = { path = "../sxg_rs", features = ["rust_signer"] } tokio = { version = "1.23.0", features = ["rt"] } url = "2.3.1" diff --git a/http_server/Cargo.toml b/http_server/Cargo.toml index aa1eba97..b54b675b 100644 --- a/http_server/Cargo.toml +++ b/http_server/Cargo.toml @@ -21,11 +21,11 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.66" -async-trait = "0.1.59" +anyhow = "1.0.68" +async-trait = "0.1.64" clap = { version = "3.2.23", features = ["derive"] } fs2 = "0.4.3" -futures = "0.3.25" +futures = "0.3.26" http = "0.2.8" hyper-reverse-proxy = { git = "https://github.com/felipenoris/hyper-reverse-proxy", rev = "96a398de8522fac07a5e15bd0699f6cd7fa84bce" } hyper-rustls = "0.23.2" @@ -33,9 +33,9 @@ hyper-tls = "0.5.0" hyper-trust-dns = { version = "0.5.0", default-features = false, features = ["rustls-webpki", "rustls-http1", "rustls-tls-12"] } hyper = { version = "0.14.23", features = ["http1", "http2", "server", "stream", "tcp"] } lazy_static = "1.4.0" -lru = "0.8.1" +lru = "0.9.0" rand = "0.8.5" -serde_yaml = "0.9.14" +serde_yaml = "0.9.17" # TODO: Determine if I can remove strip_id_headers because it's default. sxg_rs = { path = "../sxg_rs", features = ["strip_id_headers", "rust_signer"] } tokio = { version = "1.23.0", features = ["rt-multi-thread", "macros", "sync", "time"] } diff --git a/sxg_rs/Cargo.toml b/sxg_rs/Cargo.toml index 9c529c1f..0d787d7f 100644 --- a/sxg_rs/Cargo.toml +++ b/sxg_rs/Cargo.toml @@ -31,24 +31,24 @@ wasm = [] crate-type = ["cdylib", "rlib"] [dependencies] -anyhow = "1.0.66" -async-trait = "0.1.59" -base64 = "0.13.1" +anyhow = "1.0.68" +async-trait = "0.1.64" +base64 = "0.21.0" chrono = { version = "0.4.23", features = ["serde"] } der-parser = { version = "8.1.0", features = ["bigint", "serialize"] } -futures = { version = "0.3.25" } +futures = { version = "0.3.26" } getrandom = { version = "0.2.8", features = ["js"] } http = "0.2.8" js-sys = "0.3.60" -lol_html = "0.3.1" -nom = { version = "7.1.1", features = ["alloc"] } -once_cell = "1.16.0" -pem = "1.1.0" -p256 = { version = "0.11.1", features = ["ecdsa"], optional = true } -serde = { version = "1.0.149", features = ["derive"] } +lol_html = "0.3.2" +nom = { version = "7.1.3", features = ["alloc"] } +once_cell = "1.17.0" +pem = "1.1.1" +p256 = { version = "0.12.0", features = ["ecdsa"], optional = true } +serde = { version = "1.0.152", features = ["derive"] } serde-wasm-bindgen = "0.4.5" -serde_json = "1.0.89" -serde_yaml = "0.9.14" +serde_json = "1.0.91" +serde_yaml = "0.9.17" sha1 = "0.10.5" sha2 = "0.10.6" tokio = { version = "1.23.0", features = ["macros", "parking_lot", "sync", "time"] } diff --git a/tools/Cargo.toml b/tools/Cargo.toml index b8339286..97ab2e6a 100644 --- a/tools/Cargo.toml +++ b/tools/Cargo.toml @@ -20,22 +20,22 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.66" -async-trait = "0.1.59" -base64 = "0.13.1" +anyhow = "1.0.68" +async-trait = "0.1.64" +base64 = "0.21.0" clap = { version = "3.2.23", features = ["derive"] } -ctrlc = "3.2.3" +ctrlc = "3.2.4" der-parser = { version = "7.0.0", features = ["bigint", "serialize"] } http = "0.2.8" hyper = { version = "0.14.23", features = ["client", "http2"]} hyper-tls = "0.5.0" -pem = "1.1.0" -regex = "1.7.0" -serde = { version = "1.0.149", features = ["derive"] } -serde_json = "1.0.89" -serde_yaml = "0.9.14" +pem = "1.1.1" +regex = "1.7.1" +serde = { version = "1.0.152", features = ["derive"] } +serde_json = "1.0.91" +serde_yaml = "0.9.17" sxg_rs = { path = "../sxg_rs", features = ["rust_signer"] } -toml = "0.5.9" +toml = "0.7.0" tokio = { version = "1.23.0", features = ["full"] } url = "2.3.1" warp = "0.3.3"