server: error management

typhon/src/actions.rs

@@ -14,6 +14,7 @@ pub enum Error {
     ScriptNotFound,
     SecretsNotFound,
     WrongRecipient,
+    Unexpected,
 }
 
 impl std::fmt::Display for Error {
@@ -26,6 +27,7 @@ impl std::fmt::Display for Error {
             ScriptNotFound => write!(f, "Action script not found"),
             SecretsNotFound => write!(f, "Secrets file not found"),
             WrongRecipient => write!(f, "Secrets file uncrypted with wrong key"),
+            Unexpected => write!(f, "Unexpected error"),
         }
     }
 }
@@ -88,13 +90,13 @@ pub async fn run(
         .stdout(Stdio::piped())
         .spawn()
         .expect("command bwrap failed to start");
-    let mut stdin = child.stdin.take().unwrap(); // TODO: check if unwrap is safe
-    let mut stdout = child.stdout.take().unwrap(); // TODO: check if unwrap is safe
-    let mut stderr = child.stderr.take().unwrap(); // TODO: check if unwrap is safe
+    let mut stdin = child.stdin.take().ok_or(Error::Unexpected)?;
+    let mut stdout = child.stdout.take().ok_or(Error::Unexpected)?;
+    let mut stderr = child.stderr.take().ok_or(Error::Unexpected)?;
     stdin
         .write(action_input.to_string().as_bytes())
         .await
-        .unwrap(); // TODO: check if unwrap is safe
+        .map_err(|_| Error::Unexpected)?;
     drop(stdin); // send EOF
 
     let mut res = String::new();

typhon/src/error.rs

@@ -26,8 +26,9 @@ pub enum Error {
 
 impl Error {
     pub fn is_internal(&self) -> bool {
+        use Error::*;
         match self {
-            Error::UnexpectedDatabaseError(_) | Error::Todo => true,
+            ActionError(actions::Error::Unexpected) | UnexpectedDatabaseError(_) | Todo => true,
             _ => false,
         }
     }
@@ -97,6 +98,9 @@ impl Into<typhon_types::responses::ResponseError> for Error {
     fn into(self) -> typhon_types::responses::ResponseError {
         use {typhon_types::responses::ResponseError::*, Error::*};
         match self {
+            ActionError(actions::Error::Unexpected) | UnexpectedDatabaseError(_) | Todo => {
+                InternalError
+            }
             BuildNotFound(_)
             | EvaluationNotFound(_)
             | JobNotFound(_)
@@ -113,7 +117,6 @@ impl Into<typhon_types::responses::ResponseError> for Error {
             | ProjectAlreadyExists(_)
             | LoginError
             | LogNotFound(_) => BadRequest(format!("{}", self)),
-            Todo | UnexpectedDatabaseError(_) => InternalError,
         }
     }
 }