From f5bef95116b6633fe1e3770bc33a5b25281fce26 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Mon, 18 Sep 2023 13:27:05 -0700 Subject: [PATCH 1/2] Update proto. --- Cargo.lock | 25 +++++++++++++++++++------ Cargo.toml | 4 ++-- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5ebf7d468a9..37d24b19d3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4668,9 +4668,9 @@ dependencies = [ [[package]] name = "proto_core" -version = "0.17.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14fcbce786856785227d02edb778baeed6ecfc68f73367a72302adbee5b0b84" +checksum = "dc1344505e5609bda7acbff3fae9260c42e20687d90d636429a679cf88fd4932" dependencies = [ "cached", "extism", @@ -4916,6 +4916,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", + "rustls-native-certs", "rustls-pemfile", "serde", "serde_json", @@ -5016,6 +5017,18 @@ dependencies = [ "sct", ] +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.2" @@ -5216,9 +5229,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "indexmap 2.0.0", "itoa", @@ -6399,9 +6412,9 @@ dependencies = [ [[package]] name = "warpgate" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e105ab7fd178b2fc6b59439046418278b478e761549658a41eb48c97a9944a" +checksum = "817057863344de5701a42c8fa6d02473acf29a7eb6f8df1ef05c333e966e802d" dependencies = [ "extism", "miette", diff --git a/Cargo.toml b/Cargo.toml index 1f0d845c70c..0ce64b47580 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,12 +38,12 @@ pathdiff = "0.2.1" petgraph = { version = "0.6.4", default-features = false, features = [ "serde-1", ] } -proto_core = "0.17.3" +proto_core = "0.18.1" relative-path = { version = "1.9.0", features = ["serde"] } regex = "1.9.5" # We don't use openssl but its required for musl builds reqwest = { version = "0.11.20", default-features = false, features = [ - "rustls-tls", + "rustls-tls-native-roots", "native-tls-vendored", ] } rustc-hash = "1.1.0" From 576f80e6814bc4080ec4d8a489baa18b1016ca61 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Mon, 18 Sep 2023 13:31:32 -0700 Subject: [PATCH 2/2] Update changelog. --- packages/cli/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index eff4ffd1764..5b447062e7f 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -10,6 +10,11 @@ - More accurately monitors signals (ctrl+c) and shutdowns. - Tasks can now be configured with a timeout. +#### ⚙️ Internal + +- Improved handling of certificates and proxies. +- Updated to proto v0.18. + ## 1.13.5 #### 🐞 Fixes