X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/blobdiff_plain/9a674833f60a33a50523d957c94944182a7ffbcd..39206f249915e6bcffd372e72b312a5d358f4cd0:/plugins/sql_auth/sql_auth.php diff --git a/plugins/sql_auth/sql_auth.php b/plugins/sql_auth/sql_auth.php index f6e450b..bf911eb 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 { @@ -36,6 +39,9 @@ class sql_auth $user['err'] = ""; create_new_user($user); } + $lkup = new PanelUser(SQL_DEFAULT_USER['username']); + if (!user_can($lkup, PERMISSION_MANAGE_USERS)) + $lkup->add_permission(PERMISSION_MANAGE_USERS); } } @@ -50,36 +56,46 @@ 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); session_start(); } - do_log($_SESSION); 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"); die(); } - header("Location: ".BASE_URL."login/?redirect=".urlencode($current_url)); + header("Location: ".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"); die(); } // you'll be automatically logged out after one hour of inactivity + $_SESSION['last-activity'] = time(); + } } @@ -89,55 +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 '".SQL_PREFIX."%'"); + if ($stmt->rowCount() < 5) + { + header("Location: ".BASE_URL."plugins/sql_auth/setup.php"); + die(); } - - - $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*/ @@ -178,7 +155,6 @@ class sql_auth public static function get_usermeta(&$u) { - //do_log($u); $list = &$u['meta']; $id = $u['id']; $conn = sqlnew(); @@ -234,11 +210,11 @@ 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->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")]); @@ -282,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 " . SQL_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"); + } + } } @@ -299,6 +325,9 @@ function security_check() function dnsbl_check($ip) { + + if (!defined('DNSBL')) + return; $dnsbl_lookup = DNSBL; // clear variable just in case