Merge pull request #6246 from magento-borg/2.3-bugfixes-101620

[CIA] Bugfixes

Author: dvoskoboinikov

app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php

@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector\CspWhitelistXml;
+
+use Magento\Framework\Config\FileResolverInterface;
+use Magento\Framework\Filesystem;
+use Magento\Framework\View\Design\ThemeInterface;
+use Magento\Framework\View\DesignInterface;
+use Magento\Framework\View\Design\Theme\CustomizationInterface;
+use Magento\Framework\View\Design\Theme\CustomizationInterfaceFactory;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\Directory\ReadInterface as DirectoryRead;
+use Magento\Framework\Config\CompositeFileIteratorFactory;
+
+/**
+ * Combines configuration files from both modules and current theme.
+ */
+class FileResolver implements FileResolverInterface
+{
+    /**
+     * @var FileResolverInterface
+     */
+    private $moduleFileResolver;
+
+    /**
+     * @var ThemeInterface
+     */
+    private $theme;
+
+    /**
+     * @var CustomizationInterfaceFactory
+     */
+    private $themeInfoFactory;
+
+    /**
+     * @var DirectoryRead
+     */
+    private $rootDir;
+
+    /**
+     * @var CompositeFileIteratorFactory
+     */
+    private $iteratorFactory;
+
+    /**
+     * @param FileResolverInterface $moduleFileResolver
+     * @param DesignInterface $design
+     * @param CustomizationInterfaceFactory $customizationFactory
+     * @param Filesystem $filesystem
+     * @param CompositeFileIteratorFactory $iteratorFactory
+     */
+    public function __construct(
+        FileResolverInterface $moduleFileResolver,
+        DesignInterface $design,
+        CustomizationInterfaceFactory $customizationFactory,
+        Filesystem $filesystem,
+        CompositeFileIteratorFactory $iteratorFactory
+    ) {
+        $this->moduleFileResolver = $moduleFileResolver;
+        $this->theme = $design->getDesignTheme();
+        $this->themeInfoFactory = $customizationFactory;
+        $this->rootDir = $filesystem->getDirectoryRead(DirectoryList::ROOT);
+        $this->iteratorFactory = $iteratorFactory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function get($filename, $scope)
+    {
+         $configs = $this->moduleFileResolver->get($filename, $scope);
+        if ($scope === 'global') {
+            $files = [];
+            $theme = $this->theme;
+            while ($theme) {
+                /** @var CustomizationInterface $info */
+                $info = $this->themeInfoFactory->create(['theme' => $theme]);
+                $file = $info->getThemeFilesPath() .'/etc/' .$filename;
+                if ($this->rootDir->isExist($file)) {
+                    $files[] = $file;
+                }
+                $theme = $theme->getParentTheme();
+            }
+            $configs = $this->iteratorFactory->create(
+                ['paths' => array_reverse($files), 'existingIterator' => $configs]
+            );
+        }
+
+        return $configs;
+    }
+}

app/code/Magento/Csp/etc/di.xml

@@ -46,6 +46,7 @@
         <arguments>
             <argument name="converter" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Converter</argument>
             <argument name="schemaLocator" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\SchemaLocator</argument>
+            <argument name="fileResolver" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\FileResolver</argument>
             <argument name="fileName" xsi:type="string">csp_whitelist.xml</argument>
         </arguments>
     </type>

dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php

@@ -7,15 +7,17 @@
  */
 namespace Magento\Framework\Filesystem\Directory;
 
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Filesystem\DriverPool;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class ReadTest
  * Test for Magento\Framework\Filesystem\Directory\Read class
  */
-class WriteTest extends \PHPUnit\Framework\TestCase
+class WriteTest extends TestCase
 {
     /**
      * Test data to be cleaned
@@ -41,6 +43,8 @@ public function testInstance()
      * @param string $basePath
      * @param int $permissions
      * @param string $path
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testCreate($basePath, $permissions, $path)
     {
@@ -64,6 +68,11 @@ public function createProvider()
         ];
     }
 
+    /**
+     * Test for create outside
+     *
+     * @throws FileSystemException
+     */
     public function testCreateOutside()
     {
         $exceptions = 0;
@@ -91,6 +100,8 @@ public function testCreateOutside()
      *
      * @dataProvider deleteProvider
      * @param string $path
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testDelete($path)
     {
@@ -111,6 +122,11 @@ public function deleteProvider()
         return [['subdir'], ['subdir/subsubdir']];
     }
 
+    /**
+     * Test for delete outside
+     *
+     * @throws FileSystemException
+     */
     public function testDeleteOutside()
     {
         $exceptions = 0;
@@ -141,6 +157,8 @@ public function testDeleteOutside()
      * @param int $permissions
      * @param string $name
      * @param string $newName
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testRename($basePath, $permissions, $name, $newName)
     {
@@ -164,6 +182,11 @@ public function renameProvider()
         return [['newDir1', 0777, 'first_name.txt', 'second_name.txt']];
     }
 
+    /**
+     * Test for rename outside
+     *
+     * @throws FileSystemException
+     */
     public function testRenameOutside()
     {
         $exceptions = 0;
@@ -198,6 +221,8 @@ public function testRenameOutside()
      * @param int $permission
      * @param string $name
      * @param string $newName
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testRenameTargetDir($firstDir, $secondDir, $permission, $name, $newName)
     {
@@ -231,6 +256,8 @@ public function renameTargetDirProvider()
      * @param int $permissions
      * @param string $name
      * @param string $newName
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testCopy($basePath, $permissions, $name, $newName)
     {
@@ -255,6 +282,12 @@ public function copyProvider()
         ];
     }
 
+    /**
+     * Test for copy outside
+     *
+     * @throws FileSystemException
+     * @throws ValidatorException
+     */
     public function testCopyOutside()
     {
         $exceptions = 0;
@@ -298,6 +331,8 @@ public function testCopyOutside()
      * @param int $permission
      * @param string $name
      * @param string $newName
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testCopyTargetDir($firstDir, $secondDir, $permission, $name, $newName)
     {
@@ -327,6 +362,8 @@ public function copyTargetDirProvider()
 
     /**
      * Test for changePermissions method
+     *
+     * @throws FileSystemException|ValidatorException
      */
     public function testChangePermissions()
     {
@@ -335,6 +372,11 @@ public function testChangePermissions()
         $this->assertTrue($directory->changePermissions('test_directory', 0644));
     }
 
+    /**
+     * Test change permissions outside
+     *
+     * @throws FileSystemException
+     */
     public function testChangePermissionsOutside()
     {
         $exceptions = 0;
@@ -359,6 +401,8 @@ public function testChangePermissionsOutside()
 
     /**
      * Test for changePermissionsRecursively method
+     *
+     * @throws FileSystemException|ValidatorException
      */
     public function testChangePermissionsRecursively()
     {
@@ -370,6 +414,11 @@ public function testChangePermissionsRecursively()
         $this->assertTrue($directory->changePermissionsRecursively('test_directory', 0777, 0644));
     }
 
+    /**
+     * Test writable for outside
+     *
+     * @throws FileSystemException
+     */
     public function testChangePermissionsRecursivelyOutside()
     {
         $exceptions = 0;
@@ -400,6 +449,8 @@ public function testChangePermissionsRecursivelyOutside()
      * @param int $permissions
      * @param string $path
      * @param int $time
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testTouch($basePath, $permissions, $path, $time)
     {
@@ -422,6 +473,11 @@ public function touchProvider()
         ];
     }
 
+    /**
+     * Test touch for outside
+     *
+     * @throws FileSystemException
+     */
     public function testTouchOutside()
     {
         $exceptions = 0;
@@ -446,6 +502,8 @@ public function testTouchOutside()
 
     /**
      * Test isWritable method
+     *
+     * @throws FileSystemException|ValidatorException
      */
     public function testIsWritable()
     {
@@ -455,6 +513,11 @@ public function testIsWritable()
         $this->assertTrue($directory->isWritable('bar'));
     }
 
+    /**
+     * Test writable for outside
+     *
+     * @throws FileSystemException
+     */
     public function testIsWritableOutside()
     {
         $exceptions = 0;
@@ -485,6 +548,8 @@ public function testIsWritableOutside()
      * @param int $permissions
      * @param string $path
      * @param string $mode
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testOpenFile($basePath, $permissions, $path, $mode)
     {
@@ -507,6 +572,11 @@ public function openFileProvider()
         ];
     }
 
+    /**
+     * Test open file outside
+     *
+     * @throws FileSystemException
+     */
     public function testOpenFileOutside()
     {
         $exceptions = 0;
@@ -536,6 +606,8 @@ public function testOpenFileOutside()
      * @param string $path
      * @param string $content
      * @param string $extraContent
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testWriteFile($path, $content, $extraContent)
     {
@@ -553,6 +625,8 @@ public function testWriteFile($path, $content, $extraContent)
      * @param string $path
      * @param string $content
      * @param string $extraContent
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testWriteFileAppend($path, $content, $extraContent)
     {
@@ -573,6 +647,11 @@ public function writeFileProvider()
         return [['file1', '123', '456'], ['folder1/file1', '123', '456']];
     }
 
+    /**
+     * Test writing file to outside
+     *
+     * @throws FileSystemException
+     */
     public function testWriteFileOutside()
     {
         $exceptions = 0;
@@ -595,8 +674,25 @@ public function testWriteFileOutside()
         $this->assertEquals(3, $exceptions);
     }
 
+    /**
+     * Test for invalid delete path
+     *
+     * @throws ValidatorException
+     */
+    public function testInvalidDeletePath()
+    {
+        $this->expectException(FileSystemException::class);
+        $directory = $this->getDirectoryInstance('newDir', 0777);
+        $invalidPath = 'invalidPath/../';
+        $directory->create($invalidPath);
+        $directory->delete($invalidPath);
+    }
+
     /**
      * Tear down
+     *
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function tearDown()
     {
@@ -620,8 +716,8 @@ private function getDirectoryInstance($path, $permissions)
     {
         $fullPath = __DIR__ . '/../_files/' . $path;
         $objectManager = Bootstrap::getObjectManager();
-        /** @var \Magento\Framework\Filesystem\Directory\WriteFactory $directoryFactory */
-        $directoryFactory = $objectManager->create(\Magento\Framework\Filesystem\Directory\WriteFactory::class);
+        /** @var WriteFactory $directoryFactory */
+        $directoryFactory = $objectManager->create(WriteFactory::class);
         $directory = $directoryFactory->create($fullPath, DriverPool::FILE, $permissions);
         $this->testDirectories[] = $directory;
         return $directory;