From ca66480ba7c1dab0028e3c064438106c8f224864 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 12 Nov 2014 09:18:19 +0100
Subject: [PATCH] Hardcode the access mode to use when creating directories

refs #7163
---
 modules/monitoring/library/Monitoring/MonitoringWizard.php | 7 +------
 modules/setup/application/clicommands/ConfigCommand.php    | 6 +++---
 .../application/views/scripts/form/setup-welcome.phtml     | 2 +-
 modules/setup/library/Setup/Utils/MakeDirStep.php          | 4 ++--
 modules/setup/library/Setup/WebWizard.php                  | 2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 5201b37cc..111c7b39b 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -124,12 +124,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
         $pageData = $this->getPageData();
         $setup = new Setup();
 
-        $setup->addStep(
-            new MakeDirStep(
-                array($this->getConfigDir() . '/modules/monitoring'),
-                $pageData['setup_general_config']['global_filemode']
-            )
-        );
+        $setup->addStep(new MakeDirStep(array($this->getConfigDir() . '/modules/monitoring'), 0775));
 
         $setup->addStep(
             new BackendStep(array(
diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index a82882fcc..0006f6ce3 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -20,13 +20,13 @@ class ConfigCommand extends Command
      *
      * OPTIONS:
      *
-     *   --mode  The access mode to use. Default is: 2775
+     *   --mode  The access mode to use. Default is: 2770
      *   --path  The path to the configuration directory. If omitted the default is used.
      *
      * EXAMPLES:
      *
      *   icingacli setup config createDirectory apache
-     *   icingacli setup config createDirectory apache --mode 2770
+     *   icingacli setup config createDirectory apache --mode 2775
      *   icingacli setup config createDirectory apache --path /some/path
      */
     public function createDirectoryAction()
@@ -43,7 +43,7 @@ class ConfigCommand extends Command
             return true;
         }
 
-        $mode = octdec($this->params->get('mode', '2775'));
+        $mode = octdec($this->params->get('mode', '2770'));
         if (false === mkdir($path)) {
             $this->fail(sprintf($this->translate('Unable to create path: %s'), $path));
             return false;
diff --git a/modules/setup/application/views/scripts/form/setup-welcome.phtml b/modules/setup/application/views/scripts/form/setup-welcome.phtml
index 86c14d586..64a0af991 100644
--- a/modules/setup/application/views/scripts/form/setup-welcome.phtml
+++ b/modules/setup/application/views/scripts/form/setup-welcome.phtml
@@ -71,7 +71,7 @@ $cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
       </div>
       <p><?= mt('setup', 'In case the IcingaCLI is missing you can create the token manually:'); ?></p>
       <div class="code">
-        <span>su <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_group'; ?> && mkdir -m 2775 <?= dirname($setupTokenPath); ?>;</span>
+        <span>su <?= ($user = Platform::getPhpUser()) !== null ? $user : 'your_webserver_group'; ?> && mkdir -m 2770 <?= dirname($setupTokenPath); ?>;</span>
         <span>head -c 12 /dev/urandom | base64 | tee <?= $setupTokenPath; ?>;</span>
         <span>chmod 0660 <?= $setupTokenPath; ?>;</span>
       </div>
diff --git a/modules/setup/library/Setup/Utils/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php
index de5cfe4ad..d15c7db6a 100644
--- a/modules/setup/library/Setup/Utils/MakeDirStep.php
+++ b/modules/setup/library/Setup/Utils/MakeDirStep.php
@@ -16,12 +16,12 @@ class MakeDirStep extends Step
 
     /**
      * @param array $paths
-     * @param string $dirmode
+     * @param int   $dirmode
      */
     public function __construct($paths, $dirmode)
     {
         $this->paths = $paths;
-        $this->dirmode = octdec($dirmode) | octdec('111'); // Make sure that the directories can be traversed
+        $this->dirmode = $dirmode;
         $this->errors = array();
     }
 
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index dc163f4a8..6c9de1fee 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -355,7 +355,7 @@ class WebWizard extends Wizard implements SetupWizard
                     $configDir . '/preferences',
                     $configDir . '/enabledModules'
                 ),
-                $pageData['setup_general_config']['global_filemode']
+                0775
             )
         );