Merge pull request #44 from ShibalovRoman/master

chkp-ofirs · web-flow · commit 55e12ede576a · 2022-01-18T17:03:27.000+02:00
Fixed window and mouse behavior when exception throwed
diff --git a/SmartMove/MainWindow.xaml.cs b/SmartMove/MainWindow.xaml.cs
@@ -57,6 +57,8 @@ public partial class MainWindow : Window
         #region Private Members
 
         private readonly SupportedVendors _supportedVendors = new SupportedVendors();
+
+        private static bool canCloseWindow = true;
         
         #endregion
 
@@ -263,7 +265,8 @@ public string ConfigurationFileLinesCount
 
         private void CloseButton_OnClick(object sender, RoutedEventArgs e)
         {
-            Close();
+            if (canCloseWindow)
+                Close();
         }
 
         private void MinimizeButton_OnClick(object sender, RoutedEventArgs e)
@@ -428,6 +431,7 @@ private void BrowseTargetFolder_OnClick(object sender, RoutedEventArgs e)
 
         private async void Go_OnClick(object sender, RoutedEventArgs e)
         {
+            canCloseWindow = false;
             string fileName = Path.GetFileNameWithoutExtension(ConfigFilePath.Text);
 
             if (string.IsNullOrEmpty(ConfigFilePath.Text) || string.IsNullOrEmpty(fileName))
@@ -547,11 +551,13 @@ private async void Go_OnClick(object sender, RoutedEventArgs e)
                 case Vendor.CiscoASA:
                     if (string.IsNullOrEmpty(vendorParser.Version))
                     {
+                        EnableWindow();
                         ShowMessage("Unspecified ASA version.\nCannot find ASA version for the selected configuration.\nThe configuration may not parse correctly.", MessageTypes.Warning);
                         return;
                     }
                     else if (vendorParser.MajorVersion < 8 || (vendorParser.MajorVersion == 8 && vendorParser.MinorVersion < 3))
                     {
+                        EnableWindow();
                         ShowMessage("Unsupported ASA version (" + vendorParser.Version + ").\nThis tool supports ASA 8.3 and above configuration files.\nThe configuration may not parse correctly.", MessageTypes.Warning);
                         return;
                     }
@@ -560,11 +566,13 @@ private async void Go_OnClick(object sender, RoutedEventArgs e)
                 case Vendor.FirePower:
                     if (string.IsNullOrEmpty(vendorParser.Version))
                     {
+                        EnableWindow();
                         ShowMessage("Unspecified NGFW version.\nCannot find version for the selected configuration.\nThe configuration may not parse correctly.", MessageTypes.Warning);
                         return;
                     }
                     else if (vendorParser.MajorVersion < 6 || (vendorParser.MajorVersion == 6 && vendorParser.MinorVersion < 4))
                     {
+                        EnableWindow();
                         ShowMessage("Unsupported version (" + vendorParser.Version + ").\nThis tool supports NGFW 6.4 and above configuration files.\nThe configuration may not parse correctly.", MessageTypes.Warning);
                         return;
                     }
@@ -573,11 +581,13 @@ private async void Go_OnClick(object sender, RoutedEventArgs e)
                 case Vendor.JuniperJunosOS:
                     if (string.IsNullOrEmpty(vendorParser.Version))
                     {
+                        EnableWindow();
                         ShowMessage("Unspecified SRX version.\nCannot find SRX version for the selected configuration.\nThe configuration may not parse correctly.", MessageTypes.Warning);
                         return;
                     }
                     else if (vendorParser.MajorVersion < 12 || (vendorParser.MajorVersion == 12 && vendorParser.MinorVersion < 1))
                     {
+                        EnableWindow();
                         ShowMessage("Unsupported SRX version (" + vendorParser.Version + ").\nThis tool supports SRX 12.1 and above configuration files.\nThe configuration may not parse correctly.", MessageTypes.Warning);
                         return;
                     }
@@ -589,35 +599,41 @@ private async void Go_OnClick(object sender, RoutedEventArgs e)
                 case Vendor.FortiGate:
                     if (string.IsNullOrEmpty(vendorParser.Version))
                     {
+                        EnableWindow();
                         ShowMessage("Unspecified FortiGate version.\nCannot find FortiGate version for the selected configuration.\nThe configuration may not parse correctly.", MessageTypes.Warning);
                         return;
                     }
                     else if(vendorParser.MajorVersion < 5)
                     {
+                        EnableWindow();
                         ShowMessage("Unsupported FortiGate version (" + vendorParser.Version + ").\nThis tool supports FortiGate 5.x and above configuration files.\nThe configuration may not parse correctly.", MessageTypes.Warning);
                         return;
                     }
                     break;
                 case Vendor.PaloAlto:
                     if (string.IsNullOrEmpty(vendorParser.Version))
                     {
+                        EnableWindow();
                         ShowMessage("Unspecified PaloAlto version.\nCannot find PaloAlto PAN-OS version for the selected configuration.\nThe configuration may not parse correctly.", MessageTypes.Warning);
                         return;
                     }
                     else if (vendorParser.MajorVersion < 7)
                     {
+                        EnableWindow();
                         ShowMessage("Unsupported PaloAlto version (" + vendorParser.Version + ").\nThis tool supports PaloAlto PAN-OS 7.x and above configuration files.\nThe configuration may not parse correctly.", MessageTypes.Warning);
                         return;
                     }
                     break;
                 case Vendor.PaloAltoPanorama:
                     if (string.IsNullOrEmpty(vendorParser.Version))
                     {
+                        EnableWindow();
                         ShowMessage("Unspecified PaloAlto version.\nCannot find PaloAlto Panorama version for the selected configuration.\nThe configuration may not parse correctly.", MessageTypes.Warning);
                         return;
                     }
                     else if (vendorParser.MajorVersion < 7)
                     {
+                        EnableWindow();
                         ShowMessage("Unsupported PaloAlto version (" + vendorParser.Version + ").\nThis tool supports PaloAlto Panorama 7.x and above configuration files.\nThe configuration may not parse correctly.", MessageTypes.Warning);
                         return;
                     }
@@ -738,6 +754,14 @@ private async void Go_OnClick(object sender, RoutedEventArgs e)
             ResultsPanel.Visibility = Visibility.Visible;
 
             ShowResults(vendorConverter, vendorParser.ParsedLines);
+            canCloseWindow = true;
+        }
+
+        private void EnableWindow()
+        {
+            Mouse.OverrideCursor = null;
+            EnableDisableControls(true);
+            OutputPanel.Visibility = Visibility.Collapsed;
         }
 
         private void ConvertUserConf_Checked(object sender, RoutedEventArgs e)
@@ -975,7 +999,9 @@ public static void ShowMessage(string message, MessageTypes messageType, string
                 MessageLinkValue = messageLinkValue
             };
 
+            Mouse.OverrideCursor = null;
             messageWindow.ShowDialog();
+            canCloseWindow = true;
         }
 
         #endregion

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ public partial class MainWindow : Window`
`57`	`57`	`#region Private Members`
`58`	`58`
`59`	`59`	`private readonly SupportedVendors _supportedVendors = new SupportedVendors();`
	`60`	`+`
	`61`	`+ private static bool canCloseWindow = true;`
`60`	`62`
`61`	`63`	`#endregion`
`62`	`64`
`@@ -263,7 +265,8 @@ public string ConfigurationFileLinesCount`
`263`	`265`
`264`	`266`	`private void CloseButton_OnClick(object sender, RoutedEventArgs e)`
`265`	`267`	`{`
`266`		`- Close();`
	`268`	`+ if (canCloseWindow)`
	`269`	`+ Close();`
`267`	`270`	`}`
`268`	`271`
`269`	`272`	`private void MinimizeButton_OnClick(object sender, RoutedEventArgs e)`
`@@ -428,6 +431,7 @@ private void BrowseTargetFolder_OnClick(object sender, RoutedEventArgs e)`
`428`	`431`
`429`	`432`	`private async void Go_OnClick(object sender, RoutedEventArgs e)`
`430`	`433`	`{`
	`434`	`+ canCloseWindow = false;`
`431`	`435`	`string fileName = Path.GetFileNameWithoutExtension(ConfigFilePath.Text);`
`432`	`436`
`433`	`437`	`if (string.IsNullOrEmpty(ConfigFilePath.Text) \|\| string.IsNullOrEmpty(fileName))`
`@@ -547,11 +551,13 @@ private async void Go_OnClick(object sender, RoutedEventArgs e)`
`547`	`551`	`case Vendor.CiscoASA:`
`548`	`552`	`if (string.IsNullOrEmpty(vendorParser.Version))`
`549`	`553`	`{`
	`554`	`+ EnableWindow();`
`550`	`555`	`ShowMessage("Unspecified ASA version.\nCannot find ASA version for the selected configuration.\nThe configuration may not parse correctly.", MessageTypes.Warning);`
`551`	`556`	`return;`
`552`	`557`	`}`
`553`	`558`	`else if (vendorParser.MajorVersion < 8 \|\| (vendorParser.MajorVersion == 8 && vendorParser.MinorVersion < 3))`
`554`	`559`	`{`
	`560`	`+ EnableWindow();`
`555`	`561`	`ShowMessage("Unsupported ASA version (" + vendorParser.Version + ").\nThis tool supports ASA 8.3 and above configuration files.\nThe configuration may not parse correctly.", MessageTypes.Warning);`
`556`	`562`	`return;`
`557`	`563`	`}`
`@@ -560,11 +566,13 @@ private async void Go_OnClick(object sender, RoutedEventArgs e)`
`560`	`566`	`case Vendor.FirePower:`
`561`	`567`	`if (string.IsNullOrEmpty(vendorParser.Version))`
`562`	`568`	`{`
	`569`	`+ EnableWindow();`
`563`	`570`	`ShowMessage("Unspecified NGFW version.\nCannot find version for the selected configuration.\nThe configuration may not parse correctly.", MessageTypes.Warning);`
`564`	`571`	`return;`
`565`	`572`	`}`
`566`	`573`	`else if (vendorParser.MajorVersion < 6 \|\| (vendorParser.MajorVersion == 6 && vendorParser.MinorVersion < 4))`
`567`	`574`	`{`
	`575`	`+ EnableWindow();`
`568`	`576`	`ShowMessage("Unsupported version (" + vendorParser.Version + ").\nThis tool supports NGFW 6.4 and above configuration files.\nThe configuration may not parse correctly.", MessageTypes.Warning);`
`569`	`577`	`return;`
`570`	`578`	`}`
`@@ -573,11 +581,13 @@ private async void Go_OnClick(object sender, RoutedEventArgs e)`
`573`	`581`	`case Vendor.JuniperJunosOS:`
`574`	`582`	`if (string.IsNullOrEmpty(vendorParser.Version))`
`575`	`583`	`{`
	`584`	`+ EnableWindow();`
`576`	`585`	`ShowMessage("Unspecified SRX version.\nCannot find SRX version for the selected configuration.\nThe configuration may not parse correctly.", MessageTypes.Warning);`
`577`	`586`	`return;`
`578`	`587`	`}`
`579`	`588`	`else if (vendorParser.MajorVersion < 12 \|\| (vendorParser.MajorVersion == 12 && vendorParser.MinorVersion < 1))`
`580`	`589`	`{`
	`590`	`+ EnableWindow();`
`581`	`591`	`ShowMessage("Unsupported SRX version (" + vendorParser.Version + ").\nThis tool supports SRX 12.1 and above configuration files.\nThe configuration may not parse correctly.", MessageTypes.Warning);`
`582`	`592`	`return;`
`583`	`593`	`}`
`@@ -589,35 +599,41 @@ private async void Go_OnClick(object sender, RoutedEventArgs e)`
`589`	`599`	`case Vendor.FortiGate:`
`590`	`600`	`if (string.IsNullOrEmpty(vendorParser.Version))`
`591`	`601`	`{`
	`602`	`+ EnableWindow();`
`592`	`603`	`ShowMessage("Unspecified FortiGate version.\nCannot find FortiGate version for the selected configuration.\nThe configuration may not parse correctly.", MessageTypes.Warning);`
`593`	`604`	`return;`
`594`	`605`	`}`
`595`	`606`	`else if(vendorParser.MajorVersion < 5)`
`596`	`607`	`{`
	`608`	`+ EnableWindow();`
`597`	`609`	`ShowMessage("Unsupported FortiGate version (" + vendorParser.Version + ").\nThis tool supports FortiGate 5.x and above configuration files.\nThe configuration may not parse correctly.", MessageTypes.Warning);`
`598`	`610`	`return;`
`599`	`611`	`}`
`600`	`612`	`break;`
`601`	`613`	`case Vendor.PaloAlto:`
`602`	`614`	`if (string.IsNullOrEmpty(vendorParser.Version))`
`603`	`615`	`{`
	`616`	`+ EnableWindow();`
`604`	`617`	`ShowMessage("Unspecified PaloAlto version.\nCannot find PaloAlto PAN-OS version for the selected configuration.\nThe configuration may not parse correctly.", MessageTypes.Warning);`
`605`	`618`	`return;`
`606`	`619`	`}`
`607`	`620`	`else if (vendorParser.MajorVersion < 7)`
`608`	`621`	`{`
	`622`	`+ EnableWindow();`
`609`	`623`	`ShowMessage("Unsupported PaloAlto version (" + vendorParser.Version + ").\nThis tool supports PaloAlto PAN-OS 7.x and above configuration files.\nThe configuration may not parse correctly.", MessageTypes.Warning);`
`610`	`624`	`return;`
`611`	`625`	`}`
`612`	`626`	`break;`
`613`	`627`	`case Vendor.PaloAltoPanorama:`
`614`	`628`	`if (string.IsNullOrEmpty(vendorParser.Version))`
`615`	`629`	`{`
	`630`	`+ EnableWindow();`
`616`	`631`	`ShowMessage("Unspecified PaloAlto version.\nCannot find PaloAlto Panorama version for the selected configuration.\nThe configuration may not parse correctly.", MessageTypes.Warning);`
`617`	`632`	`return;`
`618`	`633`	`}`
`619`	`634`	`else if (vendorParser.MajorVersion < 7)`
`620`	`635`	`{`
	`636`	`+ EnableWindow();`
`621`	`637`	`ShowMessage("Unsupported PaloAlto version (" + vendorParser.Version + ").\nThis tool supports PaloAlto Panorama 7.x and above configuration files.\nThe configuration may not parse correctly.", MessageTypes.Warning);`
`622`	`638`	`return;`
`623`	`639`	`}`
`@@ -738,6 +754,14 @@ private async void Go_OnClick(object sender, RoutedEventArgs e)`
`738`	`754`	`ResultsPanel.Visibility = Visibility.Visible;`
`739`	`755`
`740`	`756`	`ShowResults(vendorConverter, vendorParser.ParsedLines);`
	`757`	`+ canCloseWindow = true;`
	`758`	`+ }`
	`759`	`+`
	`760`	`+ private void EnableWindow()`
	`761`	`+ {`
	`762`	`+ Mouse.OverrideCursor = null;`
	`763`	`+ EnableDisableControls(true);`
	`764`	`+ OutputPanel.Visibility = Visibility.Collapsed;`
`741`	`765`	`}`
`742`	`766`
`743`	`767`	`private void ConvertUserConf_Checked(object sender, RoutedEventArgs e)`
`@@ -975,7 +999,9 @@ public static void ShowMessage(string message, MessageTypes messageType, string`
`975`	`999`	`MessageLinkValue = messageLinkValue`
`976`	`1000`	`};`
`977`	`1001`
	`1002`	`+ Mouse.OverrideCursor = null;`
`978`	`1003`	`messageWindow.ShowDialog();`
	`1004`	`+ canCloseWindow = true;`
`979`	`1005`	`}`
`980`	`1006`
`981`	`1007`	`#endregion`