aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-11-16 13:09:03 +0100
committerMarc Alexander <admin@m-a-styles.de>2014-11-21 22:32:28 +0100
commit34004612acb0c55f1cf86271d5a62c1b396ee829 (patch)
tree82cef5015936296e570aaa7b00744ad2655d4e51 /tests
parentda1888a7fad3be8a42b326e24bd676c92a7e4c51 (diff)
downloadforums-34004612acb0c55f1cf86271d5a62c1b396ee829.tar
forums-34004612acb0c55f1cf86271d5a62c1b396ee829.tar.gz
forums-34004612acb0c55f1cf86271d5a62c1b396ee829.tar.bz2
forums-34004612acb0c55f1cf86271d5a62c1b396ee829.tar.xz
forums-34004612acb0c55f1cf86271d5a62c1b396ee829.zip
[ticket/security-171] Sanitize data from composer.json
SECURITY-171
Diffstat (limited to 'tests')
-rw-r--r--tests/extension/metadata_manager_test.php1
-rw-r--r--tests/mock/metadata_manager.php2
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 8e27b39459..fab1d3af3a 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -123,6 +123,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
}
$json = json_decode(file_get_contents($this->phpbb_root_path . 'ext/vendor2/foo/composer.json'), true);
+ array_walk_recursive($json, array($manager, 'sanitize_json'));
$this->assertEquals($metadata, $json);
}
diff --git a/tests/mock/metadata_manager.php b/tests/mock/metadata_manager.php
index 16900a0fc1..2443fad560 100644
--- a/tests/mock/metadata_manager.php
+++ b/tests/mock/metadata_manager.php
@@ -15,11 +15,13 @@ class phpbb_mock_metadata_manager extends \phpbb\extension\metadata_manager
{
public function set_metadata($metadata)
{
+ array_walk_recursive($metadata, array($this, 'sanitize_json'));
$this->metadata = $metadata;
}
public function merge_metadata($metadata)
{
+ array_walk_recursive($metadata, array($this, 'sanitize_json'));
$this->metadata = array_merge($this->metadata, $metadata);
}
}