Skip to content

Commit 6421275

Browse files
author
Dale Sikkema
committed
MAGETWO-50284: stop controlling FS permissions on application level
1 parent 2d82d19 commit 6421275

File tree

40 files changed

+79
-89
lines changed

40 files changed

+79
-89
lines changed

‎app/bootstrap.php

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
*/
1010
error_reporting(E_ALL);
1111
#ini_set('display_errors', 1);
12-
umask(0);
1312

1413
/* PHP version validation */
1514
if (version_compare(phpversion(), '5.5.0', '<') === true) {

‎app/code/Magento/Backup/Model/Fs/Collection.php

-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ protected function _hideBackupsForApache()
9191
$filename = '.htaccess';
9292
if (!$this->_varDirectory->isFile($filename)) {
9393
$this->_varDirectory->writeFile($filename, 'deny from all');
94-
$this->_varDirectory->changePermissions($filename, 0640);
9594
}
9695
}
9796

‎app/code/Magento/Captcha/Helper/Data.php

-2
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,6 @@ public function getImgDir($website = null)
150150
$mediaDir = $this->_filesystem->getDirectoryWrite(DirectoryList::MEDIA);
151151
$captchaDir = '/captcha/' . $this->_getWebsiteCode($website);
152152
$mediaDir->create($captchaDir);
153-
$mediaDir->changePermissions($captchaDir, DriverInterface::WRITEABLE_DIRECTORY_MODE);
154-
155153
return $mediaDir->getAbsolutePath($captchaDir) . '/';
156154
}
157155

‎app/code/Magento/Catalog/Model/Product/Gallery/Processor.php

-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ public function addImage(
157157
$this->mediaDirectory->copyFile($file, $destinationFile);
158158

159159
$storageHelper->saveFile($this->mediaConfig->getTmpMediaShortUrl($fileName));
160-
$this->mediaDirectory->changePermissions($destinationFile, DriverInterface::WRITEABLE_FILE_MODE);
161160
}
162161
} catch (\Exception $e) {
163162
throw new LocalizedException(__('We couldn\'t move this file: %1.', $e->getMessage()));

‎app/code/Magento/Deploy/Model/Filesystem.php

+8-9
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@ class Filesystem
2020
{
2121
/**
2222
* File access permissions
23+
*
24+
* @deprecated
2325
*/
2426
const PERMISSIONS_FILE = 0640;
2527

2628
/**
2729
* Directory access permissions
30+
*
31+
* @deprecated
2832
*/
2933
const PERMISSIONS_DIR = 0750;
3034

@@ -109,19 +113,10 @@ public function regenerateStatic(
109113
DirectoryList::TMP_MATERIALIZATION_DIR
110114
]
111115
);
112-
$this->changePermissions(
113-
[
114-
DirectoryList::STATIC_VIEW
115-
],
116-
self::PERMISSIONS_DIR,
117-
self::PERMISSIONS_DIR
118-
);
119-
120116
// Trigger static assets compilation and deployment
121117
$this->deployStaticContent($output);
122118
// Trigger code generation
123119
$this->compile($output);
124-
$this->lockStaticResources();
125120
}
126121

127122
/**
@@ -227,6 +222,8 @@ public function cleanupFilesystem($directoryCodeList)
227222
* @param int $dirPermissions
228223
* @param int $filePermissions
229224
* @return void
225+
*
226+
* @deprecated
230227
*/
231228
protected function changePermissions($directoryCodeList, $dirPermissions, $filePermissions)
232229
{
@@ -245,6 +242,8 @@ protected function changePermissions($directoryCodeList, $dirPermissions, $fileP
245242
* Chenge permissions on static resources
246243
*
247244
* @return void
245+
*
246+
* @deprecated
248247
*/
249248
public function lockStaticResources()
250249
{

‎app/code/Magento/Deploy/Model/Mode.php

-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ public function enableProductionMode()
9292
*/
9393
public function enableProductionModeMinimal()
9494
{
95-
$this->filesystem->lockStaticResources();
9695
$this->setStoreMode(State::MODE_PRODUCTION);
9796
}
9897

‎app/code/Magento/Translation/Model/FileManager.php

+1-4
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,7 @@ public function updateTranslationFileContent($content)
100100
\DIRECTORY_SEPARATOR .
101101
$this->assetRepo->getStaticViewFileContext()->getPath();
102102
if (!$this->driverFile->isExists($this->getTranslationFileFullPath())) {
103-
$this->driverFile->createDirectory(
104-
$translationDir,
105-
\Magento\Framework\Filesystem\Driver\File::WRITEABLE_DIRECTORY_MODE
106-
);
103+
$this->driverFile->createDirectory($translationDir);
107104
}
108105
$this->driverFile->filePutContents($this->getTranslationFileFullPath(), $content);
109106
}

‎dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ protected function endFactory($type)
105105
* @return bool
106106
* @throws \Exception
107107
*/
108-
protected function checkAndCreateFolder($folder, $mode = DriverInterface::WRITEABLE_DIRECTORY_MODE)
108+
protected function checkAndCreateFolder($folder, $mode = 0777)
109109
{
110110
if (is_dir($folder)) {
111111
return true;
@@ -127,7 +127,7 @@ protected function checkAndCreateFolder($folder, $mode = DriverInterface::WRITEA
127127
* @param bool $recursive
128128
* @return bool
129129
*/
130-
protected function mkDir($dir, $mode = 0770, $recursive = true)
130+
protected function mkDir($dir, $mode = 0777, $recursive = true)
131131
{
132132
return @mkdir($dir, $mode, $recursive);
133133
}

‎dev/tests/integration/framework/Magento/TestFramework/Application.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ protected function _ensureDirExists($dir)
577577
{
578578
if (!file_exists($dir)) {
579579
$old = umask(0);
580-
mkdir($dir, DriverInterface::WRITEABLE_DIRECTORY_MODE);
580+
mkdir($dir);
581581
umask($old);
582582
} elseif (!is_dir($dir)) {
583583
throw new \Magento\Framework\Exception\LocalizedException(__("'%1' is not a directory.", $dir));

‎dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static function setUpBeforeClass()
2525
'Magento\Cms\Helper\Wysiwyg\Images'
2626
)->getCurrentPath() . 'MagentoCmsModelWysiwygImagesStorageTest';
2727
if (!file_exists(self::$_baseDir)) {
28-
mkdir(self::$_baseDir, 0770);
28+
mkdir(self::$_baseDir);
2929
}
3030
touch(self::$_baseDir . '/1.swf');
3131
}

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

+22-22
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class WriteTest extends \PHPUnit_Framework_TestCase
2828
*/
2929
public function testInstance()
3030
{
31-
$dir = $this->getDirectoryInstance('newDir1', 0770);
31+
$dir = $this->getDirectoryInstance('newDir1', 0777);
3232
$this->assertTrue($dir instanceof ReadInterface);
3333
$this->assertTrue($dir instanceof WriteInterface);
3434
}
@@ -56,10 +56,10 @@ public function testCreate($basePath, $permissions, $path)
5656
public function createProvider()
5757
{
5858
return [
59-
['newDir1', 0770, "newDir1"],
60-
['newDir1', 0770, "root_dir1/subdir1/subdir2"],
61-
['newDir2', 0750, "root_dir2/subdir"],
62-
['newDir1', 0770, "."]
59+
['newDir1', 0777, "newDir1"],
60+
['newDir1', 0777, "root_dir1/subdir1/subdir2"],
61+
['newDir2', 0777, "root_dir2/subdir"],
62+
['newDir1', 0777, "."]
6363
];
6464
}
6565

@@ -71,7 +71,7 @@ public function createProvider()
7171
*/
7272
public function testDelete($path)
7373
{
74-
$directory = $this->getDirectoryInstance('newDir', 0770);
74+
$directory = $this->getDirectoryInstance('newDir', 0777);
7575
$directory->create($path);
7676
$this->assertTrue($directory->isExist($path));
7777
$directory->delete($path);
@@ -116,7 +116,7 @@ public function testRename($basePath, $permissions, $name, $newName)
116116
*/
117117
public function renameProvider()
118118
{
119-
return [['newDir1', 0770, 'first_name.txt', 'second_name.txt']];
119+
return [['newDir1', 0777, 'first_name.txt', 'second_name.txt']];
120120
}
121121

122122
/**
@@ -150,7 +150,7 @@ public function testRenameTargetDir($firstDir, $secondDir, $permission, $name, $
150150
*/
151151
public function renameTargetDirProvider()
152152
{
153-
return [['dir1', 'dir2', 0770, 'first_name.txt', 'second_name.txt']];
153+
return [['dir1', 'dir2', 0777, 'first_name.txt', 'second_name.txt']];
154154
}
155155

156156
/**
@@ -180,8 +180,8 @@ public function testCopy($basePath, $permissions, $name, $newName)
180180
public function copyProvider()
181181
{
182182
return [
183-
['newDir1', 0770, 'first_name.txt', 'second_name.txt'],
184-
['newDir1', 0770, 'subdir/first_name.txt', 'subdir/second_name.txt']
183+
['newDir1', 0777, 'first_name.txt', 'second_name.txt'],
184+
['newDir1', 0777, 'subdir/first_name.txt', 'subdir/second_name.txt']
185185
];
186186
}
187187

@@ -216,8 +216,8 @@ public function testCopyTargetDir($firstDir, $secondDir, $permission, $name, $ne
216216
public function copyTargetDirProvider()
217217
{
218218
return [
219-
['dir1', 'dir2', 0770, 'first_name.txt', 'second_name.txt'],
220-
['dir1', 'dir2', 0770, 'subdir/first_name.txt', 'subdir/second_name.txt']
219+
['dir1', 'dir2', 0777, 'first_name.txt', 'second_name.txt'],
220+
['dir1', 'dir2', 0777, 'subdir/first_name.txt', 'subdir/second_name.txt']
221221
];
222222
}
223223

@@ -226,9 +226,9 @@ public function copyTargetDirProvider()
226226
*/
227227
public function testChangePermissions()
228228
{
229-
$directory = $this->getDirectoryInstance('newDir1', 0770);
229+
$directory = $this->getDirectoryInstance('newDir1', 0777);
230230
$directory->create('test_directory');
231-
$this->assertTrue($directory->changePermissions('test_directory', 0640));
231+
$this->assertTrue($directory->changePermissions('test_directory', 0644));
232232
}
233233

234234
/**
@@ -241,7 +241,7 @@ public function testChangePermissionsRecursively()
241241
$directory->create('test_directory/subdirectory');
242242
$directory->writeFile('test_directory/subdirectory/test_file.txt', 'Test Content');
243243

244-
$this->assertTrue($directory->changePermissionsRecursively('test_directory', 0750, 0640));
244+
$this->assertTrue($directory->changePermissionsRecursively('test_directory', 0777, 0644));
245245
}
246246

247247
/**
@@ -269,8 +269,8 @@ public function testTouch($basePath, $permissions, $path, $time)
269269
public function touchProvider()
270270
{
271271
return [
272-
['test_directory', 0770, 'touch_file.txt', time() - 3600],
273-
['test_directory', 0770, 'subdirectory/touch_file.txt', time() - 3600]
272+
['test_directory', 0777, 'touch_file.txt', time() - 3600],
273+
['test_directory', 0777, 'subdirectory/touch_file.txt', time() - 3600]
274274
];
275275
}
276276

@@ -279,7 +279,7 @@ public function touchProvider()
279279
*/
280280
public function testIsWritable()
281281
{
282-
$directory = $this->getDirectoryInstance('newDir1', 0770);
282+
$directory = $this->getDirectoryInstance('newDir1', 0777);
283283
$directory->create('bar');
284284
$this->assertFalse($directory->isWritable('not_existing_dir'));
285285
$this->assertTrue($directory->isWritable('bar'));
@@ -310,8 +310,8 @@ public function testOpenFile($basePath, $permissions, $path, $mode)
310310
public function openFileProvider()
311311
{
312312
return [
313-
['newDir1', 0770, 'newFile.txt', 'w+'],
314-
['newDir1', 0770, 'subdirectory/newFile.txt', 'w+']
313+
['newDir1', 0777, 'newFile.txt', 'w+'],
314+
['newDir1', 0777, 'subdirectory/newFile.txt', 'w+']
315315
];
316316
}
317317

@@ -325,7 +325,7 @@ public function openFileProvider()
325325
*/
326326
public function testWriteFile($path, $content, $extraContent)
327327
{
328-
$directory = $this->getDirectoryInstance('writeFileDir', 0770);
328+
$directory = $this->getDirectoryInstance('writeFileDir', 0777);
329329
$directory->writeFile($path, $content);
330330
$this->assertEquals($content, $directory->readFile($path));
331331
$directory->writeFile($path, $extraContent);
@@ -342,7 +342,7 @@ public function testWriteFile($path, $content, $extraContent)
342342
*/
343343
public function testWriteFileAppend($path, $content, $extraContent)
344344
{
345-
$directory = $this->getDirectoryInstance('writeFileDir', 0770);
345+
$directory = $this->getDirectoryInstance('writeFileDir', 0777);
346346
$directory->writeFile($path, $content, 'a+');
347347
$this->assertEquals($content, $directory->readFile($path));
348348
$directory->writeFile($path, $extraContent, 'a+');

‎dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function testCreateDirectory()
7777
if (is_dir($generatedPath)) {
7878
$this->assertTrue($this->driver->deleteDirectory($generatedPathBase));
7979
}
80-
$this->assertTrue($this->driver->createDirectory($generatedPath, DriverInterface::WRITEABLE_DIRECTORY_MODE));
80+
$this->assertTrue($this->driver->createDirectory($generatedPath));
8181
$this->assertTrue(is_dir($generatedPath));
8282
}
8383
}

‎dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,14 @@ protected function setUp()
7070
$basePath = BP;
7171
$basePath = str_replace('\\', '/', $basePath);
7272

73-
7473
$this->_tmpDir = realpath(__DIR__) . '/tmp';
7574
$this->_generationDir = $this->_tmpDir . '/generation';
7675
if (!file_exists($this->_generationDir)) {
77-
mkdir($this->_generationDir, 0770, true);
76+
mkdir($this->_generationDir, 0777, true);
7877
}
7978
$this->_compilationDir = $this->_tmpDir . '/di';
8079
if (!file_exists($this->_compilationDir)) {
81-
mkdir($this->_compilationDir, 0770, true);
80+
mkdir($this->_compilationDir, 0777, true);
8281
}
8382

8483
$this->_command = 'php ' . $basePath . '/bin/magento setup:di:compile-multi-tenant --generation=%s --di=%s';

‎dev/tests/static/testsuite/Magento/Test/Js/Exemplar/JsHintTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protected function setUp()
2929
{
3030
$reportFile = self::$_cmd->getReportFile();
3131
if (!is_dir(dirname($reportFile))) {
32-
mkdir(dirname($reportFile), 0770);
32+
mkdir(dirname($reportFile));
3333
}
3434
}
3535

‎dev/tests/static/testsuite/Magento/Test/Js/LiveCodeTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static function setUpBeforeClass()
6060
{
6161
$reportDir = BP . '/dev/tests/static/report';
6262
if (!is_dir($reportDir)) {
63-
mkdir($reportDir, 0770);
63+
mkdir($reportDir);
6464
}
6565
self::$_reportFile = $reportDir . '/js_report.txt';
6666
@unlink(self::$_reportFile);

‎dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static function setUpBeforeClass()
4242
self::$pathToSource = BP;
4343
self::$reportDir = self::$pathToSource . '/dev/tests/static/report';
4444
if (!is_dir(self::$reportDir)) {
45-
mkdir(self::$reportDir, 0770);
45+
mkdir(self::$reportDir);
4646
}
4747
}
4848

‎lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class Factory
2020
* Default cache entry lifetime
2121
*/
2222
const DEFAULT_LIFETIME = 7200;
23+
2324
/**
2425
* Caching params, that applied for all cache frontends regardless of type
2526
*/
@@ -67,7 +68,7 @@ class Factory
6768
*/
6869
protected $_backendOptions = [
6970
'hashed_directory_level' => 1,
70-
'hashed_directory_umask' => DriverInterface::WRITEABLE_DIRECTORY_MODE,
71+
'hashed_directory_umask' => 0777,
7172
'file_name_prefix' => 'mage',
7273
];
7374

‎lib/internal/Magento/Framework/Archive/Helper/File.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function __destruct()
9191
* @throws LocalizedException
9292
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
9393
*/
94-
public function open($mode = 'w+', $chmod = DriverInterface::WRITEABLE_FILE_MODE)
94+
public function open($mode = 'w+', $chmod = null)
9595
{
9696
$this->_isInWriteMode = $this->_isWritableMode($mode);
9797

@@ -182,7 +182,7 @@ public function close()
182182
$this->_close();
183183
$this->_fileHandler = false;
184184

185-
if ($this->_isInWriteMode) {
185+
if ($this->_isInWriteMode && isset($this->_chmod)) {
186186
@chmod($this->_filePath, $this->_chmod);
187187
}
188188
}

‎lib/internal/Magento/Framework/Archive/Tar.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ protected function _unpackCurrentTar($destination)
404404

405405
if (in_array($header['type'], ["0", chr(0), ''])) {
406406
if (!file_exists($dirname)) {
407-
$mkdirResult = @mkdir($dirname, DriverInterface::WRITEABLE_DIRECTORY_MODE, true);
407+
$mkdirResult = @mkdir($dirname, 0777, true);
408408

409409
if (false === $mkdirResult) {
410410
throw new \Magento\Framework\Exception\LocalizedException(

‎lib/internal/Magento/Framework/Backup/Filesystem.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ protected function _checkBackupsDir()
279279
}
280280

281281
mkdir($backupsDir);
282-
chmod($backupsDir, DriverInterface::WRITEABLE_DIRECTORY_MODE);
282+
chmod($backupsDir);
283283
}
284284

285285
if (!is_writable($backupsDir)) {

0 commit comments

Comments
 (0)