tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3486 from Icinga/fix/request-parses-json-without-respecting-content-type-3484 

Fix that Request parses json without respecting content type
This commit is contained in:
Eric Lippmann 2018-07-05 13:19:27 +02:00 committed by GitHub
parent 51307d77a9 8cbff87af1
commit 189b519135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
library/Icinga/Web/Request.php
View File

@ -124,8 +124,24 @@ class Request extends Zend_Controller_Request_Http
public function getPost($key = null, $default = null)
{
return $key === null && $this->isApiRequest()
? Json::decode(file_get_contents('php://input'), true)
: parent::getPost($key, $default);
if ($key === null && $this->extractMediaType($this->getHeader('Content-Type')) === 'application/json') {
return Json::decode(file_get_contents('php://input'), true);
}
return parent::getPost($key, $default);
}
/**
* Extract and return the media type from the given header value
*
* @param string $headerValue
*
* @return string
*/
protected function extractMediaType($headerValue)
{
// Pretty basic and does not care about parameters
$parts = explode(';', $headerValue, 2);
return strtolower(trim($parts[0]));
}
}