Handle String values

IB-7521 Signed-off-by: Raul Metsma <raul@metsma.ee>
web-eid · Sep 20, 2022 · a0d9549 · a0d9549
1 parent 4f65368
commit a0d9549
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/src/FirefoxAction.cs b/src/FirefoxAction.cs
@@ -40,8 +40,8 @@ public static ActionResult ExtensionSettingsInstall(Session session)
             session.Log("Begin ExtensionSettingsInstall " + extensionSettings.UUID);
             using (RegistryKey firefox = Utils.FirefoxKey())
             {
-                string[] value = (string[])firefox.GetValue("ExtensionSettings", new string[] { "{}" });
-                JObject json = JObject.Parse(string.Join("\n", value));
+                string value = firefox.GetStringValue("ExtensionSettings", "{}");
+                JObject json = JObject.Parse(value);
                 json[extensionSettings.UUID] = new JObject
                 {
                     ["installation_mode"] = "normal_installed",
@@ -59,10 +59,10 @@ public static ActionResult ExtensionSettingsRemove(Session session)
             session.Log("Begin ExtensionSettingsRemove " + extensionSettings.UUID);
             using (RegistryKey firefox = Utils.FirefoxKey())
             {
-                string[] value = (string[])firefox.GetValue("ExtensionSettings");
+                string value = firefox.GetStringValue("ExtensionSettings");
                 if (value != null)
                 {
-                    JObject json = JObject.Parse(string.Join("\n", value));
+                    JObject json = JObject.Parse(value);
                     json[extensionSettings.UUID] = new JObject
                     {
                         ["installation_mode"] = "blocked"
@@ -98,5 +98,18 @@ internal static RegistryKey OpenOrCreateSubKey(this RegistryKey registryKey, str
         {
             return registryKey.OpenSubKey(name, writable) ?? registryKey.CreateSubKey(name);
         }
+
+        internal static string GetStringValue(this RegistryKey registryKey, string name, string defaultValue = null)
+        {
+            switch (registryKey.GetValueKind(name))
+            {
+            case RegistryValueKind.String:
+            case RegistryValueKind.ExpandString:
+                return (string)registryKey.GetValue(name, defaultValue);
+            case RegistryValueKind.MultiString:
+                return string.Join("\n", (string[])registryKey.GetValue(name));
+            default: return defaultValue;
+            }
+        }
     }
 }