Catch extension errors on remove to allow installer to continue

WE2-925 Signed-off-by: Raul Metsma <[email protected]>
web-eid · May 1, 2024 · 7eb83a3 · 7eb83a3
1 parent 1605cf5
commit 7eb83a3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,12 +4,12 @@ jobs:
   build:
     runs-on: windows-2019
     steps:
-    - uses: actions/checkout@v3
-    - uses: microsoft/setup-msbuild@v1.1
-    - uses: NuGet/setup-nuget@v1
+    - uses: actions/checkout@v4
+    - uses: microsoft/setup-msbuild@v2
+    - uses: NuGet/setup-nuget@v2
     - run: nuget restore src/FirefoxAction.sln
     - run: msbuild src/FirefoxAction.sln -t:rebuild -property:Configuration=Release
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: dll
         path: ./src/bin/Release/FirefoxAction.CA.dll
diff --git a/src/FirefoxAction.cs b/src/FirefoxAction.cs
@@ -36,7 +36,7 @@ public static ActionResult ExtensionSettingsInstall(Session session)
             // with error status 1603, but when letting exceptions through the raw exception
             // stack trace will be logged in installer log which gives more information.
 
-            var extensionSettings = GetExtensionSettingsFromSession(session);
+            var extensionSettings = session.GetExtensionSettings();
             session.Log("Begin ExtensionSettingsInstall " + extensionSettings.UUID);
             using (RegistryKey firefox = Utils.FirefoxKey())
             {
@@ -54,26 +54,36 @@ public static ActionResult ExtensionSettingsInstall(Session session)
 
         [CustomAction]
         public static ActionResult ExtensionSettingsRemove(Session session)
-        {
-            var extensionSettings = GetExtensionSettingsFromSession(session);
-            session.Log("Begin ExtensionSettingsRemove " + extensionSettings.UUID);
-            using (RegistryKey firefox = Utils.FirefoxKey())
+        {
+            var extensionSettings = session.GetExtensionSettings();
+            try
             {
-                string value = firefox.GetStringValue("ExtensionSettings");
-                if (value != null)
+                session.Log("Begin ExtensionSettingsRemove " + extensionSettings.UUID);
+                using (RegistryKey firefox = Utils.FirefoxKey())
                 {
-                    JObject json = JObject.Parse(value);
-                    json[extensionSettings.UUID] = new JObject
+                    string value = firefox.GetStringValue("ExtensionSettings");
+                    if (value != null)
                     {
-                        ["installation_mode"] = "blocked"
-                    };
-                    firefox.SetValue("ExtensionSettings", json.ToString().Split('\n'));
+                        JObject json = JObject.Parse(value);
+                        json[extensionSettings.UUID] = new JObject
+                        {
+                            ["installation_mode"] = "blocked"
+                        };
+                        firefox.SetValue("ExtensionSettings", json.ToString().Split('\n'));
+                    }
                 }
-                return ActionResult.Success;
             }
+            catch
+            {
+                session.Log("Error on ExtensionSettingsRemove " + extensionSettings.UUID);
+            }
+            return ActionResult.Success;
         }
+    }
 
-        private static (string UUID, string URL) GetExtensionSettingsFromSession(Session session)
+    internal static class Utils
+    {
+        internal static (string UUID, string URL) GetExtensionSettings(this Session session)
         {
             // Deferred custom actions cannot directly access installer properties from session,
             // only the CustomActionData property is available, see README how to populate it.
@@ -82,10 +92,7 @@ private static (string UUID, string URL) GetExtensionSettingsFromSession(Session
                 session.CustomActionData["EXTENSIONSETTINGS_URL"]
            );
         }
-    }
 
-    internal static class Utils
-    {
         internal static RegistryKey FirefoxKey()
         {
             using (RegistryKey mozilla = Registry.LocalMachine.OpenOrCreateSubKey(@"Software\Policies\Mozilla", true))