better validation on configuration file names

Author: tomysshadow

FlashpointSecurePlayer/FlashpointSecurePlayer.cs

@@ -27,7 +27,7 @@ public partial class FlashpointSecurePlayer : Form {
         private readonly DownloadsBefore DownloadsBefore;
         private readonly RegistryBackup RegistryBackup;
         private readonly SingleInstance SingleInstance;
-        string ModificationsName = null;
+        string ModificationsName = ACTIVE_EXE_CONFIGURATION_NAME;
         bool RunAsAdministratorModification = false;
         List<string> DownloadsBeforeModificationNames = null;
         bool ActiveX = false;

FlashpointSecurePlayer/Program.cs

@@ -846,6 +846,10 @@ public static async Task DownloadAsync(string name) {
         }
 
         private static string GetValidEXEConfigurationName(string name) {
+            if (String.IsNullOrEmpty(name)) {
+                throw new ConfigurationErrorsException();
+            }
+
             string invalidNameCharacters = new string(Path.GetInvalidFileNameChars()) + new string(Path.GetInvalidPathChars());
             Regex invalidNameCharactersRegex = new Regex("[" + Regex.Escape(invalidNameCharacters) + "]+");
             return invalidNameCharactersRegex.Replace(name, ".").ToLower();
@@ -872,6 +876,10 @@ private static Configuration GetActiveEXEConfiguration() {
                 // open from configuration folder
                 ActiveEXEConfiguration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
 
+                if (ActiveEXEConfiguration == null) {
+                    throw new ConfigurationErrorsException();
+                }
+
                 if (!ActiveEXEConfiguration.HasFile) {
                     throw new ConfigurationErrorsException();
                 }
@@ -881,17 +889,21 @@ private static Configuration GetActiveEXEConfiguration() {
                 // Fail silently.
             }
 
+            if (ActiveEXEConfiguration == null) {
+                throw new ConfigurationErrorsException();
+            }
+
             // create anew
             ActiveEXEConfiguration.Save(ConfigurationSaveMode.Modified);
             // open the new one
-            ActiveEXEConfiguration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+            ActiveEXEConfiguration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None) ?? throw new ConfigurationErrorsException();
             return ActiveEXEConfiguration;
         }
 
         // where should ConfigurationErrorsExceptions all be caught? Review this
         private static Configuration GetEXEConfiguration(string name) {
             // active
-            if (name == ACTIVE_EXE_CONFIGURATION_NAME) {
+            if (String.IsNullOrEmpty(name)) {
                 return GetActiveEXEConfiguration();
             }
 
@@ -913,19 +925,24 @@ private static Configuration GetEXEConfiguration(string name) {
                 // open from configuration folder
                 exeConfiguration = ConfigurationManager.OpenMappedExeConfiguration(exeConfigurationFileMap, ConfigurationUserLevel.None);
 
-                if (!exeConfiguration.HasFile) {
+                if (exeConfiguration == null) {
                     throw new ConfigurationErrorsException();
                 }
 
-                // presto!
-                EXEConfiguration = exeConfiguration ?? throw new ConfigurationErrorsException();
+                if (!exeConfiguration.HasFile) {
+                    throw new ConfigurationErrorsException();
+                }
             } catch (ConfigurationErrorsException) {
                 try {
                     // nope, so open from configuration download
                     EXEConfiguration = ConfigurationManager.OpenMappedExeConfiguration(new ExeConfigurationFileMap {
                         ExeConfigFilename = Application.StartupPath + "\\" + HTDOCS + "\\" + CONFIGURATION_DOWNLOAD_NAME + "\\" + name + ".config"
                     }, ConfigurationUserLevel.None);
 
+                    if (EXEConfiguration == null) {
+                        throw new ConfigurationErrorsException();
+                    }
+
                     if (!EXEConfiguration.HasFile) {
                         throw new ConfigurationErrorsException();
                     }
@@ -938,10 +955,9 @@ private static Configuration GetEXEConfiguration(string name) {
                 } catch (ConfigurationErrorsException) {
                     // Fail silently.
                 }
-
-                EXEConfiguration = exeConfiguration ?? throw new ConfigurationErrorsException();
             }
 
+            EXEConfiguration = exeConfiguration ?? throw new ConfigurationErrorsException();
             EXEConfigurationName = name;
             return EXEConfiguration;
         }
@@ -950,7 +966,7 @@ public static FlashpointSecurePlayerSection GetFlashpointSecurePlayerSection(str
             FlashpointSecurePlayerSection flashpointSecurePlayerSection = null;
             Configuration exeConfiguration = null;
 
-            if (exeConfigurationName == ACTIVE_EXE_CONFIGURATION_NAME) {
+            if (String.IsNullOrEmpty(exeConfigurationName)) {
                 if (Shared.activeFlashpointSecurePlayerSection != null) {
                     return Shared.activeFlashpointSecurePlayerSection;
                 }
@@ -992,7 +1008,7 @@ public static FlashpointSecurePlayerSection GetFlashpointSecurePlayerSection(str
                 throw new ConfigurationErrorsException();
             }
 
-            if (exeConfigurationName == ACTIVE_EXE_CONFIGURATION_NAME) {
+            if (String.IsNullOrEmpty(exeConfigurationName)) {
                 Shared.activeFlashpointSecurePlayerSection = flashpointSecurePlayerSection;
             } else {
                 Shared.flashpointSecurePlayerSection = flashpointSecurePlayerSection;
@@ -1003,8 +1019,12 @@ public static FlashpointSecurePlayerSection GetFlashpointSecurePlayerSection(str
         public static void SetFlashpointSecurePlayerSection(string exeConfigurationName) {
             Configuration activeEXEConfiguration = GetActiveEXEConfiguration();
             activeEXEConfiguration.Save(ConfigurationSaveMode.Modified);
-            Configuration exeConfiguration = GetEXEConfiguration(exeConfigurationName);
-            exeConfiguration.Save(ConfigurationSaveMode.Modified);
+
+            if (!String.IsNullOrEmpty(exeConfigurationName)) {
+                Configuration exeConfiguration = GetEXEConfiguration(exeConfigurationName);
+                exeConfiguration.Save(ConfigurationSaveMode.Modified);
+            }
+
             ConfigurationManager.RefreshSection("flashpointSecurePlayer");
         }