From 9d3374fe7646d14d6c90a9d246032d7e793f95ab Mon Sep 17 00:00:00 2001
From: Paul Hebble <pjhebble@gmail.com>
Date: Sat, 21 Dec 2019 19:53:35 -0600
Subject: [PATCH] Catch nested GameData folders in Netkan

---
 Netkan/ConsoleUser.cs                       |  2 +-
 Netkan/Services/IModuleService.cs           |  1 +
 Netkan/Services/ModuleService.cs            |  7 +++++++
 Netkan/Validators/InstallsFilesValidator.cs | 12 +++++++++++-
 Netkan/Validators/LicensesValidator.cs      |  4 ++--
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Netkan/ConsoleUser.cs b/Netkan/ConsoleUser.cs
index 4540d88520..a8cec710e3 100644
--- a/Netkan/ConsoleUser.cs
+++ b/Netkan/ConsoleUser.cs
@@ -20,7 +20,7 @@ public class ConsoleUser : IUser
         /// <summary>
         /// Initializes a new instance of the <see cref="T:CKAN.CmdLine.ConsoleUser"/> class.
         /// </summary>
-        /// <param name="headless">If set to <c>true</c>, supress interactive dialogs like Yes/No-Dialog or SelectionDialog.</param>
+        /// <param name="headless">If set to <c>true</c>, suppress interactive dialogs like Yes/No-Dialog or SelectionDialog.</param>
         public ConsoleUser (bool headless)
         {
             Headless = headless;
diff --git a/Netkan/Services/IModuleService.cs b/Netkan/Services/IModuleService.cs
index 1ac9302051..062e10fc02 100644
--- a/Netkan/Services/IModuleService.cs
+++ b/Netkan/Services/IModuleService.cs
@@ -13,5 +13,6 @@ internal interface IModuleService
         
         IEnumerable<InstallableFile> GetConfigFiles(CkanModule module, ZipFile zip);
         
+        IEnumerable<string> FileDestinations(CkanModule module, string filePath);
     }
 }
diff --git a/Netkan/Services/ModuleService.cs b/Netkan/Services/ModuleService.cs
index 6303933d79..7c4f3a30ab 100644
--- a/Netkan/Services/ModuleService.cs
+++ b/Netkan/Services/ModuleService.cs
@@ -72,6 +72,13 @@ public IEnumerable<InstallableFile> GetConfigFiles(CkanModule module, ZipFile zi
                 .Where(instF => cfgRegex.IsMatch(instF.source.Name));
         }
 
+        public IEnumerable<string> FileDestinations(CkanModule module, string filePath)
+        {
+            return ModuleInstaller
+                .FindInstallableFiles(module, filePath, new KSP("/", "dummy", null, false))
+                .Select(f => f.destination);
+        }
+
         /// <summary>
         /// Return a parsed JObject from a stream.
         /// </summary>
diff --git a/Netkan/Validators/InstallsFilesValidator.cs b/Netkan/Validators/InstallsFilesValidator.cs
index 5a404126ac..a03b346eeb 100644
--- a/Netkan/Validators/InstallsFilesValidator.cs
+++ b/Netkan/Validators/InstallsFilesValidator.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using CKAN.NetKAN.Model;
 using CKAN.NetKAN.Services;
 
@@ -20,7 +21,6 @@ public void Validate(Metadata metadata)
             var file = _http.DownloadPackage(metadata.Download, metadata.Identifier, metadata.RemoteTimestamp);
 
             // Make sure this would actually generate an install.
-
             if (!_moduleService.HasInstallableFiles(mod, file))
             {
                 throw new Kraken(string.Format(
@@ -28,6 +28,16 @@ public void Validate(Metadata metadata)
                     mod.DescribeInstallStanzas()
                 ));
             }
+            
+            // Make sure no paths include GameData other than at the start
+            var gamedatas = _moduleService.FileDestinations(mod, file)
+                .Where(p => p.StartsWith("GameData") && p.LastIndexOf("/GameData/") > 0)
+                .ToList();
+            if (gamedatas.Any())
+            {
+                var badPaths = string.Join("\r\n", gamedatas);
+                throw new Kraken($"GameData directory found within GameData:\r\n{badPaths}");
+            }
         }
     }
 }
diff --git a/Netkan/Validators/LicensesValidator.cs b/Netkan/Validators/LicensesValidator.cs
index fdfe90e3af..a46e2e01ed 100644
--- a/Netkan/Validators/LicensesValidator.cs
+++ b/Netkan/Validators/LicensesValidator.cs
@@ -33,7 +33,7 @@ public void Validate(Metadata metadata)
             {
                 if (licenses == null || licenses.Count < 1)
                 {
-                    throw new Kraken("License should match spec. Set `x_netkan_license_ok` to supress");
+                    throw new Kraken("License should match spec. Set `x_netkan_license_ok` to suppress");
                 }
                 else foreach (var lic in licenses)
                 {
@@ -44,7 +44,7 @@ public void Validate(Metadata metadata)
                     }
                     catch
                     {
-                        throw new Kraken($"License {lic} should match spec. Set `x_netkan_license_ok` to supress");
+                        throw new Kraken($"License {lic} should match spec. Set `x_netkan_license_ok` to suppress");
                     }
                 }
             }