X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/blobdiff_plain/e9c858fdc39029b51c86ef90b53978e468e50e2a..ea90b321a4b3768028d841b307c362af97a5e6e1:/plugins/sql_auth/sql_auth.php

diff --git a/plugins/sql_auth/sql_auth.php b/plugins/sql_auth/sql_auth.php
index ca12f28..16b1a9a 100644
--- a/plugins/sql_auth/sql_auth.php
+++ b/plugins/sql_auth/sql_auth.php
@@ -25,6 +25,7 @@ class sql_auth
 		Hook::func(HOOKTYPE_USER_DELETE, 'sql_auth::user_delete');
 		Hook::func(HOOKTYPE_EDIT_USER, 'sql_auth::edit_core');
 		Hook::func(HOOKTYPE_PRE_OVERVIEW_CARD, 'sql_auth::add_pre_overview_card');
+		AuthModLoaded::$status = 1;
 
 		if (defined('SQL_DEFAULT_USER')) // we've got a default account
 		{
@@ -64,6 +65,10 @@ class sql_auth
 	/* pre-Header hook */
 	public static function session_start($n)
 	{
+		$current_page = $_SERVER['REQUEST_URI'];
+		if (str_ends_with($current_page,"setup.php"))
+			return;
+
 		if (!isset($_SESSION))
 		{
 			session_set_cookie_params(3600);
@@ -71,13 +76,13 @@ class sql_auth
 		}
 		if (!isset($_SESSION['id']) || empty($_SESSION))
 		{
-			$current_page = $_SERVER['REQUEST_URI'];
+			
 			$tok = split($_SERVER['SCRIPT_FILENAME'], "/");
 			if ($check = security_check() && $tok[count($tok) - 1] !== "error.php") {
-				header("Location: " . BASE_URL . "plugins/sql_auth/error.php");
+				header("Location: " . get_config("base_url") . "plugins/sql_auth/error.php");
 				die();
 			}
-			header("Location: ".BASE_URL."login/?redirect=".urlencode($current_page));
+			header("Location: ".get_config("base_url")."login/?redirect=".urlencode($current_page));
 			die();
 		}
 		else
@@ -85,10 +90,12 @@ class sql_auth
 			if (!unreal_get_current_user()) // user no longer exists
 			{
 				session_destroy();
-				header("Location: ".BASE_URL."login");
+				header("Location: ".get_config("base_url")."login");
 				die();
 			}
 			// you'll be automatically logged out after one hour of inactivity
+			$_SESSION['last-activity'] = time();
+
 		}
 	}
 
@@ -98,67 +105,16 @@ class sql_auth
 	 */
 	public static function create_tables()
 	{
+		$script = $_SERVER['SCRIPT_FILENAME'];
+		if (str_ends_with($script,"setup.php"))
+			return;
 		$conn = sqlnew();
-		$conn->query("CREATE TABLE IF NOT EXISTS " . SQL_PREFIX . "users (
-			user_id int AUTO_INCREMENT NOT NULL,
-			user_name VARCHAR(255) NOT NULL,
-			user_pass VARCHAR(255) NOT NULL,
-			user_email VARCHAR(255),
-			user_fname VARCHAR(255),
-			user_lname VARCHAR(255),
-			user_bio VARCHAR(255),
-			created VARCHAR(255),
-			PRIMARY KEY (user_id)
-		)");
-
-		/**
-		 * Patch for beta users
-		 * This adds the email column to existing tables without it
-		*/
-		$columns = $conn->query("SHOW COLUMNS FROM " . SQL_PREFIX . "users");
-		$column_names = array();
-		$c = $columns->fetchAll();
-
-		foreach($c as $column) {
-			$column_names[] = $column['Field'];
-		}
-		$column_exists = in_array("user_email", $column_names);
-		if (!$column_exists) {
-			$conn->query("ALTER TABLE " . SQL_PREFIX . "users ADD COLUMN user_email varchar(255)");
+		$stmt = $conn->query("SHOW TABLES LIKE '".get_config("mysql::table_prefix")."%'");
+		if ($stmt->rowCount() < 4)
+		{
+			header("Location: ".get_config("base_url")."plugins/sql_auth/setup.php");
+			die();
 		}
-
-		/**
-		 * Another patch for beta users
-		 * This changes the size of the meta_value so we can store more
-		 */
-		
-		$conn->query("CREATE TABLE IF NOT EXISTS " . SQL_PREFIX . "user_meta (
-			meta_id int AUTO_INCREMENT NOT NULL,
-			user_id int NOT NULL,
-			meta_key VARCHAR(255) NOT NULL,
-			meta_value VARCHAR(255),
-			PRIMARY KEY (meta_id)
-		)");
-		$conn->query("CREATE TABLE IF NOT EXISTS " . SQL_PREFIX . "auth_settings (
-			id int AUTO_INCREMENT NOT NULL,
-			setting_key VARCHAR(255) NOT NULL,
-			setting_value VARCHAR(255),
-			PRIMARY KEY (id)
-		)");
-		$conn->query("CREATE TABLE IF NOT EXISTS " . SQL_PREFIX . "fail2ban (
-			id int AUTO_INCREMENT NOT NULL,
-			ip VARCHAR(255) NOT NULL,
-			count VARCHAR(255),
-			PRIMARY KEY (id)
-		)");
-		$c = [];
-		if (($columns = $conn->query("SHOW COLUMNS FROM ".SQL_PREFIX."user_meta")));
-			$c = $columns->fetchAll();
-		if (!empty($c))
-			$conn->query("ALTER TABLE `".SQL_PREFIX."user_meta` CHANGE `meta_value` `meta_value` VARCHAR(5000) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NULL DEFAULT NULL");
-
-
-		new AuthSettings();
 	}
 
 	/* We convert $u with a full user as an object ;D*/
@@ -170,12 +126,12 @@ class sql_auth
 
 		if ($id)
 		{
-			$prep = $conn->prepare("SELECT * FROM " . SQL_PREFIX . "users WHERE user_id = :id LIMIT 1");
+			$prep = $conn->prepare("SELECT * FROM " . get_config("mysql::table_prefix") . "users WHERE user_id = :id LIMIT 1");
 			$prep->execute(["id" => strtolower($id)]);
 		}
 		elseif ($name)
 		{
-			$prep = $conn->prepare("SELECT * FROM " . SQL_PREFIX . "users WHERE LOWER(user_name) = :name LIMIT 1");
+			$prep = $conn->prepare("SELECT * FROM " . get_config("mysql::table_prefix") . "users WHERE LOWER(user_name) = :name LIMIT 1");
 			$prep->execute(["name" => strtolower($name)]);
 		}
 		$data = NULL;
@@ -204,7 +160,7 @@ class sql_auth
 		$conn = sqlnew();
 		if (isset($id))
 		{
-			$prep = $conn->prepare("SELECT * FROM " . SQL_PREFIX . "user_meta WHERE user_id = :id");
+			$prep = $conn->prepare("SELECT * FROM " . get_config("mysql::table_prefix") . "user_meta WHERE user_id = :id");
 			$prep->execute(["id" => $id]);
 		}
 		foreach ($prep->fetchAll() as $row)
@@ -218,12 +174,12 @@ class sql_auth
 		$meta = $meta['meta'];
 		$conn = sqlnew();
 		/* check if it exists first, update it if it does */
-		$query = "SELECT * FROM " . SQL_PREFIX . "user_meta WHERE user_id = :id AND meta_key = :key";
+		$query = "SELECT * FROM " . get_config("mysql::table_prefix") . "user_meta WHERE user_id = :id AND meta_key = :key";
 		$stmt = $conn->prepare($query);
 		$stmt->execute(["id" => $meta['id'], "key" => $meta['key']]);
 		if ($stmt->rowCount()) // it exists, update instead of insert
 		{
-			$query = "UPDATE " . SQL_PREFIX . "user_meta SET meta_value = :value WHERE user_id = :id AND meta_key = :key";
+			$query = "UPDATE " . get_config("mysql::table_prefix") . "user_meta SET meta_value = :value WHERE user_id = :id AND meta_key = :key";
 			$stmt = $conn->prepare($query);
 			$stmt->execute($meta);
 			if ($stmt->rowCount())
@@ -233,7 +189,7 @@ class sql_auth
 
 		else
 		{
-			$query = "INSERT INTO " . SQL_PREFIX . "user_meta (user_id, meta_key, meta_value) VALUES (:id, :key, :value)";
+			$query = "INSERT INTO " . get_config("mysql::table_prefix") . "user_meta (user_id, meta_key, meta_value) VALUES (:id, :key, :value)";
 			$stmt = $conn->prepare($query);
 			$stmt->execute($meta);
 			if ($stmt->rowCount())
@@ -244,7 +200,7 @@ class sql_auth
 	public static function del_usermeta(&$u)
 	{
 		$conn = sqlnew();
-		$query = "DELETE FROM " . SQL_PREFIX . "user_meta WHERE user_id = :id AND meta_key = :key";
+		$query = "DELETE FROM " . get_config("mysql::table_prefix") . "user_meta WHERE user_id = :id AND meta_key = :key";
 		$stmt = $conn->prepare($query);
 		$stmt->execute($u['meta']);
 		if ($stmt->rowCount())
@@ -260,7 +216,7 @@ class sql_auth
 		$user_bio = $u['user_bio'] ?? NULL;
 		$user_email = $u['user_email'] ?? NULL;
 		$conn = sqlnew();
-		$prep = $conn->prepare("INSERT INTO " . SQL_PREFIX . "users (user_name, user_pass, user_fname, user_lname, user_bio, user_email, created) VALUES (:name, :pass, :fname, :lname, :user_bio, :user_email, :created)");
+		$prep = $conn->prepare("INSERT INTO " . get_config("mysql::table_prefix") . "users (user_name, user_pass, user_fname, user_lname, user_bio, user_email, created) VALUES (:name, :pass, :fname, :lname, :user_bio, :user_email, :created)");
 		$prep->execute(["name" => $username, "pass" => $password, "fname" => $first_name, "lname" => $last_name, "user_bio" => $user_bio, "user_email" => $user_email, "created" => date("Y-m-d H:i:s")]);
 		if ($prep->rowCount())
 			$u['success'] = true;
@@ -271,7 +227,7 @@ class sql_auth
 	public static function get_user_list(&$list)
 	{
 		$conn = sqlnew();
-		$result = $conn->query("SELECT user_id FROM " . SQL_PREFIX . "users");
+		$result = $conn->query("SELECT user_id FROM " . get_config("mysql::table_prefix") . "users");
 		if (!$result) // impossible
 		{
 			die("Something went wrong.");
@@ -288,7 +244,7 @@ class sql_auth
 	public static function user_delete(&$u)
 	{
 		$user = $u['user'];
-		$query = "DELETE FROM " . SQL_PREFIX . "users WHERE user_id = :id";
+		$query = "DELETE FROM " . get_config("mysql::table_prefix") . "users WHERE user_id = :id";
 		$conn = sqlnew();
 		$stmt = $conn->prepare($query);
 		$stmt->execute(["id" => $user->id]);
@@ -311,7 +267,7 @@ class sql_auth
 		foreach($info as $key => $val)
 		{
 			$value = NULL;
-			if (!$val)
+			if (!$val || !strlen($val) || BadPtr($val))
 				continue;
 			if (!strcmp($key,"update_fname") && $val != $user->first_name)
 			{
@@ -341,7 +297,7 @@ class sql_auth
 			
 			if (!$value)
 				continue;
-			$query = "UPDATE " . SQL_PREFIX . "users SET $value=:value WHERE user_id = :id";
+			$query = "UPDATE " . get_config("mysql::table_prefix") . "users SET $value=:value WHERE user_id = :id";
 			$stmt = $conn->prepare($query);
 			$stmt->execute(["value" => $val, "id" => $user->id]);