SVS_Public_Repo/SAMY
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update samy.ps1

Browse Source
This commit is contained in:
Stephan Yelle
2025-12-05 14:48:09 -05:00
parent a66b6d6112
commit c4108c880b
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samy.ps1
View File

@@ -1328,6 +1328,12 @@ function Send-JSON {
if (-not $Context -or -not $Context.Response) { if (-not $Context -or -not $Context.Response) {
return return
} }
# If caller gave us $null, reply with an empty array instead of blowing up
if ($null -eq $Object) {
$Object = @()
}
$json = $Object | ConvertTo-Json -Depth 5 $json = $Object | ConvertTo-Json -Depth 5
$bytes = [Text.Encoding]::UTF8.GetBytes($json) $bytes = [Text.Encoding]::UTF8.GetBytes($json)
$Context.Response.ContentType = 'application/json' $Context.Response.ContentType = 'application/json'
@@ -1794,6 +1800,12 @@ function Invoke-GetPrinters {
# NOTE: We never log the actual password # NOTE: We never log the actual password
$printers = Get-SamyClientListFromServer -Uri $uri -Password $password $printers = Get-SamyClientListFromServer -Uri $uri -Password $password
# 🔹 EXTRA SAFETY: never pass $null to Send-JSON
if ($null -eq $printers) {
Write-LogHybrid "Get-SamyClientListFromServer returned `$null; sending empty JSON array." Warning Printers -LogToEvent
$printers = @()
}
# Return raw objects as JSON; JS will filter/group # Return raw objects as JSON; JS will filter/group
Send-JSON $Context $printers Send-JSON $Context $printers
} }