b/239875086 Warn if executable does not exist (#3)

Check if executable exists and offer user to reset executable path when opening dialog.
GoogleCloudPlatform · Aug 19, 2022 · c1bb3f5 · c1bb3f5
1 parent 73a6f52
commit c1bb3f5
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 0 deletions.
diff --git a/sources/Google.Solutions.WWAuth.Test/Data/TestCredentialConfiguration.cs b/sources/Google.Solutions.WWAuth.Test/Data/TestCredentialConfiguration.cs
@@ -24,6 +24,7 @@
 using Google.Solutions.WWAuth.Util;
 using NUnit.Framework;
 using System;
+using System.IO;
 
 namespace Google.Solutions.WWAuth.Test.Data
 {
@@ -433,5 +434,20 @@ public void WhenNewFileCreated_ThenExecutableIsInitialized()
                 ".exe",
                 configuration.Options.Executable);
         }
+
+        //---------------------------------------------------------------------
+        // ResetExecutable.
+        //---------------------------------------------------------------------
+
+        [Test]
+        public void WhenExutableInvalid_ThenResetExecutableUpdatesPath()
+        {
+            var configuration = CredentialConfiguration.NewWorkloadIdentityConfiguration();
+            configuration.Options.Executable = "doesnotexist.exe";
+
+            configuration.ResetExecutable();
+
+            Assert.True(File.Exists(configuration.Options.Executable));
+        }
     }
 }
diff --git a/sources/Google.Solutions.WWAuth.Test/View/TestAdfsConfigurationViewModel.cs b/sources/Google.Solutions.WWAuth.Test/View/TestAdfsConfigurationViewModel.cs
@@ -522,5 +522,25 @@ public void WhenApplyingChanges_DefaultsAreReapplied()
             vm.ApplyChanges(null);
             StringAssert.EndsWith("/changed", vm.RelyingPartyId);
         }
+
+        //---------------------------------------------------------------------
+        // ResetExecutable.
+        //---------------------------------------------------------------------
+
+        [Test]
+        public void WhenExecutableReset_ThenEventIsRaisedAndDirtyIsSet()
+        {
+            var vm = new AdfsConfigurationViewModel(
+                CredentialConfigurationFile.NewWorkloadIdentityConfigurationFile(),
+                new Mock<IShellAdapter>().Object,
+                new Mock<ICertificateStoreAdapter>().Object);
+
+            PropertyAssert.RaisesPropertyChangeNotification(
+                vm,
+                m => m.IsDirty,
+                () => vm.ResetExecutable());
+
+            Assert.IsTrue(vm.IsDirty);
+        }
     }
 }
diff --git a/sources/Google.Solutions.WWAuth/Data/CredentialConfiguration.cs b/sources/Google.Solutions.WWAuth/Data/CredentialConfiguration.cs
@@ -94,6 +94,11 @@ public void Validate()
             this.PoolConfiguration.Validate();
         }
 
+        public void ResetExecutable()
+        {
+            this.Options.Executable = Assembly.GetExecutingAssembly().Location;
+        }
+
         //---------------------------------------------------------------------
         // Factory methods.
         //---------------------------------------------------------------------

diff --git a/sources/Google.Solutions.WWAuth/View/AdfsConfigurationSheet.cs b/sources/Google.Solutions.WWAuth/View/AdfsConfigurationSheet.cs
@@ -22,6 +22,7 @@
 using Google.Solutions.WWAuth.Adapters;
 using Google.Solutions.WWAuth.Data;
 using Google.Solutions.WWAuth.Util;
+using System.IO;
 using System.Windows.Forms;
 
 namespace Google.Solutions.WWAuth.View
@@ -140,6 +141,22 @@ public AdfsConfigurationSheet(
                 this.viewModel,
                 m => m.IsViewCertificateMenuItemEnabled,
                 this.Container);
+
+            this.Load += (s, e) =>
+            {
+                if (!File.Exists(viewModel.Executable) &&
+                    MessageBox.Show(
+                        this,
+                        "The credential configuration contains points to a copy of WWAuth " +
+                            "that does not exist anymore. Do you want to update the configuration " +
+                            "to use the current path instead?",
+                        "Executable path",
+                        MessageBoxButtons.YesNoCancel,
+                        MessageBoxIcon.Warning) == DialogResult.Yes)
+                {
+                    viewModel.ResetExecutable();
+                }
+            };
         }
 
         public IPropertiesSheetViewModel ViewModel => this.viewModel;

diff --git a/sources/Google.Solutions.WWAuth/View/AdfsConfigurationViewModel.cs b/sources/Google.Solutions.WWAuth/View/AdfsConfigurationViewModel.cs
@@ -227,10 +227,18 @@ public string SigningCertificateSubject
         public bool IsViewCertificateMenuItemEnabled
             => this.RequestSigningCertificate != null;
 
+        public string Executable => this.File.Configuration.Options.Executable;
+
         //---------------------------------------------------------------------
         // Actions.
         //---------------------------------------------------------------------
 
+        public void ResetExecutable()
+        {
+            this.File.Configuration.ResetExecutable();
+            this.IsDirty = true;
+        }
+
         public void ReapplyProtocolDefaults()
         {
             //