Merge pull request #3439 from jpculp/hyper-proxy-shim

pluto: Add hyper-proxy as a module

COPYRIGHT

@@ -14,6 +14,6 @@ operating system images.
 
 =^..^=   =^..^=   =^..^=   =^..^=   =^..^=   =^..^=   =^..^=   =^..^=   =^..^=   =^..^=   =^..^=
 
-macros/rust and macros/cargo (used during build) are derived from the Fedora Rust SIG's rust2rpm.
-https://pagure.io/fedora-rust/rust2rpm
-Copyright (c) 2017 Igor Gnatenko
+Contains modified hyper-proxy files [mod.rs, stream.rs, tunnel.rs] from
+https://github.com/tafia/hyper-proxy 2021-09-20.
+Copyright (c) 2017 Johann Tuffe. Licensed under the MIT License.

sources/api/pluto/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pluto"
 version = "0.1.0"
 authors = ["Michael Patraw <[email protected]>"]
-license = "Apache-2.0 OR MIT"
+license = "(Apache-2.0 OR MIT) AND MIT"
 edition = "2021"
 publish = false
 build = "build.rs"
@@ -11,9 +11,12 @@ exclude = ["README.md"]
 
 [dependencies]
 apiclient = { path = "../apiclient", version = "0.1" }
+bytes = "1"
 constants = { path = "../../constants", version = "0.1" }
+futures-util = { version = "0.3", default-features = false }
+headers = "0.3"
+http = "0.2"
 hyper = "0.14"
-hyper-proxy = {  version = "0.9", 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" }
@@ -27,6 +30,7 @@ serde_json = "1"
 snafu = "0.7"
 tokio = { version = "~1.25", default-features = false, features = ["macros", "rt-multi-thread"] }  # LTS
 tokio-retry = "0.3"
+tokio-rustls = "0.23"
 
 [build-dependencies]
 bottlerocket-variant = { version = "0.1", path = "../../bottlerocket-variant" }

sources/api/pluto/src/hyper_proxy/LICENSE-MIT.md

@@ -0,0 +1,23 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Johann Tuffe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.