MAGETWO-52322: port file permissions fixes to 2.0 branch

Author: dsikkema-magento

.htaccess

@@ -4,6 +4,12 @@
 
 #   SetEnv MAGE_MODE developer
 
+############################################
+## overrides default umask value to allow using different
+## file permissions
+
+#   SetEnv MAGE_UMASK 022
+
 ############################################
 ## uncomment these lines for CGI mode
 ## make sure to specify the correct cgi php binary file name

.htaccess.sample

@@ -3,6 +3,12 @@
 
 #   SetEnv MAGE_MODE developer
 
+############################################
+## overrides default umask value to allow using different
+## file permissions
+
+#   SetEnv MAGE_UMASK 022
+
 ############################################
 ## uncomment these lines for CGI mode
 ## make sure to specify the correct cgi php binary file name

app/bootstrap.php

@@ -9,7 +9,10 @@
  */
 error_reporting(E_ALL);
 #ini_set('display_errors', 1);
-umask(0);
+
+/* Custom umask value may be provided in MAGE_UMASK environment variable */
+$mask = isset($_SERVER['MAGE_UMASK']) ? octdec($_SERVER['MAGE_UMASK']) : 002;
+umask($mask);
 
 /* PHP version validation */
 if (version_compare(phpversion(), '5.5.0', '<') === true) {

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

@@ -91,7 +91,6 @@ protected function _hideBackupsForApache()
         $filename = '.htaccess';
         if (!$this->_varDirectory->isFile($filename)) {
             $this->_varDirectory->writeFile($filename, 'deny from all');
-            $this->_varDirectory->changePermissions($filename, 0640);
         }
     }
 

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

@@ -150,8 +150,6 @@ public function getImgDir($website = null)
         $mediaDir = $this->_filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $captchaDir = '/captcha/' . $this->_getWebsiteCode($website);
         $mediaDir->create($captchaDir);
-        $mediaDir->changePermissions($captchaDir, DriverInterface::WRITEABLE_DIRECTORY_MODE);
-
         return $mediaDir->getAbsolutePath($captchaDir) . '/';
     }
 

app/code/Magento/Catalog/Model/Product/Attribute/Backend/AbstractMedia.php

@@ -170,9 +170,7 @@ public function addImage(
                 $storageHelper->saveFile($this->mediaConfig->getTmpMediaShortUrl($fileName));
             } else {
                 $this->mediaDirectory->copyFile($file, $destinationFile);
-
                 $storageHelper->saveFile($this->mediaConfig->getTmpMediaShortUrl($fileName));
-                $this->mediaDirectory->changePermissions($destinationFile, DriverInterface::WRITEABLE_FILE_MODE);
             }
         } catch (\Exception $e) {
             throw new LocalizedException(__('We couldn\'t move this file: %1.', $e->getMessage()));

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

@@ -18,11 +18,15 @@ class Filesystem
 {
     /**
      * File access permissions
+     *
+     * @deprecated
      */
     const PERMISSIONS_FILE = 0640;
 
     /**
      * Directory access permissions
+     *
+     * @deprecated
      */
     const PERMISSIONS_DIR = 0750;
 
@@ -107,19 +111,11 @@ public function regenerateStatic(
                 DirectoryList::TMP_MATERIALIZATION_DIR
             ]
         );
-        $this->changePermissions(
-            [
-                DirectoryList::STATIC_VIEW
-            ],
-            self::PERMISSIONS_DIR,
-            self::PERMISSIONS_DIR
-        );
 
         // Trigger static assets compilation and deployment
         $this->deployStaticContent($output);
         // Trigger code generation
         $this->compile($output);
-        $this->lockStaticResources();
     }
 
     /**
@@ -215,6 +211,8 @@ public function cleanupFilesystem($directoryCodeList)
      * @param int $dirPermissions
      * @param int $filePermissions
      * @return void
+     *
+     * @deprecated
      */
     protected function changePermissions($directoryCodeList, $dirPermissions, $filePermissions)
     {
@@ -233,6 +231,8 @@ protected function changePermissions($directoryCodeList, $dirPermissions, $fileP
      * Chenge permissions on static resources
      *
      * @return void
+     *
+     * @deprecated
      */
     public function lockStaticResources()
     {

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

@@ -92,7 +92,6 @@ public function enableProductionMode()
      */
     public function enableProductionModeMinimal()
     {
-        $this->filesystem->lockStaticResources();
         $this->setStoreMode(State::MODE_PRODUCTION);
     }
 

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

@@ -105,7 +105,7 @@ protected function endFactory($type)
      * @return bool
      * @throws \Exception
      */
-    protected function checkAndCreateFolder($folder, $mode = DriverInterface::WRITEABLE_DIRECTORY_MODE)
+    protected function checkAndCreateFolder($folder, $mode = 0777)
     {
         if (is_dir($folder)) {
             return true;
@@ -127,7 +127,7 @@ protected function checkAndCreateFolder($folder, $mode = DriverInterface::WRITEA
      * @param bool $recursive
      * @return bool
      */
-    protected function mkDir($dir, $mode = 0770, $recursive = true)
+    protected function mkDir($dir, $mode = 0777, $recursive = true)
     {
         return @mkdir($dir, $mode, $recursive);
     }

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

@@ -573,7 +573,7 @@ protected function _ensureDirExists($dir)
     {
         if (!file_exists($dir)) {
             $old = umask(0);
-            mkdir($dir, DriverInterface::WRITEABLE_DIRECTORY_MODE);
+            mkdir($dir);
             umask($old);
         } elseif (!is_dir($dir)) {
             throw new \Magento\Framework\Exception\LocalizedException(__("'%1' is not a directory.", $dir));