Added blacklist to directory operations

Author: sivaschenko

app/code/Magento/MediaGallery/Model/Asset.php

@@ -13,7 +13,7 @@
 
 /**
  * Media Gallery Asset
- * @SuppressWarnings(PHPMD.ExcessiveParameterList
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  */
 class Asset implements AssetInterface
 {

app/code/Magento/MediaGallery/Model/Directory/Command/CreateByPaths.php

@@ -10,6 +10,7 @@
 use Magento\Cms\Model\Wysiwyg\Images\Storage;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\MediaGalleryApi\Api\CreateDirectoriesByPathsInterface;
+use Magento\MediaGalleryApi\Api\IsPathBlacklistedInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -27,16 +28,24 @@ class CreateByPaths implements CreateDirectoriesByPathsInterface
      */
     private $storage;
 
+    /**
+     * @var IsPathBlacklistedInterface
+     */
+    private $isPathBlacklisted;
+
     /**
      * @param LoggerInterface $logger
      * @param Storage $storage
+     * @param IsPathBlacklistedInterface $isPathBlacklisted
      */
     public function __construct(
         LoggerInterface $logger,
-        Storage $storage
+        Storage $storage,
+        IsPathBlacklistedInterface $isPathBlacklisted
     ) {
         $this->logger = $logger;
         $this->storage = $storage;
+        $this->isPathBlacklisted = $isPathBlacklisted;
     }
 
     /**
@@ -46,6 +55,10 @@ public function execute(array $paths): void
     {
         $failedPaths = [];
         foreach ($paths as $path) {
+            if ($this->isPathBlacklisted->execute($path)) {
+                $failedPaths[] = $path;
+                continue;
+            }
             try {
                 //phpcs:ignore Magento2.Functions.DiscouragedFunction
                 $name = basename($path);

app/code/Magento/MediaGallery/Model/Directory/Command/DeleteByPaths.php

@@ -10,6 +10,7 @@
 use Magento\Cms\Model\Wysiwyg\Images\Storage;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\MediaGalleryApi\Api\DeleteDirectoriesByPathsInterface;
+use Magento\MediaGalleryApi\Api\IsPathBlacklistedInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -27,16 +28,24 @@ class DeleteByPaths implements DeleteDirectoriesByPathsInterface
      */
     private $storage;
 
+    /**
+     * @var IsPathBlacklistedInterface
+     */
+    private $isPathBlacklisted;
+
     /**
      * @param LoggerInterface $logger
      * @param Storage $storage
+     * @param IsPathBlacklistedInterface $isPathBlacklisted
      */
     public function __construct(
         LoggerInterface $logger,
-        Storage $storage
+        Storage $storage,
+        IsPathBlacklistedInterface $isPathBlacklisted
     ) {
         $this->logger = $logger;
         $this->storage = $storage;
+        $this->isPathBlacklisted = $isPathBlacklisted;
     }
 
     /**
@@ -46,6 +55,10 @@ public function execute(array $paths): void
     {
         $failedPaths = [];
         foreach ($paths as $path) {
+            if ($this->isPathBlacklisted->execute($path)) {
+                $failedPaths[] = $path;
+                continue;
+            }
             try {
                 $this->storage->deleteDirectory($this->storage->getCmsWysiwygImages()->getStorageRoot() . $path);
             } catch (\Exception $exception) {