Update samy.ps1
This commit is contained in:
90
samy.ps1
90
samy.ps1
@@ -1910,6 +1910,26 @@ function Install-DattoRMM {
|
|||||||
|
|
||||||
#endregion Install-DattoRMM
|
#endregion Install-DattoRMM
|
||||||
|
|
||||||
|
# --- Task handler resolver (prevents Get-Command $null + supports fallback naming) ---
|
||||||
|
function Get-TaskHandlerName {
|
||||||
|
param([object]$Task)
|
||||||
|
|
||||||
|
# Preferred explicit properties (if your JSON provides them)
|
||||||
|
foreach ($p in @('HandlerFn','Handler','Fn')) {
|
||||||
|
if ($Task.PSObject.Properties.Name -contains $p) {
|
||||||
|
$v = [string]$Task.$p
|
||||||
|
if (-not [string]::IsNullOrWhiteSpace($v)) { return $v }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Fallback convention: Name="InstallChrome" -> Invoke-InstallChrome
|
||||||
|
$n = [string]$Task.Name
|
||||||
|
if (-not [string]::IsNullOrWhiteSpace($n)) { return "Invoke-$n" }
|
||||||
|
|
||||||
|
return $null
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#region Dispatch-Request
|
#region Dispatch-Request
|
||||||
|
|
||||||
# Sends the HTML for a given page or invokes a task handler
|
# Sends the HTML for a given page or invokes a task handler
|
||||||
@@ -1966,26 +1986,33 @@ function Install-DattoRMM {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# ---- Task invocation ----
|
# ---- Task invocation ----
|
||||||
$task = $Global:SamyTasks | Where-Object Name -EQ $path
|
$task = $Global:SamyTasks | Where-Object Name -EQ $path | Select-Object -First 1
|
||||||
if ($task) {
|
if ($task) {
|
||||||
$fn = $task.HandlerFn
|
|
||||||
$cmd = Get-Command $fn -ErrorAction SilentlyContinue
|
|
||||||
if (-not $cmd) {
|
|
||||||
$Context.Response.StatusCode = 500
|
|
||||||
Send-Text $Context "Handler not found: $fn"
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
# If the handler declares a Context parameter, pass it by name.
|
$fn = Get-TaskHandlerName -Task $task
|
||||||
if ($cmd.Parameters.ContainsKey('Context')) {
|
if ([string]::IsNullOrWhiteSpace($fn)) {
|
||||||
& $fn -Context $Context
|
$Context.Response.StatusCode = 500
|
||||||
}
|
Send-Text $Context "Task '$($task.Label)' is missing a handler (HandlerFn/Handler/Fn/Name)."
|
||||||
else {
|
|
||||||
& $fn
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$cmd = Get-Command -Name $fn -ErrorAction SilentlyContinue
|
||||||
|
if (-not $cmd) {
|
||||||
|
$Context.Response.StatusCode = 500
|
||||||
|
Send-Text $Context "Handler not found: $fn"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
# If the handler declares a Context parameter, pass it by name.
|
||||||
|
if ($cmd.Parameters.ContainsKey('Context')) {
|
||||||
|
& $fn -Context $Context
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
& $fn
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
# ---- 404 ----
|
# ---- 404 ----
|
||||||
$Context.Response.StatusCode = 404
|
$Context.Response.StatusCode = 404
|
||||||
Send-Text $Context '404 - Not Found'
|
Send-Text $Context '404 - Not Found'
|
||||||
@@ -2066,17 +2093,32 @@ function Install-DattoRMM {
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach ($task in $offboardTasks) {
|
foreach ($task in $offboardTasks) {
|
||||||
try {
|
try {
|
||||||
Write-LogHybrid "Running offboard task: $($task.Label)" Info OffBoard -LogToEvent
|
Write-LogHybrid "Running offboard task: $($task.Label)" Info OffBoard -LogToEvent
|
||||||
if (-not (Get-Command $task.HandlerFn -ErrorAction SilentlyContinue)) {
|
|
||||||
Write-LogHybrid "Missing handler $($task.HandlerFn)" Error OffBoard -LogToEvent
|
$fn = Get-TaskHandlerName -Task $task
|
||||||
continue
|
if ([string]::IsNullOrWhiteSpace($fn)) {
|
||||||
|
Write-LogHybrid "Offboard task is missing a handler (Id=$($task.Id) Label='$($task.Label)')" Error OffBoard -LogToEvent
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
$cmd = Get-Command -Name $fn -ErrorAction SilentlyContinue
|
||||||
|
if (-not $cmd) {
|
||||||
|
Write-LogHybrid "Missing handler $fn (task '$($task.Label)')" Error OffBoard -LogToEvent
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($cmd.Parameters.ContainsKey('Context')) {
|
||||||
|
& $fn -Context $null
|
||||||
|
} else {
|
||||||
|
& $fn
|
||||||
}
|
}
|
||||||
& $task.HandlerFn $null
|
|
||||||
} catch {
|
|
||||||
Write-LogHybrid "Offboard task $($task.Label) failed: $($_.Exception.Message)" Error OffBoard -LogToEvent
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
catch {
|
||||||
|
Write-LogHybrid "Offboard task $($task.Label) failed: $($_.Exception.Message)" Error OffBoard -LogToEvent
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Write-LogHybrid "Headless offboarding completed" Success OffBoard -LogToEvent
|
Write-LogHybrid "Headless offboarding completed" Success OffBoard -LogToEvent
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user