-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #566 from magento-falcons/MAGETWO-59376
Fixed issue: - Split Deployment - scrub sensitive data - override config values by environment
- Loading branch information
Showing
55 changed files
with
2,413 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
149 changes: 149 additions & 0 deletions
149
app/code/Magento/Config/App/Config/Source/DumpConfigSourceAggregated.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2016 Magento. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| namespace Magento\Config\App\Config\Source; | ||
|
|
||
| use Magento\Config\Model\Config\Export\ExcludeList; | ||
| use Magento\Framework\App\Config\ConfigSourceInterface; | ||
| use Magento\Framework\App\Config\ScopeConfigInterface; | ||
|
|
||
| class DumpConfigSourceAggregated implements DumpConfigSourceInterface | ||
| { | ||
| /** | ||
| * @var ExcludeList | ||
| */ | ||
| private $excludeList; | ||
|
|
||
| /** | ||
| * @var ConfigSourceInterface[] | ||
| */ | ||
| private $sources; | ||
|
|
||
| /** | ||
| * @var array | ||
| */ | ||
| private $excludedFields; | ||
|
|
||
| /** | ||
| * @var array | ||
| */ | ||
| private $data; | ||
|
|
||
| /** | ||
| * @param ExcludeList $excludeList | ||
| * @param array $sources | ||
| */ | ||
| public function __construct(ExcludeList $excludeList, array $sources = []) | ||
| { | ||
| $this->excludeList = $excludeList; | ||
| $this->sources = $sources; | ||
| } | ||
|
|
||
| /** | ||
| * Retrieve aggregated configuration from all available sources. | ||
| * | ||
| * @param string $path | ||
| * @return array | ||
| */ | ||
| public function get($path = '') | ||
| { | ||
| $path = (string)$path; | ||
| $data = []; | ||
|
|
||
| if (isset($this->data[$path])) { | ||
| return $this->data[$path]; | ||
| } | ||
|
|
||
| $this->sortSources(); | ||
|
|
||
| foreach ($this->sources as $sourceConfig) { | ||
| /** @var ConfigSourceInterface $source */ | ||
| $source = $sourceConfig['source']; | ||
| $data = array_replace_recursive($data, $source->get($path)); | ||
| } | ||
|
|
||
| $this->excludedFields = []; | ||
| $this->filterChain($path, $data); | ||
|
|
||
| return $this->data[$path] = $data; | ||
| } | ||
|
|
||
| /** | ||
| * Recursive filtering of sensitive data | ||
| * | ||
| * @param string $path | ||
| * @param array $data | ||
| * @return void | ||
| */ | ||
| private function filterChain($path, &$data) | ||
| { | ||
| foreach ($data as $subKey => &$subData) { | ||
| $newPath = $path ? $path . '/' . $subKey : $subKey; | ||
| $filteredPath = $this->filterPath($newPath); | ||
|
|
||
| if ( | ||
| $filteredPath | ||
| && !is_array($data[$subKey]) | ||
| && $this->excludeList->isPresent($filteredPath) | ||
| ) { | ||
| $this->excludedFields[$newPath] = $filteredPath; | ||
|
|
||
| unset($data[$subKey]); | ||
| } elseif (is_array($subData)) { | ||
| $this->filterChain($newPath, $subData); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Eliminating scope info from path | ||
| * | ||
| * @param string $path | ||
| * @return null|string | ||
| */ | ||
| private function filterPath($path) | ||
| { | ||
| $parts = explode('/', $path); | ||
|
|
||
| // Check if there are enough parts to recognize scope | ||
| if (count($parts) < 3) { | ||
| return null; | ||
| } | ||
|
|
||
| if ($parts[0] === ScopeConfigInterface::SCOPE_TYPE_DEFAULT) { | ||
| unset($parts[0]); | ||
| } else { | ||
| unset($parts[0], $parts[1]); | ||
| } | ||
|
|
||
| return implode('/', $parts); | ||
| } | ||
|
|
||
| /** | ||
| * Sort sources ASC from higher priority to lower | ||
| * | ||
| * @return void | ||
| */ | ||
| private function sortSources() | ||
| { | ||
| uasort($this->sources, function ($firstItem, $secondItem) { | ||
| return $firstItem['sortOrder'] > $secondItem['sortOrder']; | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Retrieves list of field paths were excluded from config dump | ||
| * @return array | ||
| */ | ||
| public function getExcludedFields() | ||
| { | ||
| $this->get(); | ||
|
|
||
| $fields = array_values($this->excludedFields); | ||
| $fields = array_unique($fields); | ||
|
|
||
| return $fields; | ||
| } | ||
| } |
21 changes: 21 additions & 0 deletions
21
app/code/Magento/Config/App/Config/Source/DumpConfigSourceInterface.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2016 Magento. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| namespace Magento\Config\App\Config\Source; | ||
|
|
||
| use Magento\Framework\App\Config\ConfigSourceInterface; | ||
|
|
||
| /** | ||
| * Interface DumpConfigSourceInterface | ||
| */ | ||
| interface DumpConfigSourceInterface extends ConfigSourceInterface | ||
| { | ||
| /** | ||
| * Retrieves list of field paths were excluded from config dump | ||
| * | ||
| * @return array | ||
| */ | ||
| public function getExcludedFields(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.