MAGETWO-67736: Secure environment variables does not apply properly

Author: oshmyheliuk

app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php

@@ -30,13 +30,6 @@ class EnvironmentConfigSource implements ConfigSourceInterface
      */
     private $placeholder;
 
-    /**
-     * Variable for caching loaded environment config.
-     *
-     * @var DataObject
-     */
-    private $data;
-
     /**
      * @param ArrayManager $arrayManager
      * @param PlaceholderFactory $placeholderFactory
@@ -54,11 +47,8 @@ public function __construct(
      */
     public function get($path = '')
     {
-        if ($this->data === null) {
-            $this->data = new DataObject($this->loadConfig());
-        }
-
-        return $this->data->getData($path) ?: [];
+        $data = new DataObject($this->loadConfig());
+        return $data->getData($path) ?: [];
     }
 
     /**

app/etc/di.xml

@@ -1323,5 +1323,9 @@
             <argument name="logCallStack" xsi:type="init_parameter">Magento\Framework\Config\ConfigOptionsListConstants::CONFIG_PATH_DB_LOGGER_INCLUDE_STACKTRACE</argument>
         </arguments>
     </type>
-
+    <type name="Magento\Framework\App\Config\MetadataConfigTypeProcessor">
+        <arguments>
+            <argument name="configSource" xsi:type="object">Magento\Config\App\Config\Source\EnvironmentConfigSource</argument>
+        </arguments>
+    </type>
 </config>

lib/internal/Magento/Framework/App/Config/MetadataConfigTypeProcessor.php

@@ -7,7 +7,6 @@
  */
 namespace Magento\Framework\App\Config;
 
-use Magento\Config\App\Config\Source\EnvironmentConfigSource;
 use Magento\Framework\App\Config\Data\ProcessorFactory;
 use Magento\Framework\App\Config\Spi\PostProcessorInterface;
 use Magento\Framework\App\ObjectManager;
@@ -25,11 +24,11 @@ class MetadataConfigTypeProcessor implements PostProcessorInterface
     protected $_metadata = [];
 
     /**
-     * The environment configuration
+     * Source of configurations
      *
-     * @var EnvironmentConfigSource
+     * @var ConfigSourceInterface
      */
-    private $environmentConfigSource;
+    private $configSource;
 
     /**
      * The resolver for configuration paths
@@ -41,19 +40,19 @@ class MetadataConfigTypeProcessor implements PostProcessorInterface
     /**
      * @param ProcessorFactory $processorFactory
      * @param Initial $initialConfig
-     * @param EnvironmentConfigSource $environmentConfigSource The environment configuration
+     * @param ConfigSourceInterface $configSource Source of configurations
      * @param ConfigPathResolver $configPathResolver The resolver for configuration paths
      */
     public function __construct(
         ProcessorFactory $processorFactory,
         Initial $initialConfig,
-        EnvironmentConfigSource $environmentConfigSource = null,
+        ConfigSourceInterface $configSource = null,
         ConfigPathResolver $configPathResolver = null
     ) {
         $this->_processorFactory = $processorFactory;
         $this->_metadata = $initialConfig->getMetadata();
-        $this->environmentConfigSource = $environmentConfigSource
-            ?: ObjectManager::getInstance()->get(EnvironmentConfigSource::class);
+        $this->configSource = $configSource
+            ?: ObjectManager::getInstance()->get(ConfigSourceInterface::class);
         $this->configPathResolver = $configPathResolver
             ?: ObjectManager::getInstance()->get(ConfigPathResolver::class);
     }
@@ -116,7 +115,7 @@ private function processScopeData(
     ) {
         foreach ($this->_metadata as $path => $metadata) {
             $configPath = $this->configPathResolver->resolve($path, $scope, $scopeCode);
-            if (!empty($this->environmentConfigSource->get($configPath))) {
+            if (!empty($this->configSource->get($configPath))) {
                 continue;
             }
             /** @var \Magento\Framework\App\Config\Data\ProcessorInterface $processor */

lib/internal/Magento/Framework/App/Test/Unit/Config/MetadataConfigTypeProcessorTest.php

@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\App\Test\Unit\Config;
 
-use Magento\Config\App\Config\Source\EnvironmentConfigSource;
 use Magento\Framework\App\Config\ConfigPathResolver;
+use Magento\Framework\App\Config\ConfigSourceInterface;
 use Magento\Framework\App\Config\Data\ProcessorFactory;
 use Magento\Framework\App\Config\Data\ProcessorInterface;
 use Magento\Framework\App\Config\Initial;
@@ -36,9 +36,9 @@ class MetadataConfigTypeProcessorTest extends \PHPUnit_Framework_TestCase
     protected $_backendModelMock;
 
     /**
-     * @var EnvironmentConfigSource|MockObject
+     * @var ConfigSourceInterface|MockObject
      */
-    private $environmentConfigSourceMock;
+    private $configSourceMock;
 
     /**
      * @var ConfigPathResolver|MockObject
@@ -55,9 +55,8 @@ protected function setUp()
             ->getMock();
         $this->_backendModelMock= $this->getMockBuilder(ProcessorInterface::class)
             ->getMockForAbstractClass();
-        $this->environmentConfigSourceMock = $this->getMockBuilder(EnvironmentConfigSource::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->configSourceMock = $this->getMockBuilder(ConfigSourceInterface::class)
+            ->getMockForAbstractClass();
         $this->configPathResolverMock = $this->getMockBuilder(ConfigPathResolver::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -72,7 +71,7 @@ protected function setUp()
         $this->_model = new MetadataConfigTypeProcessor(
             $this->_modelPoolMock,
             $this->_initialConfigMock,
-            $this->environmentConfigSourceMock,
+            $this->configSourceMock,
             $this->configPathResolverMock
         );
     }
@@ -97,7 +96,7 @@ public function testProcess()
                 'websites/website_one/some/config/path2',
                 'websites/website_one/some/config/path3'
             );
-        $this->environmentConfigSourceMock->expects($this->exactly(6))
+        $this->configSourceMock->expects($this->exactly(6))
             ->method('get')
             ->withConsecutive(
                 ['default/some/config/path1'],