diff --git a/Cargo.lock b/Cargo.lock index ed9fa55..c96dab5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,21 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" - [[package]] name = "aho-corasick" version = "1.1.3" @@ -28,9 +13,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.19" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" dependencies = [ "anstyle", "anstyle-parse", @@ -43,9 +28,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" [[package]] name = "anstyle-parse" @@ -58,22 +43,22 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" +checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.9" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" +checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -82,21 +67,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "backtrace" -version = "0.3.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets", -] - [[package]] name = "base64" version = "0.22.1" @@ -105,15 +75,15 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.7.3" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" +checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" [[package]] name = "bitflags" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "block-buffer" @@ -126,9 +96,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.18.1" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "bytes" @@ -138,24 +108,25 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.27" +version = "1.2.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" +checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7" dependencies = [ + "find-msvc-tools", "shlex", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "clap" -version = "4.5.40" +version = "4.5.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" +checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623" dependencies = [ "clap_builder", "clap_derive", @@ -163,9 +134,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.40" +version = "4.5.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" +checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0" dependencies = [ "anstream", "anstyle", @@ -175,9 +146,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.40" +version = "4.5.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" +checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" dependencies = [ "heck", "proc-macro2", @@ -187,9 +158,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" +checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "colorchoice" @@ -267,9 +238,9 @@ dependencies = [ [[package]] name = "data-url" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" +checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" [[package]] name = "der" @@ -314,9 +285,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" dependencies = [ "curve25519-dalek", "ed25519", @@ -337,9 +308,9 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" +checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" dependencies = [ "log", "regex", @@ -366,12 +337,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.12" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -386,6 +357,12 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + [[package]] name = "fnv" version = "1.0.7" @@ -409,9 +386,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] @@ -468,9 +445,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.7" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" dependencies = [ "typenum", "version_check", @@ -484,32 +461,26 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "wasip2", ] -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - [[package]] name = "h2" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5" +checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386" dependencies = [ "atomic-waker", "bytes", @@ -526,9 +497,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" [[package]] name = "heck" @@ -592,19 +563,21 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hyper" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" +checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" dependencies = [ + "atomic-waker", "bytes", "futures-channel", - "futures-util", + "futures-core", "h2", "http", "http-body", "httparse", "itoa", "pin-project-lite", + "pin-utils", "smallvec", "tokio", "want", @@ -644,9 +617,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" +checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" dependencies = [ "base64", "bytes", @@ -756,9 +729,9 @@ dependencies = [ [[package]] name = "idna" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -777,9 +750,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", "hashbrown", @@ -803,9 +776,9 @@ dependencies = [ [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itoa" @@ -839,9 +812,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ "once_cell", "wasm-bindgen", @@ -849,15 +822,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.172" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "litemap" @@ -867,15 +840,15 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "mime" @@ -883,24 +856,15 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "miniz_oxide" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" -dependencies = [ - "adler2", -] - [[package]] name = "mio" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.59.0", + "wasi", + "windows-sys 0.61.2", ] [[package]] @@ -920,15 +884,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.21.3" @@ -937,15 +892,15 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "once_cell_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "openssl" -version = "0.10.73" +version = "0.10.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" +checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654" dependencies = [ "bitflags", "cfg-if", @@ -975,9 +930,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.109" +version = "0.9.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" +checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2" dependencies = [ "cc", "libc", @@ -987,9 +942,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pin-project-lite" @@ -1036,27 +991,27 @@ dependencies = [ [[package]] name = "potential_utf" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" dependencies = [ "zerovec", ] [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] @@ -1078,18 +1033,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", @@ -1098,9 +1053,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.1" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -1110,9 +1065,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -1121,15 +1076,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" -version = "0.12.20" +version = "0.12.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" dependencies = [ "base64", "bytes", @@ -1189,12 +1144,6 @@ dependencies = [ "web-bot-auth", ] -[[package]] -name = "rustc-demangle" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" - [[package]] name = "rustc_version" version = "0.4.1" @@ -1206,22 +1155,22 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.7" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.28" +version = "0.23.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643" +checksum = "751e04a496ca00bb97a5e043158d23d66b5aabf2e1d5aa2a0aaebb1aafe6f82c" dependencies = [ "once_cell", "rustls-pki-types", @@ -1241,9 +1190,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.3" +version = "0.103.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" +checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf" dependencies = [ "ring", "rustls-pki-types", @@ -1252,9 +1201,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" @@ -1264,11 +1213,11 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "schannel" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1286,9 +1235,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.14.0" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" +checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" dependencies = [ "core-foundation-sys", "libc", @@ -1296,24 +1245,34 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1322,14 +1281,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1383,9 +1343,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "smallvec" @@ -1395,12 +1355,12 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.5.10" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -1415,9 +1375,9 @@ dependencies = [ [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "strsim" @@ -1433,9 +1393,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.101" +version = "2.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b" dependencies = [ "proc-macro2", "quote", @@ -1485,15 +1445,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.20.0" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand", - "getrandom 0.3.3", + "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1508,17 +1468,16 @@ dependencies = [ [[package]] name = "tokio" -version = "1.45.1" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", "libc", "mio", "pin-project-lite", "socket2", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -1533,9 +1492,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ "rustls", "tokio", @@ -1543,9 +1502,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ "bytes", "futures-core", @@ -1626,15 +1585,15 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06" [[package]] name = "untrusted" @@ -1644,13 +1603,14 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.4" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] @@ -1688,36 +1648,37 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" dependencies = [ "bumpalo", "log", @@ -1729,9 +1690,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.50" +version = "0.4.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" dependencies = [ "cfg-if", "js-sys", @@ -1742,9 +1703,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1752,9 +1713,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", @@ -1765,9 +1726,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" dependencies = [ "unicode-ident", ] @@ -1780,6 +1741,7 @@ dependencies = [ "data-url", "ed25519-dalek", "indexmap", + "regex", "serde", "serde_json", "sfv", @@ -1788,9 +1750,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" dependencies = [ "js-sys", "wasm-bindgen", @@ -1802,13 +1764,19 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + [[package]] name = "windows-registry" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820" +checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" dependencies = [ - "windows-link", + "windows-link 0.1.3", "windows-result", "windows-strings", ] @@ -1819,7 +1787,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -1828,7 +1796,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -1837,16 +1805,25 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets", + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link 0.2.1", ] [[package]] @@ -1855,14 +1832,31 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link 0.2.1", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -1871,42 +1865,84 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -1914,13 +1950,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "windows_x86_64_msvc" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags", -] +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" @@ -1975,9 +2014,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" [[package]] name = "zerotrie" @@ -1992,9 +2031,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.2" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" dependencies = [ "yoke", "zerofrom", diff --git a/Cargo.toml b/Cargo.toml index 97645c7..7602bf7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,6 +30,7 @@ sha2 = "0.10.9" base64 = "0.22.1" serde_json = "1.0.140" data-url = "0.3.1" +regex = "1.12.2" # workspace dependencies web-bot-auth = { version = "0.5.1", path = "./crates/web-bot-auth" } diff --git a/crates/http-signature-directory/src/main.rs b/crates/http-signature-directory/src/main.rs index 78cb302..7108423 100644 --- a/crates/http-signature-directory/src/main.rs +++ b/crates/http-signature-directory/src/main.rs @@ -11,7 +11,7 @@ use reqwest::{ }; use serde::{Deserialize, Serialize}; use web_bot_auth::{ - components::{CoveredComponent, DerivedComponent}, + components::{CoveredComponent, DerivedComponent, HTTPField}, keyring::{JSONWebKeySet, KeyRing, Thumbprintable}, message_signatures::{MessageVerifier, SignedMessage}, }; @@ -68,18 +68,21 @@ struct SignedDirectory { } impl SignedMessage for SignedDirectory { - fn fetch_all_signature_headers(&self) -> Vec { - self.signature.clone() - } - fn fetch_all_signature_inputs(&self) -> Vec { - self.input.clone() - } - fn lookup_component(&self, name: &CoveredComponent) -> Option { - match *name { + fn lookup_component(&self, name: &CoveredComponent) -> Vec { + match name { CoveredComponent::Derived(DerivedComponent::Authority { .. }) => { - Some(self.authority.clone()) + vec![self.authority.clone()] + } + CoveredComponent::HTTP(HTTPField { name, .. }) => { + if name == "signature" { + return self.signature.clone(); + } + if name == "signature-input" { + return self.input.clone(); + } + vec![] } - _ => None, + _ => vec![], } } } diff --git a/crates/web-bot-auth/Cargo.toml b/crates/web-bot-auth/Cargo.toml index a60f531..20b066f 100644 --- a/crates/web-bot-auth/Cargo.toml +++ b/crates/web-bot-auth/Cargo.toml @@ -15,6 +15,7 @@ categories.workspace = true [dependencies] ed25519-dalek = { workspace = true } indexmap = { workspace = true } +regex = { workspace = true } sfv = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/crates/web-bot-auth/src/lib.rs b/crates/web-bot-auth/src/lib.rs index f7b40e2..15ed0fd 100644 --- a/crates/web-bot-auth/src/lib.rs +++ b/crates/web-bot-auth/src/lib.rs @@ -32,6 +32,8 @@ use data_url::DataUrl; use keyring::{Algorithm, JSONWebKeySet, KeyRing}; use std::time::SystemTimeError; +use crate::components::{HTTPField, HTTPFieldParameters}; + /// Errors that may be thrown by this module. #[derive(Debug)] pub enum ImplementationError { @@ -91,16 +93,6 @@ pub enum WebBotAuthError { /// and `creates` method. SignatureIsExpired, } -/// A trait that messages wishing to be verified as a `web-bot-auth` method specifically -/// must implement. -pub trait WebBotAuthSignedMessage: SignedMessage { - /// Obtain every `Signature-Agent` header in the message. Despite the name, you can omit - /// `Signature-Agents` that are known to be invalid ahead of time. However, each `Signature-Agent` - /// header must be unparsed and a be a valid sfv::Item::String value (meaning it should be encased - /// in double quotes). You should separately implement looking this up in `SignedMessage::lookup_component` - /// as an HTTP header with multiple values. - fn fetch_all_signature_agents(&self) -> Vec; -} /// A verifier for Web Bot Auth messages specifically. #[derive(Clone, Debug)] @@ -127,10 +119,14 @@ impl WebBotAuthVerifier { /// # Errors /// /// Returns `ImplementationErrors` relevant to verifying and parsing. - pub fn parse(message: &impl WebBotAuthSignedMessage) -> Result { - let signature_agents = message.fetch_all_signature_agents(); - let web_bot_auth_verifier = Self { - message_verifier: MessageVerifier::parse(message, |(_, innerlist)| { + pub fn parse(message: &impl SignedMessage) -> Result { + let signature_agents = message.lookup_component(&CoveredComponent::HTTP(HTTPField { + name: "signature-agent".to_string(), + parameters: components::HTTPFieldParametersSet(vec![]), + })); + + let message_verifier = + MessageVerifier::parse(message, |(_, innerlist)| { innerlist.params.contains_key("keyid") && innerlist.params.contains_key("tag") && innerlist.params.contains_key("expires") @@ -140,19 +136,83 @@ impl WebBotAuthVerifier { .get("tag") .and_then(|tag| tag.as_string()) .is_some_and(|tag| tag.as_str() == "web-bot-auth") - && innerlist - .items - .iter() - .any(|item| *item == sfv::Item::new(sfv::StringRef::constant("@authority"))) + && (innerlist.items.iter().any(|item| { + *item == sfv::Item::new(sfv::StringRef::constant("@authority")) + }) || innerlist.items.iter().any(|item| { + *item == sfv::Item::new(sfv::StringRef::constant("@target-uri")) + })) && (if !signature_agents.is_empty() { innerlist.items.iter().any(|item| { - *item == sfv::Item::new(sfv::StringRef::constant("signature-agent")) + item.bare_item + .as_string() + .is_some_and(|i| i == sfv::StringRef::constant("signature-agent")) }) } else { true }) - })?, - parsed_directories: signature_agents + })?; + + let mut signature_agent_key: Option = None; + 'outer_loop: for (component, _) in message_verifier.parsed.base.components.iter() { + if let CoveredComponent::HTTP(HTTPField { name, parameters }) = component { + if name == "signature-agent" { + for parameter in parameters.0.iter() { + if let HTTPFieldParameters::Key(key) = parameter { + signature_agent_key = Some(key.clone()); + break 'outer_loop; + } + } + } + } + } + + let parse_link = |link: &sfv::StringRef| { + let link_str = link.as_str(); + if link_str.starts_with("https://") || link_str.starts_with("http://") { + return Some(SignatureAgentLink::External(String::from(link_str))); + } + + if let Ok(url) = DataUrl::process(link_str) { + let mediatype = url.mime_type(); + if mediatype.type_ == "application" + && mediatype.subtype == "http-message-signatures-directory" + { + if let Ok((body, _)) = url.decode_to_vec() { + if let Ok(jwks) = serde_json::from_slice::(&body) { + return Some(SignatureAgentLink::Inline(jwks)); + } + } + } + } + + None + }; + + let parsed_directories = match signature_agent_key { + Some(key) => signature_agents + .iter() + .filter_map(|header| sfv::Parser::new(header).parse_dictionary().ok()) + .reduce(|mut acc, sig_agent| { + acc.extend(sig_agent); + acc + }) + .ok_or(ImplementationError::ParsingError( + "Failed to parse `Signature-Agent` into valid sfv::Dictionary".to_string(), + ))? + .into_iter() + .filter_map(|(label, listentry)| match listentry { + sfv::ListEntry::Item(item) => Some((label, item)), + sfv::ListEntry::InnerList(_) => None, + }) + .filter_map(|(label, item)| { + if label.as_str() != key { + return None; + } + let as_string = item.bare_item.as_string(); + as_string.and_then(parse_link) + }) + .collect(), + None => signature_agents .iter() .map(|header| { sfv::Parser::new(header).parse_item().map_err(|e| { @@ -165,32 +225,16 @@ impl WebBotAuthVerifier { .iter() .flat_map(|item| { let as_string = item.bare_item.as_string(); - as_string.and_then(|link| { - let link_str = link.as_str(); - if link_str.starts_with("https://") || link_str.starts_with("http://") { - return Some(SignatureAgentLink::External(String::from(link_str))); - } - - if let Ok(url) = DataUrl::process(link_str) { - let mediatype = url.mime_type(); - if mediatype.type_ == "application" - && mediatype.subtype == "http-message-signatures-directory" - { - if let Ok((body, _)) = url.decode_to_vec() { - if let Ok(jwks) = serde_json::from_slice::(&body) - { - return Some(SignatureAgentLink::Inline(jwks)); - } - } - } - } - - None - }) + as_string.and_then(parse_link) }) .collect(), }; + let web_bot_auth_verifier = Self { + message_verifier, + parsed_directories, + }; + Ok(web_bot_auth_verifier) } @@ -230,28 +274,26 @@ mod tests { struct StandardTestVector {} impl SignedMessage for StandardTestVector { - fn fetch_all_signature_headers(&self) -> Vec { - vec!["sig1=:uz2SAv+VIemw+Oo890bhYh6Xf5qZdLUgv6/PbiQfCFXcX/vt1A8Pf7OcgL2yUDUYXFtffNpkEr5W6dldqFrkDg==:".to_owned()] - } - fn fetch_all_signature_inputs(&self) -> Vec { - vec![r#"sig1=("@authority");created=1735689600;keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";alg="ed25519";expires=1735693200;nonce="gubxywVx7hzbYKatLgzuKDllDAIXAkz41PydU7aOY7vT+Mb3GJNxW0qD4zJ+IOQ1NVtg+BNbTCRUMt1Ojr5BgA==";tag="web-bot-auth""#.to_owned()] - } - fn lookup_component(&self, name: &CoveredComponent) -> Option { - match *name { + fn lookup_component(&self, name: &CoveredComponent) -> Vec { + match name { + CoveredComponent::HTTP(HTTPField { name, .. }) => { + if name == "signature" { + return vec!["sig1=:uz2SAv+VIemw+Oo890bhYh6Xf5qZdLUgv6/PbiQfCFXcX/vt1A8Pf7OcgL2yUDUYXFtffNpkEr5W6dldqFrkDg==:".to_owned()]; + } + + if name == "signature-input" { + return vec![r#"sig1=("@authority");created=1735689600;keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";alg="ed25519";expires=1735693200;nonce="gubxywVx7hzbYKatLgzuKDllDAIXAkz41PydU7aOY7vT+Mb3GJNxW0qD4zJ+IOQ1NVtg+BNbTCRUMt1Ojr5BgA==";tag="web-bot-auth""#.to_owned()]; + } + vec![] + } CoveredComponent::Derived(DerivedComponent::Authority { .. }) => { - Some("example.com".to_string()) + vec!["example.com".to_string()] } - _ => None, + _ => vec![], } } } - impl WebBotAuthSignedMessage for StandardTestVector { - fn fetch_all_signature_agents(&self) -> Vec { - vec![] - } - } - #[test] fn test_verifying_as_web_bot_auth() { let test = StandardTestVector {}; @@ -307,28 +349,26 @@ mod tests { } impl SignedMessage for MyTest { - fn fetch_all_signature_headers(&self) -> Vec { - vec![self.signature_header.clone()] - } - fn fetch_all_signature_inputs(&self) -> Vec { - vec![self.signature_input.clone()] - } - fn lookup_component(&self, name: &CoveredComponent) -> Option { - match *name { + fn lookup_component(&self, name: &CoveredComponent) -> Vec { + match name { + CoveredComponent::HTTP(HTTPField { name, .. }) => { + if name == "signature" { + return vec![self.signature_header.clone()]; + } + + if name == "signature-input" { + return vec![self.signature_input.clone()]; + } + vec![] + } CoveredComponent::Derived(DerivedComponent::Authority { .. }) => { - Some("example.com".to_string()) + vec!["example.com".to_string()] } - _ => None, + _ => vec![], } } } - impl WebBotAuthSignedMessage for MyTest { - fn fetch_all_signature_agents(&self) -> Vec { - vec![] - } - } - let public_key: [u8; ed25519_dalek::PUBLIC_KEY_LENGTH] = [ 0x26, 0xb4, 0x0b, 0x8f, 0x93, 0xff, 0xf3, 0xd8, 0x97, 0x11, 0x2f, 0x7e, 0xbc, 0x58, 0x2b, 0x23, 0x2d, 0xbd, 0x72, 0x51, 0x7d, 0x08, 0x2f, 0xe8, 0x3c, 0xfb, 0x30, 0xdd, @@ -388,30 +428,28 @@ mod tests { struct MissingParametersTestVector {} impl SignedMessage for MissingParametersTestVector { - fn fetch_all_signature_headers(&self) -> Vec { - vec![ - "sig1=:uz2SAv+VIemw+Oo890bhYh6Xf5qZdLUgv6/PbiQfCFXcX/vt1A8Pf7OcgL2yUDUYXFtffNpkEr5W6dldqFrkDg==:".to_owned() - ] - } - fn fetch_all_signature_inputs(&self) -> Vec { - vec![r#"sig1=("@authority");created=1735689600;keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";alg="ed25519";expires=1735693200;nonce="gubxywVx7hzbYKatLgzuKDllDAIXAkz41PydU7aOY7vT+Mb3GJNxW0qD4zJ+IOQ1NVtg+BNbTCRUMt1Ojr5BgA==";tag="not-web-bot-auth""#.to_owned()] - } - fn lookup_component(&self, name: &CoveredComponent) -> Option { - match *name { + fn lookup_component(&self, name: &CoveredComponent) -> Vec { + match name { + CoveredComponent::HTTP(HTTPField { name, .. }) => { + if name == "signature" { + return vec![ + "sig1=:uz2SAv+VIemw+Oo890bhYh6Xf5qZdLUgv6/PbiQfCFXcX/vt1A8Pf7OcgL2yUDUYXFtffNpkEr5W6dldqFrkDg==:".to_owned() + ]; + } + + if name == "signature-input" { + return vec![r#"sig1=("@authority");created=1735689600;keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";alg="ed25519";expires=1735693200;nonce="gubxywVx7hzbYKatLgzuKDllDAIXAkz41PydU7aOY7vT+Mb3GJNxW0qD4zJ+IOQ1NVtg+BNbTCRUMt1Ojr5BgA==";tag="not-web-bot-auth""#.to_owned()]; + } + vec![] + } CoveredComponent::Derived(DerivedComponent::Authority { .. }) => { - Some("example.com".to_string()) + vec!["example.com".to_string()] } - _ => None, + _ => vec![], } } } - impl WebBotAuthSignedMessage for MissingParametersTestVector { - fn fetch_all_signature_agents(&self) -> Vec { - vec![] - } - } - let test = MissingParametersTestVector {}; WebBotAuthVerifier::parse(&test).expect_err("This should not have parsed"); } @@ -421,62 +459,116 @@ mod tests { struct MissingParametersTestVector {} impl SignedMessage for MissingParametersTestVector { - fn fetch_all_signature_headers(&self) -> Vec { - vec!["sig1=:uz2SAv+VIemw+Oo890bhYh6Xf5qZdLUgv6/PbiQfCFXcX/vt1A8Pf7OcgL2yUDUYXFtffNpkEr5W6dldqFrkDg==:".to_owned()] - } - fn fetch_all_signature_inputs(&self) -> Vec { - vec![r#"sig1=("@authority");created=1735689600;keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";alg="ed25519";expires=1735693200;nonce="gubxywVx7hzbYKatLgzuKDllDAIXAkz41PydU7aOY7vT+Mb3GJNxW0qD4zJ+IOQ1NVtg+BNbTCRUMt1Ojr5BgA==";tag="web-bot-auth""#.to_owned()] - } - fn lookup_component(&self, name: &CoveredComponent) -> Option { - match *name { + fn lookup_component(&self, name: &CoveredComponent) -> Vec { + match name { + CoveredComponent::HTTP(HTTPField { name, .. }) => { + if name == "signature" { + return vec!["sig1=:uz2SAv+VIemw+Oo890bhYh6Xf5qZdLUgv6/PbiQfCFXcX/vt1A8Pf7OcgL2yUDUYXFtffNpkEr5W6dldqFrkDg==:".to_owned()]; + } + + if name == "signature-input" { + return vec![r#"sig1=("@authority");created=1735689600;keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";alg="ed25519";expires=1735693200;nonce="gubxywVx7hzbYKatLgzuKDllDAIXAkz41PydU7aOY7vT+Mb3GJNxW0qD4zJ+IOQ1NVtg+BNbTCRUMt1Ojr5BgA==";tag="web-bot-auth""#.to_owned()]; + } + + if name == "signature-agent" { + return vec![String::from("\"https://myexample.com\"")]; + } + vec![] + } CoveredComponent::Derived(DerivedComponent::Authority { .. }) => { - Some("example.com".to_string()) + vec!["example.com".to_string()] } - _ => None, + _ => vec![], } } } - impl WebBotAuthSignedMessage for MissingParametersTestVector { - fn fetch_all_signature_agents(&self) -> Vec { - vec![String::from("\"https://myexample.com\"")] - } - } - let test = MissingParametersTestVector {}; WebBotAuthVerifier::parse(&test).expect_err("This should not have parsed"); } #[test] - fn test_signature_agents_are_parsed_correctly() { + fn test_signature_agents_are_parsed_with_fallback() { struct StandardTestVector {} impl SignedMessage for StandardTestVector { - fn fetch_all_signature_headers(&self) -> Vec { - vec!["sig1=:3q7S1TtbrFhQhpcZ1gZwHPCFHTvdKXNY1xngkp6lyaqqqv3QZupwpu/wQG5a7qybnrj2vZYMeVKuWepm+rNkDw==:".to_owned()] - } - fn fetch_all_signature_inputs(&self) -> Vec { - vec![r#"sig1=("@authority" "signature-agent");alg="ed25519";keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";nonce="ZO3/XMEZjrvSnLtAP9M7jK0WGQf3J+pbmQRUpKDhF9/jsNCWqUh2sq+TH4WTX3/GpNoSZUa8eNWMKqxWp2/c2g==";tag="web-bot-auth";created=1749331474;expires=1749331484"#.to_owned()] - } - fn lookup_component(&self, name: &CoveredComponent) -> Option { + fn lookup_component(&self, name: &CoveredComponent) -> Vec { match name { - CoveredComponent::Derived(DerivedComponent::Authority { .. }) => { - Some("example.com".to_string()) - } - CoveredComponent::HTTP(components::HTTPField { name, .. }) => { + CoveredComponent::HTTP(HTTPField { name, .. }) => { + if name == "signature" { + return vec!["sig1=:3q7S1TtbrFhQhpcZ1gZwHPCFHTvdKXNY1xngkp6lyaqqqv3QZupwpu/wQG5a7qybnrj2vZYMeVKuWepm+rNkDw==:".to_owned()]; + } + + if name == "signature-input" { + return vec![r#"sig1=("@authority" "signature-agent");alg="ed25519";keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";nonce="ZO3/XMEZjrvSnLtAP9M7jK0WGQf3J+pbmQRUpKDhF9/jsNCWqUh2sq+TH4WTX3/GpNoSZUa8eNWMKqxWp2/c2g==";tag="web-bot-auth";created=1749331474;expires=1749331484"#.to_owned()]; + } + if name == "signature-agent" { - return Some(String::from("\"https://myexample.com\"")); + return vec![ + String::from("\"https://myexample.com\""), + String::from("\"https://myexample2.com\""), + ]; } - None + vec![] + } + CoveredComponent::Derived(DerivedComponent::Authority { .. }) => { + vec!["example.com".to_string()] } - _ => None, + _ => vec![], } } } - impl WebBotAuthSignedMessage for StandardTestVector { - fn fetch_all_signature_agents(&self) -> Vec { - vec![String::from("\"https://myexample.com\"")] + let public_key: [u8; ed25519_dalek::PUBLIC_KEY_LENGTH] = [ + 0x26, 0xb4, 0x0b, 0x8f, 0x93, 0xff, 0xf3, 0xd8, 0x97, 0x11, 0x2f, 0x7e, 0xbc, 0x58, + 0x2b, 0x23, 0x2d, 0xbd, 0x72, 0x51, 0x7d, 0x08, 0x2f, 0xe8, 0x3c, 0xfb, 0x30, 0xdd, + 0xce, 0x43, 0xd1, 0xbb, + ]; + let mut keyring = KeyRing::default(); + keyring.import_raw( + "poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U".to_string(), + Algorithm::Ed25519, + public_key.to_vec(), + ); + + let test = StandardTestVector {}; + let verifier = WebBotAuthVerifier::parse(&test).unwrap(); + assert_eq!(verifier.get_signature_agents().len(), 2); + assert_eq!( + verifier.get_signature_agents()[0], + SignatureAgentLink::External("https://myexample.com".to_string()) + ); + } + + #[test] + fn test_signature_agents_are_parsed_correctly() { + struct StandardTestVector {} + + impl SignedMessage for StandardTestVector { + fn lookup_component(&self, name: &CoveredComponent) -> Vec { + match name { + CoveredComponent::HTTP(HTTPField { name, .. }) => { + if name == "signature" { + return vec!["sig1=:3q7S1TtbrFhQhpcZ1gZwHPCFHTvdKXNY1xngkp6lyaqqqv3QZupwpu/wQG5a7qybnrj2vZYMeVKuWepm+rNkDw==:".to_owned()]; + } + + if name == "signature-input" { + return vec![r#"sig1=("@authority" "signature-agent";key="agent1");alg="ed25519";keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";nonce="ZO3/XMEZjrvSnLtAP9M7jK0WGQf3J+pbmQRUpKDhF9/jsNCWqUh2sq+TH4WTX3/GpNoSZUa8eNWMKqxWp2/c2g==";tag="web-bot-auth";created=1749331474;expires=1749331484"#.to_owned()]; + } + + if name == "signature-agent" { + return vec![ + r#"agent1="https://myexample.com", agent2="https://example2.com""# + .to_owned(), + ]; + } + vec![] + } + CoveredComponent::Derived(DerivedComponent::Authority { .. }) => { + vec!["example.com".to_string()] + } + _ => vec![], + } } } @@ -494,8 +586,11 @@ mod tests { let test = StandardTestVector {}; let verifier = WebBotAuthVerifier::parse(&test).unwrap(); - let timing = verifier.verify(&keyring, None).unwrap(); - assert!(timing.generation.as_nanos() > 0); - assert!(timing.verification.as_nanos() > 0); + + assert_eq!(verifier.get_signature_agents().len(), 1); + assert_eq!( + verifier.get_signature_agents()[0], + SignatureAgentLink::External("https://myexample.com".to_string()) + ); } } diff --git a/crates/web-bot-auth/src/message_signatures.rs b/crates/web-bot-auth/src/message_signatures.rs index 1b89fd9..080b74c 100644 --- a/crates/web-bot-auth/src/message_signatures.rs +++ b/crates/web-bot-auth/src/message_signatures.rs @@ -1,11 +1,14 @@ -use crate::components::CoveredComponent; +use super::ImplementationError; +use crate::components::{self, CoveredComponent, HTTPField}; use crate::keyring::{Algorithm, KeyRing}; use indexmap::IndexMap; +use regex::bytes::Regex; use sfv::SerializeValue; use std::fmt::Write as _; +use std::sync::LazyLock; use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; - -use super::ImplementationError; +static OBSOLETE_LINE_FOLDING: LazyLock = + LazyLock::new(|| Regex::new(r"\s*\r\n\s+").unwrap()); /// The component parameters associated with the signature in `Signature-Input` #[derive(Clone, Debug)] @@ -153,8 +156,26 @@ impl SignatureBaseBuilder { self.components .into_iter() .map(|component| match message.lookup_component(&component) { - Some(serialized_value) => Ok((component, serialized_value)), - None => Err(ImplementationError::LookupError(component)), + v if v.len() == 1 => Ok((component, v[0].to_owned())), + v if v.len() > 1 && matches!(component, CoveredComponent::HTTP(_)) => { + let mut register: Vec = vec![]; + + for header_value in v.into_iter() { + register.push( + // replace leading / trailing whitespace and obsolete line folding, + // per HTTP message signature spec + String::from_utf8( + OBSOLETE_LINE_FOLDING + .replace_all(header_value.as_bytes().trim_ascii(), b" ") + .into_owned(), + ) + .map_err(|_| ImplementationError::NonAsciiContentFound)?, + ); + } + + Ok((component, register.join(", "))) + } + _ => Err(ImplementationError::LookupError(component)), }) .collect::, ImplementationError>>()?, ), @@ -215,31 +236,14 @@ impl SignatureBase { /// Trait that messages seeking verification should implement to facilitate looking up /// raw values from the underlying message. pub trait SignedMessage { - /// Obtain every `Signature` header in the message. Despite the name, you can omit - /// `Signature` that are known to be invalid ahead of time. However, each `Signature-` - /// header should be unparsed and be a valid sfv::Item::Dictionary value. You should - /// separately implement looking this up in `lookup_component` as an HTTP header with - /// multiple values, although including these as signature components when signing is - /// NOT recommended. During verification, invalid values (those that cannot be - /// parsed as an sfv::Dictionary) will be skipped without raising an error. - fn fetch_all_signature_headers(&self) -> Vec; - /// Obtain every `Signature-Input` header in the message. Despite the name, you - /// can omit `Signature-Input` that are known to be invalid ahead of time. However, - /// each `Signature-Input` header should be unparsed and be a valid sfv::Item::Dictionary - /// value (meaning it should be encased in double quotes). You should separately implement - /// looking this up in `lookup_component` as an HTTP header with multiple values, although - /// including these as signature components when signing is NOT recommended. During - /// verification, invalid values (those that cannot be parsed as an sfv::Dictionary) will - /// be skipped will be skipped without raising an error. - fn fetch_all_signature_inputs(&self) -> Vec; - /// Obtain the serialized value of a covered component. Implementations should + /// Retrieve the raw value(s) of a covered component. Implementations should /// respect any parameter values set on the covered component per the message - /// signature spec. Component values that cannot be found must return None. + /// signature spec. Component values that cannot be found must return an empty vector. /// `CoveredComponent::HTTP` fields are guaranteed to have lowercase ASCII names, so /// care should be taken to ensure HTTP field names in the message are checked in a - /// case-insensitive way. HTTP fields with multiple values should be combined into a - /// single string in the manner described in . - fn lookup_component(&self, name: &CoveredComponent) -> Option; + /// case-insensitive way. Only `CoveredComponent::Http` should return a vector with + /// more than one element. + fn lookup_component(&self, name: &CoveredComponent) -> Vec; } /// Trait that messages seeking signing should implement to generate `Signature-Input` @@ -386,6 +390,8 @@ impl MessageSigner { /// of the chosen labl and its components. #[derive(Clone, Debug)] pub struct ParsedLabel { + /// The label that was chosen. + pub label: sfv::Key, /// The signature obtained from the message that verifiers will verify pub signature: Vec, /// The signature base obtained from the message, containining both the chosen @@ -424,7 +430,10 @@ impl MessageVerifier { P: Fn(&(sfv::Key, sfv::InnerList)) -> bool, { let signature_input = message - .fetch_all_signature_inputs() + .lookup_component(&CoveredComponent::HTTP(HTTPField { + name: "signature-input".to_string(), + parameters: components::HTTPFieldParametersSet(vec![]), + })) .into_iter() .filter_map(|sig_input| sfv::Parser::new(&sig_input).parse_dictionary().ok()) .reduce(|mut acc, sig_input| { @@ -432,11 +441,14 @@ impl MessageVerifier { acc }) .ok_or(ImplementationError::ParsingError( - "No `Signature-Input` headers found".to_string(), + "No validly-formatted `Signature-Input` headers found".to_string(), ))?; let mut signature_header = message - .fetch_all_signature_headers() + .lookup_component(&CoveredComponent::HTTP(HTTPField { + name: "signature".to_string(), + parameters: components::HTTPFieldParametersSet(vec![]), + })) .into_iter() .filter_map(|sig_input| sfv::Parser::new(&sig_input).parse_dictionary().ok()) .reduce(|mut acc, sig_input| { @@ -444,7 +456,7 @@ impl MessageVerifier { acc }) .ok_or(ImplementationError::ParsingError( - "No `Signature` headers found".to_string(), + "No validly-formatted `Signature` headers found".to_string(), ))?; let (label, innerlist) = signature_input @@ -483,7 +495,11 @@ impl MessageVerifier { let base = builder.into_signature_base(message)?; Ok(MessageVerifier { - parsed: ParsedLabel { signature, base }, + parsed: ParsedLabel { + label, + signature, + base, + }, }) } @@ -550,18 +566,22 @@ mod tests { struct StandardTestVector {} impl SignedMessage for StandardTestVector { - fn fetch_all_signature_headers(&self) -> Vec { - vec!["sig1=:uz2SAv+VIemw+Oo890bhYh6Xf5qZdLUgv6/PbiQfCFXcX/vt1A8Pf7OcgL2yUDUYXFtffNpkEr5W6dldqFrkDg==:".to_owned()] - } - fn fetch_all_signature_inputs(&self) -> Vec { - vec![r#"sig1=("@authority");created=1735689600;keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";alg="ed25519";expires=1735693200;nonce="gubxywVx7hzbYKatLgzuKDllDAIXAkz41PydU7aOY7vT+Mb3GJNxW0qD4zJ+IOQ1NVtg+BNbTCRUMt1Ojr5BgA==";tag="web-bot-auth""#.to_owned()] - } - fn lookup_component(&self, name: &CoveredComponent) -> Option { - match *name { + fn lookup_component(&self, name: &CoveredComponent) -> Vec { + match name { + CoveredComponent::HTTP(HTTPField { name, .. }) => { + if name == "signature" { + return vec!["sig1=:uz2SAv+VIemw+Oo890bhYh6Xf5qZdLUgv6/PbiQfCFXcX/vt1A8Pf7OcgL2yUDUYXFtffNpkEr5W6dldqFrkDg==:".to_owned()]; + } + + if name == "signature-input" { + return vec![r#"sig1=("@authority");created=1735689600;keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";alg="ed25519";expires=1735693200;nonce="gubxywVx7hzbYKatLgzuKDllDAIXAkz41PydU7aOY7vT+Mb3GJNxW0qD4zJ+IOQ1NVtg+BNbTCRUMt1Ojr5BgA==";tag="web-bot-auth""#.to_owned()]; + } + vec![] + } CoveredComponent::Derived(DerivedComponent::Authority { .. }) => { - Some("example.com".to_string()) + vec!["example.com".to_string()] } - _ => None, + _ => vec![], } } } diff --git a/examples/rust/signing.rs b/examples/rust/signing.rs index fcfd49d..17fe7a1 100644 --- a/examples/rust/signing.rs +++ b/examples/rust/signing.rs @@ -15,7 +15,9 @@ use indexmap::IndexMap; use std::{time::Duration, vec}; use web_bot_auth::{ - components::{CoveredComponent, DerivedComponent, HTTPField, HTTPFieldParametersSet}, + components::{ + CoveredComponent, DerivedComponent, HTTPField, HTTPFieldParameters, HTTPFieldParametersSet, + }, keyring::Algorithm, message_signatures::{MessageSigner, UnsignedMessage}, }; @@ -36,9 +38,11 @@ impl UnsignedMessage for MyThing { ( CoveredComponent::HTTP(HTTPField { name: "signature-agent".to_string(), - parameters: HTTPFieldParametersSet(vec![]), + parameters: HTTPFieldParametersSet(vec![HTTPFieldParameters::Key( + "agent1".to_string(), + )]), }), - "\"https://myexample.com\"".to_string(), + r#"agent1="https://myexample.com""#.to_string(), ), ]) } @@ -50,12 +54,14 @@ impl UnsignedMessage for MyThing { } fn main() { - // Signing a message + // Signing a message - private key pulled from https://datatracker.ietf.org/doc/draft-meunier-web-bot-auth-architecture/ + // and only for example purposes. let private_key = vec![ 0x9f, 0x83, 0x62, 0xf8, 0x7a, 0x48, 0x4a, 0x95, 0x4e, 0x6e, 0x74, 0x0c, 0x5b, 0x4c, 0x0e, 0x84, 0x22, 0x91, 0x39, 0xa2, 0x0a, 0xa8, 0xab, 0x56, 0xff, 0x66, 0x58, 0x6f, 0x6a, 0x7d, 0x29, 0xc5, ]; + // sample keyid pulled from https://datatracker.ietf.org/doc/draft-meunier-web-bot-auth-architecture/ let signer = MessageSigner { keyid: "poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U".into(), nonce: "ZO3/XMEZjrvSnLtAP9M7jK0WGQf3J+pbmQRUpKDhF9/jsNCWqUh2sq+TH4WTX3/GpNoSZUa8eNWMKqxWp2/c2g==".into(), diff --git a/examples/rust/verify.rs b/examples/rust/verify.rs index 64dec9e..e1961b7 100644 --- a/examples/rust/verify.rs +++ b/examples/rust/verify.rs @@ -13,7 +13,7 @@ // limitations under the License. use web_bot_auth::{ - SignatureAgentLink, WebBotAuthSignedMessage, WebBotAuthVerifier, + SignatureAgentLink, WebBotAuthVerifier, components::{CoveredComponent, DerivedComponent, HTTPField}, keyring::{Algorithm, KeyRing}, message_signatures::SignedMessage, @@ -22,34 +22,30 @@ use web_bot_auth::{ struct MySignedMsg; impl SignedMessage for MySignedMsg { - fn fetch_all_signature_headers(&self) -> Vec { - vec!["sig1=:GXzHSRZ9Sf6WwLOZjxAhfE6WEUPfDMrVBJITsL2sbG8gtcZgqKe2Yn7uavk0iNQrfcPzgGq8h8Pk5osNGqdtCw==:".to_owned()] - } - fn fetch_all_signature_inputs(&self) -> Vec { - vec![r#"sig1=("@authority" "signature-agent");alg="ed25519";keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";nonce="ZO3/XMEZjrvSnLtAP9M7jK0WGQf3J+pbmQRUpKDhF9/jsNCWqUh2sq+TH4WTX3/GpNoSZUa8eNWMKqxWp2/c2g==";tag="web-bot-auth";created=1749332605;expires=1749332615"#.to_owned()] - } - fn lookup_component(&self, name: &CoveredComponent) -> Option { + fn lookup_component(&self, name: &CoveredComponent) -> Vec { match name { CoveredComponent::Derived(DerivedComponent::Authority { .. }) => { - Some("example.com".to_string()) + vec!["example.com".to_string()] } CoveredComponent::HTTP(HTTPField { name, .. }) => { if name == "signature-agent" { - return Some(String::from("\"https://myexample.com\"")); + return vec![r#"agent1="https://myexample.com""#.to_string()]; } - None + + if name == "signature" { + return vec![r#"sig1=:EZZ8VJcVQ9WgiUytQWAfEvRWLLu2O+UkJ15aVI//dfLTCLnr1Vg2CDXXlrW4D+OjBB6zu/UkFtxpKzbXh2ESBg==:"#.to_string()]; + } + + if name == "signature-input" { + return vec![r#"sig1=("@authority" "signature-agent";key="agent1");keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";nonce="ZO3/XMEZjrvSnLtAP9M7jK0WGQf3J+pbmQRUpKDhF9/jsNCWqUh2sq+TH4WTX3/GpNoSZUa8eNWMKqxWp2/c2g==";tag="web-bot-auth";created=1761143856;expires=1761143866"#.to_string()]; + } + vec![] } - _ => None, + _ => vec![], } } } -impl WebBotAuthSignedMessage for MySignedMsg { - fn fetch_all_signature_agents(&self) -> Vec { - vec!["\"https://myexample.com\"".into()] - } -} - fn main() { // Verifying a Web Bot Auth message let public_key = [ @@ -58,6 +54,7 @@ fn main() { 0xd1, 0xbb, ]; let mut keyring = KeyRing::default(); + // sample keyid pulled from https://datatracker.ietf.org/doc/draft-meunier-web-bot-auth-architecture/ keyring.import_raw( "poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U".to_string(), Algorithm::Ed25519, diff --git a/examples/rust/verify_arbitrary.rs b/examples/rust/verify_arbitrary.rs index dff8d80..c5ba261 100644 --- a/examples/rust/verify_arbitrary.rs +++ b/examples/rust/verify_arbitrary.rs @@ -13,7 +13,7 @@ // limitations under the License. use web_bot_auth::{ - components::{CoveredComponent, DerivedComponent}, + components::{CoveredComponent, DerivedComponent, HTTPField}, keyring::{Algorithm, KeyRing}, message_signatures::{MessageVerifier, SignedMessage}, }; @@ -21,18 +21,22 @@ use web_bot_auth::{ struct MySignedMsg; impl SignedMessage for MySignedMsg { - fn fetch_all_signature_headers(&self) -> Vec { - vec!["sig1=:uz2SAv+VIemw+Oo890bhYh6Xf5qZdLUgv6/PbiQfCFXcX/vt1A8Pf7OcgL2yUDUYXFtffNpkEr5W6dldqFrkDg==:".to_owned()] - } - fn fetch_all_signature_inputs(&self) -> Vec { - vec![r#"sig1=("@authority");created=1735689600;keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";alg="ed25519";expires=1735693200;nonce="gubxywVx7hzbYKatLgzuKDllDAIXAkz41PydU7aOY7vT+Mb3GJNxW0qD4zJ+IOQ1NVtg+BNbTCRUMt1Ojr5BgA==";tag="web-bot-auth""#.to_owned()] - } - fn lookup_component(&self, name: &CoveredComponent) -> Option { - match *name { + fn lookup_component(&self, name: &CoveredComponent) -> Vec { + match name { CoveredComponent::Derived(DerivedComponent::Authority { .. }) => { - Some("example.com".to_string()) + vec!["example.com".to_string()] + } + CoveredComponent::HTTP(HTTPField { name, .. }) => { + if name == "signature" { + return vec!["sig1=:uz2SAv+VIemw+Oo890bhYh6Xf5qZdLUgv6/PbiQfCFXcX/vt1A8Pf7OcgL2yUDUYXFtffNpkEr5W6dldqFrkDg==:".to_owned()]; + } + + if name == "signature-input" { + return vec![r#"sig1=("@authority");created=1735689600;keyid="poqkLGiymh_W0uP6PZFw-dvez3QJT5SolqXBCW38r0U";alg="ed25519";expires=1735693200;nonce="gubxywVx7hzbYKatLgzuKDllDAIXAkz41PydU7aOY7vT+Mb3GJNxW0qD4zJ+IOQ1NVtg+BNbTCRUMt1Ojr5BgA==";tag="web-bot-auth""#.to_owned()]; + } + vec![] } - _ => None, + _ => vec![], } } }