Fixed up True/False values from partner config

Author: AngryProgrammerInside

Agent/Lib/InstallAgent-Core.psm1

@@ -678,9 +678,9 @@ function ValidatePartnerConfig {
     $Config.NETFile = $InstallInfo.NETFileName
     $Config.NETVersion = $InstallInfo.NETVersion
     $Config.NETFileVersion = $InstallInfo.NETFileVersion
-    $Config.EnforceBehaviorPolicy = $Partner.Config.ServiceBehavior.EnforcePolicy
-    $Config.ForceAgentCleanup = $Partner.Config.ScriptBehavior.ForceAgentCleanup
-    $Config.UseWSDLVerifcation = $Partner.Config.ScriptBehavior.UseWSDLVerification
+    $Config.EnforceBehaviorPolicy = if ($Partner.Config.ServiceBehavior.EnforcePolicy -like "True") {$true} else {$false}
+    $Config.ForceAgentCleanup = if ($Partner.Config.ScriptBehavior.ForceAgentCleanup -like "True") {$true} else {$false}
+    $Cofig.UseWSDLVerifcation = if ($Partner.Config.ScriptBehavior.UseWSDLVerification -like "True") {$true} else {$false}
 
     ### Function Body
     ###############################
@@ -1598,23 +1598,21 @@ function TestNCServer {
     }
     # Check if Agent has Connectivity to Server in Partner Configuration
 
-    if ($Config.UseWSDLVerifcation -and $NCResult -eq $false) {
+    if ($Cofig.UseWSDLVerifcation -and $NCResult -eq $false) {
         $client = New-Object System.Net.WebClient
         try {
             $response = $client.DownloadString("https://$($Config.NCServerAddress)/dms2/services2/ServerEI2?wsdl")
             $xmlResponse = [xml]$response
-            if ($xmlResponse.definitions.service.port.address.location -eq "https://$($Config.NCServerAddress)/dms2/services2/ServerEI2"){
+            if ($xmlResponse.definitions.service.port.address.location -eq "https://$($Config.NCServerAddress)/dms2/services2/ServerEI2") {
                 $Flag = "W"
                 $Out = ("Device failed ping test, but succeeded on WSDL verification method for " + $NC.Products.NCServer.Name + ", script will proceed with online activities")             
                 Log $Flag 0 $Out
-            } else{
-                $Out = ("WSDL verification failed. Expected: https://$($Config.NCServerAddress)/dms2/services2/ServerEI2 Received:$($xmlResponse.definitions.service.port.address.location)")             
-                Log W 0 $Out
-
             }
-        } catch {
+        }
+        catch {
+            $Flag = "W"
             $Out = ("WSDL verification method for " + $NC.Products.NCServer.Name + "failed, Offline Repairs will be performed possible until connectivity is restored.")             
-            Log W 0 $Out   
+            Log $Flag 0 $Out   
         }
     }
 
@@ -3172,21 +3170,23 @@ function InstallAgent {
     ### Function Body
     ###############################
     ### Perform WSDL verfication before attempting any install or removal
-    if ($Config.UseWSDLVerifcation) {
+    if ($Cofig.UseWSDLVerifcation) {
         $client = New-Object System.Net.WebClient
         try {
             $response = $client.DownloadString("https://$($Config.NCServerAddress)/dms2/services2/ServerEI2?wsdl")
             $xmlResponse = [xml]$response
-            if ($xmlResponse.definitions.service.port.address.location -eq "https://$($Config.NCServerAddress)/dms2/services2/ServerEI2"){
+            if ($xmlResponse.definitions.service.port.address.location -eq "https://$($Config.NCServerAddress)/dms2/services2/ServerEI2") {
                 $Flag = "I"
                 $Out = ("WSDL verification succeeded, proceeding with installation actions.")             
                 Log $Flag 0 $Out
-            } else {
+            }
+            else {
                 $Flag = "E"
-                $Out = ("WSDL verification failed. Expected: https://$($Config.NCServerAddress)/dms2/services2/ServerEI2 Received:$($xmlResponse.definitions.service.port.address.location). Terminating install")             
-                Log $Flag 13 $Out -Exit
+                $Out = ("WSDL verification failed. Expected: https://$($Config.NCServerAddress)/dms2/services2/ServerEI2 Received:$($xmlResponse.definitions.service.port.address.location)")             
+                Log $Flag 13 $Out
             }
-        } catch {
+        }
+        catch {
             $Flag = "E"
             $Out = ("WSDL verification method for " + $NC.Products.NCServer.Name + "failed prior to install. Terminating install.")             
             Log $Flag 13 $Out -Exit  

Agent/PartnerConfig.xml

@@ -39,8 +39,10 @@ help@mymsp.com
     <!-- [REQUIRED - (1-60)] Amount of time (in minutes) to wait for the Windows Installer Service
   while another installation is in progress -->
     <InstallTimeoutPeriod>5</InstallTimeoutPeriod>    <!-- Default Value is 5 -->
-        <!-- [RECOMMENDED - (True)] - If there are issues with the MSI uninstall of the previous version, perform a cleanup -->
+        <!-- [REQUIRED - (True)] - If there are issues with the MSI uninstall of the previous version, perform a cleanup -->
   <ForceAgentCleanup>True</ForceAgentCleanup>
+  <!-- [REQUIRED - (True)] - If true enables fallback from ICMP to HTTP/S lookup of the WSDL endpoint for network verification 
+  and pre-install server verification -->
   <UseWSDLVerification>True</UseWSDLVerification>
   </ScriptBehavior>
   <Server>

ReleaseNotes.md

@@ -1,8 +1,9 @@
 # 2021-05-7 - 6.0.2
 * Fixed bug with Invoke-Webrequest not working due to absence of -UseBasicParsing per [#36](https://github.com/AngryProgrammerInside/InstallAgent/issues/36)
 * Added forced removal/cleanup when bad MSI uninstall information or MSI unable to remove old/rogue agent when needed. [#37](https://github.com/AngryProgrammerInside/InstallAgent/issues/37)
+* Added WSDL based server verification for environments where outbound ICMP is disabled [#38](https://github.com/AngryProgrammerInside/InstallAgent/issues/38)
 * Fixed bug with InstallAgent process not being spun off Async unless -Monitor flag used [#39](https://github.com/AngryProgrammerInside/InstallAgent/issues/39)
-
+* Fixed up Partner Config file validation of True/False attributes
 
 # 2021-04-12 - 6.0.1