Merge branch 'main' into peg/debian-package

* main:
  Accept hostnames as target server for proxy server
  Normalize non-PKCS8 private keys
  Rm unwraps

Author: ameba23

Cargo.lock

@@ -53,6 +53,11 @@ tower-http = { version = "0.6.7", features = ["fs"] }
 tokio-tungstenite = { version = "0.28.0", optional = true }
 futures-util = { version = "0.3.31", optional = true }
 
+rsa   = { version = "0.9", default-features = false }
+p256 = { version = "0.13.2", features = ["pkcs8"] }
+pkcs1 = "0.7.5"
+pkcs8 = "0.10.2"
+
 [dev-dependencies]
 rcgen = "0.14.5"
 tempfile = "3.23.0"

Cargo.toml

@@ -81,7 +81,7 @@ mod tests {
             cert_chain,
             server_config,
             "127.0.0.1:0",
-            target_addr,
+            target_addr.to_string(),
             AttestationGenerator::new_not_dummy(AttestationType::DcapTdx).unwrap(),
             AttestationVerifier::expect_none(),
         )

src/attested_get.rs

@@ -18,7 +18,7 @@ pub async fn attested_file_server(
     let server = ProxyServer::new(
         cert_and_key,
         listen_addr,
-        target_addr,
+        target_addr.to_string(),
         attestation_generator,
         attestation_verifier,
         client_auth,
@@ -42,8 +42,7 @@ pub(crate) async fn static_file_server(path: PathBuf) -> Result<SocketAddr, Prox
     tracing::info!("Statically serving {path:?} on {addr}");
 
     tokio::spawn(async move {
-        if let Err(err) = axum::serve(tokio::net::TcpListener::bind(addr).await.unwrap(), app).await
-        {
+        if let Err(err) = axum::serve(listener, app).await {
             tracing::error!("HTTP file server: {err}");
         }
     });
@@ -103,7 +102,7 @@ mod tests {
             cert_chain,
             server_config,
             "127.0.0.1:0",
-            target_addr,
+            target_addr.to_string(),
             AttestationGenerator::new_not_dummy(AttestationType::DcapTdx).unwrap(),
             AttestationVerifier::expect_none(),
         )

src/file_server.rs

@@ -31,7 +31,9 @@ pub async fn server(listen_addr: SocketAddr) -> anyhow::Result<SocketAddr> {
     tracing::info!("Starting health check server at {}", listen_addr);
 
     tokio::spawn(async move {
-        axum::serve(listener, app).await.unwrap();
+        if let Err(err) = axum::serve(listener, app).await {
+            tracing::error!("Health check server closed: {err}");
+        }
     });
 
     Ok(listen_addr)