upstream/icinga-powershell-framework
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-powershell-framework.git synced 2025-12-21 07:10:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes REST message reader for reading new msg properly and body read fixing

Browse source
This commit is contained in:
Christian Stein 2020-03-27 16:42:46 +01:00
parent c5e4c4eade
commit 1993683602
1 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/web/Read-IcingaRESTMessage.psm1
View file

@ -1,20 +1,34 @@
function Read-IcingaRESTMessage() function Read-IcingaRESTMessage()
{ {
param( param(
[string]$RestMessage = $null [string]$RestMessage = $null,
[hashtable]$Connection = $null
);
# Just in case we didnt receive anything - no need to
# parse through everything
if ([string]::IsNullOrEmpty($RestMessage)) {
return $null;
}
Write-IcingaDebugMessage (
[string]::Format(
'Receiving client message{0}{0}{1}',
(New-IcingaNewline),
$RestMessage
)
); );
[hashtable]$Request = @{}; [hashtable]$Request = @{};
$RestMessage -match '(\d+) (.+) (.+) (.+)' | Out-Null; $RestMessage -match '(.+) (.+) (.+)' | Out-Null;
$Request.Add('MessageLength', $Matches[1]); $Request.Add('Method', $Matches[1]);
$Request.Add('Method', $Matches[2]); $Request.Add('FullRequest', $Matches[2]);
$Request.Add('FullRequest', $Matches[3]);
$Request.Add('RequestPath', @{}); $Request.Add('RequestPath', @{});
$Request.Add('RequestArguments', @{}); $Request.Add('RequestArguments', @{});
#Path #Path
$PathMatch = $Matches[3]; $PathMatch = $Matches[2];
$PathMatch -match '((\/[^\/\?]+)*)\??([^\/]*)' | Out-Null; $PathMatch -match '((\/[^\/\?]+)*)\??([^\/]*)' | Out-Null;
$Arguments = $Matches[3]; $Arguments = $Matches[3];
$Request.RequestPath.Add('FullPath', $Matches[1]); $Request.RequestPath.Add('FullPath', $Matches[1]);
@ -53,5 +67,14 @@ function Read-IcingaRESTMessage()
$RestMessage -match '(\{(.*\n)*}|\{.*\})' | Out-Null; $RestMessage -match '(\{(.*\n)*}|\{.*\})' | Out-Null;
$Request.Add('Body', $Matches[1]); $Request.Add('Body', $Matches[1]);
# We received a content length, but couldnt load the body. Some clients will send the body as separate message
# Lets try to read the body content
if ($null -ne $Connection) {
if ($Request.ContainsKey('ContentLength') -And $Request.ContentLength -gt 0 -And ($Request.ContainsKey('Body') -eq $FALSE -Or [string]::IsNullOrEmpty($Request.Body))) {
$Request.Body = Read-IcingaTCPStream -Client $Connection.Client -Stream $Connection.Stream -ReadLength $Request.ContentLength;
Write-IcingaDebugMessage -Message 'Body Content' -Objects $Request;
}
}
return $Request; return $Request;
} }