From 79e46ebda9eb3b92fc911fd82ef3b701ef3a64da Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 30 Jul 2015 10:13:25 -0400
Subject: Reinitialize the captive portal database for a zone if it is
 corrupt/unreadable. Fixes #4904

---
 etc/inc/captiveportal.inc | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

(limited to 'etc/inc')

diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 3d29791..dd4f35a 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -1404,16 +1404,30 @@ function radius($username, $password, $clientip, $clientmac, $type, $radiusctx =
 function captiveportal_opendb() {
 	global $g, $cpzone;
 
-	$DB = new SQLite3("{$g['vardb_path']}/captiveportal{$cpzone}.db");
-	if (! $DB->exec("CREATE TABLE IF NOT EXISTS captiveportal (" .
-						"allow_time INTEGER, pipeno INTEGER, ip TEXT, mac TEXT, username TEXT, " .
-						"sessionid TEXT, bpassword TEXT, session_timeout INTEGER, idle_timeout INTEGER, " .
-						"session_terminate_time INTEGER, interim_interval INTEGER, radiusctx TEXT); " .
-					"CREATE UNIQUE INDEX IF NOT EXISTS idx_active ON captiveportal (sessionid, username); " .
-					"CREATE INDEX IF NOT EXISTS user ON captiveportal (username); " .
-					"CREATE INDEX IF NOT EXISTS ip ON captiveportal (ip); " .
-					"CREATE INDEX IF NOT EXISTS starttime ON captiveportal (allow_time)")) {
-		captiveportal_syslog("Error during table {$cpzone} creation. Error message: {$DB->lastErrorMsg()}");
+	$db_path = "{$g['vardb_path']}/captiveportal{$cpzone}.db";
+	$createquery = "CREATE TABLE IF NOT EXISTS captiveportal (" .
+				"allow_time INTEGER, pipeno INTEGER, ip TEXT, mac TEXT, username TEXT, " .
+				"sessionid TEXT, bpassword TEXT, session_timeout INTEGER, idle_timeout INTEGER, " .
+				"session_terminate_time INTEGER, interim_interval INTEGER, radiusctx TEXT); " .
+			"CREATE UNIQUE INDEX IF NOT EXISTS idx_active ON captiveportal (sessionid, username); " .
+			"CREATE INDEX IF NOT EXISTS user ON captiveportal (username); " .
+			"CREATE INDEX IF NOT EXISTS ip ON captiveportal (ip); " .
+			"CREATE INDEX IF NOT EXISTS starttime ON captiveportal (allow_time)";
+
+	$DB = new SQLite3($db_path);
+	if (! $DB->exec($createquery)) {
+		captiveportal_syslog("Error during table {$cpzone} creation. Error message: {$DB->lastErrorMsg()}. Resetting and trying again.");
+
+		/* If unable to initialize the database, reset and try again. */
+		$DB->close();
+		unset($DB);
+		unlink_if_exists($db_path);
+		$DB = new SQLite3($db_path);
+		if ($DB->exec($createquery)) {
+			captiveportal_syslog("Successfully reinitialized tables for {$cpzone} -- database has been reset.");
+		} else {
+			captiveportal_syslog("Still unable to create tables for {$cpzone}. Error message: {$DB->lastErrorMsg()}. Remove the database file manually and try again.");
+		}
 	}
 
 	return $DB;
-- 
cgit v1.1