sources: add hyper-proxy-shim

hyper-proxy-shim is a clone of tafia/hyper-proxy with updated Rust dependencies. The 'native-tls' feature was removed since Bottlerocket packages rely on 'rustls' instead, and 'rustls' has been made the new default.
bottlerocket-os · Sep 8, 2023 · 101b1b8 · 101b1b8
1 parent fc549eb
commit 101b1b8
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 1,419 deletions.
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/Cargo.toml b/sources/Cargo.toml
@@ -103,8 +103,14 @@ members = [
 
     "constants",
 
-    "shimpei"
+    "shimpei",
+
+    "hyper-proxy-shim",
 ]
 
 [profile.release]
 debug = true
+
+# This replaces hyper-proxy with a shim using updated dependencies
+[patch.crates-io.hyper-proxy]
+path = "hyper-proxy-shim"
diff --git a/sources/api/pluto/Cargo.toml b/sources/api/pluto/Cargo.toml
@@ -13,7 +13,7 @@ exclude = ["README.md"]
 apiclient = { path = "../apiclient", version = "0.1" }
 constants = { path = "../../constants", version = "0.1" }
 hyper = "0.14"
-hyper-proxy = {  version = "0.9", default-features = false, features = ["rustls"] }
+hyper-proxy = {  version = "0.10", default-features = false, features = ["rustls"] }
 hyper-rustls = { version = "0.23", default-features = false, features = ["http2", "native-tokio", "tls12", "logging"] }
 imdsclient = { path = "../../imdsclient", version = "0.1" }
 models = { path = "../../models", version = "0.1" }

diff --git a/sources/deny.toml b/sources/deny.toml
@@ -25,6 +25,7 @@ allow = [
 
 exceptions = [
     { name = "unicode-ident", version = "1.0.4", allow = ["MIT", "Apache-2.0", "Unicode-DFS-2016"] },
+    { name = "webpki-roots", allow = ["MPL-2.0"], version = "*" },
 ]
 
 # https://github.com/hsivonen/encoding_rs The non-test code that isn't generated from the WHATWG data in this crate is
@@ -65,15 +66,13 @@ skip = [
 ]
 
 skip-tree = [
-    # hyper-proxy is using an older hyper-rustls
-    { name = "hyper-proxy", version = "=0.9.1" },
     # tungstenite is using an older sha-1
     { name = "tungstenite", version = "=0.16" },
     # windows-sys is not a direct dependency. mio and schannel
     # are using different versions of windows-sys. we skip the
     # dependency tree because windows-sys has many sub-crates
     # that differ in major version.
-    { name = "windows-sys", version = "=0.42.0" },
+    { name = "windows-sys" },
     # generate-readme pulls in an older clap that causes some duplicate
     # dependencies
     { name = "generate-readme", version = "=0.1.0" },