chroot: set exit codes to 125, 126 or 127 for errors from chroot itself

tertsdiepraam · tertsdiepraam · commit 38c8b7da09dd · 2022-09-10T12:13:30.000+02:00
diff --git a/src/uu/chroot/src/chroot.rs b/src/uu/chroot/src/chroot.rs
@@ -15,7 +15,7 @@ use std::ffi::CString;
 use std::io::Error;
 use std::path::Path;
 use std::process;
-use uucore::error::{set_exit_code, UResult};
+use uucore::error::{set_exit_code, UClapError, UResult};
 use uucore::libc::{self, chroot, setgid, setgroups, setuid};
 use uucore::{entries, format_usage};
 
@@ -35,7 +35,7 @@ mod options {
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let args = args.collect_lossy();
 
-    let matches = uu_app().get_matches_from(args);
+    let matches = uu_app().try_get_matches_from(args).with_exit_code(125)?;
 
     let default_shell: &'static str = "/bin/sh";
     let default_option: &'static str = "-i";
@@ -80,7 +80,14 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         .status()
     {
         Ok(status) => status,
-        Err(e) => return Err(ChrootError::CommandFailed(command[0].to_string(), e).into()),
+        Err(e) => {
+            return Err(if e.kind() == std::io::ErrorKind::NotFound {
+                ChrootError::CommandNotFound(command[0].to_string(), e)
+            } else {
+                ChrootError::CommandFailed(command[0].to_string(), e)
+            }
+            .into())
+        }
     };
 
     let code = if pstatus.success() {
diff --git a/src/uu/chroot/src/error.rs b/src/uu/chroot/src/error.rs
@@ -18,6 +18,9 @@ pub enum ChrootError {
     /// Failed to execute the specified command.
     CommandFailed(String, Error),
 
+    /// Failed to find the specified command.
+    CommandNotFound(String, Error),
+
     /// The given user and group specification was invalid.
     InvalidUserspec(String),
 
@@ -43,20 +46,23 @@ pub enum ChrootError {
 impl std::error::Error for ChrootError {}
 
 impl UError for ChrootError {
-    // TODO: Exit status:
     // 125 if chroot itself fails
     // 126 if command is found but cannot be invoked
     // 127 if command cannot be found
     fn code(&self) -> i32 {
-        1
+        match self {
+            Self::CommandFailed(_, _) => 126,
+            Self::CommandNotFound(_, _) => 127,
+            _ => 125,
+        }
     }
 }
 
 impl Display for ChrootError {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
             Self::CannotEnter(s, e) => write!(f, "cannot chroot to {}: {}", s.quote(), e,),
-            Self::CommandFailed(s, e) => {
+            Self::CommandFailed(s, e) | Self::CommandNotFound(s, e) => {
                 write!(f, "failed to run command {}: {}", s.to_string().quote(), e,)
             }
             Self::InvalidUserspec(s) => write!(f, "invalid userspec: {}", s.quote(),),
diff --git a/tests/by-util/test_chroot.rs b/tests/by-util/test_chroot.rs
@@ -4,7 +4,9 @@ use crate::common::util::*;
 
 #[test]
 fn test_missing_operand() {
-    let result = new_ucmd!().run();
+    let result = new_ucmd!().fails();
+
+    result.code_is(125);
 
     assert!(result
         .stderr_str()
@@ -22,7 +24,7 @@ fn test_enter_chroot_fails() {
     at.mkdir("jail");
 
     let result = ucmd.arg("jail").fails();
-
+    result.code_is(125);
     assert!(result
         .stderr_str()
         .starts_with("chroot: cannot chroot to 'jail': Operation not permitted (os error 1)"));
@@ -36,7 +38,8 @@ fn test_no_such_directory() {
 
     ucmd.arg("a")
         .fails()
-        .stderr_is("chroot: cannot change root directory to 'a': no such directory");
+        .stderr_is("chroot: cannot change root directory to 'a': no such directory")
+        .code_is(125);
 }
 
 #[test]
@@ -46,7 +49,7 @@ fn test_invalid_user_spec() {
     at.mkdir("a");
 
     let result = ucmd.arg("a").arg("--userspec=ARABA:").fails();
-
+    result.code_is(125);
     assert!(result.stderr_str().starts_with("chroot: invalid userspec"));
 }
 
@@ -86,7 +89,9 @@ fn test_preference_of_userspec() {
         .arg("-G")
         .arg("ABC,DEF")
         .arg(format!("--userspec={}:{}", username, group_name))
-        .run();
+        .fails();
+
+    result.code_is(125);
 
     println!("result.stdout = {}", result.stdout_str());
     println!("result.stderr = {}", result.stderr_str());
