X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/blobdiff_plain/79d2194cc20f680adca5fd9898ee1f6640543118..ea90b321a4b3768028d841b307c362af97a5e6e1:/plugins/sql_auth/sql_auth.php diff --git a/plugins/sql_auth/sql_auth.php b/plugins/sql_auth/sql_auth.php index aab5527..16b1a9a 100644 --- a/plugins/sql_auth/sql_auth.php +++ b/plugins/sql_auth/sql_auth.php @@ -23,6 +23,9 @@ class sql_auth Hook::func(HOOKTYPE_USER_CREATE, 'sql_auth::user_create'); Hook::func(HOOKTYPE_GET_USER_LIST, 'sql_auth::get_user_list'); 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 { @@ -45,7 +48,7 @@ class sql_auth public static function add_footer_info($empty) { - if (!($user = unreal_get_current_user())->id) + if (!($user = unreal_get_current_user())) return; else { @@ -53,9 +56,19 @@ class sql_auth } } + public static function add_pre_overview_card($empty) + { + if (defined('SQL_DEFAULT_USER')) + Message::Fail("Warning: SQL_DEFAULT_USER is set in config.php. You should remove that item now, as it is only used during installation."); + } + /* 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); @@ -63,25 +76,26 @@ class sql_auth } if (!isset($_SESSION['id']) || empty($_SESSION)) { - $secure = ($_SERVER['HTTPS'] == 'on') ? "https://" : "http://"; - $current_url = "$secure$_SERVER[HTTP_HOST]$_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_url)); + header("Location: ".get_config("base_url")."login/?redirect=".urlencode($current_page)); die(); } else { - if (!unreal_get_current_user()->id) // user no longer exists + 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(); + } } @@ -91,65 +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 - */ - $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"); - - - $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) - )"); - new AuthSettings(); } /* We convert $u with a full user as an object ;D*/ @@ -161,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; @@ -195,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) @@ -209,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()) @@ -224,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()) @@ -235,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()) @@ -245,13 +210,13 @@ class sql_auth public static function user_create(&$u) { $username = $u['user_name']; - $first_name = $u['fname']; - $last_name = $u['lname']; - $password = $u['user_pass']; - $user_bio = $u['user_bio']; - $user_email = $u['user_email']; + $first_name = $u['fname'] ?? NULL; + $last_name = $u['lname'] ?? NULL; + $password = $u['user_pass'] ?? NULL; + $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; @@ -262,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."); @@ -279,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]); @@ -293,6 +258,56 @@ class sql_auth $u['boolint'] = 0; } } + + public static function edit_core($arr) + { + $conn = sqlnew(); + $user = $arr['user']; + $info = $arr['info']; + foreach($info as $key => $val) + { + $value = NULL; + if (!$val || !strlen($val) || BadPtr($val)) + continue; + if (!strcmp($key,"update_fname") && $val != $user->first_name) + { + $value = "user_fname"; + $valuestr = "first name"; + } + elseif (!strcmp($key,"update_lname") && $val != $user->last_name) + { + $value = "user_lname"; + $valuestr = "last name"; + } + elseif (!strcmp($key,"update_bio") && $val != $user->bio) + { + $value = "user_bio"; + $valuestr = "bio"; + } + elseif (!strcmp($key,"update_pass") || !strcmp($key,"update_pass_conf")) + { + $value = "user_pass"; + $valuestr = "password"; + } + elseif(!strcmp($key,"update_email") && $val != $user->email) + { + $value = "user_email"; + $valuestr = "email address"; + } + + if (!$value) + continue; + $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]); + + if (!$stmt->rowCount() && $stmt->errorInfo()[0] != "00000") + Message::Fail("Could not update $valuestr for $user->username: ".$stmt->errorInfo()[0]." (CODE: ".$stmt->errorCode().")"); + + else + Message::Success("Successfully updated the $valuestr for $user->username"); + } + } } @@ -310,6 +325,9 @@ function security_check() function dnsbl_check($ip) { + + if (!defined('DNSBL')) + return; $dnsbl_lookup = DNSBL; // clear variable just in case