installer: archives without root directory can now be installed correctly

Using `tar ... --strip-components=1` with archives without root directory
would result in an empty extracted directory leading to "No executable found" error.

To fix this problem the `walkdir` crate was used in order to traverse
the directories and find the executable (if any).

Author: devmatteini

src/installer/archive.rs

@@ -1,9 +1,10 @@
-use crate::installer::error::MapErrWithMessage;
 use std::ffi::OsString;
-use std::fs::DirEntry;
 use std::os::unix::prelude::PermissionsExt;
 use std::path::{Path, PathBuf};
 
+use walkdir::WalkDir;
+
+use crate::installer::error::MapErrWithMessage;
 use crate::installer::InstallerResult;
 
 pub struct ArchiveInstaller;
@@ -32,23 +33,24 @@ impl ArchiveInstaller {
     }
 
     fn find_executable(directory: &Path) -> Result<ExecutableFile, String> {
-        std::fs::read_dir(directory)
-            .map_err_with(format!("Error reading files in {}", directory.display()))?
+        let ignore_error = |result: walkdir::Result<walkdir::DirEntry>| result.ok();
+
+        WalkDir::new(directory)
+            .max_depth(2)
+            .into_iter()
+            .filter_map(ignore_error)
             .find(Self::is_executable)
-            .ok_or_else(|| String::from("No executable found"))?
+            .ok_or_else(|| String::from("No executable found"))
             .map(ExecutableFile::from_file)
-            .map_err_with("Cannot read file information".into())
     }
 
-    fn is_executable(entry: &std::io::Result<DirEntry>) -> bool {
-        entry
-            .as_ref()
-            .map(|x| {
-                let path = x.path();
-                path.metadata()
-                    .map(|metadata| path.is_file() && (metadata.permissions().mode() & 0o111) != 0)
-                    .unwrap_or(false)
-            })
+    fn is_executable(x: &walkdir::DirEntry) -> bool {
+        let path = x.path();
+        let is_executable =
+            |metadata: std::fs::Metadata| (metadata.permissions().mode() & 0o111) != 0;
+
+        path.metadata()
+            .map(|metadata| path.is_file() && is_executable(metadata))
             .unwrap_or(false)
     }
 
@@ -78,10 +80,10 @@ struct ExecutableFile {
 }
 
 impl ExecutableFile {
-    fn from_file(x: DirEntry) -> Self {
+    fn from_file(x: walkdir::DirEntry) -> Self {
         Self {
-            path: x.path(),
-            name: x.file_name(),
+            name: x.file_name().to_os_string(),
+            path: x.path().to_path_buf(),
         }
     }
 }

src/installer/tar_archive.rs

@@ -21,9 +21,7 @@ impl TarArchiveInstaller {
                 .arg("xf")
                 .arg(source)
                 .arg("-C")
-                .arg(temp_dir)
-                // Remove the root dir inside the tar archive. See https://askubuntu.com/a/470266
-                .arg("--strip-components=1"),
+                .arg(temp_dir),
         )
     }
 }

tests/integration_tests.rs

@@ -66,4 +66,17 @@ mod archives {
         let output = assert_error(result);
         assert_contains("No executable found", &output);
     }
+
+    #[test]
+    fn no_root_directory() {
+        let container = Docker::run(images::UBUNTU);
+
+        let result = container.exec(
+            "dra download -s no_root_directory.tar.gz -i devmatteini/dra-tests",
+            ExecArgs::Default,
+        );
+
+        let output = assert_success(result);
+        assert_contains("Installation completed", &output);
+    }
 }