gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #16222 Secure parameters before giving them to DI

Browse Source 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
Hugues Peccatte 2020-06-28 16:21:28 +02:00
parent 638fb99f5b
commit ff3bbe0f99
8 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/classes/Di/Migration.php
View File

@ -66,6 +66,6 @@ class Migration
public function setGlobal(string $key, $value)
{
$GLOBALS[$key] = $value;
$this->containerBuilder->setParameter($key, $value);
$this->containerBuilder->setParameter($key, $this->containerBuilder->getParameterBag()->escapeValue($value));
}
}

5
tbl_chart.php
View File

@ -25,9 +25,10 @@ $dependency_definitions = [
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(ChartController::class);
$parameterBag = $containerBuilder->getParameterBag();
array_map(
static function (string $parameterName, $value) use ($definition) {
$definition->replaceArgument($parameterName, $value);
static function (string $parameterName, $value) use ($definition, $parameterBag) {
$definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
},
array_keys($dependency_definitions),
$dependency_definitions

5
tbl_find_replace.php
View File

@ -30,9 +30,10 @@ $dependency_definitions = [
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(SearchController::class);
$parameterBag = $containerBuilder->getParameterBag();
array_map(
static function (string $parameterName, $value) use ($definition) {
$definition->replaceArgument($parameterName, $value);
static function (string $parameterName, $value) use ($definition, $parameterBag) {
$definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
},
array_keys($dependency_definitions),
$dependency_definitions

5
tbl_gis_visualization.php
View File

@ -42,9 +42,10 @@ $dependency_definitions = [
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(GisVisualizationController::class);
$parameterBag = $containerBuilder->getParameterBag();
array_map(
static function (string $parameterName, $value) use ($definition) {
$definition->replaceArgument($parameterName, $value);
static function (string $parameterName, $value) use ($definition, $parameterBag) {
$definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
},
array_keys($dependency_definitions),
$dependency_definitions

5
tbl_relation.php
View File

@ -77,9 +77,10 @@ if (Util::isForeignKeySupported($tbl_storage_engine)) {
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(RelationController::class);
$parameterBag = $containerBuilder->getParameterBag();
array_map(
static function (string $parameterName, $value) use ($definition) {
$definition->replaceArgument($parameterName, $value);
static function (string $parameterName, $value) use ($definition, $parameterBag) {
$definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
},
array_keys($dependency_definitions),
$dependency_definitions

5
tbl_select.php
View File

@ -30,9 +30,10 @@ $dependency_definitions = [
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(SearchController::class);
$parameterBag = $containerBuilder->getParameterBag();
array_map(
static function (string $parameterName, $value) use ($definition) {
$definition->replaceArgument($parameterName, $value);
static function (string $parameterName, $value) use ($definition, $parameterBag) {
$definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
},
array_keys($dependency_definitions),
$dependency_definitions

5
tbl_structure.php
View File

@ -55,9 +55,10 @@ $dependency_definitions = [
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(StructureController::class);
$parameterBag = $containerBuilder->getParameterBag();
array_map(
static function (string $parameterName, $value) use ($definition) {
$definition->replaceArgument($parameterName, $value);
static function (string $parameterName, $value) use ($definition, $parameterBag) {
$definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
},
array_keys($dependency_definitions),
$dependency_definitions

5
tbl_zoom_select.php
View File

@ -29,9 +29,10 @@ $dependency_definitions = [
/** @var Definition $definition */
$definition = $containerBuilder->getDefinition(SearchController::class);
$parameterBag = $containerBuilder->getParameterBag();
array_map(
static function (string $parameterName, $value) use ($definition) {
$definition->replaceArgument($parameterName, $value);
static function (string $parameterName, $value) use ($definition, $parameterBag) {
$definition->replaceArgument($parameterName, $parameterBag->escapeValue($value));
},
array_keys($dependency_definitions),
$dependency_definitions