forked from ashishjob0424/magento2-patches
-
Notifications
You must be signed in to change notification settings - Fork 15
/
Patch-Magento2-Framework-directoryResolver-validatePath.patch
53 lines (53 loc) · 1.55 KB
/
Patch-Magento2-Framework-directoryResolver-validatePath.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
--- a/App/Filesystem/DirectoryResolver.php
+++ b/App/Filesystem/DirectoryResolver.php
@@ -3,8 +3,10 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Framework\App\Filesystem;
-
+use Magento\Framework\Filesystem;
+use Magento\Framework\App\ObjectManager;
/**
* Magento directories resolver.
*/
@@ -14,15 +16,20 @@ class DirectoryResolver
* @var DirectoryList
*/
private $directoryList;
-
+ /**
+ * @var \Magento\Framework\Filesystem
+ */
+ private $filesystem;
/**
* @param DirectoryList $directoryList
+ * @param Filesystem|null $filesystem
+ * @throws \RuntimeException
*/
- public function __construct(DirectoryList $directoryList)
+ public function __construct(DirectoryList $directoryList, Filesystem $filesystem = null)
{
$this->directoryList = $directoryList;
+ $this->filesystem = $filesystem ?: ObjectManager::getInstance()->get(Filesystem::class);
}
-
/**
* Validate path.
*
@@ -38,9 +45,10 @@ class DirectoryResolver
*/
public function validatePath($path, $directoryConfig = DirectoryList::MEDIA)
{
- $realPath = realpath($path);
+ $directory = $this->filesystem->getDirectoryWrite($directoryConfig);
+ $realPath = $directory->getDriver()->getRealPathSafety($path);
$root = $this->directoryList->getPath($directoryConfig);
-
+
return strpos($realPath, $root) === 0;
}
-}
+}
\ No newline at end of file