Merge pull request #120 from datachainlab/audit-202409-lcp-8

LCP-8: Add `panic-logging` feature to `enclave-runtime` crate

Signed-off-by: Jun Kimura <[email protected]>

enclave-modules/runtime/Cargo.toml

@@ -17,3 +17,7 @@ host-api = { path = "../host-api" }
 ecall-handler = { path = "../ecall-handler" }
 enclave-environment = { path = "../environment" }
 ecall-commands = { path = "../../modules/ecall-commands", default-features = false }
+
+[features]
+default = []
+panic-logging = []

enclave-modules/runtime/src/lib.rs

@@ -31,12 +31,15 @@ mod errors;
 static ALLOC: sgx_alloc::System = sgx_alloc::System;
 
 #[cfg(not(test))]
+#[allow(unused_variables)]
 #[panic_handler]
 fn begin_panic_handler(info: &core::panic::PanicInfo<'_>) -> ! {
+    #[cfg(feature = "panic-logging")]
+    let msg = alloc::format!("[enclave] panic: {:?}\n", info).into_bytes();
+    #[cfg(not(feature = "panic-logging"))]
+    let msg = alloc::format!("[enclave] panic\n").into_bytes();
     let _ = host_api::api::execute_command(host_api::ocall_commands::Command::Log(
-        host_api::ocall_commands::LogCommand {
-            msg: alloc::format!("[enclave] panic: {:?}\n", info).into_bytes(),
-        },
+        host_api::ocall_commands::LogCommand { msg },
     ));
     sgx_abort();
 }

enclave/Cargo.toml

@@ -9,7 +9,10 @@ name = "proxy_enclave"
 crate-type = ["staticlib"]
 
 [features]
-default = []
+default = ["panic-logging"]
+panic-logging = [
+    "enclave-runtime/panic-logging",
+]
 
 [dependencies]
 enclave-runtime = { path = "../enclave-modules/runtime" }