upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Use regex for all JSON-related content types

Browse source 
Signed-off-by: Stanimir Bozhilov <stanimir@audriga.com>
This commit is contained in:
Stanimir Bozhilov 2022-09-21 16:36:01 +02:00
parent 0ace70488a
commit f286a9d6ac
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/private/AppFramework/Http/Request.php
View file

@ -107,6 +107,8 @@ class Request implements \ArrayAccess, \Countable, IRequest {
/** @var bool */
protected $contentDecoded = false;
protected $jsonContentTypeRegex = '/application\/(\w+\+)?json/';
/**
* @param array $vars An associative array with the following optional values:
* - array 'urlParams' the parameters which were matched from the URL
@ -404,13 +406,13 @@ class Request implements \ArrayAccess, \Countable, IRequest {
&& $this->getHeader('Content-Length') !== '0'
&& $this->getHeader('Content-Length') !== ''
&& strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') === false
&& strpos($this->getHeader('Content-Type'), 'application/json') === false
&& strpos($this->getHeader('Content-Type'), 'application/scim+json') === false
&& preg_match($this->jsonContentTypeRegex, $this->getHeader('Content-Type')) === 0
) {
if ($this->content === false) {
throw new \LogicException(
'"put" can only be accessed once if not '
. 'application/x-www-form-urlencoded or application/json.'
. 'application/x-www-form-urlencoded, application/json '
. 'or other content type, related to JSON (like application/scim+json).'
);
}
$this->content = false;
@ -430,9 +432,8 @@ class Request implements \ArrayAccess, \Countable, IRequest {
}
$params = [];
// 'application/json' and 'application/scim+json' must be decoded manually.
if (strpos($this->getHeader('Content-Type'), 'application/json') !== false
|| strpos($this->getHeader('Content-Type'), 'application/scim+json') !== false) {
// 'application/json' and other JSON-related content types must be decoded manually.
if (preg_match($this->jsonContentTypeRegex, $this->getHeader('Content-Type')) === 1) {
$params = json_decode(file_get_contents($this->inputStream), true);
if ($params !== null && \count($params) > 0) {
$this->items['params'] = $params;