Merge pull request #41 from AngryProgrammerInside/6.0.2a

6.0.2a

Author: AngryProgrammerInside

Agent/AgentCleanup4.exe

@@ -612,6 +612,7 @@ $Script = @{
     "Library"     = @($SC.Paths.TempFolder, "Lib") -join '\'
     "PartnerFile" = @($SC.Paths.TempFolder, $SC.Names.PartnerConfig) -join '\'
     "TempFolder"  = $SC.Paths.TempFolder
+    "AgentCleanup" = @($SC.Paths.TempFolder, "AgentCleanup4.exe") -join '\'
   }
   "Results"    = @{
     "EventLog"           = $SC.ScriptEventLog

Agent/InstallAgent.ps1

@@ -80,46 +80,45 @@ if ($null -eq $p) {
 else {
     Write-Host "Successfully launched $TempFolder\InstallAgent.ps1 with $($args.Count) arguments" -ForegroundColor Green
     Write-EventLog -EntryType Information -EventId 10 -LogName Application -Source $LauncherScript -Message  "Successfully launched $TempFolder\InstallAgent.ps1 with $($args.Count) arguments" > $null
-}
-
-Write-Host "Launched InstallAgent with PID: $($p.Id), waiting on Exit"
-$RegPaths = @{
-    Summary      = "HKLM:\SOFTWARE\N-able Community\InstallAgent"
-    Installation = "HKLM:\SOFTWARE\N-able Community\InstallAgent\Installation"
-    Diagnosis    = "HKLM:\SOFTWARE\N-able Community\InstallAgent\Diagnosis"
-}
 
-while (-not $p.HasExited) {
     if ($Monitor.IsPresent) {
-        Start-Sleep 1
-        Clear-Host
-        if (Test-Path $RegPaths.Summary) {
-            Write-Host "Progress: " -ForegroundColor Green -NoNewline
-            Get-ItemProperty $RegPaths.Summary | Select-Object * -ExcludeProperty PS* | Format-List *
+        
+        Write-Host "Launched InstallAgent with PID: $($p.Id), waiting on Exit"
+        $RegPaths = @{
+            Summary      = "HKLM:\SOFTWARE\N-able Community\InstallAgent"
+            Installation = "HKLM:\SOFTWARE\N-able Community\InstallAgent\Installation"
+            Diagnosis    = "HKLM:\SOFTWARE\N-able Community\InstallAgent\Diagnosis"
         }
-    }
-    else {
-        Start-Sleep 10
-    }
-}
-if ($p.ExitCode -eq 0) {
-    Write-Host "Script ran successfully, displaying registry results:" -ForegroundColor Green
-    $RegPaths.Keys | ForEach-Object { 
-        if (Test-Path $RegPaths[$_]) {
-            Write-Host "$($_): " -ForegroundColor Green -NoNewline;
-            Get-ItemProperty $RegPaths[$_] | Select-Object * -ExcludeProperty PS* | Format-List *
+
+        while (-not $p.HasExited) {
+                Start-Sleep 1
+                Clear-Host
+                if (Test-Path $RegPaths.Summary) {
+                    Write-Host "Progress: " -ForegroundColor Green -NoNewline
+                    Get-ItemProperty $RegPaths.Summary | Select-Object * -ExcludeProperty PS* | Format-List *
+                }
         }
-    }
-    Write-Host "Check logs for additional details"
-}
-else {
-    Write-Host "Script ran successfully, displaying registry results:"
-    $RegPaths.Keys | ForEach-Object { 
-        if (Test-Path $RegPaths[$_]) {
-            Write-Host "$($_): " -ForegroundColor Green -NoNewline;
-            Get-ItemProperty $RegPaths[$_] | Select-Object * -ExcludeProperty PS* | Format-List *
+        if ($p.ExitCode -eq 0) {
+            Write-Host "Script ran successfully, displaying registry results:" -ForegroundColor Green
+            $RegPaths.Keys | ForEach-Object { 
+                if (Test-Path $RegPaths[$_]) {
+                    Write-Host "$($_): " -ForegroundColor Green -NoNewline;
+                    Get-ItemProperty $RegPaths[$_] | Select-Object * -ExcludeProperty PS* | Format-List *
+                }
+            }
+            Write-Host "Check logs for additional details"
         }
+        else {
+            Write-Host "Script ran successfully, displaying registry results:"
+            $RegPaths.Keys | ForEach-Object { 
+                if (Test-Path $RegPaths[$_]) {
+                    Write-Host "$($_): " -ForegroundColor Green -NoNewline;
+                    Get-ItemProperty $RegPaths[$_] | Select-Object * -ExcludeProperty PS* | Format-List *
+                }
+            }
+            Write-Host "Check logs for additional details"
+            Write-EventLog -EntryType Error -EventId 13 -LogName Application -Source $LauncherScript -Message  "$SetupScript encountered an error starting the launcher" > $null
+        }
+
     }
-    Write-Host "Check logs for additional details"
-    Write-EventLog -EntryType Error -EventId 13 -LogName Application -Source $LauncherScript -Message  "$SetupScript encountered an error starting the launcher" > $null
 }

Agent/LaunchInstaller.ps1

@@ -678,7 +678,9 @@ function ValidatePartnerConfig {
     $Config.NETFile = $InstallInfo.NETFileName
     $Config.NETVersion = $InstallInfo.NETVersion
     $Config.NETFileVersion = $InstallInfo.NETFileVersion
-    $Config.EnforceBehaviorPolicy = $Partner.Config.ServiceBehavior.EnforcePolicy
+    $Config.EnforceBehaviorPolicy = if ($Partner.Config.ServiceBehavior.EnforcePolicy -like "True") {$true} else {$false}
+    $Config.ForceAgentCleanup = if ($Partner.Config.ScriptBehavior.ForceAgentCleanup -like "True") {$true} else {$false}
+    $Config.UseWSDLVerifcation = if ($Partner.Config.ScriptBehavior.UseWSDLVerification -like "True") {$true} else {$false}
 
     ### Function Body
     ###############################
@@ -1595,6 +1597,25 @@ function TestNCServer {
         }
     }
     # Check if Agent has Connectivity to Server in Partner Configuration
+
+    if ($Config.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") {
+                $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
+            }
+        }
+        catch {
+            $Flag = "W"
+            $Out = ("WSDL verification method for " + $NC.Products.NCServer.Name + "failed, Offline Repairs will be performed possible until connectivity is restored.")             
+            Log $Flag 0 $Out   
+        }
+    }
+
     $Install.NCServerAccess =
     if ($null -ne $Flag)
     { $true } else { $false }
@@ -2982,13 +3003,40 @@ function RemoveAgent {
     # Verify Removal was Successful
     DiagnoseAgent -NoLog -NoServerCheck
     if ($Agent.Health.Installed -eq $true) {
-        # Exit - Agent Removal Failed
-        FixServices -Restart
-        $Out = (
-            "MSI Removal of the existing " + $NC.Products.Agent.Name + " failed. " +
-            "Manual forcible removal is required for the Script to continue."
-        )
-        Log E 11 $Out -Exit
+
+        #If the forced removal of the agent is enabled
+        if ($Config.ForceAgentCleanup) {
+            $FAC = New-Object System.Diagnostics.ProcessStartInfo ($env:windir + "\system32\cmd.exe")
+            $FAC.UseShellExecute = $false
+            $FAC.CreateNoWindow = $true
+            $FAC.Arguments = ('/C "' + $Script.Path.AgentCleanup + '"')
+            # Run the forced cleanup
+            [System.Diagnostics.Process]::Start($FAC).WaitForExit() >$null
+
+            # Verify Removal was Successful again
+            DiagnoseAgent -NoLog -NoServerCheck
+
+            if ($Agent.Health.Installed -eq $true) {
+                # Exit - Agent Removal Failed
+                FixServices -Restart
+                $Out = (
+                    "Forced and MSI Removal of the existing " + $NC.Products.Agent.Name + " failed. " +
+                    "Manual forcible removal is required for the Script to continue."
+                )
+                Log E 11 $Out -Exit
+            }
+        }
+        else {
+            # Exit - Agent Removal Failed
+            FixServices -Restart
+            $Out = (
+                "MSI Removal of the existing " + $NC.Products.Agent.Name + " failed. " +
+                "Manual forcible removal is required for the Script to continue."
+            )
+            Log E 11 $Out -Exit
+        }
+        # If forced removal successful, flag existing agent removal as true
+        $Install.ExistingAgentRemoved = $true
     }
     else
     { $Install.ExistingAgentRemoved = $true }
@@ -3082,7 +3130,7 @@ function RequestAzWebProxyToken {
     $Uri = "https://$($Config.AzNableProxyUri)/api/Get?Code=$($Config.AzNableAuthCode)&ID="
     try {
         $Uri += "$($Install.ChosenMethod.Value)"
-        $Response = (Invoke-WebRequest -Method GET -Uri $Uri).Content
+        $Response = (Invoke-WebRequest -Method GET -Uri $Uri -UseBasicParsing).Content
     }
     catch {
         $Out = "Error retrieving token from $Uri using $($Install.ChosenMethod.Name)"
@@ -3121,6 +3169,30 @@ function InstallAgent {
     WriteKey $Script.Results.ScriptKey $Script.Execution
     ### Function Body
     ###############################
+    ### Perform WSDL verfication before attempting any install or removal
+    if ($Config.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") {
+                $Flag = "I"
+                $Out = ("WSDL verification succeeded, proceeding with installation actions.")             
+                Log $Flag 0 $Out
+            }
+            else {
+                $Flag = "E"
+                $Out = ("WSDL verification failed. Expected: https://$($Config.NCServerAddress)/dms2/services2/ServerEI2 Received:$($xmlResponse.definitions.service.port.address.location)")             
+                Log $Flag 13 $Out
+            }
+        }
+        catch {
+            $Flag = "E"
+            $Out = ("WSDL verification method for " + $NC.Products.NCServer.Name + "failed prior to install. Terminating install.")             
+            Log $Flag 13 $Out -Exit  
+        }
+    }
+
     ### Attempt Agent Installation
     for (
         $Install.ChosenMethod.FailedAttempts = 0

Agent/Lib/InstallAgent-Core.psm1

@@ -22,7 +22,7 @@ Required Values CANNOT be left blank (the Event Log will inform you of this). Ad
 and/or Recommendations may be added here with regard to new Configuration Values.
 -->
 <Config>
-  <Version>6.0.1</Version>
+  <Version>6.0.2</Version>
   <Branding>
     <!-- [OPTIONAL - (Business Contact Info)] Partner Contact Information to display in the Event Log
   when a Documented Error occurs -->
@@ -33,12 +33,14 @@ help@mymsp.com
     </ErrorContactInfo>
   </Branding>
   <ScriptBehavior>
-    <!-- [RECOMMENDED - (0-60)] Amount of time (in minutes) to wait since the Last System Boot before
-  diagnosing the Agent -->
+    <!-- [RECOMMENDED - (0-60)] Amount of time (in minutes) to wait since the Last System Boot before diagnosing the Agent -->
     <BootTimeWaitPeriod>5</BootTimeWaitPeriod>    <!-- Default Value is 5 -->
-    <!-- [REQUIRED - (1-60)] Amount of time (in minutes) to wait for the Windows Installer Service
-  while another installation is in progress -->
+    <!-- [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 -->
+    <!-- [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>
     <!-- [REQUIRED - (URL Without Protocol)] Your N-Central Server Address (get this from the

Agent/PartnerConfig.xml

@@ -2,9 +2,11 @@
 
 ## Table of Contents
 - [InstallAgent Automation Suite](#installagent-automation-suite)
-  * [Table of Contents](#table-of-contents)
   * [Introduction](#introduction)
-  * [New and improved Features since AgentDeploymentPackage in 6.0.0](#new-and-improved-features-since-agentdeploymentpackage-in-600)
+  * [Status of Suite](#status-of-suite)
+  * [Release notes for 6.0.2](#release-notes-for-602)
+  * [Release notes for 6.0.1](#release-notes-for-601)
+  * [New and improved Features in AgentDeploymentPackage 6.0.0](#new-and-improved-features-in-agentdeploymentpackage-600)
   * [Key Features](#key-features)
 - [The "Registration Token" - Agent Deployment and Considerations](#the--registration-token----agent-deployment-and-considerations)
   * [History](#history)
@@ -28,6 +30,7 @@
   * [1a - Setup the N-Central Custom Service (Version 6.xx)](#1a---setup-the-n-central-custom-service--version-6xx-)
   * [1b - Setup AMP based PartnerConfiguration update amps](#1b---setup-amp-based-partnerconfiguration-update-amps)
   * [1c - Setup AMP based PartnerConfiguration update amps](#1c---setup-amp-based-partnerconfiguration-update-amps)
+  * [1d - Setup AMP based monitoring of the PartnerConfig.xml file](#1d---setup-amp-based-monitoring-of-the-partnerconfigxml-file)
     + [Update PartnerConfig from CP](#update-partnerconfig-from-cp)
     + [Update PartnerConfig from JWT](#update-partnerconfig-from-jwt)
   * [2 - Review Deployment Package Results](#2---review-deployment-package-results)
@@ -48,20 +51,27 @@
 ## Introduction
 This is a community-based Automation Suite intended as a replacement for the stock N-central Group Policy Installer Script as provided by N-able. It is not supported by N-able, so please do not contact their support department regarding any problems or questions about this script. In addition, please do not contact the support departments of any individual Partners in the Community regarding the Automation Suite or its components.
 
+This suite is a fork of [Ryan Crowther Jr's AgentDeploymentPackage on GitHub](https://github.com/N-able/AgentDeploymentPackage/) and will soon be the future branch going forward as they have moved on to other projects.
+
+If you discover a problem with any component of the Automation Suite or have ideas on how it could be improved, [post an issue on GitHub](https://github.com/AngryProgrammerInside/InstallAgent/issues). Alternatively, post on the N-Central Slack Community chat.
+
+These tools are provided as-is, in the best of faith, by those Partners and Community Members involved in their development. If you use this in your environment, we would love to hear from you on GitHub!
+
 ## Status of Suite
 All scripts in the suite have been run and tested as functional. It is currently considered in a 'beta' phase while wider testing is being performed.
 
 Feel free to provide feedback and lodge issues and they will be reviewed.
 
-## New and improved Features in AgentDeploymentPackage 6.0.1 (Beta)
+## Release notes for 6.0.2
+* Fixed several small bugs, full [Release Notes](ReleaseNotes.md)
+* Added WSDL endpoint based N-Central Server verification for environments where Echo/ICMP is blocked, or where additional verification that the server N-Central is up and accessible. Enabled by setting the `<UseWSDLVerification>` attribute to **True**
+* Added forced removal/cleanup when bad MSI uninstall information or MSI unable to remove old/rogue agent when needed using the AgentCleanup4.exe. Enabled by setting the `<ForceAgentCleanup>` attribute to **True**
 
-This script is a fork of [Ryan Crowther Jr's AgentDeploymentPackage on GitHub](https://github.com/N-able/AgentDeploymentPackage/) and will soon be the future branch going forward as they have moved on to other projects.
-
-If you discover a problem with any component of the Automation Suite or have ideas on how it could be improved, [post an issue on GitHub](https://github.com/AngryProgrammerInside/InstallAgent/issues). Alternatively, post on the N-Central Slack Community chat.
-
-These tools are provided as-is, in the best of faith, by those Partners and Community Members involved in their development. If you use this in your environment, we would love to hear from you on GitHub!
+## Release notes for 6.0.1
+* Fixed a large number of bugs, full [Release Notes](ReleaseNotes.md)
+* Added the ability enable/disable service policy enforcement with `<EnforcePolicy>` attribute for service timeouts/restarts. By default is now **False** as the service policy can get overriden by the maintenance service eventually.
 
-## New and improved Features in AgentDeploymentPackage 6.0.1
+## New and improved Features in AgentDeploymentPackage 6.0.0
 
 ![](media/readme-image8.png)
 *   Registration token install method:

ReadMe.md

@@ -1,3 +1,10 @@
+# 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
 
 ## Fixes