From d87f76019fc231ec20d95126a7fee0487e7be5f0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 14 Aug 2012 10:56:20 -0400
Subject: [PATCH] - Added new web folder named private to web folder layout. The folder is intended to store data that shall not be visible in the web directory, it is owned by the user of the web. - Changed ownership of web root directory to root user in all security modes to prevent symlink attacks. - Apache log files are now owned by user root. - Improved functions in system library.
---
server/lib/classes/monitor_tools.inc.php | 385 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 306 insertions(+), 79 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index f5258e3..d1ed129 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -1,31 +1,31 @@
<?php
/*
- Copyright (c) 2007-2011, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
- All rights reserved.
+ Copyright (c) 2007-2011, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
+ All rights reserved.
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
+ this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
* Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
class monitor_tools {
@@ -44,8 +44,80 @@
//** Debian or Ubuntu
if (file_exists('/etc/debian_version')) {
+ if (strstr(trim(file_get_contents('/etc/issue')), 'Ubuntu')) {
+ if (strstr(trim(file_get_contents('/etc/issue')), 'LTS')) {
+ $lts=" LTS";
+ } else {
+ $lts="";
+ }
- if (trim(file_get_contents('/etc/debian_version')) == '4.0') {
+ $issue=file_get_contents('/etc/issue');
+ $distname = 'Ubuntu';
+ $distid = 'debian40';
+ $distbaseid = 'debian';
+ $ver = explode(' ',$issue);
+ $ver = array_filter($ver);
+ $ver = next($ver);
+ $mainver = explode('.',$ver);
+ $mainver = array_filter($mainver);
+ $mainver = current($mainver).'.'.next($mainver);
+ switch ($mainver){
+ case "12.10":
+ $relname = "(Quantal Quetzal)";
+ break;
+ case "12.04":
+ $relname = "(Precise Pangolin)";
+ break;
+ case "11.10":
+ $relname = "(Oneiric Ocelot)";
+ break;
+ case "11.14":
+ $relname = "(Natty Narwhal)";
+ break;
+ case "10.10":
+ $relname = "(Maverick Meerkat)";
+ break;
+ case "10.04":
+ $relname = "(Lucid Lynx)";
+ break;
+ case "9.10":
+ $relname = "(Karmic Koala)";
+ break;
+ case "9.04":
+ $relname = "(Jaunty Jackpole)";
+ break;
+ case "8.10":
+ $relname = "(Intrepid Ibex)";
+ break;
+ case "8.04":
+ $relname = "(Hardy Heron)";
+ break;
+ case "7.10":
+ $relname = "(Gutsy Gibbon)";
+ break;
+ case "7.04":
+ $relname = "(Feisty Fawn)";
+ break;
+ case "6.10":
+ $relname = "(Edgy Eft)";
+ break;
+ case "6.06":
+ $relname = "(Dapper Drake)";
+ break;
+ case "5.10":
+ $relname = "(Breezy Badger)";
+ break;
+ case "5.04":
+ $relname = "(Hoary Hedgehog)";
+ break;
+ case "4.10":
+ $relname = "(Warty Warthog)";
+ break;
+ default:
+ $relname = "UNKNOWN";
+ }
+ $distver = $ver.$lts." ".$relname;
+ } elseif(trim(file_get_contents('/etc/debian_version')) == '4.0') {
$distname = 'Debian';
$distver = '4.0';
$distid = 'debian40';
@@ -59,6 +131,11 @@
$distname = 'Debian';
$distver = 'Squeeze/Sid';
$distid = 'debian60';
+ $distbaseid = 'debian';
+ } elseif (strstr(trim(file_get_contents('/etc/debian_version')), '7.0') || trim(file_get_contents('/etc/debian_version')) == 'wheezy/sid') {
+ $distname = 'Debian';
+ $distver = 'Wheezy/Sid';
+ $distid = 'debian70';
$distbaseid = 'debian';
} else {
$distname = 'Debian';
@@ -149,9 +226,9 @@
return array('name' => $distname, 'version' => $distver, 'id' => $distid, 'baseid' => $distbaseid);
}
- //** Email Quota
- public function monitorEmailQuota() {
- global $conf;
+ //** Email Quota
+ public function monitorEmailQuota() {
+ global $conf, $app;
//* Initialize data array
$data = array();
@@ -165,26 +242,50 @@
//* The state of the email_quota.
$state = 'ok';
- //* Dovecot quota check Courier in progress lathama@gmail.com
- if($dir = opendir("/var/vmail")){
- while (($quotafiles = readdir($dir)) !== false){
- if(preg_match('/.\_quota$/', $quotafiles)){
- $quotafile = (file("/var/vmail/" . $quotafiles));
- $emailaddress = preg_replace('/_quota/',"", $quotafiles);
- $emailaddress = preg_replace('/_/',"@", $emailaddress);
- $data[$emailaddress]['used'] = trim($quotafile['1']);
- }
- }
- closedir($dir);
- }
+ $mailboxes = $app->db->queryAllRecords("SELECT email,maildir FROM mail_user WHERE server_id = $server_id");
+ if(is_array($mailboxes)) {
+ foreach($mailboxes as $mb) {
+ $email = $mb['email'];
+ $email_parts = explode('@',$mb['email']);
+ $filename = $mb['maildir'].'/.quotausage';
+ if(file_exists($filename) && !is_link($filename)) {
+ $quotafile = file($filename);
+ $data[$email]['used'] = trim($quotafile['1']);
+ unset($quotafile);
+ } else {
+ exec('du -s '.escapeshellcmd($mb['maildir']),$out);
+ $parts = explode(' ',$out[0]);
+ $data[$email]['used'] = intval($parts[0])*1024;
+ unset($out);
+ unset($parts);
+ }
+ }
+ }
+
+ unset($mailboxes);
+
+ //* Dovecot quota check Courier in progress lathama@gmail.com
+ /*
+ if($dir = opendir("/var/vmail")){
+ while (($quotafiles = readdir($dir)) !== false){
+ if(preg_match('/.\_quota$/', $quotafiles)){
+ $quotafile = (file("/var/vmail/" . $quotafiles));
+ $emailaddress = preg_replace('/_quota/',"", $quotafiles);
+ $emailaddress = preg_replace('/_/',"@", $emailaddress);
+ $data[$emailaddress]['used'] = trim($quotafile['1']);
+ }
+ }
+ closedir($dir);
+ }
+ */
$res['server_id'] = $server_id;
$res['type'] = $type;
$res['data'] = $data;
$res['state'] = $state;
- return $res;
- }
+ return $res;
+ }
- //** Filesystem Quota
+ //** Filesystem Quota
public function monitorHDQuota() {
global $conf;
@@ -217,10 +318,12 @@
$data['user'][$username]['used'] += $s[2];
$data['user'][$username]['soft'] += $s[3];
$data['user'][$username]['hard'] += $s[4];
+ $data['user'][$username]['files'] += $s[5];
} else {
$data['user'][$username]['used'] = $s[2];
$data['user'][$username]['soft'] = $s[3];
$data['user'][$username]['hard'] = $s[4];
+ $data['user'][$username]['files'] = $s[5];
}
}
}
@@ -270,7 +373,7 @@
$type = 'server_load';
/*
- Fetch the data into a array
+ Fetch the data into a array
*/
$procUptime = shell_exec("cat /proc/uptime | cut -f1 -d' '");
$data['up_days'] = floor($procUptime / 86400);
@@ -321,7 +424,7 @@
$type = 'os_info';
/*
- Fetch the data into a array
+ Fetch the data into a array
*/
$dist = $this->get_distname();
@@ -351,7 +454,7 @@
$type = 'ispc_info';
/*
- Fetch the data into a array
+ Fetch the data into a array
*/
$data['name'] = ISPC_APP_TITLE;
$data['version'] = ISPC_APP_VERSION;
@@ -408,6 +511,15 @@
*/
$usePercent = floatval($data[$i]['percent']);
+ //* get the free memsize
+ if(substr($data[$i]['available'],-1) == 'G') {
+ $freesize = floatval($data[$i]['available'])*1024;
+ } elseif(substr($data[$i]['available'],-1) == 'T') {
+ $freesize = floatval($data[$i]['available'])*1024*1024;
+ } else {
+ $freesize = floatval($data[$i]['available']);
+ }
+
//* We don't want to check some filesystem which have no sensible filling levels
switch ($data[$i]['type']) {
case 'iso9660':
@@ -418,13 +530,13 @@
case 'udev':
break;
default:
- if ($usePercent > 75)
+ if ($usePercent > 75 && $freesize < 2000)
$state = $this->_setState($state, 'info');
- if ($usePercent > 80)
+ if ($usePercent > 80 && $freesize < 1000)
$state = $this->_setState($state, 'warning');
- if ($usePercent > 90)
+ if ($usePercent > 90 && $freesize < 500)
$state = $this->_setState($state, 'critical');
- if ($usePercent > 95)
+ if ($usePercent > 95 && $freesize < 100)
$state = $this->_setState($state, 'error');
break;
}
@@ -451,7 +563,7 @@
$type = 'mem_usage';
/*
- Fetch the data into a array
+ Fetch the data into a array
*/
$miData = shell_exec('cat /proc/meminfo');
@@ -493,7 +605,7 @@
$type = 'cpu_info';
/*
- Fetch the data into a array
+ Fetch the data into a array
*/
if (file_exists('/proc/cpuinfo')) {
$cpuData = shell_exec('cat /proc/cpuinfo');
@@ -663,7 +775,7 @@
$type = 'openvz_veinfo';
/*
- Fetch the data into a array
+ Fetch the data into a array
*/
$app->load(openvz_tools);
$openVzTools = new openvz_tools();
@@ -693,7 +805,7 @@
$type = 'openvz_beancounter';
/*
- Fetch the data into a array
+ Fetch the data into a array
*/
$app->load(openvz_tools);
$openVzTools = new openvz_tools();
@@ -846,7 +958,7 @@
/*
* Fetch the output
*/
- $data['output'] = shell_exec('zypper --non-interactive up');
+ $data['output'] = shell_exec('zypper lu');
} else {
/*
* It is not Debian/Ubuntu, so there is no data and no state
@@ -888,7 +1000,7 @@
*/
$tmp = explode("\n", $data['output']);
$more = $tmp[sizeof($tmp) - 1];
- $this->_getIntArray($more);
+ $res = $this->_getIntArray($more);
$data['bytes'] = $res[0];
$data['requests'] = $res[1];
@@ -987,43 +1099,102 @@
/*
* Fetch the output
*/
- $data['output'] = shell_exec('mpt-status --autoload -n');
+ $data['output'] = shell_exec('mpt-status --autoload');
/*
* Then calc the state.
*/
$state = 'ok';
- foreach ($data['output'] as $item) {
- /*
- * The output contains information for every RAID and every HDD.
- * We only need the state of the RAID
- */
- if (strpos($item, 'raidlevel:') !== false) {
+ if(is_array($data['output'])) {
+ foreach ($data['output'] as $item) {
/*
- * We found a raid, process the state of it
- */
- if (strpos($item, ' ONLINE ') !== false) {
- $this->_setState($state, 'ok');
- } elseif (strpos($item, ' OPTIMAL ') !== false) {
- $this->_setState($state, 'ok');
- } elseif (strpos($item, ' INITIAL ') !== false) {
- $this->_setState($state, 'info');
- } elseif (strpos($item, ' INACTIVE ') !== false) {
- $this->_setState($state, 'critical');
- } elseif (strpos($item, ' RESYNC ') !== false) {
- $this->_setState($state, 'info');
- } elseif (strpos($item, ' DEGRADED ') !== false) {
- $this->_setState($state, 'critical');
- } else {
- /* we don't know the state. so we set the state to critical, that the
- * admin is warned, that something is wrong
- */
- $this->_setState($state, 'critical');
+ * The output contains information for every RAID and every HDD.
+ * We only need the state of the RAID
+ */
+ if (strpos($item, 'state ') !== false) {
+ /*
+ * We found a raid, process the state of it
+ */
+ if (strpos($item, ' ONLINE ') !== false) {
+ $this->_setState($state, 'ok');
+ } elseif (strpos($item, ' OPTIMAL ') !== false) {
+ $this->_setState($state, 'ok');
+ } elseif (strpos($item, ' INITIAL ') !== false) {
+ $this->_setState($state, 'info');
+ } elseif (strpos($item, ' INACTIVE ') !== false) {
+ $this->_setState($state, 'critical');
+ } elseif (strpos($item, ' RESYNC ') !== false) {
+ $this->_setState($state, 'info');
+ } elseif (strpos($item, ' DEGRADED ') !== false) {
+ $this->_setState($state, 'critical');
+ } else {
+ /* we don't know the state. so we set the state to critical, that the
+ * admin is warned, that something is wrong
+ */
+ $this->_setState($state, 'critical');
+ }
}
}
}
}
}
+
+ /*
+ * 3ware Controller
+ */
+ system('which tw_cli', $retval);
+ if($retval === 0) {
+
+ $data['output'] = shell_exec('tw_cli info c0');
+
+ $state = 'ok';
+ if(is_array($data['output'])) {
+ foreach ($data['output'] as $item) {
+ if (strpos($item, 'RAID') !== false) {
+ if (strpos($item, ' VERIFYING ') !== false) {
+ $this->_setState($state, 'info');
+ }
+ else if (strpos($item, ' MIGRATE-PAUSED ') !== false) {
+ $this->_setState($state, 'info');
+ }
+ else if (strpos($item, ' MIGRATING ') !== false) {
+ $this->_setState($state, 'ok');
+ }
+ else if (strpos($item, ' INITIALIZING ') !== false) {
+ $this->_setState($state, 'info');
+ }
+ else if (strpos($item, ' INIT-PAUSED ') !== false) {
+ $this->_setState($state, 'info');
+ }
+ else if (strpos($item, ' REBUILDING ') !== false) {
+ $this->_setState($state, 'info');
+ }
+ else if (strpos($item, ' REBUILD-PAUSED ') !== false) {
+ $this->_setState($state, 'warning');
+ }
+ else if (strpos($item, ' RECOVERY ') !== false) {
+ $this->_setState($state, 'warning');
+ }
+ else if (strpos($item, ' DEGRADED ') !== false) {
+ $this->_setState($state, 'critical');
+ }
+ else if (strpos($item, ' UNKNOWN ') !== false) {
+ $this->_setState($state, 'critical');
+ }
+ else if (strpos($item, ' OK ') !== false) {
+ $this->_setState($state, 'ok');
+ }
+ else if (strpos($item, ' OPTIMAL ') !== false) {
+ $this->_setState($state, 'ok');
+ }
+ else {
+ $this->_setState($state, 'critical');
+ }
+ }
+ }
+ }
+ }
+
/*
* Return the Result
@@ -1124,6 +1295,56 @@
$res['state'] = $state;
return $res;
}
+
+ public function monitorIPTables() {
+ global $conf;
+
+ /* the id of the server as int */
+ $server_id = intval($conf['server_id']);
+
+ /** The type of the data */
+ $type = 'iptables_rules';
+
+ /* This monitoring is only available if fail2ban is installed */
+ system('which iptables', $retval); // Debian, Ubuntu, Fedora
+ if ($retval === 0) {
+ /* Get the data of the log */
+ $data['output'] = '<h2>iptables -S (ipv4)</h2>'.shell_exec('iptables -S');
+
+ /*
+ * At this moment, there is no state (maybe later)
+ */
+ $state = 'no_state';
+ } else {
+ $state = 'no_state';
+ $data = '';
+ }
+
+
+ /* This monitoring is only available if fail2ban is installed */
+ system('which ip6tables', $retval); // Debian, Ubuntu, Fedora
+ if ($retval === 0) {
+ /* Get the data of the log */
+ $data['output'] .= '<br><h2>ip6tables -S (ipv6)</h2>'.shell_exec('ip6tables -S');
+
+ /*
+ * At this moment, there is no state (maybe later)
+ */
+ $state = 'no_state';
+ } else {
+ $state = 'no_state';
+ $data = '';
+ }
+
+ /*
+ * Return the Result
+ */
+ $res['server_id'] = $server_id;
+ $res['type'] = $type;
+ $res['data'] = $data;
+ $res['state'] = $state;
+ return $res;
+ }
public function monitorSysLog() {
global $app;
@@ -1468,7 +1689,7 @@
break;
case 'log_messages':
if ($dist == 'debian') {
- $logfile = '/var/log/messages';
+ $logfile = '/var/log/syslog';
} elseif ($dist == 'redhat') {
$logfile = '/var/log/messages';
} elseif ($dist == 'suse') {
@@ -1579,7 +1800,13 @@
* So we can do a deepter test and try to get data over this connection.
* (if apache hangs, we get a connection but a timeout by trying to GET the data!)
*/
- fwrite($fp, "GET / HTTP/1.0\r\n\r\n");
+ // fwrite($fp, "GET / HTTP/1.0\r\n\r\n");
+ $out = "GET / HTTP/1.1\r\n";
+ $out .= "Host: localhost\r\n";
+ $out .= "User-Agent: Mozilla/5.0 (ISPConfig monitor)\r\n";
+ $out .= "Accept: application/xml,application/xhtml+xml,text/html\r\n";
+ $out .= "Connection: Close\r\n\r\n";
+ fwrite($fp, $out);
stream_set_timeout($fp, 5); // Timeout after 5 seconds
$res = fread($fp, 10); // try to get 10 bytes (enough to test!)
$info = stream_get_meta_data($fp);
--
Gitblit v1.9.1