Merge pull request #35 from AngryProgrammerInside/6.0.1b

6.0.1

Author: AngryProgrammerInside

AMPs/Agent AD Status.amp

@@ -0,0 +1,38 @@
+#region AMP startup variable. This region isn't in the the AMP itself.
+$NetworkFolder = "Agent"
+$GPOName = "n-able - Install Agent (PS)"
+$NetLogonShare = "C:\Windows\SYSVOL\domain\scripts" # This is gathered inside the AMP
+#endregion
+
+$PartnerConfigFile = $NetLogonShare + "\" + $NetworkFolder + "\PartnerConfig.xml"
+
+Try {
+    [xml]$PCXml = Get-Content -Path $PartnerConfigFile
+    $PartnerConfigFileVersion = $PCXml.Config.Version
+    $NCentralVersion = $PCXml.config.Deployment.Typical.SOAgentVersion
+    $InstallationFile = Try {
+        $NCentralFileVersion = $PCXml.config.Deployment.Typical.SOAgentFileVersion
+        $SOFileVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("$NetLogonShare\$NetworkFolder\$($PCXml.config.Deployment.Typical.InstallFolder)\$($PCxml.Config.Deployment.Typical.SOAgentFileName)").FileVersion
+        if ($NCentralFileVersion -eq "$SOFileVersion.0") { "INFO: File version OK" } else { "ERROR: Wrong Installer File" }
+    }
+    Catch {
+        "ERROR: $($PCxml.Config.Deployment.Typical.SOAgentFileName) file not found"
+    }
+    $CustomerId = $PCXml.Config.Deployment.Typical.CustomerId
+    $RegistrationToken = if ($PCXml.Config.Deployment.Typical.RegistrationToken) { "INFO: Present" } else { "ERROR: Registration token missing" }
+}
+Catch {
+    $PartnerConfigFileVersion = "ERROR: PartnerConfig.xml file not found"
+    $NCentralVersion = "ERROR: PartnerConfig.xml file not found"
+    $InstallationFile = "ERROR: PartnerConfig.xml file not found"
+    $CustomerID = 0
+    $RegistrationToken = "ERROR: PartnerConfig.xml file not found"
+}
+
+$OSVersion = [system.environment]::OSVersion.Version
+$GPOInstalled = if (($OSVersion.Major -eq 10) -or (($OSVersion.Major -eq 6) -and ($OSVersion.Minor -ge 2))) {
+    (get-gpo -name $GPOName -ErrorAction ignore).Count
+}
+else {
+    -1
+}

AMPs/Agent AD Status.ps1

@@ -1,11 +1,15 @@
 # Installation, Diagnostic and Repair Script for the N-Central Agent
 # Original Script Created by Tim Wiser
-# Maintained by the Solarwinds MSP Community
+# Maintained by the N-able Community
 
 ################################
 ########## Change Log ##########
 ################################
 
+### 6.0.1 on 2021-04-12 - David Brooks & Robby Swartenbroekx
+##################################################################
+# See ReleaseNotes.md for all the changes
+
 ### 6.0.0 on 2021-02-01 - David Brooks
 ##################################################################
 # - Added various token registration method and agent activation methods
@@ -80,7 +84,7 @@
 # HOUSEKEEPING
 # - Re-published Change Log with most recent developments up top and some basic Categories for
 #   updates
-# - Moved Script Execution Registry Key to HKLM:\SOFTWARE\Solarwinds MSP Community
+# - Moved Script Execution Registry Key to HKLM:\SOFTWARE\SolarWinds MSP Community
 # - Added a Legacy Version Cleanup section which will automatically remove values/files created by
 #   older versions of the Script (Huge thanks to Tim and Jon for their contributions!)
 #
@@ -191,8 +195,8 @@ if ($DebugMode.IsPresent) {
   if (Get-Module InstallAgent-Core) {
     Remove-Module InstallAgent-Core
   }
-  $AgentRegPath = "HKLM:\SOFTWARE\Solarwinds MSP Community\InstallAgent"
-  if (Test-Path $AgentRegPath){
+  $AgentRegPath = "HKLM:\SOFTWARE\N-able Community\InstallAgent"
+  if (Test-Path $AgentRegPath) {
     Remove-Item $AgentRegPath -Recurse -Force
   }
 }
@@ -215,8 +219,8 @@ $NC.InstallParameters = @{
 }
 # Path Constants
 $NC.Paths = @{
-  "BinFolder"      = "N-Able Technologies\Windows Agent\bin"
-  "ConfigFolder"   = "N-Able Technologies\Windows Agent\config"
+  "BinFolder"      = "N-able Technologies\Windows Agent\bin"
+  "ConfigFolder"   = "N-able Technologies\Windows Agent\config"
   "UninstallKey32" = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
   "UninstallKey64" = "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall"
 }
@@ -286,7 +290,7 @@ $SC = @{
   }
   "RunningInstanceTimeout" = 30
   "ScriptEventLog"         = "Application"
-  "ScriptVersion"          = "6.0.0"
+  "ScriptVersion"          = "6.0.1"
   "SuccessScriptAction"    = "Graceful Exit"
   "SuccessScriptResult"    = "Script Completed Successfully"
 }
@@ -309,88 +313,88 @@ $SC.ExitTypes = @{
   "E" = "Report This Error"
 }
 $SC.Exit = @{
-  "Error"  = @{
+  "Error" = @{
     "ExitResult" = "Undocumented Error (See Event Log)"
     "ExitType"   = $SC.ExitTypes.E
   }
-  "A"      = @{
+  "A"     = @{
     "ExitResult" = $SC.SuccessScriptResult
     "ExitType"   = $SC.ExitTypes.A
   }
-  "B"      = @{
+  "B"     = @{
     "ExitResult" = "Partner Configuration File is Missing"
     "ExitType"   = $SC.ExitTypes.B
   }
-  "C"      = @{
+  "C"     = @{
     "ExitResult" = "Partner Configuration is Invalid"
     "ExitType"   = $SC.ExitTypes.B
   }
-  "D"      = @{
+  "D"     = @{
     "ExitResult" = "No Installation Sources Available"
     "ExitType"   = $SC.ExitTypes.B
   }
-  "E"      = @{
+  "E"     = @{
     "ExitResult" = "Installer File is Missing"
     "ExitType"   = $SC.ExitTypes.B
   }
-  "F"      = @{
+  "F"     = @{
     "ExitResult" = "Installer Version Mismatch"
     "ExitType"   = $SC.ExitTypes.B
   }
-  "G"      = @{
+  "G"     = @{
     "ExitResult" = ("Unable to Reach " + $NC.Products.NCServer.Name)
     "ExitType"   = $SC.ExitTypes.C
   }
-  "H"      = @{
+  "H"     = @{
     "ExitResult" = "Customer ID Parameter Required"
     "ExitType"   = $SC.ExitTypes.B
   }
-  "I"      = @{
+  "I"     = @{
     "ExitResult" = "Customer ID Parameter Invalid"
     "ExitType"   = $SC.ExitTypes.B
   }
-  "J"      = @{
+  "J"     = @{
     "ExitResult" = "Windows Installer Service Unavailable"
     "ExitType"   = $SC.ExitTypes.D
   }
-  "K"      = @{
+  "K"     = @{
     "ExitResult" = ".NET Framework Installation Failed"
     "ExitType"   = $SC.ExitTypes.D
   }
-  "L"      = @{
+  "L"     = @{
     "ExitResult" = "Agent Removal Failed"
     "ExitType"   = $SC.ExitTypes.D
   }
-  "M"      = @{
+  "M"     = @{
     "ExitResult" = "No Installation Methods Remaining"
     "ExitType"   = $SC.ExitTypes.D
   }
-  "AA"     = @{
+  "AA"    = @{
     "ExitMessage" = "An invalid Parameter value or type was provided to a Script Function."
     "ExitResult"  = "Invalid Parameter"
     "ExitType"    = $SC.ExitTypes.E
   }
-  "AB"     = @{
+  "AB"    = @{
     "ExitMessage" = ("The current " + $NC.Products.Agent.Name + " installation requires repair, but no Repairs were selected to be applied.")
     "ExitResult"  = "No Repairs Selected"
     "ExitType"    = $SC.ExitTypes.E
   }
-  "AC"     = @{
+  "AC"    = @{
     "ExitMessage" = "An error occurred during a file transfer and the Script cannot proceed."
     "ExitResult"  = "File Transfer Failed"
     "ExitType"    = $SC.ExitTypes.E
   }
-  "AD"     = @{
+  "AD"    = @{
     "ExitMessage" = "The file at the specified path does not exist."
     "ExitResult"  = "File Not Found"
     "ExitType"    = $SC.ExitTypes.E
   }
-  "AE"     = @{
+  "AE"    = @{
     "ExitMessage" = "An error occurred during item creation and the Script cannot proceed."
     "ExitResult"  = "File/Folder Creation Failed"
     "ExitType"    = $SC.ExitTypes.E
   }
-  "LEGACY" = @{
+  "AF"    = @{
     "ExitMessage" = "The agent could not be installed on this legacy platform."
     "ExitResult"  = "Legacy installation unavailable"
     "ExitType"    = $SC.ExitTypes.E
@@ -482,7 +486,7 @@ $SC.Names = @{
 }
 # Path Constants
 $SC.Paths = @{
-  "ExecutionKey" = "HKLM:\SOFTWARE\Solarwinds MSP Community"
+  "ExecutionKey" = "HKLM:\SOFTWARE\N-able Community"
   "ServiceKey"   = "HKLM:\SYSTEM\CurrentControlSet\Services"
   "TempFolder"   = Split-Path $MyInvocation.MyCommand.Path -Parent
 }
@@ -575,13 +579,14 @@ $SC.Validation = @{
 }
 ### Retired Values - PLACE RETIRED VALUES HERE TO CLEANUP OLD SCRIPT ENTRIES
 $SC.Paths.Old = @{
-  "ExecutionKeyTim" = "HKLM:\SOFTWARE\Tim Wiser"
-  "ExecutionKey"    = "HKLM:\SOFTWARE\N-Central"
-  "EventKey"        = "HKLM:\SYSTEM\CurrentControlSet\Services\EventLog\InstallAgent"
+  "ExecutionKeySolarWinds" = "HKLM:\SOFTWARE\SolarWinds MSP Community"
+  "ExecutionKeyTim"        = "HKLM:\SOFTWARE\Tim Wiser"
+  "ExecutionKey"           = "HKLM:\SOFTWARE\N-Central"
+  "EventKey"               = "HKLM:\SYSTEM\CurrentControlSet\Services\EventLog\InstallAgent"
 }
 
 function GetCustomInstallMethods {
-# An empty function for a partner to override and update/insert custom install information
+  # An empty function for a partner to override and update/insert custom install information
 }
 
 

Agent/InstallAgent.ps1

@@ -2,7 +2,8 @@ param (
     [Switch]$Monitor
 )
 ### 1.0.0 on 2021-02-21 - David Brooks, Premier Technology Solutions
-##################################################################
+### 1.0.1 on 2021-03-23 - Robby Swartenbroekx, b-inside bv
+####################################################################
 # - Adapted updated Batch file version of InstallAgent to PowerShell
 Write-Host "CustomerID: $($args[0])" -ForegroundColor Green
 Write-Host "Token: $($args[1])" -ForegroundColor Green
@@ -76,12 +77,16 @@ if ($null -eq $p) {
     Write-EventLog -EntryType Error -EventId 13 -LogName Application -Source $LauncherScript -Message  "$SetupScript encountered an error starting the launcher" > $null
     Exit 2
 }
+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\Solarwinds MSP Community\InstallAgent"
-    Installation = "HKLM:\SOFTWARE\Solarwinds MSP Community\InstallAgent\Installation"
-    Diagnosis    = "HKLM:\SOFTWARE\Solarwinds MSP Community\InstallAgent\Diagnosis"
+    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) {
@@ -92,7 +97,8 @@ while (-not $p.HasExited) {
             Write-Host "Progress: " -ForegroundColor Green -NoNewline
             Get-ItemProperty $RegPaths.Summary | Select-Object * -ExcludeProperty PS* | Format-List *
         }
-    } else {
+    }
+    else {
         Start-Sleep 10
     }
 }