do not accept a path with a __MACOSX component as a project dir in zip

Author: Heliozoa

plugins/csharp/src/plugin.rs

@@ -132,16 +132,21 @@ impl LanguagePlugin for CSharpPlugin {
     }
 
     /// Finds any directory X which contains a X/src/*.csproj file.
+    /// Ignores everything in a __MACOSX directory.
     fn find_project_dir_in_zip<R: Read + Seek>(
         zip_archive: &mut ZipArchive<R>,
     ) -> Result<PathBuf, TmcError> {
         for i in 0..zip_archive.len() {
             let file = zip_archive.by_index(i)?;
             let file_path = Path::new(file.name());
+
             if file_path.extension() == Some(OsStr::new("csproj")) {
                 if let Some(csproj_parent) = file_path.parent().and_then(Path::parent) {
                     if csproj_parent.file_name() == Some(OsStr::new("src")) {
                         if let Some(src_parent) = csproj_parent.parent() {
+                            if src_parent.components().any(|p| p.as_os_str() == "__MACOSX") {
+                                continue;
+                            }
                             return Ok(src_parent.to_path_buf());
                         }
                     }

plugins/r/src/plugin.rs

@@ -108,6 +108,8 @@ impl LanguagePlugin for RPlugin {
         path.join("R").exists() || path.join("tests/testthat").exists()
     }
 
+    /// Finds an R directory.
+    /// Ignores everything in a __MACOSX directory.
     fn find_project_dir_in_zip<R: Read + Seek>(
         zip_archive: &mut ZipArchive<R>,
     ) -> Result<PathBuf, TmcError> {
@@ -116,12 +118,17 @@ impl LanguagePlugin for RPlugin {
             // so we need to check every path for R
             let file = zip_archive.by_index(i)?;
             let file_path = Path::new(file.name());
+
             // todo: do in one pass somehow
             if file_path.components().any(|c| c.as_os_str() == "R") {
                 let path: PathBuf = file_path
                     .components()
                     .take_while(|c| c.as_os_str() != "R")
                     .collect();
+
+                if path.components().any(|p| p.as_os_str() == "__MACOSX") {
+                    continue;
+                }
                 return Ok(path);
             }
         }

tmc-langs-framework/src/plugin.rs

@@ -374,6 +374,7 @@ pub trait LanguagePlugin {
     /// Note that the returned path may not actually have an entry in the zip.
     /// The default implementation tries to find a directory that contains a "src" directory,
     /// which may be sufficient for some languages.
+    /// Ignores everything in a __MACOSX directory.
     fn find_project_dir_in_zip<R: Read + Seek>(
         zip_archive: &mut ZipArchive<R>,
     ) -> Result<PathBuf, TmcError> {
@@ -382,12 +383,17 @@ pub trait LanguagePlugin {
             // so we need to check every path for src
             let file = zip_archive.by_index(i)?;
             let file_path = Path::new(file.name());
+
             // todo: do in one pass somehow
             if file_path.components().any(|c| c.as_os_str() == "src") {
                 let path: PathBuf = file_path
                     .components()
                     .take_while(|c| c.as_os_str() != "src")
                     .collect();
+
+                if path.components().any(|p| p.as_os_str() == "__MACOSX") {
+                    continue;
+                }
                 return Ok(path);
             }
         }