diff --git a/Cargo.lock b/Cargo.lock index 80fe0ae..d9ab3fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2494,7 +2494,7 @@ dependencies = [ [[package]] name = "ic_tee_agent" -version = "0.2.13" +version = "0.2.14" dependencies = [ "axum-core", "base64 0.22.1", @@ -2522,7 +2522,7 @@ dependencies = [ [[package]] name = "ic_tee_cdk" -version = "0.2.13" +version = "0.2.14" dependencies = [ "candid", "ciborium", @@ -2535,7 +2535,7 @@ dependencies = [ [[package]] name = "ic_tee_cli" -version = "0.2.13" +version = "0.2.14" dependencies = [ "anyhow", "candid", @@ -2557,7 +2557,7 @@ dependencies = [ [[package]] name = "ic_tee_daemon" -version = "0.2.13" +version = "0.2.14" dependencies = [ "anyhow", "clap", @@ -2570,7 +2570,7 @@ dependencies = [ [[package]] name = "ic_tee_host_daemon" -version = "0.2.13" +version = "0.2.14" dependencies = [ "anyhow", "clap", @@ -2583,7 +2583,7 @@ dependencies = [ [[package]] name = "ic_tee_identity" -version = "0.2.13" +version = "0.2.14" dependencies = [ "candid", "ciborium", @@ -2601,7 +2601,7 @@ dependencies = [ [[package]] name = "ic_tee_logtail" -version = "0.2.13" +version = "0.2.14" dependencies = [ "anyhow", "clap", @@ -2612,7 +2612,7 @@ dependencies = [ [[package]] name = "ic_tee_nitro_attestation" -version = "0.2.13" +version = "0.2.14" dependencies = [ "candid", "ciborium", @@ -2628,7 +2628,7 @@ dependencies = [ [[package]] name = "ic_tee_nitro_gateway" -version = "0.2.13" +version = "0.2.14" dependencies = [ "aws-nitro-enclaves-nsm-api", "axum", diff --git a/Cargo.toml b/Cargo.toml index 7cea59b..77cfc39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ strip = true opt-level = 's' [workspace.package] -version = "0.2.13" +version = "0.2.14" edition = "2021" repository = "https://github.com/ldclabs/ic-tee" keywords = ["tee", "canister", "icp", "nitro"] diff --git a/src/ic_tee_daemon/README.md b/src/ic_tee_daemon/README.md index 7000ca8..c1b9748 100644 --- a/src/ic_tee_daemon/README.md +++ b/src/ic_tee_daemon/README.md @@ -10,7 +10,7 @@ ## Usage ```bash -ic_tee_daemon --outbound-vsock-addr 3:448 --outbound_listen_addr 127.0.0.1:448 --inbound-vsock-addr 8:443 --inbound-listen-addr 127.0.0.1:8443 --logtail-addr 127.0.0.1:9999 +ic_tee_daemon --outbound-vsock-addr 3:448 --outbound_listen_addr 127.0.0.1:448 --inbound-vsock-addr 8:443 --inbound-listen-addr 127.0.0.1:8443 ``` ## License diff --git a/src/ic_tee_daemon/src/main.rs b/src/ic_tee_daemon/src/main.rs index 457d308..7e59e71 100644 --- a/src/ic_tee_daemon/src/main.rs +++ b/src/ic_tee_daemon/src/main.rs @@ -1,7 +1,6 @@ use anyhow::Result; use clap::Parser; use structured_logger::{async_json::new_writer, get_env_level, Builder}; -use tokio::net::TcpStream; mod helper; mod ip_to_vsock_transparent; @@ -25,23 +24,14 @@ pub struct Cli { /// IP address of listener in enclave (e.g. 127.0.0.1:8443) #[clap(long, default_value = "127.0.0.1:8443")] inbound_listen_addr: String, - - /// where the logtail server is running on host (e.g. 127.0.0.1:9999) - #[arg(long, default_value = "127.0.0.1:9999")] - logtail_addr: String, } #[tokio::main] async fn main() -> Result<()> { let cli = Cli::parse(); - let writer = { - let stream = TcpStream::connect(&cli.logtail_addr).await?; - stream.writable().await?; - new_writer(stream) - }; Builder::with_level(&get_env_level().to_string()) - .with_target_writer("*", writer) + .with_target_writer("*", new_writer(tokio::io::stdout())) .init(); let serve_vsock_to_ip = async { diff --git a/src/ic_tee_nitro_gateway/src/handler.rs b/src/ic_tee_nitro_gateway/src/handler.rs index 01b6ff9..d94551f 100644 --- a/src/ic_tee_nitro_gateway/src/handler.rs +++ b/src/ic_tee_nitro_gateway/src/handler.rs @@ -1,7 +1,7 @@ use axum::{ body::Body, extract::{Request, State}, - http::{header, uri::Uri, HeaderMap, StatusCode}, + http::{header, uri::Uri, HeaderMap, StatusCode, Version}, response::IntoResponse, }; use candid::decode_args; @@ -453,6 +453,7 @@ pub async fn proxy( *req.uri_mut() = Uri::try_from(uri) .map_err(|err| Content::Text(err.to_string(), Some(StatusCode::BAD_REQUEST)))?; + *req.version_mut() = Version::HTTP_11; match app.http_client.request(req).await { Ok(res) => Ok(res.into_response()),