Add a basic integritychecker after every update

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>

install/updatesql.php

@@ -44,6 +44,23 @@ if(!isFroxlor()) {
 
 if (isFroxlor()) {
 	include_once (makeCorrectFile(dirname(__FILE__).'/updates/froxlor/0.9/update_0.9.inc.php'));
+
+	// Check Froxlor - database integrity (only happens after all updates are done, so we know the db-layout is okay)
+	showUpdateStep("Checking database integrity");
+
+	$integrity = new IntegrityCheck();
+	if (!$integrity->checkAll()) {
+		lastStepStatus(2, 'Monkeys ate the integrity');
+		showUpdateStep("Trying to remove monkeys, feeding bananas");
+		if(!$integrity->fixAll()) {
+			lastStepStatus(2, 'Some monkeys just would not move');
+		} else {
+			lastStepStatus(0);
+		}
+	} else {
+		lastStepStatus(0);
+	}
+
 	$filelog->logAction(ADM_ACTION, LOG_WARNING, '--------------- END LOG ---------------');
 	unset($filelog);
 }

lib/classes/integrity/class.IntegrityCheck.php

@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2014- the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Aders <eleras@froxlor.org>
+ * @author     Froxlor team <team@froxlor.org> (2014-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Integrity
+ *
+ * IntegrityCheck - class 
+ */
+
+class IntegrityCheck {
+
+	/**
+	 * Check all occuring integrity problems at once
+	 */
+	public function checkAll() {
+		$integrityok = true;
+		$integrityok = $this->DomainIpTable() ? $integrityok : false;
+		return $integrityok;
+	}
+
+	/**
+	 * Fix all occuring integrity problems at once with default settings
+	 */
+	public function fixAll() {
+		$integrityok = true;
+		$integrityok = $this->DomainIpTable(true) ? $integrityok : false;
+		return $integrityok;
+	}
+
+	/**
+	 * Check the integrity of the domain to ip/port - association
+	 * @param $fix Fix everything found directly
+	 */
+	public function DomainIpTable($fix = false) {
+		$ips = array();
+		$domains = array();
+		$ipstodomains = array();
+		$admips = array();
+
+		if ($fix) {
+			// Prepare insert / delete statement for the fixes
+			$del_stmt = Database::prepare("
+				DELETE FROM `" . TABLE_DOMAINTOIP . "`
+				WHERE `id_domain` = :domainid AND `id_ipandports` = :ipandportid "
+			);
+			$ins_stmt = Database::prepare("
+				INSERT INTO `" . TABLE_DOMAINTOIP . "`
+				SET `id_domain` = :domainid, `id_ipandports` = :ipandportid "
+			);
+
+			// Cache all IPs the admins have assigned
+			$adm_stmt = Database::prepare("SELECT `adminid`, `ip` FROM `" . TABLE_PANEL_ADMINS . "` ORDER BY `adminid` ASC");
+			Database::pexecute($adm_stmt);
+			while ($row = $adm_stmt->fetch(PDO::FETCH_ASSOC)) {
+				if ($row['ip'] == -1) {
+					// Admin uses default-IP
+					$admips[$row['adminid']] = Settings::Get('system.defaultip');
+				} else {
+					$admips[$row['adminid']] = $row['ip'];
+				}
+			}
+		}
+
+		// Cache all available ip/port - combinations
+		$result_stmt = Database::prepare("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` ORDER BY `id` ASC");
+		Database::pexecute($result_stmt);
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			$ips[$row['id']] = $row['ip'] . ':' . $row['port'];
+		}
+		
+		// Cache all configured domains
+		$result_stmt = Database::prepare("SELECT `id`, `adminid` FROM `" . TABLE_PANEL_DOMAINS . "` ORDER BY `id` ASC");
+		Database::pexecute($result_stmt);
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			$domains[$row['id']] = $row['adminid'];
+		}
+		
+		// Check if every domain to ip/port - association is valid in TABLE_DOMAINTOIP
+		$result_stmt = Database::prepare("SELECT `id_domain`, `id_ipandports` FROM `" . TABLE_DOMAINTOIP . "`");
+		Database::pexecute($result_stmt);
+		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			if (!array_key_exists($row['id_ipandports'], $ips)) { 
+				if ($fix) {
+					Database::pexecute($del_stmt, array('domainid' => $row['id_domain'], 'ipandportid' => $row['id_ipandports']));
+				} else {
+					return false;
+				}
+			}
+			if (!array_key_exists($row['id_domain'], $domains)) {
+				if ($fix) {
+					Database::pexecute($del_stmt, array('domainid' => $row['id_domain'], 'ipandportid' => $row['id_ipandports']));
+				} else {
+					return false; 
+				}
+			}
+			// Save one IP/Port combination per domain, so we know, if one domain is missing an IP
+			$ipstodomains[$row['id_domain']] = $row['id_ipandports'];
+		}
+		
+		// Check that all domains have at least one IP/Port combination
+		foreach ($domains as $domainid => $adminid) {
+			if (!array_key_exists($domainid, $ipstodomains)) {
+				if ($fix) {
+					Database::pexecute($ins_stmt, array('domainid' => $domainid, 'ipandportid' => $admips[$adminid]));
+				} else {
+					return false;
+				}
+			}
+		}
+
+		if ($fix) {
+			return $this->DomainIpTable();
+		} else {
+			return true;
+		}
+	}
+
+}