diff --git a/Cargo.lock b/Cargo.lock index 7d14b19dd..fa215e01d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -198,7 +198,7 @@ dependencies = [ "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -363,8 +363,8 @@ dependencies = [ "futures", "hostname 0.4.0", "http 0.2.9", - "hyper", - "hyper-rustls", + "hyper 0.14.27", + "hyper-rustls 0.25.0", "hyper-staticfile", "indexmap", "lazy_static", @@ -376,7 +376,8 @@ dependencies = [ "pem", "percent-encoding", "rcgen", - "rustls", + "reqwest", + "rustls 0.22.4", "rustls-pemfile", "rustls-pki-types", "schemars", @@ -397,7 +398,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tokio-tungstenite", "toml", "trybuild", @@ -515,6 +516,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -676,6 +692,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.0.0", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.14.1" @@ -758,6 +793,29 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.1", + "pin-project-lite", +] + [[package]] name = "http-range" version = "0.1.4" @@ -786,9 +844,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.9", - "http-body", + "http-body 0.4.3", "httparse", "httpdate", "itoa", @@ -800,6 +858,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.6", + "http 1.0.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.25.0" @@ -808,13 +886,30 @@ checksum = "399c78f9338483cb7e630c8474b07268983c6bd5acee012e4211f9f7bb21b070" dependencies = [ "futures-util", "http 0.2.9", - "hyper", + "hyper 0.14.27", "log", - "rustls", + "rustls 0.22.4", "rustls-native-certs", "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http 1.0.0", + "hyper 1.4.1", + "hyper-util", + "rustls 0.23.13", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", ] [[package]] @@ -827,7 +922,7 @@ dependencies = [ "http 0.2.9", "http-range", "httpdate", - "hyper", + "hyper 0.14.27", "mime_guess", "percent-encoding", "rand", @@ -836,6 +931,41 @@ dependencies = [ "winapi", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.47" @@ -852,11 +982,10 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -872,6 +1001,12 @@ dependencies = [ "serde", ] +[[package]] +name = "ipnet" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" + [[package]] name = "is-terminal" version = "0.4.12" @@ -940,12 +1075,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[package]] name = "memchr" version = "2.6.0" @@ -1015,6 +1144,23 @@ dependencies = [ "version_check", ] +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "newline-converter" version = "0.3.0" @@ -1069,9 +1215,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openapiv3" @@ -1084,12 +1230,50 @@ dependencies = [ "serde_json", ] +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "openssl-probe" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "parking" version = "2.2.0" @@ -1198,6 +1382,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + [[package]] name = "plain" version = "0.2.3" @@ -1322,6 +1512,49 @@ dependencies = [ "redox_syscall", ] +[[package]] +name = "reqwest" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.6", + "http 1.0.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls 0.27.3", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-registry", +] + [[package]] name = "ring" version = "0.17.7" @@ -1369,6 +1602,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls" +version = "0.23.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.7.0" @@ -1400,9 +1646,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.1" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -1728,9 +1974,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.7.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -1796,6 +2042,36 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.4.0", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "take_mut" version = "0.2.2" @@ -1952,13 +2228,34 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + [[package]] name = "tokio-rustls" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls", + "rustls 0.22.4", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.13", "rustls-pki-types", "tokio", ] @@ -2109,9 +2406,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -2121,9 +2418,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -2148,13 +2445,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.2.2" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", ] @@ -2238,6 +2534,12 @@ dependencies = [ "serde", ] +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.5" @@ -2294,6 +2596,18 @@ dependencies = [ "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.82" @@ -2323,6 +2637,16 @@ version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" +[[package]] +name = "web-sys" +version = "0.3.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "winapi" version = "0.3.9" @@ -2361,7 +2685,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -2370,7 +2694,37 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -2412,7 +2766,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -2447,17 +2801,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "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]] @@ -2474,9 +2829,9 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -2492,9 +2847,9 @@ checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -2510,9 +2865,15 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -2528,9 +2889,9 @@ checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -2546,9 +2907,9 @@ checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -2564,9 +2925,9 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -2582,9 +2943,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" diff --git a/dropshot/Cargo.toml b/dropshot/Cargo.toml index aa27be0eb..9970e7d84 100644 --- a/dropshot/Cargo.toml +++ b/dropshot/Cargo.toml @@ -104,6 +104,10 @@ rcgen = "0.13.1" # Used in a doc-test demonstrating the WebsocketUpgrade extractor. tokio-tungstenite = "0.23.1" +[dev-dependencies.reqwest] +version = "0.12.7" +features = [ "json" ] + [dev-dependencies.rustls-pki-types] version = "1.8.0" # Needed for CertificateDer::into_owned diff --git a/dropshot/examples/versioning.rs b/dropshot/examples/versioning.rs index 2ed68c59e..934af8873 100644 --- a/dropshot/examples/versioning.rs +++ b/dropshot/examples/versioning.rs @@ -19,7 +19,6 @@ use schemars::JsonSchema; use semver::Version; use serde::Serialize; use slog::Logger; -use std::str::FromStr; #[tokio::main] async fn main() -> Result<(), String> { @@ -60,45 +59,10 @@ impl DynamicVersionPolicy for BasicVersionPolicy { request: &Request, _log: &Logger, ) -> Result { - parse_header(request.headers(), "dropshot-demo-version") + dropshot::parse_header(request.headers(), "dropshot-demo-version") } } -/// Parses a required header out of a request (producing useful error messages -/// for all failure modes) -fn parse_header( - headers: &http::HeaderMap, - header_name: &str, -) -> Result -where - T: FromStr, - ::Err: std::fmt::Display, -{ - let v_value = headers.get(header_name).ok_or_else(|| { - HttpError::for_bad_request( - None, - format!("missing expected header {:?}", header_name), - ) - })?; - - let v_str = v_value.to_str().map_err(|_| { - HttpError::for_bad_request( - None, - format!( - "bad value for header {:?}: not ASCII: {:?}", - header_name, v_value - ), - ) - })?; - - v_str.parse::().map_err(|e| { - HttpError::for_bad_request( - None, - format!("bad value for header {:?}: {}: {}", header_name, e, v_str), - ) - }) -} - // HTTP API interface // // This API defines several different versions: diff --git a/dropshot/src/lib.rs b/dropshot/src/lib.rs index 78049aa77..e6a7e5614 100644 --- a/dropshot/src/lib.rs +++ b/dropshot/src/lib.rs @@ -855,3 +855,40 @@ extern crate dropshot_endpoint; pub use dropshot_endpoint::api_description; pub use dropshot_endpoint::channel; pub use dropshot_endpoint::endpoint; + +use std::str::FromStr; + +/// Parses a required header out of a request (producing useful error messages +/// for all failure modes) +pub fn parse_header( + headers: &http::HeaderMap, + header_name: &str, +) -> Result +where + T: FromStr, + ::Err: std::fmt::Display, +{ + let v_value = headers.get(header_name).ok_or_else(|| { + HttpError::for_bad_request( + None, + format!("missing expected header {:?}", header_name), + ) + })?; + + let v_str = v_value.to_str().map_err(|_| { + HttpError::for_bad_request( + None, + format!( + "bad value for header {:?}: not ASCII: {:?}", + header_name, v_value + ), + ) + })?; + + v_str.parse::().map_err(|e| { + HttpError::for_bad_request( + None, + format!("bad value for header {:?}: {}: {}", header_name, e, v_str), + ) + }) +} diff --git a/dropshot/tests/test_versions.rs b/dropshot/tests/test_versions.rs new file mode 100644 index 000000000..c8c0e628c --- /dev/null +++ b/dropshot/tests/test_versions.rs @@ -0,0 +1,296 @@ +// Copyright 2024 Oxide Computer Company + +//! Exercise the API versioning behavior + +use dropshot::endpoint; +use dropshot::ApiDescription; +use dropshot::ConfigDropshot; +use dropshot::HttpError; +use dropshot::HttpErrorResponseBody; +use dropshot::HttpResponseOk; +use dropshot::HttpServerStarter; +use dropshot::RequestContext; +use dropshot::VersionPolicy; +use reqwest::Method; +use reqwest::StatusCode; +use semver::Version; + +pub mod common; + +const VERSION_HEADER_NAME: &str = "dropshot-test-version"; +const HANDLER1_MSG: &str = "handler1"; +const HANDLER2_MSG: &str = "handler2"; +const HANDLER3_MSG: &str = "handler3"; +const HANDLER4_MSG: &str = "handler3"; +const FORBIDDEN_MSG: &str = "THAT VALUE IS FORBIDDEN!!!"; + +#[tokio::test] +async fn test_versions() { + let mut api = ApiDescription::<()>::new(); + api.register(handler1).unwrap(); + api.register(handler2).unwrap(); + api.register(handler3).unwrap(); + api.register(handler4).unwrap(); + + let logctx = common::create_log_context("test_versions"); + let server = HttpServerStarter::new_with_versioning( + &ConfigDropshot::default(), + api, + (), + &logctx.log, + None, + VersionPolicy::Dynamic(Box::new(TestVersionPolicy {})), + ) + .unwrap() + .start(); + + let server_addr = server.local_addr(); + let mkurl = |path: &str| format!("http://{}{}", server_addr, path); + let client = reqwest::Client::new(); + + #[derive(Debug)] + struct TestCase<'a> { + method: Method, + path: &'a str, + header: Option<&'a str>, + expected_status: StatusCode, + body_contents: String, + } + + impl<'a> TestCase<'a> { + fn new( + method: Method, + path: &'a str, + header: Option<&'a str>, + expected_status: StatusCode, + body_contents: S, + ) -> TestCase<'a> + where + String: From, + { + TestCase { + method, + path, + header, + expected_status, + body_contents: String::from(body_contents), + } + } + } + + let test_cases = [ + // Test that errors produced by the version policy get propagated + // through to the client. + TestCase::new( + Method::GET, + "/demo", + None, + StatusCode::BAD_REQUEST, + format!("missing expected header {:?}", VERSION_HEADER_NAME), + ), + TestCase::new( + Method::GET, + "/demo", + Some("not-a-semver"), + StatusCode::BAD_REQUEST, + format!( + "bad value for header {:?}: unexpected character 'n' while \ + parsing major version number: not-a-semver", + VERSION_HEADER_NAME + ), + ), + // Versions prior to and including 1.0.0 get "handler1". + TestCase::new( + Method::GET, + "/demo", + Some("0.9.0"), + StatusCode::OK, + HANDLER1_MSG, + ), + TestCase::new( + Method::GET, + "/demo", + Some("1.0.0"), + StatusCode::OK, + HANDLER1_MSG, + ), + // Versions between 1.0.0 and 1.1.0 (non-inclusive) do not exist. + // + // Because there's a PUT handler for all versions, the expected error is + // 405 ("Method Not Allowed"), not 404 ("Not Found"). + TestCase::new( + Method::GET, + "/demo", + Some("1.0.1"), + StatusCode::METHOD_NOT_ALLOWED, + StatusCode::METHOD_NOT_ALLOWED.canonical_reason().unwrap(), + ), + TestCase::new( + Method::GET, + "/demo", + Some("1.0.99"), + StatusCode::METHOD_NOT_ALLOWED, + StatusCode::METHOD_NOT_ALLOWED.canonical_reason().unwrap(), + ), + // Versions between 1.1.0 and 1.3.0 (inclusive) get "handler2". + TestCase::new( + Method::GET, + "/demo", + Some("1.1.0"), + StatusCode::OK, + HANDLER2_MSG, + ), + TestCase::new( + Method::GET, + "/demo", + Some("1.3.0"), + StatusCode::OK, + HANDLER2_MSG, + ), + // Versions between 1.3.0 and 1.4.0 (exclusive) do not exist. + // See above for why this is a 405. + TestCase::new( + Method::GET, + "/demo", + Some("1.3.1"), + StatusCode::METHOD_NOT_ALLOWED, + StatusCode::METHOD_NOT_ALLOWED.canonical_reason().unwrap(), + ), + TestCase::new( + Method::GET, + "/demo", + Some("1.3.99"), + StatusCode::METHOD_NOT_ALLOWED, + StatusCode::METHOD_NOT_ALLOWED.canonical_reason().unwrap(), + ), + // Versions after 1.4.0 (inclusive) get "handler3". + TestCase::new( + Method::GET, + "/demo", + Some("1.4.0"), + StatusCode::OK, + HANDLER3_MSG, + ), + // For all of these versions, a PUT should get handler4. + TestCase::new( + Method::PUT, + "/demo", + Some("0.9.0"), + StatusCode::OK, + HANDLER4_MSG, + ), + TestCase::new( + Method::PUT, + "/demo", + Some("1.0.0"), + StatusCode::OK, + HANDLER4_MSG, + ), + TestCase::new( + Method::PUT, + "/demo", + Some("1.1.0"), + StatusCode::OK, + HANDLER4_MSG, + ), + TestCase::new( + Method::PUT, + "/demo", + Some("1.3.1"), + StatusCode::OK, + HANDLER4_MSG, + ), + TestCase::new( + Method::PUT, + "/demo", + Some("1.4.0"), + StatusCode::OK, + HANDLER4_MSG, + ), + ]; + + for t in test_cases { + println!("test case: {:?}", t); + let mut request = client.request(t.method, mkurl(t.path)); + if let Some(h) = t.header { + request = request.header(VERSION_HEADER_NAME, h); + } + let response = request.send().await.unwrap(); + assert_eq!(response.status(), t.expected_status); + + if !t.expected_status.is_success() { + let error: HttpErrorResponseBody = response.json().await.unwrap(); + assert_eq!(error.message, t.body_contents); + } else { + let body: String = response.json().await.unwrap(); + assert_eq!(body, t.body_contents); + } + } +} + +#[endpoint { + method = GET, + path = "/demo", + versions = .."1.0.0", +}] +async fn handler1( + _rqctx: RequestContext<()>, +) -> Result, HttpError> { + Ok(HttpResponseOk(HANDLER1_MSG)) +} + +#[endpoint { + method = GET, + path = "/demo", + versions = "1.1.0".."1.3.0", +}] +async fn handler2( + _rqctx: RequestContext<()>, +) -> Result, HttpError> { + Ok(HttpResponseOk(HANDLER2_MSG)) +} + +#[endpoint { + method = GET, + path = "/demo", + versions = "1.4.0".., +}] +async fn handler3( + _rqctx: RequestContext<()>, +) -> Result, HttpError> { + Ok(HttpResponseOk(HANDLER3_MSG)) +} + +#[endpoint { + method = PUT, + path = "/demo", + versions = .. +}] +async fn handler4( + _rqctx: RequestContext<()>, +) -> Result, HttpError> { + Ok(HttpResponseOk(HANDLER4_MSG)) +} + +#[derive(Debug)] +struct TestVersionPolicy; +impl dropshot::DynamicVersionPolicy for TestVersionPolicy { + fn request_extract_version( + &self, + request: &http::Request, + _log: &slog::Logger, + ) -> Result { + dropshot::parse_header(request.headers(), VERSION_HEADER_NAME).and_then( + |v: semver::Version| { + if v.major == 4 && v.minor == 3 && v.patch == 2 { + Err(HttpError::for_bad_request( + None, + String::from(FORBIDDEN_MSG), + )) + } else { + Ok(v) + } + }, + ) + } +}