makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10824] Add json sanitizer class

Browse source 
PHPBB3-10824
This commit is contained in:
Marc Alexander 2016-01-16 18:51:13 +01:00
parent 8244aff9cb
commit 04e791d9fe
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_styles.php
View file

@ -1154,7 +1154,7 @@ class acp_styles
} }
$json = file_get_contents($this->styles_path . $dir . '/composer.json'); $json = file_get_contents($this->styles_path . $dir . '/composer.json');
$style_data = json_decode($json, true); $style_data = \phpbb\json_sanitizer::sanitize(json_decode($json, true));
if (!is_array($style_data) || !isset($style_data['type']) || $style_data['type'] !== 'phpbb-style') if (!is_array($style_data) || !isset($style_data['type']) || $style_data['type'] !== 'phpbb-style')
{ {

41
phpBB/phpbb/json_sanitizer.php Normal file
View file

@ -0,0 +1,41 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb;
/**
* JSON sanitizer class
*/
class json_sanitizer
{
/**
* Sanitize json data
*
* @param array $data Data to sanitize
*
* @return array Sanitized data
*/
static public function sanitize($data)
{
if (!empty($data))
{
$json_sanitizer = function (&$value, $key) {
$type_cast_helper = new \phpbb\request\type_cast_helper();
$type_cast_helper->set_var($value, $value, gettype($value), true);
};
array_walk_recursive($data, $json_sanitizer);
}
return $data;
}
}

11
phpBB/phpbb/version_helper.php
View file

@ -389,17 +389,8 @@ class version_helper
throw new version_check_exception($error_string); throw new version_check_exception($error_string);
} }
$info = json_decode($info, true);
// Sanitize any data we retrieve from a server // Sanitize any data we retrieve from a server
if (!empty($info)) $info = \phpbb\json_sanitizer::sanitize(json_decode($info, true));
{
$json_sanitizer = function (&$value, $key) {
$type_cast_helper = new \phpbb\request\type_cast_helper();
$type_cast_helper->set_var($value, $value, gettype($value), true);
};
array_walk_recursive($info, $json_sanitizer);
}
if (empty($info['stable']) && empty($info['unstable'])) if (empty($info['stable']) && empty($info['unstable']))
{ {