From 4a67bd4b335ddff5bc6836a9cdc2856b31382a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Birkner?= Date: Mon, 27 May 2024 17:54:24 +0000 Subject: [PATCH] fix(custom-domains): changed error code to 400 for user misconfigurations [S3_UPLOAD] --- Cargo.Bazel.Fuzzing.json.lock | 379 ++++++++---------- Cargo.Bazel.Fuzzing.toml.lock | 129 +++--- Cargo.Bazel.json.lock | 379 ++++++++---------- Cargo.Bazel.toml.lock | 129 +++--- Cargo.lock | 144 +++---- Cargo.toml | 6 +- bazel/external_crates.bzl | 3 +- .../certificate_issuer/src/api.rs | 4 +- .../certificate_issuer/src/cloudflare.rs | 6 +- 9 files changed, 538 insertions(+), 641 deletions(-) diff --git a/Cargo.Bazel.Fuzzing.json.lock b/Cargo.Bazel.Fuzzing.json.lock index 1fc9826ef52..b81f9e3a97e 100644 --- a/Cargo.Bazel.Fuzzing.json.lock +++ b/Cargo.Bazel.Fuzzing.json.lock @@ -1,5 +1,5 @@ { - "checksum": "12a05ecee19d16336b7db1195f8263c7ac5f93325b467e8d41fe957897d2aaee", + "checksum": "2865b49958a1f02a6dc582ff0aa90fc53f6ae682e0d6eb3184e297a1f2804dc0", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -5585,6 +5585,7 @@ ], "crate_features": { "common": [ + "alloc", "default", "std" ], @@ -11935,14 +11936,17 @@ ], "license_file": null }, - "cloudflare 0.9.1": { + "cloudflare 0.11.0": { "name": "cloudflare", - "version": "0.9.1", + "version": "0.11.0", "package_url": null, "repository": { - "Http": { - "url": "https://static.crates.io/crates/cloudflare/0.9.1/download", - "sha256": "28a69d53c61ddd5611ad0203c60aa02074d67f91bfb98db2225833f6bdc2f1a4" + "Git": { + "remote": "https://github.com/blind-oracle/cloudflare-rs.git", + "commitish": { + "Rev": "386c8c6a0a95ad0c8a87aa1aac27b26a6cfec5cc" + }, + "strip_prefix": "cloudflare" } }, "targets": [ @@ -11972,18 +11976,6 @@ }, "deps": { "common": [ - { - "id": "anyhow 1.0.75", - "target": "anyhow" - }, - { - "id": "base64 0.13.1", - "target": "base64" - }, - { - "id": "cfg-if 0.1.10", - "target": "cfg_if" - }, { "id": "chrono 0.4.31", "target": "chrono" @@ -11993,7 +11985,7 @@ "target": "http" }, { - "id": "percent-encoding 1.0.1", + "id": "percent-encoding 2.3.0", "target": "percent_encoding" }, { @@ -12009,35 +12001,30 @@ "target": "serde_json" }, { - "id": "serde_qs 0.4.6", - "target": "serde_qs" + "id": "serde_urlencoded 0.7.1", + "target": "serde_urlencoded" }, { - "id": "serde_with 1.14.0", + "id": "serde_with 2.3.3", "target": "serde_with" }, + { + "id": "thiserror 1.0.57", + "target": "thiserror" + }, { "id": "url 2.4.1", "target": "url" }, { - "id": "uuid 0.8.2", + "id": "uuid 1.5.0", "target": "uuid" } ], "selects": {} }, "edition": "2018", - "proc_macro_deps": { - "common": [ - { - "id": "async-trait 0.1.74", - "target": "async_trait" - } - ], - "selects": {} - }, - "version": "0.9.1" + "version": "0.11.0" }, "license": "BSD-3-Clause", "license_ids": [ @@ -16577,6 +16564,10 @@ { "id": "powerfmt 0.2.0", "target": "powerfmt" + }, + { + "id": "serde 1.0.195", + "target": "serde" } ], "selects": {} @@ -17249,7 +17240,7 @@ "target": "clap" }, { - "id": "cloudflare 0.9.1", + "id": "cloudflare 0.11.0", "target": "cloudflare" }, { @@ -20440,20 +20431,8 @@ "compile_data_glob": [ "**" ], - "crate_features": { - "common": [ - "backtrace", - "default", - "example_generated" - ], - "selects": {} - }, "deps": { "common": [ - { - "id": "backtrace 0.3.69", - "target": "backtrace" - }, { "id": "error-chain 0.12.4", "target": "build_script_build" @@ -30673,6 +30652,10 @@ { "id": "indexmap 1.9.3", "target": "build_script_build" + }, + { + "id": "serde 1.0.195", + "target": "serde" } ], "selects": {} @@ -44272,45 +44255,6 @@ ], "license_file": "LICENSE-APACHE" }, - "percent-encoding 1.0.1": { - "name": "percent-encoding", - "version": "1.0.1", - "package_url": "https://github.com/servo/rust-url/", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/percent-encoding/1.0.1/download", - "sha256": "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - } - }, - "targets": [ - { - "Library": { - "crate_name": "percent_encoding", - "crate_root": "lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "percent_encoding", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2015", - "version": "1.0.1" - }, - "license": "MIT/Apache-2.0", - "license_ids": [ - "Apache-2.0", - "MIT" - ], - "license_file": "LICENSE-APACHE" - }, "percent-encoding 2.3.0": { "name": "percent-encoding", "version": "2.3.0", @@ -57945,72 +57889,6 @@ ], "license_file": "LICENSE-APACHE" }, - "serde_qs 0.4.6": { - "name": "serde_qs", - "version": "0.4.6", - "package_url": "https://github.com/samscott89/serde_qs", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/serde_qs/0.4.6/download", - "sha256": "35965fa1d2413717053d67c2df1f5c3e1763fbf77200ea7e767523707bd5a0af" - } - }, - "targets": [ - { - "Library": { - "crate_name": "serde_qs", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "serde_qs", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "data-encoding 2.4.0", - "target": "data_encoding" - }, - { - "id": "error-chain 0.12.4", - "target": "error_chain" - }, - { - "id": "percent-encoding 1.0.1", - "target": "percent_encoding" - }, - { - "id": "serde 1.0.195", - "target": "serde" - } - ], - "selects": {} - }, - "edition": "2015", - "version": "0.4.6" - }, - "license": "MIT/Apache-2.0", - "license_ids": [ - "Apache-2.0", - "MIT" - ], - "license_file": "LICENSE-APACHE" - }, "serde_qs 0.8.5": { "name": "serde_qs", "version": "0.8.5", @@ -58374,6 +58252,77 @@ ], "license_file": "LICENSE-APACHE" }, + "serde_with 2.3.3": { + "name": "serde_with", + "version": "2.3.3", + "package_url": "https://github.com/jonasbb/serde_with", + "repository": { + "Http": { + "url": "https://static.crates.io/crates/serde_with/2.3.3/download", + "sha256": "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" + } + }, + "targets": [ + { + "Library": { + "crate_name": "serde_with", + "crate_root": "src/lib.rs", + "srcs": { + "allow_empty": false, + "include": [ + "**/*.rs" + ] + } + } + } + ], + "library_target_name": "serde_with", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "alloc", + "base64", + "default", + "macros", + "std" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "base64 0.13.1", + "target": "base64" + }, + { + "id": "serde 1.0.195", + "target": "serde" + } + ], + "selects": {} + }, + "edition": "2021", + "proc_macro_deps": { + "common": [ + { + "id": "serde_with_macros 2.3.3", + "target": "serde_with_macros" + } + ], + "selects": {} + }, + "version": "2.3.3" + }, + "license": "MIT OR Apache-2.0", + "license_ids": [ + "Apache-2.0", + "MIT" + ], + "license_file": "LICENSE-APACHE" + }, "serde_with_macros 1.5.2": { "name": "serde_with_macros", "version": "1.5.2", @@ -58434,6 +58383,66 @@ ], "license_file": "LICENSE-APACHE" }, + "serde_with_macros 2.3.3": { + "name": "serde_with_macros", + "version": "2.3.3", + "package_url": "https://github.com/jonasbb/serde_with/", + "repository": { + "Http": { + "url": "https://static.crates.io/crates/serde_with_macros/2.3.3/download", + "sha256": "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" + } + }, + "targets": [ + { + "ProcMacro": { + "crate_name": "serde_with_macros", + "crate_root": "src/lib.rs", + "srcs": { + "allow_empty": false, + "include": [ + "**/*.rs" + ] + } + } + } + ], + "library_target_name": "serde_with_macros", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "darling 0.20.3", + "target": "darling" + }, + { + "id": "proc-macro2 1.0.76", + "target": "proc_macro2" + }, + { + "id": "quote 1.0.35", + "target": "quote" + }, + { + "id": "syn 2.0.48", + "target": "syn" + } + ], + "selects": {} + }, + "edition": "2021", + "version": "2.3.3" + }, + "license": "MIT OR Apache-2.0", + "license_ids": [ + "Apache-2.0", + "MIT" + ], + "license_file": "LICENSE-APACHE" + }, "serde_yaml 0.8.26": { "name": "serde_yaml", "version": "0.8.26", @@ -64194,6 +64203,10 @@ "id": "powerfmt 0.2.0", "target": "powerfmt" }, + { + "id": "serde 1.0.195", + "target": "serde" + }, { "id": "time-core 0.1.2", "target": "time_core" @@ -69396,68 +69409,6 @@ ], "license_file": "LICENSE-APACHE" }, - "uuid 0.8.2": { - "name": "uuid", - "version": "0.8.2", - "package_url": "https://github.com/uuid-rs/uuid", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/uuid/0.8.2/download", - "sha256": "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" - } - }, - "targets": [ - { - "Library": { - "crate_name": "uuid", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "uuid", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default", - "getrandom", - "serde", - "std", - "v4" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "getrandom 0.2.10", - "target": "getrandom" - }, - { - "id": "serde 1.0.195", - "target": "serde" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.8.2" - }, - "license": "Apache-2.0 OR MIT", - "license_ids": [ - "Apache-2.0", - "MIT" - ], - "license_file": "LICENSE-APACHE" - }, "uuid 1.5.0": { "name": "uuid", "version": "1.5.0", @@ -77928,7 +77879,7 @@ "cidr 0.2.2", "clap 3.2.25", "clap 4.4.6", - "cloudflare 0.9.1", + "cloudflare 0.11.0", "colored 2.0.4", "comparable 0.5.4", "console 0.11.3", diff --git a/Cargo.Bazel.Fuzzing.toml.lock b/Cargo.Bazel.Fuzzing.toml.lock index f6f37e853fb..d159389898b 100644 --- a/Cargo.Bazel.Fuzzing.toml.lock +++ b/Cargo.Bazel.Fuzzing.toml.lock @@ -78,7 +78,7 @@ dependencies = [ "language-tags", "local-channel", "mime", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rand 0.8.5", "sha1", @@ -462,7 +462,7 @@ dependencies = [ "askama_escape", "humansize", "num-traits", - "percent-encoding 2.3.0", + "percent-encoding", "serde", "serde_json", ] @@ -738,7 +738,7 @@ dependencies = [ "matchit", "memchr", "mime", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rustversion", "serde", @@ -772,7 +772,7 @@ dependencies = [ "matchit", "memchr", "mime", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rustversion", "serde", @@ -2024,24 +2024,20 @@ dependencies = [ [[package]] name = "cloudflare" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a69d53c61ddd5611ad0203c60aa02074d67f91bfb98db2225833f6bdc2f1a4" +version = "0.11.0" +source = "git+https://github.com/blind-oracle/cloudflare-rs.git?rev=386c8c6a0a95ad0c8a87aa1aac27b26a6cfec5cc#386c8c6a0a95ad0c8a87aa1aac27b26a6cfec5cc" dependencies = [ - "anyhow", - "async-trait", - "base64 0.13.1", - "cfg-if 0.1.10", "chrono", "http 0.2.9", - "percent-encoding 1.0.1", + "percent-encoding", "reqwest 0.11.27", "serde", "serde_json", - "serde_qs 0.4.6", - "serde_with", + "serde_urlencoded", + "serde_with 2.3.3", + "thiserror", "url", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -2195,7 +2191,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", "time", "version_check", ] @@ -2772,7 +2768,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "uuid 1.5.0", + "uuid", ] [[package]] @@ -2820,6 +2816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ "powerfmt", + "serde", ] [[package]] @@ -3161,7 +3158,7 @@ dependencies = [ "serde_cbor", "serde_derive", "serde_json", - "serde_with", + "serde_with 1.14.0", "serde_yaml 0.9.30", "sha2 0.10.8", "sha2 0.9.9", @@ -3224,7 +3221,7 @@ dependencies = [ "trust-dns-resolver", "turmoil", "url", - "uuid 1.5.0", + "uuid", "vsock", "walkdir", "walrus 0.19.0", @@ -3576,7 +3573,6 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" dependencies = [ - "backtrace", "version_check", ] @@ -3894,7 +3890,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", ] [[package]] @@ -5376,6 +5372,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg 1.1.0", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -6680,7 +6677,7 @@ dependencies = [ "tagptr", "thiserror", "triomphe", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -7291,7 +7288,7 @@ dependencies = [ "futures-util", "once_cell", "opentelemetry_api 0.18.0", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.8.5", "thiserror", ] @@ -7310,7 +7307,7 @@ dependencies = [ "once_cell", "opentelemetry_api 0.20.0", "ordered-float 3.9.2", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.8.5", "regex", "thiserror", @@ -7331,7 +7328,7 @@ dependencies = [ "once_cell", "opentelemetry 0.21.0", "ordered-float 4.2.0", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.8.5", "thiserror", "tokio", @@ -7585,12 +7582,6 @@ dependencies = [ "base64ct", ] -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.3.0" @@ -8862,7 +8853,7 @@ dependencies = [ "mime", "mime_guess", "once_cell", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rustls 0.21.12", "rustls-pemfile 1.0.3", @@ -8908,7 +8899,7 @@ dependencies = [ "log", "mime", "once_cell", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rustls 0.22.2", "rustls-native-certs 0.7.0", @@ -9018,7 +9009,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -9797,25 +9788,13 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_qs" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35965fa1d2413717053d67c2df1f5c3e1763fbf77200ea7e767523707bd5a0af" -dependencies = [ - "data-encoding", - "error-chain", - "percent-encoding 1.0.1", - "serde", -] - [[package]] name = "serde_qs" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", "serde", "thiserror", ] @@ -9828,7 +9807,7 @@ checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" dependencies = [ "axum 0.6.20", "futures", - "percent-encoding 2.3.0", + "percent-encoding", "serde", "thiserror", ] @@ -9874,7 +9853,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" dependencies = [ "serde", - "serde_with_macros", + "serde_with_macros 1.5.2", +] + +[[package]] +name = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "indexmap 1.9.3", + "serde", + "serde_json", + "serde_with_macros 2.3.3", + "time", ] [[package]] @@ -9889,6 +9884,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling 0.20.3", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", +] + [[package]] name = "serde_yaml" version = "0.8.26" @@ -10489,7 +10496,7 @@ dependencies = [ "debugid", "memmap2", "stable_deref_trait", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -11086,7 +11093,7 @@ dependencies = [ "http-body 0.4.5", "hyper 0.14.27", "hyper-timeout", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project", "prost 0.11.9", "tokio", @@ -11113,7 +11120,7 @@ dependencies = [ "http-body 0.4.5", "hyper 0.14.27", "hyper-timeout", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project", "prost 0.12.2", "tokio", @@ -11181,7 +11188,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -11204,7 +11211,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -11685,7 +11692,7 @@ checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna 0.4.0", - "percent-encoding 2.3.0", + "percent-encoding", "serde", ] @@ -11713,16 +11720,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.10", - "serde", -] - [[package]] name = "uuid" version = "1.5.0" @@ -11859,7 +11856,7 @@ dependencies = [ "mime", "mime_guess", "multer", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project", "rustls-pemfile 1.0.3", "scoped-tls", diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock index 8581f5e7d29..ee91e465103 100644 --- a/Cargo.Bazel.json.lock +++ b/Cargo.Bazel.json.lock @@ -1,5 +1,5 @@ { - "checksum": "b193afe3ef67a9c8c49f5575089192f1d112f7142cc89d7b245f500881275489", + "checksum": "44371154cd829021c65efd27442ffa516af21acfd893a1d03e911cc3f84b26c7", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -5596,6 +5596,7 @@ ], "crate_features": { "common": [ + "alloc", "default", "std" ], @@ -11836,14 +11837,17 @@ ], "license_file": null }, - "cloudflare 0.9.1": { + "cloudflare 0.11.0": { "name": "cloudflare", - "version": "0.9.1", + "version": "0.11.0", "package_url": null, "repository": { - "Http": { - "url": "https://static.crates.io/crates/cloudflare/0.9.1/download", - "sha256": "28a69d53c61ddd5611ad0203c60aa02074d67f91bfb98db2225833f6bdc2f1a4" + "Git": { + "remote": "https://github.com/blind-oracle/cloudflare-rs.git", + "commitish": { + "Rev": "386c8c6a0a95ad0c8a87aa1aac27b26a6cfec5cc" + }, + "strip_prefix": "cloudflare" } }, "targets": [ @@ -11873,18 +11877,6 @@ }, "deps": { "common": [ - { - "id": "anyhow 1.0.72", - "target": "anyhow" - }, - { - "id": "base64 0.13.1", - "target": "base64" - }, - { - "id": "cfg-if 0.1.10", - "target": "cfg_if" - }, { "id": "chrono 0.4.31", "target": "chrono" @@ -11894,7 +11886,7 @@ "target": "http" }, { - "id": "percent-encoding 1.0.1", + "id": "percent-encoding 2.3.0", "target": "percent_encoding" }, { @@ -11910,35 +11902,30 @@ "target": "serde_json" }, { - "id": "serde_qs 0.4.6", - "target": "serde_qs" + "id": "serde_urlencoded 0.7.1", + "target": "serde_urlencoded" }, { - "id": "serde_with 1.14.0", + "id": "serde_with 2.3.3", "target": "serde_with" }, + { + "id": "thiserror 1.0.57", + "target": "thiserror" + }, { "id": "url 2.4.1", "target": "url" }, { - "id": "uuid 0.8.2", + "id": "uuid 1.5.0", "target": "uuid" } ], "selects": {} }, "edition": "2018", - "proc_macro_deps": { - "common": [ - { - "id": "async-trait 0.1.73", - "target": "async_trait" - } - ], - "selects": {} - }, - "version": "0.9.1" + "version": "0.11.0" }, "license": "BSD-3-Clause", "license_ids": [ @@ -16410,6 +16397,10 @@ { "id": "powerfmt 0.2.0", "target": "powerfmt" + }, + { + "id": "serde 1.0.195", + "target": "serde" } ], "selects": {} @@ -17082,7 +17073,7 @@ "target": "clap" }, { - "id": "cloudflare 0.9.1", + "id": "cloudflare 0.11.0", "target": "cloudflare" }, { @@ -20294,20 +20285,8 @@ "compile_data_glob": [ "**" ], - "crate_features": { - "common": [ - "backtrace", - "default", - "example_generated" - ], - "selects": {} - }, "deps": { "common": [ - { - "id": "backtrace 0.3.68", - "target": "backtrace" - }, { "id": "error-chain 0.12.4", "target": "build_script_build" @@ -30507,6 +30486,10 @@ { "id": "indexmap 1.9.3", "target": "build_script_build" + }, + { + "id": "serde 1.0.195", + "target": "serde" } ], "selects": {} @@ -44185,45 +44168,6 @@ ], "license_file": "LICENSE-APACHE" }, - "percent-encoding 1.0.1": { - "name": "percent-encoding", - "version": "1.0.1", - "package_url": "https://github.com/servo/rust-url/", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/percent-encoding/1.0.1/download", - "sha256": "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - } - }, - "targets": [ - { - "Library": { - "crate_name": "percent_encoding", - "crate_root": "lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "percent_encoding", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2015", - "version": "1.0.1" - }, - "license": "MIT/Apache-2.0", - "license_ids": [ - "Apache-2.0", - "MIT" - ], - "license_file": "LICENSE-APACHE" - }, "percent-encoding 2.3.0": { "name": "percent-encoding", "version": "2.3.0", @@ -57930,72 +57874,6 @@ ], "license_file": "LICENSE-APACHE" }, - "serde_qs 0.4.6": { - "name": "serde_qs", - "version": "0.4.6", - "package_url": "https://github.com/samscott89/serde_qs", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/serde_qs/0.4.6/download", - "sha256": "35965fa1d2413717053d67c2df1f5c3e1763fbf77200ea7e767523707bd5a0af" - } - }, - "targets": [ - { - "Library": { - "crate_name": "serde_qs", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "serde_qs", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "data-encoding 2.4.0", - "target": "data_encoding" - }, - { - "id": "error-chain 0.12.4", - "target": "error_chain" - }, - { - "id": "percent-encoding 1.0.1", - "target": "percent_encoding" - }, - { - "id": "serde 1.0.195", - "target": "serde" - } - ], - "selects": {} - }, - "edition": "2015", - "version": "0.4.6" - }, - "license": "MIT/Apache-2.0", - "license_ids": [ - "Apache-2.0", - "MIT" - ], - "license_file": "LICENSE-APACHE" - }, "serde_qs 0.8.5": { "name": "serde_qs", "version": "0.8.5", @@ -58359,6 +58237,77 @@ ], "license_file": "LICENSE-APACHE" }, + "serde_with 2.3.3": { + "name": "serde_with", + "version": "2.3.3", + "package_url": "https://github.com/jonasbb/serde_with", + "repository": { + "Http": { + "url": "https://static.crates.io/crates/serde_with/2.3.3/download", + "sha256": "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" + } + }, + "targets": [ + { + "Library": { + "crate_name": "serde_with", + "crate_root": "src/lib.rs", + "srcs": { + "allow_empty": false, + "include": [ + "**/*.rs" + ] + } + } + } + ], + "library_target_name": "serde_with", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "alloc", + "base64", + "default", + "macros", + "std" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "base64 0.13.1", + "target": "base64" + }, + { + "id": "serde 1.0.195", + "target": "serde" + } + ], + "selects": {} + }, + "edition": "2021", + "proc_macro_deps": { + "common": [ + { + "id": "serde_with_macros 2.3.3", + "target": "serde_with_macros" + } + ], + "selects": {} + }, + "version": "2.3.3" + }, + "license": "MIT OR Apache-2.0", + "license_ids": [ + "Apache-2.0", + "MIT" + ], + "license_file": "LICENSE-APACHE" + }, "serde_with_macros 1.5.2": { "name": "serde_with_macros", "version": "1.5.2", @@ -58419,6 +58368,66 @@ ], "license_file": "LICENSE-APACHE" }, + "serde_with_macros 2.3.3": { + "name": "serde_with_macros", + "version": "2.3.3", + "package_url": "https://github.com/jonasbb/serde_with/", + "repository": { + "Http": { + "url": "https://static.crates.io/crates/serde_with_macros/2.3.3/download", + "sha256": "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" + } + }, + "targets": [ + { + "ProcMacro": { + "crate_name": "serde_with_macros", + "crate_root": "src/lib.rs", + "srcs": { + "allow_empty": false, + "include": [ + "**/*.rs" + ] + } + } + } + ], + "library_target_name": "serde_with_macros", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "darling 0.20.3", + "target": "darling" + }, + { + "id": "proc-macro2 1.0.76", + "target": "proc_macro2" + }, + { + "id": "quote 1.0.35", + "target": "quote" + }, + { + "id": "syn 2.0.48", + "target": "syn" + } + ], + "selects": {} + }, + "edition": "2021", + "version": "2.3.3" + }, + "license": "MIT OR Apache-2.0", + "license_ids": [ + "Apache-2.0", + "MIT" + ], + "license_file": "LICENSE-APACHE" + }, "serde_yaml 0.8.26": { "name": "serde_yaml", "version": "0.8.26", @@ -64209,6 +64218,10 @@ "id": "powerfmt 0.2.0", "target": "powerfmt" }, + { + "id": "serde 1.0.195", + "target": "serde" + }, { "id": "time-core 0.1.2", "target": "time_core" @@ -69411,68 +69424,6 @@ ], "license_file": "LICENSE-APACHE" }, - "uuid 0.8.2": { - "name": "uuid", - "version": "0.8.2", - "package_url": "https://github.com/uuid-rs/uuid", - "repository": { - "Http": { - "url": "https://static.crates.io/crates/uuid/0.8.2/download", - "sha256": "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" - } - }, - "targets": [ - { - "Library": { - "crate_name": "uuid", - "crate_root": "src/lib.rs", - "srcs": { - "allow_empty": false, - "include": [ - "**/*.rs" - ] - } - } - } - ], - "library_target_name": "uuid", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default", - "getrandom", - "serde", - "std", - "v4" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "getrandom 0.2.10", - "target": "getrandom" - }, - { - "id": "serde 1.0.195", - "target": "serde" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.8.2" - }, - "license": "Apache-2.0 OR MIT", - "license_ids": [ - "Apache-2.0", - "MIT" - ], - "license_file": "LICENSE-APACHE" - }, "uuid 1.5.0": { "name": "uuid", "version": "1.5.0", @@ -77866,7 +77817,7 @@ "cidr 0.2.2", "clap 3.2.25", "clap 4.4.8", - "cloudflare 0.9.1", + "cloudflare 0.11.0", "colored 2.0.4", "comparable 0.5.4", "console 0.11.3", diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock index 4de5565c809..3aa62d38f56 100644 --- a/Cargo.Bazel.toml.lock +++ b/Cargo.Bazel.toml.lock @@ -78,7 +78,7 @@ dependencies = [ "language-tags", "local-channel", "mime", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rand 0.8.5", "sha1", @@ -464,7 +464,7 @@ dependencies = [ "askama_escape", "humansize", "num-traits", - "percent-encoding 2.3.0", + "percent-encoding", "serde", "serde_json", ] @@ -740,7 +740,7 @@ dependencies = [ "matchit", "memchr", "mime", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rustversion", "serde", @@ -774,7 +774,7 @@ dependencies = [ "matchit", "memchr", "mime", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rustversion", "serde", @@ -2026,24 +2026,20 @@ dependencies = [ [[package]] name = "cloudflare" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a69d53c61ddd5611ad0203c60aa02074d67f91bfb98db2225833f6bdc2f1a4" +version = "0.11.0" +source = "git+https://github.com/blind-oracle/cloudflare-rs.git?rev=386c8c6a0a95ad0c8a87aa1aac27b26a6cfec5cc#386c8c6a0a95ad0c8a87aa1aac27b26a6cfec5cc" dependencies = [ - "anyhow", - "async-trait", - "base64 0.13.1", - "cfg-if 0.1.10", "chrono", "http 0.2.9", - "percent-encoding 1.0.1", + "percent-encoding", "reqwest 0.11.27", "serde", "serde_json", - "serde_qs 0.4.6", - "serde_with", + "serde_urlencoded", + "serde_with 2.3.3", + "thiserror", "url", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -2185,7 +2181,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", "time", "version_check", ] @@ -2762,7 +2758,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "uuid 1.5.0", + "uuid", ] [[package]] @@ -2810,6 +2806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", + "serde", ] [[package]] @@ -3151,7 +3148,7 @@ dependencies = [ "serde_cbor", "serde_derive", "serde_json", - "serde_with", + "serde_with 1.14.0", "serde_yaml 0.9.30", "sha2 0.10.8", "sha2 0.9.9", @@ -3214,7 +3211,7 @@ dependencies = [ "trust-dns-resolver", "turmoil", "url", - "uuid 1.5.0", + "uuid", "vsock", "walkdir", "walrus 0.19.0", @@ -3566,7 +3563,6 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" dependencies = [ - "backtrace", "version_check", ] @@ -3878,7 +3874,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", ] [[package]] @@ -5367,6 +5363,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg 1.1.0", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -6678,7 +6675,7 @@ dependencies = [ "tagptr", "thiserror", "triomphe", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -7289,7 +7286,7 @@ dependencies = [ "futures-util", "once_cell", "opentelemetry_api 0.18.0", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.8.5", "thiserror", ] @@ -7308,7 +7305,7 @@ dependencies = [ "once_cell", "opentelemetry_api 0.20.0", "ordered-float 3.7.0", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.8.5", "regex", "thiserror", @@ -7329,7 +7326,7 @@ dependencies = [ "once_cell", "opentelemetry 0.21.0", "ordered-float 4.2.0", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.8.5", "thiserror", "tokio", @@ -7583,12 +7580,6 @@ dependencies = [ "base64ct", ] -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.3.0" @@ -8855,7 +8846,7 @@ dependencies = [ "mime", "mime_guess", "once_cell", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rustls 0.21.12", "rustls-pemfile 1.0.3", @@ -8901,7 +8892,7 @@ dependencies = [ "log", "mime", "once_cell", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rustls 0.22.2", "rustls-native-certs 0.7.0", @@ -9011,7 +9002,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -9806,25 +9797,13 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_qs" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35965fa1d2413717053d67c2df1f5c3e1763fbf77200ea7e767523707bd5a0af" -dependencies = [ - "data-encoding", - "error-chain", - "percent-encoding 1.0.1", - "serde", -] - [[package]] name = "serde_qs" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", "serde", "thiserror", ] @@ -9837,7 +9816,7 @@ checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" dependencies = [ "axum 0.6.20", "futures", - "percent-encoding 2.3.0", + "percent-encoding", "serde", "thiserror", ] @@ -9883,7 +9862,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" dependencies = [ "serde", - "serde_with_macros", + "serde_with_macros 1.5.2", +] + +[[package]] +name = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "indexmap 1.9.3", + "serde", + "serde_json", + "serde_with_macros 2.3.3", + "time", ] [[package]] @@ -9898,6 +9893,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling 0.20.3", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", +] + [[package]] name = "serde_yaml" version = "0.8.26" @@ -10498,7 +10505,7 @@ dependencies = [ "debugid", "memmap2", "stable_deref_trait", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -11096,7 +11103,7 @@ dependencies = [ "http-body 0.4.5", "hyper 0.14.27", "hyper-timeout", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project", "prost 0.11.9", "tokio", @@ -11123,7 +11130,7 @@ dependencies = [ "http-body 0.4.5", "hyper 0.14.27", "hyper-timeout", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project", "prost 0.12.2", "tokio", @@ -11191,7 +11198,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -11214,7 +11221,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "uuid 1.5.0", + "uuid", ] [[package]] @@ -11695,7 +11702,7 @@ checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna 0.4.0", - "percent-encoding 2.3.0", + "percent-encoding", "serde", ] @@ -11723,16 +11730,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.10", - "serde", -] - [[package]] name = "uuid" version = "1.5.0" @@ -11869,7 +11866,7 @@ dependencies = [ "mime", "mime_guess", "multer", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project", "rustls-pemfile 1.0.3", "scoped-tls", diff --git a/Cargo.lock b/Cargo.lock index 10994307939..19a5b082dce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,7 +78,7 @@ dependencies = [ "language-tags", "local-channel", "mime", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rand 0.8.5", "sha1", @@ -460,7 +460,7 @@ dependencies = [ "askama_escape", "humansize", "num-traits", - "percent-encoding 2.3.0", + "percent-encoding", "serde", "serde_json", ] @@ -735,7 +735,7 @@ dependencies = [ "matchit", "memchr", "mime", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rustversion", "serde", @@ -768,7 +768,7 @@ dependencies = [ "matchit", "memchr", "mime", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rustversion", "serde", @@ -2209,24 +2209,20 @@ dependencies = [ [[package]] name = "cloudflare" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a69d53c61ddd5611ad0203c60aa02074d67f91bfb98db2225833f6bdc2f1a4" +version = "0.11.0" +source = "git+https://github.com/blind-oracle/cloudflare-rs.git?rev=386c8c6a0a95ad0c8a87aa1aac27b26a6cfec5cc#386c8c6a0a95ad0c8a87aa1aac27b26a6cfec5cc" dependencies = [ - "anyhow", - "async-trait", - "base64 0.13.1", - "cfg-if 0.1.10", "chrono", "http 0.2.9", - "percent-encoding 1.0.1", + "percent-encoding", "reqwest 0.11.22", "serde", "serde_json", - "serde_qs 0.4.6", - "serde_with", + "serde_urlencoded", + "serde_with 2.3.3", + "thiserror", "url", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -2375,7 +2371,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", "time", "version_check", ] @@ -3065,7 +3061,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "uuid 1.6.1", + "uuid", ] [[package]] @@ -3149,6 +3145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", + "serde", ] [[package]] @@ -3684,7 +3681,6 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" dependencies = [ - "backtrace", "version_check", ] @@ -4068,7 +4064,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", ] [[package]] @@ -8083,7 +8079,7 @@ dependencies = [ "tokio", "tonic 0.11.0", "tower", - "uuid 1.6.1", + "uuid", "warp", ] @@ -8235,7 +8231,7 @@ dependencies = [ "serde_bytes", "serde_cbor", "serde_json", - "serde_with", + "serde_with 1.14.0", "strum 0.26.2", "strum_macros 0.26.2", "tempfile", @@ -10661,7 +10657,7 @@ dependencies = [ "strum 0.26.2", "strum_macros 0.26.2", "tempfile", - "uuid 1.6.1", + "uuid", ] [[package]] @@ -11499,7 +11495,7 @@ dependencies = [ "strum_macros 0.26.2", "tempfile", "tree-deserializer", - "uuid 1.6.1", + "uuid", ] [[package]] @@ -12037,7 +12033,7 @@ dependencies = [ "serde_bytes", "serde_cbor", "serde_json", - "serde_with", + "serde_with 1.14.0", "strum 0.26.2", "strum_macros 0.26.2", "thiserror", @@ -12768,6 +12764,7 @@ checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg 1.1.0", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -14205,7 +14202,7 @@ dependencies = [ "tagptr", "thiserror", "triomphe", - "uuid 1.6.1", + "uuid", ] [[package]] @@ -14310,7 +14307,7 @@ dependencies = [ "regex", "serde", "serde_json", - "serde_with", + "serde_with 1.14.0", "sha2 0.10.8", "utils", ] @@ -14836,7 +14833,7 @@ dependencies = [ "futures-util", "once_cell", "opentelemetry_api 0.18.0", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.8.5", "thiserror", ] @@ -14855,7 +14852,7 @@ dependencies = [ "once_cell", "opentelemetry_api 0.20.0", "ordered-float 3.7.0", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.8.5", "regex", "thiserror", @@ -14876,7 +14873,7 @@ dependencies = [ "once_cell", "opentelemetry 0.21.0", "ordered-float 4.2.0", - "percent-encoding 2.3.0", + "percent-encoding", "rand 0.8.5", "thiserror", ] @@ -15204,12 +15201,6 @@ dependencies = [ "base64ct", ] -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.3.0" @@ -16655,13 +16646,15 @@ dependencies = [ "http-body 0.4.5", "hyper 0.14.26", "hyper-rustls 0.24.2", + "hyper-tls", "ipnet", "js-sys", "log", "mime", "mime_guess", + "native-tls", "once_cell", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rustls 0.21.12", "rustls-pemfile 1.0.4", @@ -16670,6 +16663,7 @@ dependencies = [ "serde_urlencoded", "system-configuration", "tokio", + "tokio-native-tls", "tokio-rustls 0.24.1", "tokio-util", "tower-service", @@ -16706,7 +16700,7 @@ dependencies = [ "mime", "mime_guess", "once_cell", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project-lite", "rustls 0.22.2", "rustls-native-certs 0.7.0", @@ -16907,7 +16901,7 @@ dependencies = [ "serde_cbor", "serde_derive", "serde_json", - "serde_with", + "serde_with 1.14.0", ] [[package]] @@ -17688,25 +17682,13 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_qs" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35965fa1d2413717053d67c2df1f5c3e1763fbf77200ea7e767523707bd5a0af" -dependencies = [ - "data-encoding", - "error-chain", - "percent-encoding 1.0.1", - "serde", -] - [[package]] name = "serde_qs" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" dependencies = [ - "percent-encoding 2.3.0", + "percent-encoding", "serde", "thiserror", ] @@ -17719,7 +17701,7 @@ checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" dependencies = [ "axum 0.6.20", "futures", - "percent-encoding 2.3.0", + "percent-encoding", "serde", "thiserror", ] @@ -17765,7 +17747,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" dependencies = [ "serde", - "serde_with_macros", + "serde_with_macros 1.5.2", +] + +[[package]] +name = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "indexmap 1.9.2", + "serde", + "serde_json", + "serde_with_macros 2.3.3", + "time", ] [[package]] @@ -17780,6 +17778,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling 0.20.3", + "proc-macro2 1.0.75", + "quote 1.0.35", + "syn 2.0.48", +] + [[package]] name = "serde_yaml" version = "0.8.26" @@ -17835,7 +17845,7 @@ dependencies = [ "partition_tools", "serde", "serde_json", - "serde_with", + "serde_with 1.14.0", "tempfile", "tokio", "url", @@ -18449,7 +18459,7 @@ dependencies = [ "debugid", "memmap2", "stable_deref_trait", - "uuid 1.6.1", + "uuid", ] [[package]] @@ -19312,7 +19322,7 @@ dependencies = [ "http-body 0.4.5", "hyper 0.14.26", "hyper-timeout", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project", "prost 0.11.9", "tokio", @@ -19339,7 +19349,7 @@ dependencies = [ "http-body 0.4.5", "hyper 0.14.26", "hyper-timeout", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project", "prost 0.12.3", "tokio", @@ -19407,7 +19417,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "uuid 1.6.1", + "uuid", ] [[package]] @@ -19426,7 +19436,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "uuid 1.6.1", + "uuid", ] [[package]] @@ -19947,7 +19957,7 @@ checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna 0.4.0", - "percent-encoding 2.3.0", + "percent-encoding", "serde", ] @@ -19983,20 +19993,10 @@ dependencies = [ "once_cell", "serde", "serde_json", - "serde_with", + "serde_with 1.14.0", "url", ] -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.12", - "serde", -] - [[package]] name = "uuid" version = "1.6.1" @@ -20172,7 +20172,7 @@ dependencies = [ "mime", "mime_guess", "multer", - "percent-encoding 2.3.0", + "percent-encoding", "pin-project", "rustls-pemfile 1.0.4", "scoped-tls", diff --git a/Cargo.toml b/Cargo.toml index 3b862aa37df..e8e84c5d892 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -448,7 +448,11 @@ chrono = { version = "0.4.31", default-features = false, features = [ ] } ciborium = "0.2.1" clap = { version = "4.4.6", features = ["derive", "string"] } -cloudflare = { version = "0.9.1", default_features = false, features = [ +# cloudflare v0.11 is broken, master is partly fixed but unreleased yet. +# see: +# - https://github.com/cloudflare/cloudflare-rs/issues/222 +# - https://github.com/cloudflare/cloudflare-rs/issues/236 +cloudflare = { git = "https://github.com/blind-oracle/cloudflare-rs.git", rev = "386c8c6a0a95ad0c8a87aa1aac27b26a6cfec5cc", feature = [ "rustls-tls", ] } crossbeam-channel = "0.5.11" diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl index fb2ae65151f..f6fefd9729c 100644 --- a/bazel/external_crates.bzl +++ b/bazel/external_crates.bzl @@ -325,7 +325,8 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable ], ), "cloudflare": crate.spec( - version = "^0.9.1", + git = "https://github.com/blind-oracle/cloudflare-rs.git", + rev = "386c8c6a0a95ad0c8a87aa1aac27b26a6cfec5cc", default_features = False, features = [ "rustls-tls", diff --git a/rs/boundary_node/certificate_issuance/certificate_issuer/src/api.rs b/rs/boundary_node/certificate_issuance/certificate_issuer/src/api.rs index 3c7b4d9c8e2..7f26177d805 100644 --- a/rs/boundary_node/certificate_issuance/certificate_issuer/src/api.rs +++ b/rs/boundary_node/certificate_issuance/certificate_issuer/src/api.rs @@ -47,7 +47,7 @@ pub async fn create_handler( } Err(err) => { return Response::builder() - .status(500) + .status(400) .body(Body::from(err.to_string())) .unwrap() } @@ -184,7 +184,7 @@ pub async fn update_handler( } Err(err) => { return Response::builder() - .status(500) + .status(400) .body(Body::from(err.to_string())) .unwrap() } diff --git a/rs/boundary_node/certificate_issuance/certificate_issuer/src/cloudflare.rs b/rs/boundary_node/certificate_issuance/certificate_issuer/src/cloudflare.rs index 25b7b5c2a71..f755614869f 100644 --- a/rs/boundary_node/certificate_issuance/certificate_issuer/src/cloudflare.rs +++ b/rs/boundary_node/certificate_issuance/certificate_issuer/src/cloudflare.rs @@ -8,11 +8,7 @@ use cloudflare::{ }, zone::{ListZones, ListZonesParams, Zone}, }, - framework::{ - async_api::{ApiClient, Client}, - auth::Credentials, - Environment, HttpApiClientConfig, - }, + framework::{async_api::Client, auth::Credentials, Environment, HttpApiClientConfig}, }; use crate::dns::{Create, Delete, Record};