Hardcode the access mode to use when creating files

refs #7163
Icinga · Nov 12, 2014 · 4992140 · 4992140
1 parent ca66480
commit 4992140
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 25 deletions.
diff --git a/library/Icinga/File/Ini/IniWriter.php b/library/Icinga/File/Ini/IniWriter.php
@@ -27,7 +27,7 @@ class IniWriter extends Zend_Config_Writer_FileAbstract
      *
      * @var int
      */
-    public static $fileMode;
+    public static $fileMode = 0664;
 
     /**
      * Create a new INI writer

diff --git a/modules/monitoring/library/Monitoring/BackendStep.php b/modules/monitoring/library/Monitoring/BackendStep.php
@@ -40,8 +40,7 @@ protected function createBackendsIni()
         try {
             $writer = new IniWriter(array(
                 'config'    => new Config($config),
-                'filename'  => Config::resolvePath('modules/monitoring/backends.ini'),
-                'filemode'  => octdec($this->data['fileMode'])
+                'filename'  => Config::resolvePath('modules/monitoring/backends.ini')
             ));
             $writer->write();
         } catch (Exception $e) {
@@ -66,7 +65,7 @@ protected function createResourcesIni()
             $writer = new IniWriter(array(
                 'config'    => $config,
                 'filename'  => Config::resolvePath('resources.ini'),
-                'filemode'  => octdec($this->data['fileMode'])
+                'filemode'  => 0660
             ));
             $writer->write();
         } catch (Exception $e) {

diff --git a/modules/monitoring/library/Monitoring/InstanceStep.php b/modules/monitoring/library/Monitoring/InstanceStep.php
@@ -29,8 +29,7 @@ public function apply()
         try {
             $writer = new IniWriter(array(
                 'config'    => new Config(array($instanceName => $instanceConfig)),
-                'filename'  => Config::resolvePath('modules/monitoring/instances.ini'),
-                'filemode'  => octdec($this->data['fileMode'])
+                'filename'  => Config::resolvePath('modules/monitoring/instances.ini')
             ));
             $writer->write();
         } catch (Exception $e) {

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -131,22 +131,19 @@ public function getSetup()
                 'backendConfig'     => $pageData['setup_monitoring_backend'],
                 'resourceConfig'    => isset($pageData['setup_monitoring_ido'])
                     ? array_diff_key($pageData['setup_monitoring_ido'], array('skip_validation' => null))
-                    : array_diff_key($pageData['setup_monitoring_livestatus'], array('skip_validation' => null)),
-                'fileMode'          => $pageData['setup_general_config']['global_filemode']
+                    : array_diff_key($pageData['setup_monitoring_livestatus'], array('skip_validation' => null))
             ))
         );
 
         $setup->addStep(
             new InstanceStep(array(
-                'instanceConfig'    => $pageData['setup_monitoring_instance'],
-                'fileMode'          => $pageData['setup_general_config']['global_filemode']
+                'instanceConfig'    => $pageData['setup_monitoring_instance']
             ))
         );
 
         $setup->addStep(
             new SecurityStep(array(
-                'securityConfig'    => $pageData['setup_monitoring_security'],
-                'fileMode'          => $pageData['setup_general_config']['global_filemode']
+                'securityConfig'    => $pageData['setup_monitoring_security']
             ))
         );
 

diff --git a/modules/monitoring/library/Monitoring/SecurityStep.php b/modules/monitoring/library/Monitoring/SecurityStep.php
@@ -28,8 +28,7 @@ public function apply()
         try {
             $writer = new IniWriter(array(
                 'config'    => new Config($config),
-                'filename'  => Config::resolvePath('modules/monitoring/config.ini'),
-                'filemode'  => octdec($this->data['fileMode'])
+                'filename'  => Config::resolvePath('modules/monitoring/config.ini')
             ));
             $writer->write();
         } catch (Exception $e) {

diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -51,8 +51,7 @@ protected function createAuthenticationIni()
         try {
             $writer = new IniWriter(array(
                 'config'    => new Config($config),
-                'filename'  => Config::resolvePath('authentication.ini'),
-                'filemode'  => octdec($this->data['fileMode'])
+                'filename'  => Config::resolvePath('authentication.ini')
             ));
             $writer->write();
         } catch (Exception $e) {
@@ -75,8 +74,7 @@ protected function defineInitialAdmin()
         try {
             $writer = new IniWriter(array(
                 'config'    => new Config($config),
-                'filename'  => Config::resolvePath('permissions.ini'),
-                'filemode'  => octdec($this->data['fileMode'])
+                'filename'  => Config::resolvePath('permissions.ini')
             ));
             $writer->write();
         } catch (Exception $e) {

diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -37,8 +37,7 @@ public function apply()
         try {
             $writer = new IniWriter(array(
                 'config'    => new Config($config),
-                'filename'  => Config::resolvePath('config.ini'),
-                'filemode'  => octdec($this->data['fileMode'])
+                'filename'  => Config::resolvePath('config.ini')
             ));
             $writer->write();
         } catch (Exception $e) {

diff --git a/modules/setup/library/Setup/Steps/ResourceStep.php b/modules/setup/library/Setup/Steps/ResourceStep.php
@@ -41,7 +41,7 @@ public function apply()
             $writer = new IniWriter(array(
                 'config'    => new Config($resourceConfig),
                 'filename'  => Config::resolvePath('resources.ini'),
-                'filemode'  => octdec($this->data['fileMode'])
+                'filemode'  => 0660
             ));
             $writer->write();
         } catch (Exception $e) {

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
@@ -306,8 +306,7 @@ public function getSetup()
                 'preferencesType'       => $pageData['setup_preferences_type']['type'],
                 'preferencesResource'   => isset($pageData['setup_db_resource']['name'])
                     ? $pageData['setup_db_resource']['name']
-                    : null,
-                'fileMode'              => $pageData['setup_general_config']['global_filemode']
+                    : null
             ))
         );
 
@@ -325,7 +324,6 @@ public function getSetup()
         $setup->addStep(
             new AuthenticationStep(array(
                 'adminAccountData'  => $adminAccountData,
-                'fileMode'          => $pageData['setup_general_config']['global_filemode'],
                 'backendConfig'     => $pageData['setup_authentication_backend'],
                 'resourceName'      => $authType === 'db' ? $pageData['setup_db_resource']['name'] : (
                     $authType === 'ldap' ? $pageData['setup_ldap_resource']['name'] : null
@@ -336,7 +334,6 @@ public function getSetup()
         if (isset($pageData['setup_db_resource']) || isset($pageData['setup_ldap_resource'])) {
             $setup->addStep(
                 new ResourceStep(array(
-                    'fileMode'              => $pageData['setup_general_config']['global_filemode'],
                     'dbResourceConfig'      => isset($pageData['setup_db_resource'])
                         ? array_diff_key($pageData['setup_db_resource'], array('skip_validation' => null))
                         : null,