Use documented NinjaOne custom field commands

.gitea/workflows/client-build.yml

@@ -74,6 +74,8 @@ jobs:
 
       - name: Publish Gitea release assets
         shell: pwsh
+        env:
+          GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         run: |
           $ref = if ($env:GITHUB_REF) { $env:GITHUB_REF } else { $env:GITEA_REF }
           $tag = if ($env:GITHUB_REF_NAME) { $env:GITHUB_REF_NAME } else { Split-Path -Leaf $ref }

installer/runtime-run-ocsentinel-monitor.ps1

@@ -46,8 +46,13 @@ function Initialize-NinjaFieldWriter {
         return
     }
 
+    if (Get-Command -Name "Set-NinjaProperty" -ErrorAction SilentlyContinue) {
+        $script:NinjaFieldBackend = "powershell-modern"
+        return
+    }
+
     if (Get-Command -Name "Ninja-Property-Set" -ErrorAction SilentlyContinue) {
-        $script:NinjaFieldBackend = "powershell"
+        $script:NinjaFieldBackend = "powershell-legacy"
         return
     }
 
@@ -64,14 +69,20 @@ function Set-NinjaCustomFieldValue {
         [Parameter(Mandatory)]
         [string]$Name,
         [AllowEmptyString()]
-        [string]$Value
+        [object]$Value,
+        [Parameter(Mandatory)]
+        [string]$Type
     )
 
     Initialize-NinjaFieldWriter
 
     switch ($script:NinjaFieldBackend) {
-        "powershell" {
-            Ninja-Property-Set $Name $Value | Out-Null
+        "powershell-modern" {
+            Set-NinjaProperty -Name $Name -Value $Value -Type $Type -Force | Out-Null
+            return $true
+        }
+        "powershell-legacy" {
+            Ninja-Property-Set -Name $Name -Value $Value | Out-Null
             return $true
         }
         "cli" {
@@ -112,28 +123,28 @@ function Publish-NinjaCustomFields {
         }
     }
 
-    $fieldValues = [ordered]@{
-        "ocsentinelstatus" = [string]$Report.AlertState
-        "ocsentinelreason" = $Reason
-        "ocsentinelbasestatus" = [string]$Report.BaseAlertState
-        "ocsentinelevents" = [string]([int]$Report.TotalEvents)
-        "ocsentineluniqueips" = [string]([int]$Report.UniqueIpCount)
-        "ocsentinelcvecritical" = [string]([int]$Report.VulnerabilityCorrelation.CriticalCount)
-        "ocsentinelcvetotal" = [string]([int]$Report.VulnerabilityCorrelation.TotalCount)
-        "ocsentinelmode" = $Mode
-        "ocsentineltriggered" = $Triggered.ToString().ToLowerInvariant()
-        "ocsentinellastscanutc" = $generatedAtUtc
-    }
+    $fieldValues = @(
+        [pscustomobject]@{ Name = "ocsentinelstatus"; Type = "Text"; Value = [string]$Report.AlertState }
+        [pscustomobject]@{ Name = "ocsentinelreason"; Type = "Text"; Value = $Reason }
+        [pscustomobject]@{ Name = "ocsentinelbasestatus"; Type = "Text"; Value = [string]$Report.BaseAlertState }
+        [pscustomobject]@{ Name = "ocsentinelevents"; Type = "Integer"; Value = [int]$Report.TotalEvents }
+        [pscustomobject]@{ Name = "ocsentineluniqueips"; Type = "Integer"; Value = [int]$Report.UniqueIpCount }
+        [pscustomobject]@{ Name = "ocsentinelcvecritical"; Type = "Integer"; Value = [int]$Report.VulnerabilityCorrelation.CriticalCount }
+        [pscustomobject]@{ Name = "ocsentinelcvetotal"; Type = "Integer"; Value = [int]$Report.VulnerabilityCorrelation.TotalCount }
+        [pscustomobject]@{ Name = "ocsentinelmode"; Type = "Text"; Value = $Mode }
+        [pscustomobject]@{ Name = "ocsentineltriggered"; Type = "Checkbox"; Value = $Triggered }
+        [pscustomobject]@{ Name = "ocsentinellastscanutc"; Type = "DateTime"; Value = $generatedAtUtc }
+    )
 
     $updated = 0
-    foreach ($entry in $fieldValues.GetEnumerator()) {
+    foreach ($entry in $fieldValues) {
         try {
-            if (Set-NinjaCustomFieldValue -Name $entry.Key -Value $entry.Value) {
+            if (Set-NinjaCustomFieldValue -Name $entry.Name -Value $entry.Value -Type $entry.Type) {
                 $updated++
             }
         }
         catch {
-            Write-Warning "Failed to set Ninja custom field '$($entry.Key)': $($_.Exception.Message)"
+            Write-Warning "Failed to set Ninja custom field '$($entry.Name)': $($_.Exception.Message)"
         }
     }
 

release/stable/version.json

@@ -1,8 +1,8 @@
 {
   "channel": "stable",
-  "version": "1.2.6",
-  "publishedAtUtc": "2026-07-25T00:00:00Z",
-  "artifactUrl": "https://gitea.officecom.cloud/officecom/oc-sentinel/releases/download/v1.2.6/OCSentinelClient-win-x64.zip",
-  "sha256": "d6256f3e376701bff18d9dfd8d5825498e85fb6d94c15227828a50678693d097",
+  "version": "1.2.11",
+  "publishedAtUtc": "2026-07-25T19:17:43.7567344Z",
+  "artifactUrl": "https://gitea.officecom.cloud/officecom/oc-sentinel/releases/download/v1.2.11/OCSentinelClient-win-x64.zip",
+  "sha256": "4a5415ce281f444a987a3fd72980c159afaa37787bbaa396f42d2c496736e5e1",
   "minUpdaterVersion": "1.0.0"
 }

scripts/bootstrap-ocsentinel-ninja.ps1

@@ -18,6 +18,20 @@ $clientConfigPath = Join-Path $installRoot "config\ocsentinel-client.json"
 $secretScriptPath = Join-Path $installRoot "scripts\protect-ocsentinel-secret.ps1"
 $secretPath = "C:\ProgramData\OCSentinel\secrets\ocsentinel-upload-secret.dat"
 
+# NinjaOne script variables are exposed as process environment variables.
+if ([string]::IsNullOrWhiteSpace($WebhookUrl)) {
+    $WebhookUrl = $env:WebhookUrl
+}
+
+if ([string]::IsNullOrWhiteSpace($SecretValue)) {
+    $SecretValue = $env:SecretValue
+}
+
+$runInitialScan = $RunInitialStatusScan.IsPresent
+if (-not $runInitialScan -and -not [string]::IsNullOrWhiteSpace($env:RunInitialStatusScan)) {
+    $runInitialScan = $env:RunInitialStatusScan -match '^(1|true|yes|on)$'
+}
+
 function Assert-ArtifactSignature {
     param([Parameter(Mandatory)][string]$ExecutablePath)
 
@@ -108,7 +122,7 @@ if (-not [string]::IsNullOrWhiteSpace($SecretValue)) {
     }
 }
 
-if ($RunInitialStatusScan) {
+if ($runInitialScan) {
     if (-not (Test-Path -LiteralPath $monitorPath)) {
         throw "OCSentinel was installed, but the monitor script is missing."
     }

scripts/configure-ocsentinel-ninja.ps1

@@ -0,0 +1,62 @@
+[CmdletBinding()]
+param(
+    [string]$WebhookUrl = "",
+    [string]$SecretValue = ""
+)
+
+$ErrorActionPreference = "Stop"
+
+function Get-NinjaValue {
+    param([Parameter(Mandatory)][string]$Name)
+
+    $value = [Environment]::GetEnvironmentVariable($Name, "Process")
+    if ($null -eq $value) {
+        return ""
+    }
+
+    return $value.Trim()
+}
+
+if ([string]::IsNullOrWhiteSpace($WebhookUrl)) {
+    $WebhookUrl = Get-NinjaValue -Name "webhookurl"
+}
+
+if ([string]::IsNullOrWhiteSpace($SecretValue)) {
+    $SecretValue = Get-NinjaValue -Name "secretvalue"
+}
+
+if ([string]::IsNullOrWhiteSpace($WebhookUrl) -or [string]::IsNullOrWhiteSpace($SecretValue)) {
+    throw "WebhookUrl and SecretValue must be supplied as NinjaOne script variables."
+}
+
+$installRoot = Join-Path $env:ProgramFiles "OCSentinel"
+$configPath = Join-Path $installRoot "config\ocsentinel-client.json"
+$secretScript = Join-Path $installRoot "scripts\protect-ocsentinel-secret.ps1"
+$monitorScript = Join-Path $installRoot "scripts\run-ocsentinel-monitor.ps1"
+$secretPath = "C:\ProgramData\OCSentinel\secrets\ocsentinel-upload-secret.dat"
+
+foreach ($path in @($configPath, $secretScript, $monitorScript)) {
+    if (-not (Test-Path -LiteralPath $path)) {
+        throw "OCSentinel installation is incomplete. Missing: $path"
+    }
+}
+
+$config = Get-Content -LiteralPath $configPath -Raw | ConvertFrom-Json
+$config.n8nWebhookUrl = $WebhookUrl
+$config.environment = "production"
+$config | ConvertTo-Json -Depth 10 | Set-Content -LiteralPath $configPath -Encoding UTF8
+Write-Host "OCSentinel upload endpoint configured."
+
+& powershell.exe -NoProfile -ExecutionPolicy Bypass -File $secretScript -SecretValue $SecretValue
+if ($LASTEXITCODE -ne 0) {
+    throw "Writing the protected upload secret failed with code $LASTEXITCODE"
+}
+
+Write-Host "Running signed OCSentinel test scan and upload."
+& powershell.exe -NoProfile -ExecutionPolicy Bypass -File $monitorScript `
+    -Mode status `
+    -ClientConfigPath $configPath `
+    -SecretPath $secretPath `
+    -UploadMode required
+
+exit $LASTEXITCODE

scripts/install-ocsentinel-ninja-once.ps1

@@ -0,0 +1,74 @@
+[CmdletBinding()]
+param(
+    [string]$ManifestUrl = "https://gitea.officecom.cloud/officecom/oc-sentinel/raw/main/release/stable/version.json",
+    [string]$WebhookUrl = "",
+    [string]$SecretValue = ""
+)
+
+$ErrorActionPreference = "Stop"
+$ProgressPreference = "SilentlyContinue"
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+function Get-NinjaValue {
+    param([Parameter(Mandatory)][string]$Name)
+
+    $value = [Environment]::GetEnvironmentVariable($Name, "Process")
+    if ($null -eq $value) {
+        return ""
+    }
+
+    return $value.Trim()
+}
+
+if ([string]::IsNullOrWhiteSpace($WebhookUrl)) { $WebhookUrl = Get-NinjaValue -Name "webhookurl" }
+if ([string]::IsNullOrWhiteSpace($SecretValue)) { $SecretValue = Get-NinjaValue -Name "secretvalue" }
+if ([string]::IsNullOrWhiteSpace($WebhookUrl) -or [string]::IsNullOrWhiteSpace($SecretValue)) {
+    throw "WebhookUrl and SecretValue must be set as NinjaOne script variables."
+}
+
+$manifest = Invoke-RestMethod -Method Get -Uri $ManifestUrl -TimeoutSec 60
+if ([string]::IsNullOrWhiteSpace($manifest.artifactUrl) -or [string]::IsNullOrWhiteSpace($manifest.sha256)) {
+    throw "The release manifest is incomplete."
+}
+
+$downloadRoot = Join-Path $env:ProgramData ("OCSentinel\\install-" + [Guid]::NewGuid().ToString("N"))
+$zipPath = Join-Path $downloadRoot "OCSentinelClient.zip"
+$extractPath = Join-Path $downloadRoot "payload"
+
+try {
+    New-Item -ItemType Directory -Force -Path $extractPath | Out-Null
+    Write-Host "Downloading OCSentinel $($manifest.version)."
+    Invoke-WebRequest -Uri $manifest.artifactUrl -OutFile $zipPath -TimeoutSec 300
+    $actualHash = (Get-FileHash -LiteralPath $zipPath -Algorithm SHA256).Hash.ToLowerInvariant()
+    if ($actualHash -ne ([string]$manifest.sha256).ToLowerInvariant()) {
+        throw "Release package SHA-256 validation failed."
+    }
+
+    Expand-Archive -LiteralPath $zipPath -DestinationPath $extractPath -Force
+    $installer = Get-ChildItem -Path $extractPath -Recurse -Filter "install-ocsentinel.ps1" | Select-Object -First 1
+    if ($null -eq $installer) { throw "The release package does not contain the installer." }
+
+    & powershell.exe -NoProfile -ExecutionPolicy Bypass -File $installer.FullName
+    if ($LASTEXITCODE -ne 0) { throw "Installer failed with code $LASTEXITCODE" }
+}
+finally {
+    if (Test-Path -LiteralPath $downloadRoot) { Remove-Item -LiteralPath $downloadRoot -Recurse -Force }
+}
+
+$installRoot = Join-Path $env:ProgramFiles "OCSentinel"
+$configPath = Join-Path $installRoot "config\ocsentinel-client.json"
+$secretScript = Join-Path $installRoot "scripts\protect-ocsentinel-secret.ps1"
+$monitorScript = Join-Path $installRoot "scripts\run-ocsentinel-monitor.ps1"
+$secretPath = "C:\ProgramData\OCSentinel\secrets\ocsentinel-upload-secret.dat"
+
+$config = Get-Content -LiteralPath $configPath -Raw | ConvertFrom-Json
+$config.n8nWebhookUrl = $WebhookUrl
+$config.environment = "production"
+$config | ConvertTo-Json -Depth 10 | Set-Content -LiteralPath $configPath -Encoding UTF8
+
+& powershell.exe -NoProfile -ExecutionPolicy Bypass -File $secretScript -SecretValue $SecretValue
+if ($LASTEXITCODE -ne 0) { throw "Writing the protected upload secret failed with code $LASTEXITCODE" }
+
+Write-Host "Running initial signed scan and upload."
+& powershell.exe -NoProfile -ExecutionPolicy Bypass -File $monitorScript -Mode status -ClientConfigPath $configPath -SecretPath $secretPath -UploadMode required
+exit $LASTEXITCODE

scripts/run-ocsentinel-monitor.ps1

@@ -46,8 +46,13 @@ function Initialize-NinjaFieldWriter {
         return
     }
 
+    if (Get-Command -Name "Set-NinjaProperty" -ErrorAction SilentlyContinue) {
+        $script:NinjaFieldBackend = "powershell-modern"
+        return
+    }
+
     if (Get-Command -Name "Ninja-Property-Set" -ErrorAction SilentlyContinue) {
-        $script:NinjaFieldBackend = "powershell"
+        $script:NinjaFieldBackend = "powershell-legacy"
         return
     }
 
@@ -64,14 +69,20 @@ function Set-NinjaCustomFieldValue {
         [Parameter(Mandatory)]
         [string]$Name,
         [AllowEmptyString()]
-        [string]$Value
+        [object]$Value,
+        [Parameter(Mandatory)]
+        [string]$Type
     )
 
     Initialize-NinjaFieldWriter
 
     switch ($script:NinjaFieldBackend) {
-        "powershell" {
-            Ninja-Property-Set $Name $Value | Out-Null
+        "powershell-modern" {
+            Set-NinjaProperty -Name $Name -Value $Value -Type $Type -Force | Out-Null
+            return $true
+        }
+        "powershell-legacy" {
+            Ninja-Property-Set -Name $Name -Value $Value | Out-Null
             return $true
         }
         "cli" {
@@ -112,28 +123,28 @@ function Publish-NinjaCustomFields {
         }
     }
 
-    $fieldValues = [ordered]@{
-        "ocsentinelstatus" = [string]$Report.AlertState
-        "ocsentinelreason" = $Reason
-        "ocsentinelbasestatus" = [string]$Report.BaseAlertState
-        "ocsentinelevents" = [string]([int]$Report.TotalEvents)
-        "ocsentineluniqueips" = [string]([int]$Report.UniqueIpCount)
-        "ocsentinelcvecritical" = [string]([int]$Report.VulnerabilityCorrelation.CriticalCount)
-        "ocsentinelcvetotal" = [string]([int]$Report.VulnerabilityCorrelation.TotalCount)
-        "ocsentinelmode" = $Mode
-        "ocsentineltriggered" = $Triggered.ToString().ToLowerInvariant()
-        "ocsentinellastscanutc" = $generatedAtUtc
-    }
+    $fieldValues = @(
+        [pscustomobject]@{ Name = "ocsentinelstatus"; Type = "Text"; Value = [string]$Report.AlertState }
+        [pscustomobject]@{ Name = "ocsentinelreason"; Type = "Text"; Value = $Reason }
+        [pscustomobject]@{ Name = "ocsentinelbasestatus"; Type = "Text"; Value = [string]$Report.BaseAlertState }
+        [pscustomobject]@{ Name = "ocsentinelevents"; Type = "Integer"; Value = [int]$Report.TotalEvents }
+        [pscustomobject]@{ Name = "ocsentineluniqueips"; Type = "Integer"; Value = [int]$Report.UniqueIpCount }
+        [pscustomobject]@{ Name = "ocsentinelcvecritical"; Type = "Integer"; Value = [int]$Report.VulnerabilityCorrelation.CriticalCount }
+        [pscustomobject]@{ Name = "ocsentinelcvetotal"; Type = "Integer"; Value = [int]$Report.VulnerabilityCorrelation.TotalCount }
+        [pscustomobject]@{ Name = "ocsentinelmode"; Type = "Text"; Value = $Mode }
+        [pscustomobject]@{ Name = "ocsentineltriggered"; Type = "Checkbox"; Value = $Triggered }
+        [pscustomobject]@{ Name = "ocsentinellastscanutc"; Type = "DateTime"; Value = $generatedAtUtc }
+    )
 
     $updated = 0
-    foreach ($entry in $fieldValues.GetEnumerator()) {
+    foreach ($entry in $fieldValues) {
         try {
-            if (Set-NinjaCustomFieldValue -Name $entry.Key -Value $entry.Value) {
+            if (Set-NinjaCustomFieldValue -Name $entry.Name -Value $entry.Value -Type $entry.Type) {
                 $updated++
             }
         }
         catch {
-            Write-Warning "Failed to set Ninja custom field '$($entry.Key)': $($_.Exception.Message)"
+            Write-Warning "Failed to set Ninja custom field '$($entry.Name)': $($_.Exception.Message)"
         }
     }
 

src/OCSentinelCli/JsonOptions.cs

@@ -8,6 +8,9 @@ internal static class JsonOptions
     public static readonly JsonSerializerOptions Default = new()
     {
         WriteIndented = true,
+        // Client configuration is also written by PowerShell/NinjaOne scripts.
+        // Accept their conventional camelCase names (for example n8nWebhookUrl).
+        PropertyNameCaseInsensitive = true,
         DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
     };
 }

src/OCSentinelCli/OCSentinelCli.csproj

@@ -9,10 +9,10 @@
     <RootNamespace>OCSentinelCli</RootNamespace>
     <Product>OfficeCom Sentinel</Product>
     <Company>OfficeCom</Company>
-    <Version>1.2.8</Version>
-    <AssemblyVersion>1.2.3.0</AssemblyVersion>
-    <FileVersion>1.2.3.0</FileVersion>
-    <InformationalVersion>1.2.3</InformationalVersion>
+    <Version>1.2.11</Version>
+    <AssemblyVersion>1.2.11.0</AssemblyVersion>
+    <FileVersion>1.2.11.0</FileVersion>
+    <InformationalVersion>1.2.11</InformationalVersion>
   </PropertyGroup>
 
   <ItemGroup>