Merge pull request #522 from fabriziosestito/fix/fix-wasi-runtime-rej…

…ection-response fix: WASI runtime rejection response
kubewarden · Jun 17, 2024 · 8bc7ac1 · 8bc7ac1
2 parents 64b37a9 + 4a83de7
commit 8bc7ac1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/src/runtimes/wasi_cli/errors.rs b/src/runtimes/wasi_cli/errors.rs
@@ -4,9 +4,8 @@ pub type Result<T> = std::result::Result<T, WasiRuntimeError>;
 
 #[derive(Error, Debug)]
 pub enum WasiRuntimeError {
-    #[error("program exited with code {code:?}; stderr set to '{stderr}', error: '{error}'")]
+    #[error("{stderr}")]
     WasiEvaluation {
-        code: Option<i32>,
         stderr: String,
         #[source]
         error: wasmtime::Error,

diff --git a/src/runtimes/wasi_cli/runtime.rs b/src/runtimes/wasi_cli/runtime.rs
@@ -72,10 +72,7 @@ impl<'a> Runtime<'a> {
                     ),
                 }
             }
-            Err(e) => AdmissionResponse::reject_internal_server_error(
-                request.uid().to_string(),
-                e.to_string(),
-            ),
+            Err(e) => AdmissionResponse::reject(request.uid().to_string(), e.to_string(), 500),
         }
     }
 

diff --git a/src/runtimes/wasi_cli/stack.rs b/src/runtimes/wasi_cli/stack.rs
@@ -1,5 +1,6 @@
 use std::io::Cursor;
 use std::sync::{Arc, RwLock};
+use tracing::debug;
 use wasi_common::pipe::{ReadPipe, WritePipe};
 use wasi_common::sync::WasiCtxBuilder;
 use wasi_common::WasiCtx;
@@ -71,26 +72,25 @@ impl Stack {
         // references to the WritePipe(s) that we need exclusive access to.
         drop(store);
 
-        let stderr = pipe_to_string("stderr", stderr_pipe)?;
+        let stderr = pipe_to_string("stderr", stderr_pipe)?.trim().to_string();
 
         if let Err(err) = evaluation_result {
             if let Some(exit_error) = err.downcast_ref::<wasi_common::I32Exit>() {
                 if exit_error.0 == EXIT_SUCCESS {
                     let stdout = pipe_to_string("stdout", stdout_pipe)?;
                     return Ok(RunResult { stdout, stderr });
                 } else {
-                    return Err(WasiRuntimeError::WasiEvaluation {
-                        code: Some(exit_error.0),
-                        stderr,
-                        error: err,
-                    });
+                    debug!(
+                        "WASI program exited with error code: {}, error: {}",
+                        exit_error.0, stderr
+                    );
+
+                    return Err(WasiRuntimeError::WasiEvaluation { stderr, error: err });
                 }
             }
-            return Err(WasiRuntimeError::WasiEvaluation {
-                code: None,
-                stderr,
-                error: err,
-            });
+
+            debug!("WASI program exited with error: {}", stderr);
+            return Err(WasiRuntimeError::WasiEvaluation { stderr, error: err });
         }
 
         let stdout = pipe_to_string("stdout", stdout_pipe)?;