Merge #3893 Handle backslashes in ZIP paths

KSP-CKAN · Dec 13, 2023 · 644c2cb · 644c2cb
2 parents 164d88a + 46cc108
commit 644c2cb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,7 @@ All notable changes to this project will be documented in this file.
 - [Core] Make where-CKAN-would-install logic consistent (#3931 by: HebaruSan; reviewed: techman83)
 - [Multiple] Improve provides prompt usability, with bugfixes (#3934 by: HebaruSan; reviewed: JonnyOThan)
 - [GUI] Fix two small typos in Resources.pt-BR.resx at line 182 (#3943 by: idrkwhattoput; reviewed: HebaruSan)
+- [Core] Handle backslashes in ZIP paths (#3893 by: HebaruSan; reviewed: techman83)
 
 ### Internal
 

diff --git a/Core/Types/ModuleInstallDescriptor.cs b/Core/Types/ModuleInstallDescriptor.cs
@@ -427,8 +427,13 @@ public List<InstallableFile> FindInstallableFiles(ZipFile zipfile, GameInstance
             // Surely there's a better way, although this is fast enough we may not care.
             foreach (ZipEntry entry in zipfile)
             {
+                // Backslashes are not allowed in filenames according to the ZIP spec,
+                // but there's a non-conformant PowerShell tool that uses them anyway.
+                // Try to accommodate those mods.
+                string entryName = entry.Name.Replace('\\', '/');
+
                 // Skips dirs and things not prescribed by our install stanza.
-                if (!IsWanted(entry.Name, shortestMatch))
+                if (!IsWanted(entryName, shortestMatch))
                 {
                     continue;
                 }
@@ -447,7 +452,7 @@ public List<InstallableFile> FindInstallableFiles(ZipFile zipfile, GameInstance
                     // Get the full name of the file.
                     // Update our file info with the install location
                     file_info.destination = TransformOutputName(
-                        ksp.game, entry.Name, installDir, @as);
+                        ksp.game, entryName, installDir, @as);
                     file_info.makedir = AllowDirectoryCreation(
                         ksp.game,
                         ksp?.ToRelativeGameDir(file_info.destination)

diff --git a/Netkan/Validators/InstallValidator.cs b/Netkan/Validators/InstallValidator.cs
@@ -87,6 +87,10 @@ public void Validate(Metadata metadata)
                         if (stanza.ContainsKey(propName))
                         {
                             string val  = (string)stanza[propName];
+                            if (string.IsNullOrEmpty(val))
+                            {
+                                throw new Kraken($"Install property '{propName}' is null or empty");
+                            }
                             string norm = CKANPathUtils.NormalizePath(val);
                             if (val != norm)
                             {