Skip to content

Fix: Add path traversal protection to DirectivePlugin (APSB26-05) #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Maksold wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Add path traversal protection to DirectivePlugin (APSB26-05) #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 34 additions & 4 deletions Plugin/Controller/Adminhtml/Wysiwyg/DirectivePlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@

use Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive;
use Magento\Cms\Model\Template\Filter;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\App\Filesystem\DirectoryResolver;
use Magento\Framework\Controller\Result\Raw;
use Magento\Framework\Controller\Result\RawFactory;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Url\DecoderInterface;use MagestyApps\WebImages\Helper\ImageHelper;
use Magento\Framework\Filesystem;
use Magento\Framework\Url\DecoderInterface;
use MagestyApps\WebImages\Helper\ImageHelper;

class DirectivePlugin
{
Expand All @@ -35,23 +39,39 @@ class DirectivePlugin
*/
private $imageHelper;

/**
* @var Filesystem
*/
private $filesystem;

/**
* @var DirectoryResolver
*/
private $directoryResolver;

/**
* DirectivePlugin constructor.
* @param DecoderInterface $urlDecoder
* @param Filter $filter
* @param RawFactory $resultRawFactory
* @param ImageHelper $imageHelper
* @param Filesystem $filesystem
* @param DirectoryResolver $directoryResolver
*/
public function __construct(
DecoderInterface $urlDecoder,
Filter $filter,
RawFactory $resultRawFactory,
ImageHelper $imageHelper
ImageHelper $imageHelper,
Filesystem $filesystem,
DirectoryResolver $directoryResolver
) {
$this->urlDecoder = $urlDecoder;
$this->filter = $filter;
$this->resultRawFactory = $resultRawFactory;
$this->imageHelper = $imageHelper;
$this->filesystem = $filesystem;
$this->directoryResolver = $directoryResolver;
}

/**
Expand All @@ -67,19 +87,29 @@ public function aroundExecute(Directive $subject, callable $proceed)
$directive = $subject->getRequest()->getParam('___directive');
$directive = $this->urlDecoder->decode($directive);
$imagePath = $this->filter->filter($directive);
$imagePath = str_replace('\\', '/', $imagePath);

if (!$this->imageHelper->isVectorImage($imagePath)) {
throw new LocalizedException(__('This is not a vector image'));
}

$urlPath = $this->filesystem->getUri(DirectoryList::MEDIA);
$relativeFilePath = str_replace(rtrim($urlPath, '/') . '/', '', $imagePath);
$mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
$absolutePath = $mediaDirectory->getAbsolutePath($relativeFilePath);

if (!$this->directoryResolver->validatePath($absolutePath, DirectoryList::MEDIA)) {
throw new LocalizedException(__('Invalid Path'));
}

/** @var Raw $resultRaw */
$resultRaw = $this->resultRawFactory->create();
$resultRaw->setHeader('Content-Type', 'image/svg+xml');
$resultRaw->setContents(file_get_contents($imagePath));
$resultRaw->setContents($mediaDirectory->readFile($relativeFilePath));

return $resultRaw;
} catch (\Exception $e) {
return $proceed();
}
}
}
}