Use messageManager instead of throwing exceptions

Author: pmarki

app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php

@@ -9,9 +9,7 @@
 
 use Magento\Backend\App\Action;
 use Magento\Framework\App\Action\HttpPostActionInterface;
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\FileSystemException;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Framework\Filesystem;
@@ -56,29 +54,33 @@ public function __construct(
     /**
      * Controller basic method implementation.
      *
-     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
-     * @throws LocalizedException
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
+        /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setPath('adminhtml/export/index');
+        $fileName = $this->getRequest()->getParam('filename');
+        if (empty($fileName)) {
+            $this->messageManager->addErrorMessage(\__('Please provide valid export file name'));
+
+            return $resultRedirect;
+        }
         try {
-            if (empty($fileName = $this->getRequest()->getParam('filename'))) {
-                throw new LocalizedException(__('Please provide export file name'));
-            }
             $directory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_DIR);
             $path = $directory->getAbsolutePath() . 'export/' . $fileName;
 
-            if (!$directory->isFile($path)) {
-                throw new LocalizedException(__('Sorry, but the data is invalid or the file is not uploaded.'));
+            if ($directory->isFile($path)) {
+                $this->file->deleteFile($path);
+                $this->messageManager->addSuccessMessage(\__('File %1 deleted', $fileName));
+            } else {
+                $this->messageManager->addErrorMessage(\__('%1 is not a valid file', $fileName));
             }
-
-            $this->file->deleteFile($path);
-            /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-            $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-            $resultRedirect->setPath('adminhtml/export/index');
-            return $resultRedirect;
         } catch (FileSystemException $exception) {
-            throw new LocalizedException(__('There are no export file with such name %1', $fileName));
+            $this->messageManager->addErrorMessage($exception->getMessage());
         }
+
+        return $resultRedirect;
     }
 }

app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Download.php

@@ -10,7 +10,6 @@
 use Magento\Backend\App\Action;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Response\Http\FileFactory;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Framework\Filesystem;
@@ -55,12 +54,17 @@ public function __construct(
      * Controller basic method implementation.
      *
      * @return \Magento\Framework\App\ResponseInterface
-     * @throws LocalizedException
      */
     public function execute()
     {
-        if (empty($fileName = $this->getRequest()->getParam('filename'))) {
-            throw new LocalizedException(__('Please provide export file name'));
+        /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setPath('adminhtml/export/index');
+        $fileName = $this->getRequest()->getParam('filename');
+        if (empty($fileName) || \preg_match('/\.\.(\\\|\/)/', $fileName) !== 0) {
+            $this->messageManager->addErrorMessage(\__('Please provide valid export file name'));
+
+            return $resultRedirect;
         }
         try {
             $path = 'export/' . $fileName;
@@ -72,8 +76,11 @@ public function execute()
                     DirectoryList::VAR_DIR
                 );
             }
-        } catch (LocalizedException | \Exception $exception) {
-            throw new LocalizedException(__('There are no export file with such name %1', $fileName));
+            $this->messageManager->addErrorMessage(\__('%1 is not a valid file', $fileName));
+        } catch (\Exception $exception) {
+            $this->messageManager->addErrorMessage($exception->getMessage());
         }
+
+        return $resultRedirect;
     }
 }