From 60b70001fd59bed089dd78bec9a897ffd3916850 Mon Sep 17 00:00:00 2001 From: Marius Cramer Date: Tue, 11 Mar 2014 15:01:19 +0100 Subject: [PATCH] Implemented apache module check and mod_authz_compat warning for OpenSuSE --- install/dist/lib/opensuse.lib.php | 18 +++++++- install/install.php | 1 + install/lib/install.lib.php | 70 +++++++++++++++++++++---------- server/lib/classes/system.inc.php | 26 ++++++++++++ 4 files changed, 92 insertions(+), 23 deletions(-) diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index d4cb7cf01..6d792f03e 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -29,7 +29,23 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ class installer_dist extends installer_base { - + + public function __construct() { + //** check apache modules */ + $mods = getapachemodules(); + if(in_array('authz_compat', $mods, true)) { + swriteln($inst->lng(' WARNING! You are using mod_authz_compat.')); + swriteln($inst->lng(' Please make sure that your apache config uses the new auth syntax:')); + swriteln($inst->lng(' ')); + swriteln($inst->lng(' Options None')); + swriteln($inst->lng(' AllowOverride None')); + swriteln($inst->lng(' Require all denied')); + swriteln($inst->lng(' '."\n")); + + swriteln($inst->lng(' If it uses the old syntax (deny from all) ISPConfig would fail to work.')); + } + } + public function configure_mailman($status = 'insert') { global $conf; diff --git a/install/install.php b/install/install.php index a3393c1fb..847c2fd72 100644 --- a/install/install.php +++ b/install/install.php @@ -87,6 +87,7 @@ include_once 'dist/conf/'.$dist['id'].'.conf.php'; //** Installer Interface //**************************************************************************************************** $inst = new installer(); + swriteln($inst->lng(' Following will be a few questions for primary configuration so be careful.')); swriteln($inst->lng(' Default values are in [brackets] and can be accepted with .')); swriteln($inst->lng(' Tap in "quit" (without the quotes) to stop the installer.'."\n\n")); diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index addd6cd31..1663a9578 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -830,29 +830,55 @@ function get_system_timezone() { } function getapacheversion($get_minor = false) { - global $app; - - $cmd = ''; - if(is_installed('apache2ctl')) $cmd = 'apache2ctl -v'; - elseif(is_installed('apachectl')) $cmd = 'apachectl -v'; - else { - $app->log("Could not check apache version, apachectl not found.", LOGLEVEL_WARN); - return '2.2'; - } - - exec($cmd, $output, $return_var); - if($return_var != 0 || !$output[0]) { - $app->log("Could not check apache version, apachectl did not return any data.", LOGLEVEL_WARN); - return '2.2'; - } - - if(preg_match('/version:\s*Apache\/(\d+)(\.(\d+)(\.(\d+))*)?(\D|$)/i', $output[0], $matches)) { - return $matches[1] . (isset($matches[3]) ? '.' . $matches[3] : '') . (isset($matches[5]) && $get_minor == true ? '.' . $matches[5] : ''); - } else { - $app->log("Could not check apache version, did not find version string in apachectl output.", LOGLEVEL_WARN); - return '2.2'; - } + global $app; + + $cmd = ''; + if(is_installed('apache2ctl')) $cmd = 'apache2ctl -v'; + elseif(is_installed('apachectl')) $cmd = 'apachectl -v'; + else { + $app->log("Could not check apache version, apachectl not found.", LOGLEVEL_WARN); + return '2.2'; + } + + exec($cmd, $output, $return_var); + if($return_var != 0 || !$output[0]) { + $app->log("Could not check apache version, apachectl did not return any data.", LOGLEVEL_WARN); + return '2.2'; + } + + if(preg_match('/version:\s*Apache\/(\d+)(\.(\d+)(\.(\d+))*)?(\D|$)/i', $output[0], $matches)) { + return $matches[1] . (isset($matches[3]) ? '.' . $matches[3] : '') . (isset($matches[5]) && $get_minor == true ? '.' . $matches[5] : ''); + } else { + $app->log("Could not check apache version, did not find version string in apachectl output.", LOGLEVEL_WARN); + return '2.2'; } +} +function getapachemodules() { + global $app; + + $cmd = ''; + if(is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES'; + elseif(is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES'; + else { + $app->log("Could not check apache modules, apachectl not found.", LOGLEVEL_WARN); + return array(); + } + + exec($cmd, $output, $return_var); + if($return_var != 0 || !$output[0]) { + $app->log("Could not check apache modules, apachectl did not return any data.", LOGLEVEL_WARN); + return array(); + } + + $modules = array(); + for($i = 0; $i < count($output); $i++) { + if(preg_match('/^\s*(\w+)\s+\((shared|static)\)\s*$/', $output[$i], $matches)) { + $modules[] = $matches[1]; + } + } + + return $modules; +} ?> diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php index 34830bf93..0348faecb 100644 --- a/server/lib/classes/system.inc.php +++ b/server/lib/classes/system.inc.php @@ -1759,6 +1759,32 @@ class system{ } } + function getapachemodules() { + global $app; + + $cmd = ''; + if(is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES'; + elseif(is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES'; + else { + $app->log("Could not check apache modules, apachectl not found.", LOGLEVEL_WARN); + return array(); + } + + exec($cmd, $output, $return_var); + if($return_var != 0 || !$output[0]) { + $app->log("Could not check apache modules, apachectl did not return any data.", LOGLEVEL_WARN); + return array(); + } + + $modules = array(); + for($i = 0; $i < count($output); $i++) { + if(preg_match('/^\s*(\w+)\s+\((shared|static)\)\s*$/', $output[$i], $matches)) { + $modules[] = $matches[1]; + } + } + + return $modules; + } } ?> -- GitLab