1
+ − 1 <?php
+ − 2
+ − 3 /*
+ − 4 * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 5 * Version 1.1.3 (Caoineag alpha 3)
1
+ − 6 * Copyright (C) 2006-2007 Dan Fuhry
+ − 7 * sessions.php - everything related to security and user management
+ − 8 *
+ − 9 * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
+ − 10 * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ − 11 *
+ − 12 * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ − 13 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
+ − 14 */
+ − 15
+ − 16 /**
+ − 17 * Anything and everything related to security and user management. This includes AES encryption, which is illegal in some countries.
+ − 18 * Documenting the API was not easy - I hope you folks enjoy it.
+ − 19 * @package Enano
+ − 20 * @subpackage Session manager
+ − 21 * @category security, user management, logins, etc.
+ − 22 */
+ − 23
+ − 24 class sessionManager {
+ − 25
+ − 26 # Variables
+ − 27
+ − 28 /**
+ − 29 * Whether we're logged in or not
+ − 30 * @var bool
+ − 31 */
+ − 32
+ − 33 var $user_logged_in = false;
+ − 34
+ − 35 /**
+ − 36 * Our current low-privilege session key
+ − 37 * @var string
+ − 38 */
+ − 39
+ − 40 var $sid;
+ − 41
+ − 42 /**
+ − 43 * Username of currently logged-in user, or IP address if not logged in
+ − 44 * @var string
+ − 45 */
+ − 46
+ − 47 var $username;
+ − 48
+ − 49 /**
436
+ − 50 * User ID of currently logged-in user, or 1 if not logged in
1
+ − 51 * @var int
+ − 52 */
+ − 53
436
+ − 54 var $user_id = 1;
1
+ − 55
+ − 56 /**
+ − 57 * Real name of currently logged-in user, or blank if not logged in
+ − 58 * @var string
+ − 59 */
+ − 60
+ − 61 var $real_name;
+ − 62
+ − 63 /**
+ − 64 * E-mail address of currently logged-in user, or blank if not logged in
+ − 65 * @var string
+ − 66 */
+ − 67
+ − 68 var $email;
+ − 69
+ − 70 /**
31
+ − 71 * List of "extra" user information fields (IM handles, etc.)
+ − 72 * @var array (associative)
+ − 73 */
+ − 74
+ − 75 var $user_extra;
+ − 76
+ − 77 /**
1
+ − 78 * User level of current user
+ − 79 * USER_LEVEL_GUEST: guest
+ − 80 * USER_LEVEL_MEMBER: regular user
+ − 81 * USER_LEVEL_CHPREF: default - pseudo-level that allows changing password and e-mail address (requires re-authentication)
+ − 82 * USER_LEVEL_MOD: moderator
+ − 83 * USER_LEVEL_ADMIN: administrator
+ − 84 * @var int
+ − 85 */
+ − 86
+ − 87 var $user_level;
+ − 88
+ − 89 /**
+ − 90 * High-privilege session key
+ − 91 * @var string or false if not running on high-level authentication
+ − 92 */
+ − 93
+ − 94 var $sid_super;
+ − 95
+ − 96 /**
+ − 97 * The user's theme preference, defaults to $template->default_theme
+ − 98 * @var string
+ − 99 */
+ − 100
+ − 101 var $theme;
+ − 102
+ − 103 /**
+ − 104 * The user's style preference, or style auto-detected based on theme if not logged in
+ − 105 * @var string
+ − 106 */
+ − 107
+ − 108 var $style;
+ − 109
+ − 110 /**
+ − 111 * Signature of current user - appended to comments, etc.
+ − 112 * @var string
+ − 113 */
+ − 114
+ − 115 var $signature;
+ − 116
+ − 117 /**
+ − 118 * UNIX timestamp of when we were registered, or 0 if not logged in
+ − 119 * @var int
+ − 120 */
+ − 121
+ − 122 var $reg_time;
+ − 123
+ − 124 /**
+ − 125 * MD5 hash of the current user's password, if applicable
+ − 126 * @var string OR bool false
+ − 127 */
+ − 128
+ − 129 var $password_hash;
+ − 130
+ − 131 /**
+ − 132 * The number of unread private messages this user has.
+ − 133 * @var int
+ − 134 */
+ − 135
+ − 136 var $unread_pms = 0;
+ − 137
+ − 138 /**
+ − 139 * AES key used to encrypt passwords and session key info - irreversibly destroyed when disallow_password_grab() is called
+ − 140 * @var string
+ − 141 */
+ − 142
+ − 143 var $private_key;
+ − 144
+ − 145 /**
+ − 146 * Regex that defines a valid username, minus the ^ and $, these are added later
+ − 147 * @var string
+ − 148 */
+ − 149
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 150 var $valid_username = '([^<>&\?\'"%\n\r\t\a\/]+)';
1
+ − 151
+ − 152 /**
+ − 153 * What we're allowed to do as far as permissions go. This changes based on the value of the "auth" URI param.
+ − 154 * @var string
+ − 155 */
+ − 156
436
+ − 157 var $auth_level = 1;
1
+ − 158
+ − 159 /**
+ − 160 * State variable to track if a session timed out
+ − 161 * @var bool
+ − 162 */
+ − 163
+ − 164 var $sw_timed_out = false;
+ − 165
+ − 166 /**
+ − 167 * Switch to track if we're started or not.
+ − 168 * @access private
+ − 169 * @var bool
+ − 170 */
+ − 171
+ − 172 var $started = false;
+ − 173
+ − 174 /**
+ − 175 * Switch to control compatibility mode (for older Enano websites being upgraded)
+ − 176 * @access private
+ − 177 * @var bool
+ − 178 */
+ − 179
+ − 180 var $compat = false;
+ − 181
+ − 182 /**
+ − 183 * Our list of permission types.
+ − 184 * @access private
+ − 185 * @var array
+ − 186 */
+ − 187
+ − 188 var $acl_types = Array();
+ − 189
+ − 190 /**
+ − 191 * The list of descriptions for the permission types
+ − 192 * @var array
+ − 193 */
+ − 194
+ − 195 var $acl_descs = Array();
+ − 196
+ − 197 /**
+ − 198 * A list of dependencies for ACL types.
+ − 199 * @var array
+ − 200 */
+ − 201
+ − 202 var $acl_deps = Array();
+ − 203
+ − 204 /**
246
+ − 205 * Our tell-all list of permissions. Do not even try to change this.
+ − 206 * @access private
1
+ − 207 * @var array
+ − 208 */
+ − 209
+ − 210 var $perms = Array();
+ − 211
+ − 212 /**
+ − 213 * A cache variable - saved after sitewide permissions are checked but before page-specific permissions.
+ − 214 * @var array
+ − 215 * @access private
+ − 216 */
+ − 217
+ − 218 var $acl_base_cache = Array();
+ − 219
+ − 220 /**
+ − 221 * Stores the scope information for ACL types.
+ − 222 * @var array
+ − 223 * @access private
+ − 224 */
+ − 225
+ − 226 var $acl_scope = Array();
+ − 227
+ − 228 /**
+ − 229 * Array to track which default permissions are being used
+ − 230 * @var array
+ − 231 * @access private
+ − 232 */
+ − 233
+ − 234 var $acl_defaults_used = Array();
+ − 235
+ − 236 /**
+ − 237 * Array to track group membership.
+ − 238 * @var array
+ − 239 */
+ − 240
+ − 241 var $groups = Array();
+ − 242
+ − 243 /**
+ − 244 * Associative array to track group modship.
+ − 245 * @var array
+ − 246 */
+ − 247
+ − 248 var $group_mod = Array();
+ − 249
+ − 250 # Basic functions
+ − 251
+ − 252 /**
+ − 253 * Constructor.
+ − 254 */
+ − 255
+ − 256 function __construct()
+ − 257 {
+ − 258 global $db, $session, $paths, $template, $plugins; // Common objects
268
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 259
289
2b60c89dc27f
Fixed a few major bugs with the upgrade script and the config file not getting loaded properly due to IN_ENANO_INSTALL
Dan
diff
changeset
+ − 260 if ( defined('IN_ENANO_INSTALL') && !defined('IN_ENANO_UPGRADE') )
268
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 261 {
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 262 @include(ENANO_ROOT.'/config.new.php');
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 263 }
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 264 else
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 265 {
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 266 @include(ENANO_ROOT.'/config.php');
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 267 }
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 268
1
+ − 269 unset($dbhost, $dbname, $dbuser, $dbpasswd);
+ − 270 if(isset($crypto_key))
+ − 271 {
+ − 272 $this->private_key = $crypto_key;
+ − 273 $this->private_key = hexdecode($this->private_key);
+ − 274 }
+ − 275 else
+ − 276 {
+ − 277 if(is_writable(ENANO_ROOT.'/config.php'))
+ − 278 {
+ − 279 // Generate and stash a private key
+ − 280 // This should only happen during an automated silent gradual migration to the new encryption platform.
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 281 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 282 $this->private_key = $aes->gen_readymade_key();
+ − 283
+ − 284 $config = file_get_contents(ENANO_ROOT.'/config.php');
+ − 285 if(!$config)
+ − 286 {
+ − 287 die('$session->__construct(): can\'t get the contents of config.php');
+ − 288 }
+ − 289
+ − 290 $config = str_replace("?>", "\$crypto_key = '{$this->private_key}';\n?>", $config);
+ − 291 // And while we're at it...
+ − 292 $config = str_replace('MIDGET_INSTALLED', 'ENANO_INSTALLED', $config);
+ − 293 $fh = @fopen(ENANO_ROOT.'/config.php', 'w');
+ − 294 if ( !$fh )
+ − 295 {
+ − 296 die('$session->__construct(): Couldn\'t open config file for writing to store the private key, I tried to avoid something like this...');
+ − 297 }
+ − 298
+ − 299 fwrite($fh, $config);
+ − 300 fclose($fh);
+ − 301 }
+ − 302 else
+ − 303 {
+ − 304 die_semicritical('Crypto error', '<p>No private key was found in the config file, and we can\'t generate one because we don\'t have write access to the config file. Please CHMOD config.php to 666 or 777 and reload this page.</p>');
+ − 305 }
+ − 306 }
+ − 307 // Check for compatibility mode
+ − 308 if(defined('IN_ENANO_INSTALL'))
+ − 309 {
+ − 310 $q = $db->sql_query('SELECT old_encryption FROM '.table_prefix.'users LIMIT 1;');
+ − 311 if(!$q)
+ − 312 {
+ − 313 $error = mysql_error();
+ − 314 if(strstr($error, "Unknown column 'old_encryption'"))
+ − 315 $this->compat = true;
+ − 316 else
+ − 317 $db->_die('This should never happen and is a bug - the only error that was supposed to happen here didn\'t happen. (sessions.php in constructor, during compat mode check)');
+ − 318 }
+ − 319 $db->free_result();
+ − 320 }
+ − 321 }
+ − 322
+ − 323 /**
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 324 * PHP 4 compatible constructor. Deprecated in 1.1.x.
1
+ − 325 */
+ − 326
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 327 /*
1
+ − 328 function sessionManager()
+ − 329 {
+ − 330 $this->__construct();
+ − 331 }
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 332 */
1
+ − 333
+ − 334 /**
+ − 335 * Wrapper function to sanitize strings for MySQL and HTML
+ − 336 * @param string $text The text to sanitize
+ − 337 * @return string
+ − 338 */
+ − 339
+ − 340 function prepare_text($text)
+ − 341 {
+ − 342 global $db;
+ − 343 return $db->escape(htmlspecialchars($text));
+ − 344 }
+ − 345
+ − 346 /**
+ − 347 * Makes a SQL query and handles error checking
+ − 348 * @param string $query The SQL query to make
+ − 349 * @return resource
+ − 350 */
+ − 351
+ − 352 function sql($query)
+ − 353 {
+ − 354 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 355 $result = $db->sql_query($query);
+ − 356 if(!$result)
+ − 357 {
+ − 358 $db->_die('The error seems to have occurred somewhere in the session management code.');
+ − 359 }
+ − 360 return $result;
+ − 361 }
+ − 362
+ − 363 # Session restoration and permissions
+ − 364
+ − 365 /**
+ − 366 * Initializes the basic state of things, including most user prefs, login data, cookie stuff
+ − 367 */
+ − 368
+ − 369 function start()
+ − 370 {
+ − 371 global $db, $session, $paths, $template, $plugins; // Common objects
209
+ − 372 global $lang;
406
+ − 373 global $timezone;
1
+ − 374 if($this->started) return;
+ − 375 $this->started = true;
+ − 376 $user = false;
+ − 377 if(isset($_COOKIE['sid']))
+ − 378 {
+ − 379 if($this->compat)
+ − 380 {
+ − 381 $userdata = $this->compat_validate_session($_COOKIE['sid']);
+ − 382 }
+ − 383 else
+ − 384 {
+ − 385 $userdata = $this->validate_session($_COOKIE['sid']);
+ − 386 }
+ − 387 if(is_array($userdata))
+ − 388 {
+ − 389 $data = RenderMan::strToPageID($paths->get_pageid_from_url());
+ − 390
+ − 391 if(!$this->compat && $userdata['account_active'] != 1 && $data[1] != 'Special' && $data[1] != 'Admin')
+ − 392 {
209
+ − 393 $language = intval(getConfig('default_language'));
+ − 394 $lang = new Language($language);
406
+ − 395 @setlocale(LC_ALL, $lang->lang_code);
209
+ − 396
1
+ − 397 $this->logout();
+ − 398 $a = getConfig('account_activation');
+ − 399 switch($a)
+ − 400 {
+ − 401 case 'none':
+ − 402 default:
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 403 $solution = $lang->get('user_login_noact_solution_none');
1
+ − 404 break;
+ − 405 case 'user':
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 406 $solution = $lang->get('user_login_noact_solution_user');
1
+ − 407 break;
+ − 408 case 'admin':
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 409 $solution = $lang->get('user_login_noact_solution_admin');
1
+ − 410 break;
+ − 411 }
127
+ − 412
+ − 413 // admin activation request opportunity
+ − 414 $q = $db->sql_query('SELECT 1 FROM '.table_prefix.'logs WHERE log_type=\'admin\' AND action=\'activ_req\' AND edit_summary=\'' . $db->escape($userdata['username']) . '\';');
+ − 415 if ( !$q )
+ − 416 $db->_die();
+ − 417
+ − 418 $can_request = ( $db->numrows() < 1 );
+ − 419 $db->free_result();
+ − 420
+ − 421 if ( isset($_POST['logout']) )
+ − 422 {
+ − 423 $this->sid = $_COOKIE['sid'];
+ − 424 $this->user_logged_in = true;
+ − 425 $this->user_id = intval($userdata['user_id']);
+ − 426 $this->username = $userdata['username'];
+ − 427 $this->auth_level = USER_LEVEL_MEMBER;
+ − 428 $this->user_level = USER_LEVEL_MEMBER;
+ − 429 $this->logout();
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 430 redirect(scriptPath . '/', $lang->get('user_login_noact_msg_logout_success_title'), $lang->get('user_login_noact_msg_logout_success_body'), 5);
127
+ − 431 }
+ − 432
+ − 433 if ( $can_request && !isset($_POST['activation_request']) )
+ − 434 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 435 $form = '<p>' . $lang->get('user_login_noact_msg_ask_admins') . '</p>
127
+ − 436 <form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 437 <p><input type="submit" name="activation_request" value="' . $lang->get('user_login_noact_btn_request_activation') . '" /> <input type="submit" name="logout" value="' . $lang->get('user_login_noact_btn_log_out') . '" /></p>
127
+ − 438 </form>';
+ − 439 }
+ − 440 else
+ − 441 {
+ − 442 if ( $can_request && isset($_POST['activation_request']) )
+ − 443 {
+ − 444 $this->admin_activation_request($userdata['username']);
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 445 $form = '<p>' . $lang->get('user_login_noact_msg_admins_just_asked') . '</p>
127
+ − 446 <form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 447 <p><input type="submit" name="logout" value="' . $lang->get('user_login_noact_btn_log_out') . '" /></p>
127
+ − 448 </form>';
+ − 449 }
+ − 450 else
+ − 451 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 452 $form = '<p>' . $lang->get('user_login_noact_msg_admins_asked') . '</p>
127
+ − 453 <form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 454 <p><input type="submit" name="logout" value="' . $lang->get('user_login_noact_btn_log_out') . '" /></p>
127
+ − 455 </form>';
+ − 456 }
+ − 457 }
+ − 458
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 459 die_semicritical($lang->get('user_login_noact_title'), '<p>' . $lang->get('user_login_noact_msg_intro') . ' '.$solution.'</p>' . $form);
1
+ − 460 }
+ − 461
+ − 462 $this->sid = $_COOKIE['sid'];
+ − 463 $this->user_logged_in = true;
+ − 464 $this->user_id = intval($userdata['user_id']);
+ − 465 $this->username = $userdata['username'];
+ − 466 $this->password_hash = $userdata['password'];
+ − 467 $this->user_level = intval($userdata['user_level']);
+ − 468 $this->real_name = $userdata['real_name'];
+ − 469 $this->email = $userdata['email'];
+ − 470 $this->unread_pms = $userdata['num_pms'];
+ − 471 if(!$this->compat)
+ − 472 {
+ − 473 $this->theme = $userdata['theme'];
+ − 474 $this->style = $userdata['style'];
+ − 475 $this->signature = $userdata['signature'];
+ − 476 $this->reg_time = $userdata['reg_time'];
+ − 477 }
436
+ − 478 $this->auth_level = USER_LEVEL_MEMBER;
1
+ − 479 if(!isset($template->named_theme_list[$this->theme]))
+ − 480 {
+ − 481 if($this->compat || !is_object($template))
+ − 482 {
+ − 483 $this->theme = 'oxygen';
+ − 484 $this->style = 'bleu';
+ − 485 }
+ − 486 else
+ − 487 {
+ − 488 $this->theme = $template->default_theme;
+ − 489 $this->style = $template->default_style;
+ − 490 }
+ − 491 }
+ − 492 $user = true;
406
+ − 493 $GLOBALS['timezone'] = $userdata['user_timezone'];
1
+ − 494
209
+ − 495 // Set language
+ − 496 if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ − 497 {
+ − 498 $lang_id = intval($userdata['user_lang']);
+ − 499 $lang = new Language($lang_id);
406
+ − 500 @setlocale(LC_ALL, $lang->lang_code);
209
+ − 501 }
1
+ − 502
+ − 503 if(isset($_REQUEST['auth']) && !$this->sid_super)
+ − 504 {
+ − 505 // Now he thinks he's a moderator. Or maybe even an administrator. Let's find out if he's telling the truth.
+ − 506 if($this->compat)
+ − 507 {
+ − 508 $key = $_REQUEST['auth'];
+ − 509 $super = $this->compat_validate_session($key);
+ − 510 }
+ − 511 else
+ − 512 {
+ − 513 $key = strrev($_REQUEST['auth']);
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 514 if ( !empty($key) && ( strlen($key) / 2 ) % 4 == 0 )
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 515 {
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 516 $super = $this->validate_session($key);
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 517 }
1
+ − 518 }
518
+ − 519 if(is_array(@$super))
1
+ − 520 {
+ − 521 $this->auth_level = intval($super['auth_level']);
+ − 522 $this->sid_super = $_REQUEST['auth'];
+ − 523 }
+ − 524 }
+ − 525 }
+ − 526 }
+ − 527 if(!$user)
+ − 528 {
+ − 529 //exit;
+ − 530 $this->register_guest_session();
+ − 531 }
+ − 532 if(!$this->compat)
+ − 533 {
+ − 534 // init groups
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 535 $q = $this->sql('SELECT g.group_name,g.group_id,m.is_mod FROM '.table_prefix.'groups AS g' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 536 . ' LEFT JOIN '.table_prefix.'group_members AS m' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 537 . ' ON g.group_id=m.group_id' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 538 . ' WHERE ( m.user_id='.$this->user_id.'' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 539 . ' OR g.group_name=\'Everyone\')' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 540 . ' ' . ( enano_version() == '1.0RC1' ? '' : 'AND ( m.pending != 1 OR m.pending IS NULL )' ) . '' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 541 . ' ORDER BY group_id ASC;'); // Make sure "Everyone" comes first so the permissions can be overridden
1
+ − 542 if($row = $db->fetchrow())
+ − 543 {
+ − 544 do {
+ − 545 $this->groups[$row['group_id']] = $row['group_name'];
+ − 546 $this->group_mod[$row['group_id']] = ( intval($row['is_mod']) == 1 );
+ − 547 } while($row = $db->fetchrow());
+ − 548 }
+ − 549 else
+ − 550 {
+ − 551 die('No group info');
+ − 552 }
+ − 553 }
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 554
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 555 // make sure we aren't banned
1
+ − 556 $this->check_banlist();
+ − 557
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 558 // Printable page view? Probably the wrong place to control
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 559 // it but $template is pretty dumb, it will just about always
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 560 // do what you ask it to do, which isn't always what we want
1
+ − 561 if ( isset ( $_GET['printable'] ) )
+ − 562 {
+ − 563 $this->theme = 'printable';
+ − 564 $this->style = 'default';
+ − 565 }
+ − 566
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 567 // setup theme ACLs
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 568 $template->process_theme_acls();
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 569
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
diff
changeset
+ − 570 profiler_log('Sessions started');
1
+ − 571 }
+ − 572
+ − 573 # Logins
+ − 574
+ − 575 /**
+ − 576 * Attempts to perform a login using crypto functions
+ − 577 * @param string $username The username
+ − 578 * @param string $aes_data The encrypted password, hex-encoded
+ − 579 * @param string $aes_key The MD5 hash of the encryption key, hex-encoded
+ − 580 * @param string $challenge The 256-bit MD5 challenge string - first 128 bits should be the hash, the last 128 should be the challenge salt
+ − 581 * @param int $level The privilege level we're authenticating for, defaults to 0
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 582 * @param array $captcha_hash Optional. If we're locked out and the lockout policy is captcha, this should be the identifier for the code.
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 583 * @param array $captcha_code Optional. If we're locked out and the lockout policy is captcha, this should be the code the user entered.
436
+ − 584 * @param bool $lookup_key Optional. If true (default) this queries the database for the "real" encryption key. Else, uses what is given.
1
+ − 585 * @return string 'success' on success, or error string on failure
+ − 586 */
+ − 587
436
+ − 588 function login_with_crypto($username, $aes_data, $aes_key_id, $challenge, $level = USER_LEVEL_MEMBER, $captcha_hash = false, $captcha_code = false, $lookup_key = true)
1
+ − 589 {
+ − 590 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 591
+ − 592 $privcache = $this->private_key;
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 593
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 594 if ( !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 595 {
436
+ − 596 $timestamp_cutoff = time() - $duration;
+ − 597 $q = $this->sql('SELECT timestamp FROM '.table_prefix.'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;');
+ − 598 $fails = $db->numrows();
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 599 // Lockout stuff
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 600 $threshold = ( $_ = getConfig('lockout_threshold') ) ? intval($_) : 5;
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 601 $duration = ( $_ = getConfig('lockout_duration') ) ? intval($_) : 15;
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 602 // convert to minutes
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 603 $duration = $duration * 60;
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 604 $policy = ( $x = getConfig('lockout_policy') && in_array(getConfig('lockout_policy'), array('lockout', 'disable', 'captcha')) ) ? getConfig('lockout_policy') : 'lockout';
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 605 if ( $policy == 'captcha' && $captcha_hash && $captcha_code )
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 606 {
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 607 // policy is captcha -- check if it's correct, and if so, bypass lockout check
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 608 $real_code = $this->get_captcha($captcha_hash);
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 609 }
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 610 if ( $policy != 'disable' && !( $policy == 'captcha' && isset($real_code) && strtolower($real_code) == strtolower($captcha_code) ) )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 611 {
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 612 $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
182
c69730750be3
Fixed the security hole (really, I'm a moron - used $failed > $threshold instead of $failed >= $threashold) and patched up some...erm... math issues
Dan
diff
changeset
+ − 613 if ( $fails >= $threshold )
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 614 {
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 615 // ooh boy, somebody's in trouble ;-)
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 616 $row = $db->fetchrow();
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 617 $db->free_result();
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 618 return array(
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 619 'success' => false,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 620 'error' => 'locked_out',
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 621 'lockout_threshold' => $threshold,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 622 'lockout_duration' => ( $duration / 60 ),
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 623 'lockout_fails' => $fails,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 624 'lockout_policy' => $policy,
182
c69730750be3
Fixed the security hole (really, I'm a moron - used $failed > $threshold instead of $failed >= $threashold) and patched up some...erm... math issues
Dan
diff
changeset
+ − 625 'time_rem' => ( $duration / 60 ) - round( ( time() - $row['timestamp'] ) / 60 ),
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 626 'lockout_last_time' => $row['timestamp']
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 627 );
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 628 }
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 629 }
436
+ − 630 $db->free_result();
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 631 }
1
+ − 632
+ − 633 // Instanciate the Rijndael encryption object
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 634 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 635
+ − 636 // Fetch our decryption key
+ − 637
436
+ − 638 if ( $lookup_key )
292
b3cfaf0a505c
Fixed highlighting in search results; changed search algorithm to give more score for terms found in page title; hopefully (hackishly) fixed login_key_cache getting too long
Dan
diff
changeset
+ − 639 {
436
+ − 640 $aes_key = $this->fetch_public_key($aes_key_id);
+ − 641 if ( !$aes_key )
292
b3cfaf0a505c
Fixed highlighting in search results; changed search algorithm to give more score for terms found in page title; hopefully (hackishly) fixed login_key_cache getting too long
Dan
diff
changeset
+ − 642 {
436
+ − 643 // It could be that our key cache is full. If it seems larger than 65KB, clear it
+ − 644 if ( strlen(getConfig('login_key_cache')) > 65000 )
+ − 645 {
+ − 646 setConfig('login_key_cache', '');
+ − 647 return array(
+ − 648 'success' => false,
+ − 649 'error' => 'key_not_found_cleared',
+ − 650 );
+ − 651 }
304
+ − 652 return array(
+ − 653 'success' => false,
436
+ − 654 'error' => 'key_not_found'
304
+ − 655 );
292
b3cfaf0a505c
Fixed highlighting in search results; changed search algorithm to give more score for terms found in page title; hopefully (hackishly) fixed login_key_cache getting too long
Dan
diff
changeset
+ − 656 }
436
+ − 657 }
+ − 658 else
+ − 659 {
+ − 660 $aes_key =& $aes_key_id;
292
b3cfaf0a505c
Fixed highlighting in search results; changed search algorithm to give more score for terms found in page title; hopefully (hackishly) fixed login_key_cache getting too long
Dan
diff
changeset
+ − 661 }
1
+ − 662
+ − 663 // Convert the key to a binary string
+ − 664 $bin_key = hexdecode($aes_key);
+ − 665
+ − 666 if(strlen($bin_key) != AES_BITS / 8)
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 667 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 668 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 669 'error' => 'key_wrong_length'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 670 );
1
+ − 671
+ − 672 // Decrypt our password
+ − 673 $password = $aes->decrypt($aes_data, $bin_key, ENC_HEX);
+ − 674
+ − 675 // Initialize our success switch
+ − 676 $success = false;
+ − 677
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 678 // Escaped username
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 679 $username = str_replace('_', ' ', $username);
135
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 680 $db_username_lower = $this->prepare_text(strtolower($username));
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 681 $db_username = $this->prepare_text($username);
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 682
1
+ − 683 // Select the user data from the table, and decrypt that so we can verify the password
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 684 $this->sql('SELECT password,old_encryption,user_id,user_level,theme,style,temp_password,temp_password_time FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=\''.$db_username_lower.'\' OR username=\'' . $db_username . '\';');
1
+ − 685 if($db->numrows() < 1)
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 686 {
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 687 // This wasn't logged in <1.0.2, dunno how it slipped through
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 688 if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 689 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 690 else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 691 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 692
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 693 if ( $policy != 'disable' && !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 694 {
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 695 $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 696 // increment fail count
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
diff
changeset
+ − 697 $this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\');');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 698 $fails++;
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 699 // ooh boy, somebody's in trouble ;-)
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 700 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 701 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 702 'error' => ( $fails >= $threshold ) ? 'locked_out' : 'invalid_credentials',
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 703 'lockout_threshold' => $threshold,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 704 'lockout_duration' => ( $duration / 60 ),
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 705 'lockout_fails' => $fails,
182
c69730750be3
Fixed the security hole (really, I'm a moron - used $failed > $threshold instead of $failed >= $threashold) and patched up some...erm... math issues
Dan
diff
changeset
+ − 706 'time_rem' => ( $duration / 60 ),
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 707 'lockout_policy' => $policy
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 708 );
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 709 }
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 710
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 711 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 712 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 713 'error' => 'invalid_credentials'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 714 );
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 715 }
1
+ − 716 $row = $db->fetchrow();
+ − 717
+ − 718 // Check to see if we're logging in using a temporary password
+ − 719
+ − 720 if((intval($row['temp_password_time']) + 3600*24) > time() )
+ − 721 {
+ − 722 $temp_pass = $aes->decrypt( $row['temp_password'], $this->private_key, ENC_HEX );
+ − 723 if( $temp_pass == $password )
+ − 724 {
+ − 725 $url = makeUrlComplete('Special', 'PasswordReset/stage2/' . $row['user_id'] . '/' . $row['temp_password']);
+ − 726
+ − 727 $code = $plugins->setHook('login_password_reset');
+ − 728 foreach ( $code as $cmd )
+ − 729 {
+ − 730 eval($cmd);
+ − 731 }
+ − 732
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 733 redirect($url, '', '', 0);
1
+ − 734 exit;
+ − 735 }
+ − 736 }
+ − 737
+ − 738 if($row['old_encryption'] == 1)
+ − 739 {
+ − 740 // The user's password is stored using the obsolete and insecure MD5 algorithm, so we'll update the field with the new password
+ − 741 if(md5($password) == $row['password'])
+ − 742 {
+ − 743 $pass_stashed = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 744 $this->sql('UPDATE '.table_prefix.'users SET password=\''.$pass_stashed.'\',old_encryption=0 WHERE user_id='.$row['user_id'].';');
+ − 745 $success = true;
+ − 746 }
+ − 747 }
+ − 748 else
+ − 749 {
+ − 750 // Our password field is up-to-date with the >=1.0RC1 encryption standards, so decrypt the password in the table and see if we have a match; if so then do challenge authentication
+ − 751 $real_pass = $aes->decrypt(hexdecode($row['password']), $this->private_key, ENC_BINARY);
436
+ − 752 if($password === $real_pass && is_string($password))
1
+ − 753 {
436
+ − 754 // Yay! We passed AES authentication. Previously an MD5 challenge was done here, this was deemed redundant in 1.1.3.
+ − 755 // It didn't seem to provide any additional security...
+ − 756 $success = true;
1
+ − 757 }
+ − 758 }
+ − 759 if($success)
+ − 760 {
+ − 761 if($level > $row['user_level'])
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 762 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 763 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 764 'error' => 'too_big_for_britches'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 765 );
436
+ − 766
+ − 767 /*
+ − 768 return array(
+ − 769 'success' => false,
+ − 770 'error' => 'Successful authentication, but session manager is in debug mode - remove the "return array(...);" in includes/sessions.php:' . ( __LINE__ - 2 )
+ − 771 );
+ − 772 */
1
+ − 773
+ − 774 $sess = $this->register_session(intval($row['user_id']), $username, $password, $level);
+ − 775 if($sess)
+ − 776 {
+ − 777 $this->username = $username;
+ − 778 $this->user_id = intval($row['user_id']);
+ − 779 $this->theme = $row['theme'];
+ − 780 $this->style = $row['style'];
+ − 781
+ − 782 if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 783 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_good\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
1
+ − 784 else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 785 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_good\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
1
+ − 786
+ − 787 $code = $plugins->setHook('login_success');
+ − 788 foreach ( $code as $cmd )
+ − 789 {
+ − 790 eval($cmd);
+ − 791 }
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 792 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 793 'success' => true
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 794 );
1
+ − 795 }
+ − 796 else
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 797 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 798 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 799 'error' => 'backend_fail'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 800 );
1
+ − 801 }
+ − 802 else
+ − 803 {
+ − 804 if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 805 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
1
+ − 806 else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 807 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
1
+ − 808
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 809 // Do we also need to increment the lockout countdown?
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 810 if ( $policy != 'disable' && !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 811 {
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 812 $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 813 // increment fail count
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
diff
changeset
+ − 814 $this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\');');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 815 $fails++;
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 816 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 817 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 818 'error' => ( $fails >= $threshold ) ? 'locked_out' : 'invalid_credentials',
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 819 'lockout_threshold' => $threshold,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 820 'lockout_duration' => ( $duration / 60 ),
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 821 'lockout_fails' => $fails,
182
c69730750be3
Fixed the security hole (really, I'm a moron - used $failed > $threshold instead of $failed >= $threashold) and patched up some...erm... math issues
Dan
diff
changeset
+ − 822 'time_rem' => ( $duration / 60 ),
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 823 'lockout_policy' => $policy
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 824 );
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 825 }
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 826
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 827 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 828 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 829 'error' => 'invalid_credentials'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 830 );
1
+ − 831 }
+ − 832 }
+ − 833
+ − 834 /**
+ − 835 * Attempts to login without using crypto stuff, mainly for use when the other side doesn't like Javascript
+ − 836 * This method of authentication is inherently insecure, there's really nothing we can do about it except hope and pray that everyone moves to Firefox
+ − 837 * Technically it still uses crypto, but it only decrypts the password already stored, which is (obviously) required for authentication
+ − 838 * @param string $username The username
+ − 839 * @param string $password The password -OR- the MD5 hash of the password if $already_md5ed is true
+ − 840 * @param bool $already_md5ed This should be set to true if $password is an MD5 hash, and should be false if it's plaintext. Defaults to false.
+ − 841 * @param int $level The privilege level we're authenticating for, defaults to 0
+ − 842 */
+ − 843
436
+ − 844 function login_without_crypto($username, $password, $already_md5ed = false, $level = USER_LEVEL_MEMBER, $captcha_hash = false, $captcha_code = false)
1
+ − 845 {
+ − 846 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 847
+ − 848 $pass_hashed = ( $already_md5ed ) ? $password : md5($password);
+ − 849
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 850 // Replace underscores with spaces in username
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 851 // (Added in 1.0.2)
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 852 $username = str_replace('_', ' ', $username);
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 853
1
+ − 854 // Perhaps we're upgrading Enano?
+ − 855 if($this->compat)
+ − 856 {
+ − 857 return $this->login_compat($username, $pass_hashed, $level);
+ − 858 }
+ − 859
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 860 if ( !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 861 {
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 862 // Lockout stuff
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 863 $threshold = ( $_ = getConfig('lockout_threshold') ) ? intval($_) : 5;
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 864 $duration = ( $_ = getConfig('lockout_duration') ) ? intval($_) : 15;
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 865 // convert to minutes
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 866 $duration = $duration * 60;
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 867 $policy = ( $x = getConfig('lockout_policy') && in_array(getConfig('lockout_policy'), array('lockout', 'disable', 'captcha')) ) ? getConfig('lockout_policy') : 'lockout';
436
+ − 868
+ − 869 $timestamp_cutoff = time() - $duration;
+ − 870 $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
+ − 871 $q = $this->sql('SELECT timestamp FROM '.table_prefix.'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;');
+ − 872 $fails = $db->numrows();
+ − 873
+ − 874 $captcha_good = false;
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 875 if ( $policy == 'captcha' && $captcha_hash && $captcha_code )
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 876 {
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 877 // policy is captcha -- check if it's correct, and if so, bypass lockout check
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 878 $real_code = $this->get_captcha($captcha_hash);
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 879 if ( strtolower($real_code) === strtolower($captcha_code) )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 880 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 881 $captcha_good = true;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 882 }
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 883 }
436
+ − 884 if ( $policy != 'disable' && !$captcha_good )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 885 {
436
+ − 886 if ( $fails >= $threshold )
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 887 {
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 888 // ooh boy, somebody's in trouble ;-)
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 889 $row = $db->fetchrow();
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 890 $db->free_result();
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 891 return array(
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 892 'success' => false,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 893 'error' => 'locked_out',
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 894 'lockout_threshold' => $threshold,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 895 'lockout_duration' => ( $duration / 60 ),
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 896 'lockout_fails' => $fails,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 897 'lockout_policy' => $policy,
436
+ − 898 'time_rem' => ( $duration / 60 ) - round( ( time() - $row['timestamp'] ) / 60 ),
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 899 'lockout_last_time' => $row['timestamp']
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 900 );
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 901 }
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 902 }
436
+ − 903 $db->free_result();
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 904 }
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 905
1
+ − 906 // Instanciate the Rijndael encryption object
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 907 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 908
+ − 909 // Initialize our success switch
+ − 910 $success = false;
+ − 911
+ − 912 // Retrieve the real password from the database
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 913 $this->sql('SELECT password,old_encryption,user_id,user_level,temp_password,temp_password_time FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=\''.$this->prepare_text(strtolower($username)).'\';');
1
+ − 914 if($db->numrows() < 1)
188
+ − 915 {
+ − 916 // This wasn't logged in <1.0.2, dunno how it slipped through
+ − 917 if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 918 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
188
+ − 919 else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 920 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 921
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 922 // Do we also need to increment the lockout countdown?
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
diff
changeset
+ − 923 if ( @$policy != 'disable' && !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 924 {
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 925 $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 926 // increment fail count
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
diff
changeset
+ − 927 $this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\');');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 928 $fails++;
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 929 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 930 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 931 'error' => ( $fails >= $threshold ) ? 'locked_out' : 'invalid_credentials',
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 932 'lockout_threshold' => $threshold,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 933 'lockout_duration' => ( $duration / 60 ),
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 934 'lockout_fails' => $fails,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 935 'lockout_policy' => $policy
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 936 );
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 937 }
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 938
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 939 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 940 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 941 'error' => 'invalid_credentials'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 942 );
188
+ − 943 }
1
+ − 944 $row = $db->fetchrow();
+ − 945
+ − 946 // Check to see if we're logging in using a temporary password
+ − 947
+ − 948 if((intval($row['temp_password_time']) + 3600*24) > time() )
+ − 949 {
+ − 950 $temp_pass = $aes->decrypt( $row['temp_password'], $this->private_key, ENC_HEX );
+ − 951 if( md5($temp_pass) == $pass_hashed )
+ − 952 {
+ − 953 $code = $plugins->setHook('login_password_reset');
+ − 954 foreach ( $code as $cmd )
+ − 955 {
+ − 956 eval($cmd);
+ − 957 }
+ − 958
+ − 959 header('Location: ' . makeUrlComplete('Special', 'PasswordReset/stage2/' . $row['user_id'] . '/' . $row['temp_password']) );
+ − 960
+ − 961 exit;
+ − 962 }
+ − 963 }
+ − 964
+ − 965 if($row['old_encryption'] == 1)
+ − 966 {
+ − 967 // The user's password is stored using the obsolete and insecure MD5 algorithm - we'll update the field with the new password
+ − 968 if($pass_hashed == $row['password'] && !$already_md5ed)
+ − 969 {
+ − 970 $pass_stashed = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 971 $this->sql('UPDATE '.table_prefix.'users SET password=\''.$pass_stashed.'\',old_encryption=0 WHERE user_id='.$row['user_id'].';');
+ − 972 $success = true;
+ − 973 }
+ − 974 elseif($pass_hashed == $row['password'] && $already_md5ed)
+ − 975 {
+ − 976 // We don't have the real password so don't bother with encrypting it, just call it success and get out of here
+ − 977 $success = true;
+ − 978 }
+ − 979 }
+ − 980 else
+ − 981 {
+ − 982 // Our password field is up-to-date with the >=1.0RC1 encryption standards, so decrypt the password in the table and see if we have a match
+ − 983 $real_pass = $aes->decrypt($row['password'], $this->private_key);
+ − 984 if($pass_hashed == md5($real_pass))
+ − 985 {
+ − 986 $success = true;
+ − 987 }
+ − 988 }
+ − 989 if($success)
+ − 990 {
+ − 991 if((int)$level > (int)$row['user_level'])
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 992 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 993 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 994 'error' => 'too_big_for_britches'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 995 );
1
+ − 996 $sess = $this->register_session(intval($row['user_id']), $username, $real_pass, $level);
+ − 997 if($sess)
+ − 998 {
+ − 999 if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 1000 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_good\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
1
+ − 1001 else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 1002 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_good\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
1
+ − 1003
+ − 1004 $code = $plugins->setHook('login_success');
+ − 1005 foreach ( $code as $cmd )
+ − 1006 {
+ − 1007 eval($cmd);
+ − 1008 }
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1009
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1010 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1011 'success' => true
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1012 );
1
+ − 1013 }
+ − 1014 else
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1015 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1016 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1017 'error' => 'backend_fail'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1018 );
1
+ − 1019 }
+ − 1020 else
+ − 1021 {
+ − 1022 if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 1023 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'admin_auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
1
+ − 1024 else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 1025 $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
1
+ − 1026
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1027 // Do we also need to increment the lockout countdown?
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 1028 if ( $policy != 'disable' && !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1029 {
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1030 $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1031 // increment fail count
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
diff
changeset
+ − 1032 $this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\');');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1033 $fails++;
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1034 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1035 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1036 'error' => ( $fails >= $threshold ) ? 'locked_out' : 'invalid_credentials',
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1037 'lockout_threshold' => $threshold,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1038 'lockout_duration' => ( $duration / 60 ),
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1039 'lockout_fails' => $fails,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1040 'lockout_policy' => $policy
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1041 );
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1042 }
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1043
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1044 return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1045 'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1046 'error' => 'invalid_credentials'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1047 );
1
+ − 1048 }
+ − 1049 }
+ − 1050
+ − 1051 /**
+ − 1052 * Attempts to log in using the old table structure and algorithm.
+ − 1053 * @param string $username
+ − 1054 * @param string $password This should be an MD5 hash
+ − 1055 * @return string 'success' if successful, or error message on failure
+ − 1056 */
+ − 1057
+ − 1058 function login_compat($username, $password, $level = 0)
+ − 1059 {
+ − 1060 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1061 $pass_hashed =& $password;
+ − 1062 $this->sql('SELECT password,user_id,user_level FROM '.table_prefix.'users WHERE username=\''.$this->prepare_text($username).'\';');
+ − 1063 if($db->numrows() < 1)
+ − 1064 return 'The username and/or password is incorrect.';
+ − 1065 $row = $db->fetchrow();
+ − 1066 if($row['password'] == $password)
+ − 1067 {
+ − 1068 if((int)$level > (int)$row['user_level'])
+ − 1069 return 'You are not authorized for this level of access.';
+ − 1070 $sess = $this->register_session_compat(intval($row['user_id']), $username, $password, $level);
+ − 1071 if($sess)
+ − 1072 return 'success';
+ − 1073 else
+ − 1074 return 'Your login credentials were correct, but an internal error occured while registering the session key in the database.';
+ − 1075 }
+ − 1076 else
+ − 1077 {
+ − 1078 return 'The username and/or password is incorrect.';
+ − 1079 }
+ − 1080 }
+ − 1081
+ − 1082 /**
+ − 1083 * Registers a session key in the database. This function *ASSUMES* that the username and password have already been validated!
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1084 * Basically the session key is a hex-encoded cookie (encrypted with the site's private key) that says "u=[username];p=[sha1 of password];s=[unique key id]"
1
+ − 1085 * @param int $user_id
+ − 1086 * @param string $username
+ − 1087 * @param string $password
+ − 1088 * @param int $level The level of access to grant, defaults to USER_LEVEL_MEMBER
+ − 1089 * @return bool
+ − 1090 */
+ − 1091
+ − 1092 function register_session($user_id, $username, $password, $level = USER_LEVEL_MEMBER)
+ − 1093 {
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1094 // Random key identifier
1
+ − 1095 $salt = md5(microtime() . mt_rand());
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1096
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1097 // SHA1 hash of password, stored in the key
1
+ − 1098 $passha1 = sha1($password);
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1099
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1100 // Unencrypted session key
1
+ − 1101 $session_key = "u=$username;p=$passha1;s=$salt";
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1102
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1103 // Encrypt the key
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1104 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1105 $session_key = $aes->encrypt($session_key, $this->private_key, ENC_HEX);
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1106
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1107 // If we're registering an elevated-privilege key, it needs to be on GET
1
+ − 1108 if($level > USER_LEVEL_MEMBER)
+ − 1109 {
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1110 // Reverse it - cosmetic only ;-)
1
+ − 1111 $hexkey = strrev($session_key);
+ − 1112 $this->sid_super = $hexkey;
+ − 1113 $_GET['auth'] = $hexkey;
+ − 1114 }
+ − 1115 else
+ − 1116 {
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1117 // Stash it in a cookie
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1118 // For now, make the cookie last forever, we can change this in 1.1.x
259
+ − 1119 setcookie( 'sid', $session_key, time()+315360000, scriptPath.'/', null, ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ) );
1
+ − 1120 $_COOKIE['sid'] = $session_key;
+ − 1121 }
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1122 // $keyhash is stored in the database, this is for compatibility with the older DB structure
1
+ − 1123 $keyhash = md5($session_key);
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1124 // Record the user's IP
466
+ − 1125 $ip = $_SERVER['REMOTE_ADDR'];
+ − 1126 if(!is_valid_ip($ip))
1
+ − 1127 die('$session->register_session: Remote-Addr was spoofed');
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1128 // The time needs to be stashed to enforce the 15-minute limit on elevated session keys
1
+ − 1129 $time = time();
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1130
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1131 // Sanity check
1
+ − 1132 if(!is_int($user_id))
+ − 1133 die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
+ − 1134 if(!is_int($level))
+ − 1135 die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
+ − 1136
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1137 // All done!
1
+ − 1138 $query = $this->sql('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time) VALUES(\''.$keyhash.'\', \''.$salt.'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.');');
+ − 1139 return true;
+ − 1140 }
+ − 1141
+ − 1142 /**
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1143 * Identical to register_session in nature, but uses the old login/table structure. DO NOT use this except in the upgrade script under very controlled circumstances.
1
+ − 1144 * @see sessionManager::register_session()
+ − 1145 * @access private
+ − 1146 */
+ − 1147
+ − 1148 function register_session_compat($user_id, $username, $password, $level = 0)
+ − 1149 {
+ − 1150 $salt = md5(microtime() . mt_rand());
+ − 1151 $thekey = md5($password . $salt);
+ − 1152 if($level > 0)
+ − 1153 {
+ − 1154 $this->sid_super = $thekey;
+ − 1155 }
+ − 1156 else
+ − 1157 {
+ − 1158 setcookie( 'sid', $thekey, time()+315360000, scriptPath.'/' );
+ − 1159 $_COOKIE['sid'] = $thekey;
+ − 1160 }
+ − 1161 $ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 1162 if(!$ip)
+ − 1163 die('$session->register_session: Remote-Addr was spoofed');
+ − 1164 $time = time();
+ − 1165 if(!is_int($user_id))
+ − 1166 die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
+ − 1167 if(!is_int($level))
+ − 1168 die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
+ − 1169 $query = $this->sql('INSERT INTO '.table_prefix.'session_keys(session_key, salt, user_id, auth_level, source_ip, time) VALUES(\''.$thekey.'\', \''.$salt.'\', '.$user_id.', '.$level.', \''.$ip.'\', '.$time.');');
+ − 1170 return true;
+ − 1171 }
+ − 1172
+ − 1173 /**
+ − 1174 * Creates/restores a guest session
+ − 1175 * @todo implement real session management for guests
+ − 1176 */
+ − 1177
+ − 1178 function register_guest_session()
+ − 1179 {
+ − 1180 global $db, $session, $paths, $template, $plugins; // Common objects
209
+ − 1181 global $lang;
1
+ − 1182 $this->username = $_SERVER['REMOTE_ADDR'];
+ − 1183 $this->user_level = USER_LEVEL_GUEST;
+ − 1184 if($this->compat || defined('IN_ENANO_INSTALL'))
+ − 1185 {
+ − 1186 $this->theme = 'oxygen';
+ − 1187 $this->style = 'bleu';
+ − 1188 }
+ − 1189 else
+ − 1190 {
+ − 1191 $this->theme = ( isset($_GET['theme']) && isset($template->named_theme_list[$_GET['theme']])) ? $_GET['theme'] : $template->default_theme;
466
+ − 1192 $this->style = ( isset($_GET['style']) && file_exists(ENANO_ROOT.'/themes/'.$this->theme . '/css/'.$_GET['style'].'.css' )) ? $_GET['style'] : preg_replace('/\.css$/', '', $template->named_theme_list[$this->theme]['default_style']);
1
+ − 1193 }
+ − 1194 $this->user_id = 1;
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
diff
changeset
+ − 1195 // This is a VERY special case we are allowing. It lets the installer create languages using the Enano API.
209
+ − 1196 if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ − 1197 {
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
diff
changeset
+ − 1198 $language = ( isset($_GET['lang']) && preg_match('/^[a-z0-9_]+$/', @$_GET['lang']) ) ? $_GET['lang'] : intval(getConfig('default_language'));
209
+ − 1199 $lang = new Language($language);
406
+ − 1200 @setlocale(LC_ALL, $lang->lang_code);
209
+ − 1201 }
1
+ − 1202 }
+ − 1203
+ − 1204 /**
+ − 1205 * Validates a session key, and returns the userdata associated with the key or false
+ − 1206 * @param string $key The session key to validate
+ − 1207 * @return array Keys are 'user_id', 'username', 'email', 'real_name', 'user_level', 'theme', 'style', 'signature', 'reg_time', 'account_active', 'activation_key', and 'auth_level' or bool false if validation failed. The key 'auth_level' is the maximum authorization level that this key provides.
+ − 1208 */
+ − 1209
+ − 1210 function validate_session($key)
+ − 1211 {
+ − 1212 global $db, $session, $paths, $template, $plugins; // Common objects
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1213 profiler_log("SessionManager: checking session: " . sha1($key));
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1214 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1215 $decrypted_key = $aes->decrypt($key, $this->private_key, ENC_HEX);
+ − 1216
+ − 1217 if ( !$decrypted_key )
+ − 1218 {
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1219 // die_semicritical('AES encryption error', '<p>Something went wrong during the AES decryption process.</p><pre>'.print_r($decrypted_key, true).'</pre>');
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1220 return false;
1
+ − 1221 }
+ − 1222
+ − 1223 $n = preg_match('/^u='.$this->valid_username.';p=([A-Fa-f0-9]+?);s=([A-Fa-f0-9]+?)$/', $decrypted_key, $keydata);
+ − 1224 if($n < 1)
+ − 1225 {
+ − 1226 // echo '(debug) $session->validate_session: Key does not match regex<br />Decrypted key: '.$decrypted_key;
+ − 1227 return false;
+ − 1228 }
+ − 1229 $keyhash = md5($key);
+ − 1230 $salt = $db->escape($keydata[3]);
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1231 // using a normal call to $db->sql_query to avoid failing on errors here
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1232 $query = $db->sql_query('SELECT u.user_id AS uid,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,' . "\n"
371
dc6026376919
Improved compatibility with PostgreSQL and fixed a number of installer bugs; fixed missing "meta" category declaration in language files
Dan
diff
changeset
+ − 1233 . ' u.reg_time,u.account_active,u.activation_key,u.user_lang,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms,' . "\n"
406
+ − 1234 . ' u.user_timezone, x.* FROM '.table_prefix.'session_keys AS k' . "\n"
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1235 . ' LEFT JOIN '.table_prefix.'users AS u' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1236 . ' ON ( u.user_id=k.user_id )' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1237 . ' LEFT JOIN '.table_prefix.'users_extra AS x' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1238 . ' ON ( u.user_id=x.user_id OR x.user_id IS NULL )' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1239 . ' LEFT JOIN '.table_prefix.'privmsgs AS p' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1240 . ' ON ( p.message_to=u.username AND p.message_read=0 )' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1241 . ' WHERE k.session_key=\''.$keyhash.'\'' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1242 . ' AND k.salt=\''.$salt.'\'' . "\n"
499
6b7fdd898ba3
Fixed some bugs with PostgreSQL and added a word_lcase column to the search_index table because collation is not working under MySQL. TODO: Trigger search index rebuild on upgrade to 1.1.4.
Dan
diff
changeset
+ − 1243 . ' GROUP BY u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,u.user_lang,u.user_timezone,k.source_ip,k.time,k.auth_level,x.user_id, x.user_aim, x.user_yahoo, x.user_msn, x.user_xmpp, x.user_homepage, x.user_location, x.user_job, x.user_hobbies, x.email_public;');
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1244
18
+ − 1245 if ( !$query )
+ − 1246 {
406
+ − 1247 $query = $this->sql('SELECT u.user_id AS uid,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms, 1440 AS user_timezone FROM '.table_prefix.'session_keys AS k
18
+ − 1248 LEFT JOIN '.table_prefix.'users AS u
+ − 1249 ON ( u.user_id=k.user_id )
+ − 1250 LEFT JOIN '.table_prefix.'privmsgs AS p
+ − 1251 ON ( p.message_to=u.username AND p.message_read=0 )
+ − 1252 WHERE k.session_key=\''.$keyhash.'\'
+ − 1253 AND k.salt=\''.$salt.'\'
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1254 GROUP BY u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,k.source_ip,k.time,k.auth_level;');
18
+ − 1255 }
1
+ − 1256 if($db->numrows() < 1)
+ − 1257 {
+ − 1258 // echo '(debug) $session->validate_session: Key was not found in database<br />';
+ − 1259 return false;
+ − 1260 }
+ − 1261 $row = $db->fetchrow();
+ − 1262 $row['user_id'] =& $row['uid'];
466
+ − 1263 $ip = $_SERVER['REMOTE_ADDR'];
1
+ − 1264 if($row['auth_level'] > $row['user_level'])
+ − 1265 {
+ − 1266 // Failed authorization check
+ − 1267 // echo '(debug) $session->validate_session: access to this auth level denied<br />';
+ − 1268 return false;
+ − 1269 }
+ − 1270 if($ip != $row['source_ip'])
+ − 1271 {
484
+ − 1272 // Special exception for 1.1.x upgrade - the 1.1.3 upgrade changes the size of the column and this is what validate_session
+ − 1273 // expects, but if the column size hasn't changed yet just check the first 10 digits of the IP.
+ − 1274 $fail = true;
+ − 1275 if ( defined('IN_ENANO_UPGRADE') )
+ − 1276 {
485
7134d4bf7a23
[Security] made session manager have some degree of IP validation for session keys and upgrades
Dan
diff
changeset
+ − 1277 if ( installer_enano_version() == '1.1.3' && substr($ip, 0, 10) == substr($row['source_ip'], 0, 10) )
484
+ − 1278 $fail = false;
+ − 1279 }
1
+ − 1280 // Failed IP address check
+ − 1281 // echo '(debug) $session->validate_session: IP address mismatch<br />';
484
+ − 1282 if ( $fail )
+ − 1283 return false;
1
+ − 1284 }
+ − 1285
+ − 1286 // Do the password validation
+ − 1287 $real_pass = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 1288
+ − 1289 //die('<pre>'.print_r($keydata, true).'</pre>');
+ − 1290 if(sha1($real_pass) != $keydata[2])
+ − 1291 {
+ − 1292 // Failed password check
+ − 1293 // echo '(debug) $session->validate_session: encrypted password is wrong<br />Real password: '.$real_pass.'<br />Real hash: '.sha1($real_pass).'<br />User hash: '.$keydata[2];
+ − 1294 return false;
+ − 1295 }
+ − 1296
+ − 1297 $time_now = time();
+ − 1298 $time_key = $row['time'] + 900;
+ − 1299 if($time_now > $time_key && $row['auth_level'] > USER_LEVEL_MEMBER)
+ − 1300 {
+ − 1301 // Session timed out
+ − 1302 // echo '(debug) $session->validate_session: super session timed out<br />';
+ − 1303 $this->sw_timed_out = true;
+ − 1304 return false;
+ − 1305 }
+ − 1306
+ − 1307 // If this is an elevated-access session key, update the time
+ − 1308 if( $row['auth_level'] > USER_LEVEL_MEMBER )
+ − 1309 {
+ − 1310 $this->sql('UPDATE '.table_prefix.'session_keys SET time='.time().' WHERE session_key=\''.$keyhash.'\';');
+ − 1311 }
+ − 1312
31
+ − 1313 $user_extra = array();
+ − 1314 foreach ( array('user_aim', 'user_yahoo', 'user_msn', 'user_xmpp', 'user_homepage', 'user_location', 'user_job', 'user_hobbies', 'email_public') as $column )
+ − 1315 {
375
8d0e3a5a6990
[minor] Trying to be a little more careful with values from users_extra in validate_session()
Dan
diff
changeset
+ − 1316 if ( isset($row[$column]) )
8d0e3a5a6990
[minor] Trying to be a little more careful with values from users_extra in validate_session()
Dan
diff
changeset
+ − 1317 $user_extra[$column] = $row[$column];
31
+ − 1318 }
+ − 1319
+ − 1320 $this->user_extra = $user_extra;
+ − 1321 // Leave the rest to PHP's automatic garbage collector ;-)
+ − 1322
1
+ − 1323 $row['password'] = md5($real_pass);
406
+ − 1324 $row['user_timezone'] = intval($row['user_timezone']) - 1440;
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1325
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1326 profiler_log("SessionManager: finished session check");
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1327
1
+ − 1328 return $row;
+ − 1329 }
+ − 1330
+ − 1331 /**
+ − 1332 * Validates a session key, and returns the userdata associated with the key or false. Optimized for compatibility with the old MD5-based auth system.
+ − 1333 * @param string $key The session key to validate
+ − 1334 * @return array Keys are 'user_id', 'username', 'email', 'real_name', 'user_level', 'theme', 'style', 'signature', 'reg_time', 'account_active', 'activation_key', and 'auth_level' or bool false if validation failed. The key 'auth_level' is the maximum authorization level that this key provides.
+ − 1335 */
+ − 1336
+ − 1337 function compat_validate_session($key)
+ − 1338 {
+ − 1339 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1340 $key = $db->escape($key);
+ − 1341
406
+ − 1342 $query = $this->sql('SELECT u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,k.source_ip,k.salt,k.time,k.auth_level,1440 AS user_timezone FROM '.table_prefix.'session_keys AS k
1
+ − 1343 LEFT JOIN '.table_prefix.'users AS u
+ − 1344 ON u.user_id=k.user_id
+ − 1345 WHERE k.session_key=\''.$key.'\';');
+ − 1346 if($db->numrows() < 1)
+ − 1347 {
+ − 1348 // echo '(debug) $session->validate_session: Key '.$key.' was not found in database<br />';
+ − 1349 return false;
+ − 1350 }
+ − 1351 $row = $db->fetchrow();
+ − 1352 $ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 1353 if($row['auth_level'] > $row['user_level'])
+ − 1354 {
+ − 1355 // Failed authorization check
+ − 1356 // echo '(debug) $session->validate_session: user not authorized for this access level';
+ − 1357 return false;
+ − 1358 }
+ − 1359 if($ip != $row['source_ip'])
+ − 1360 {
+ − 1361 // Failed IP address check
+ − 1362 // echo '(debug) $session->validate_session: IP address mismatch; IP in table: '.$row['source_ip'].'; reported IP: '.$ip.'';
+ − 1363 return false;
+ − 1364 }
+ − 1365
+ − 1366 // Do the password validation
+ − 1367 $real_key = md5($row['password'] . $row['salt']);
+ − 1368
+ − 1369 //die('<pre>'.print_r($keydata, true).'</pre>');
+ − 1370 if($real_key != $key)
+ − 1371 {
+ − 1372 // Failed password check
+ − 1373 // echo '(debug) $session->validate_session: supplied password is wrong<br />Real key: '.$real_key.'<br />User key: '.$key;
+ − 1374 return false;
+ − 1375 }
+ − 1376
+ − 1377 $time_now = time();
+ − 1378 $time_key = $row['time'] + 900;
+ − 1379 if($time_now > $time_key && $row['auth_level'] >= 1)
+ − 1380 {
+ − 1381 $this->sw_timed_out = true;
+ − 1382 // Session timed out
+ − 1383 // echo '(debug) $session->validate_session: super session timed out<br />';
+ − 1384 return false;
+ − 1385 }
+ − 1386
406
+ − 1387 $row['user_timezone'] = intval($row['user_timezone']) - 1440;
+ − 1388
1
+ − 1389 return $row;
+ − 1390 }
+ − 1391
+ − 1392 /**
+ − 1393 * Demotes us to one less than the specified auth level. AKA destroys elevated authentication and/or logs out the user, depending on $level
+ − 1394 * @param int $level How low we should go - USER_LEVEL_MEMBER means demote to USER_LEVEL_GUEST, and anything more powerful than USER_LEVEL_MEMBER means demote to USER_LEVEL_MEMBER
+ − 1395 * @return string 'success' if successful, or error on failure
+ − 1396 */
+ − 1397
+ − 1398 function logout($level = USER_LEVEL_MEMBER)
+ − 1399 {
+ − 1400 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1401 $ou = $this->username;
+ − 1402 $oid = $this->user_id;
+ − 1403 if($level > USER_LEVEL_CHPREF)
+ − 1404 {
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1405 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1406 if(!$this->user_logged_in || $this->auth_level < ( USER_LEVEL_MEMBER + 1))
221
+ − 1407 {
+ − 1408 return 'success';
+ − 1409 }
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1410 // See if we can get rid of the cached decrypted session key
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1411 $key_bin = $aes->hextostring(strrev($this->sid_super));
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1412 $key_hash = sha1($key_bin . '::' . $this->private_key);
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1413 aes_decrypt_cache_destroy($key_hash);
1
+ − 1414 // Destroy elevated privileges
+ − 1415 $keyhash = md5(strrev($this->sid_super));
+ − 1416 $this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.$keyhash.'\' AND user_id=\'' . $this->user_id . '\';');
+ − 1417 $this->sid_super = false;
+ − 1418 $this->auth_level = USER_LEVEL_MEMBER;
+ − 1419 }
+ − 1420 else
+ − 1421 {
+ − 1422 if($this->user_logged_in)
+ − 1423 {
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1424 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1425 // See if we can get rid of the cached decrypted session key
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1426 $key_bin = $aes->hextostring($this->sid);
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1427 $key_hash = sha1($key_bin . '::' . $this->private_key);
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1428 aes_decrypt_cache_destroy($key_hash);
1
+ − 1429 // Completely destroy our session
+ − 1430 if($this->auth_level > USER_LEVEL_CHPREF)
+ − 1431 {
+ − 1432 $this->logout(USER_LEVEL_ADMIN);
+ − 1433 }
+ − 1434 $this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.md5($this->sid).'\';');
+ − 1435 setcookie( 'sid', '', time()-(3600*24), scriptPath.'/' );
+ − 1436 }
+ − 1437 }
+ − 1438 $code = $plugins->setHook('logout_success'); // , Array('level'=>$level,'old_username'=>$ou,'old_user_id'=>$oid));
+ − 1439 foreach ( $code as $cmd )
+ − 1440 {
+ − 1441 eval($cmd);
+ − 1442 }
+ − 1443 return 'success';
+ − 1444 }
+ − 1445
+ − 1446 # Miscellaneous stuff
+ − 1447
+ − 1448 /**
+ − 1449 * Appends the high-privilege session key to the URL if we are authorized to do high-privilege stuff
+ − 1450 * @param string $url The URL to add session data to
+ − 1451 * @return string
+ − 1452 */
+ − 1453
+ − 1454 function append_sid($url)
+ − 1455 {
+ − 1456 $sep = ( strstr($url, '?') ) ? '&' : '?';
+ − 1457 if ( $this->sid_super )
+ − 1458 {
+ − 1459 $url = $url . $sep . 'auth=' . urlencode($this->sid_super);
+ − 1460 // echo($this->sid_super.'<br/>');
+ − 1461 }
+ − 1462 return $url;
+ − 1463 }
+ − 1464
+ − 1465 /**
+ − 1466 * Grabs the user's password MD5
+ − 1467 * @return string, or bool false if access denied
+ − 1468 */
+ − 1469
+ − 1470 function grab_password_hash()
+ − 1471 {
+ − 1472 if(!$this->password_hash) return false;
+ − 1473 return $this->password_hash;
+ − 1474 }
+ − 1475
+ − 1476 /**
+ − 1477 * Destroys the user's password MD5 in memory
+ − 1478 */
+ − 1479
+ − 1480 function disallow_password_grab()
+ − 1481 {
+ − 1482 $this->password_hash = false;
+ − 1483 return false;
+ − 1484 }
+ − 1485
+ − 1486 /**
+ − 1487 * Generates an AES key and stashes it in the database
+ − 1488 * @return string Hex-encoded AES key
+ − 1489 */
+ − 1490
+ − 1491 function rijndael_genkey()
+ − 1492 {
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1493 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1494 $key = $aes->gen_readymade_key();
+ − 1495 $keys = getConfig('login_key_cache');
+ − 1496 if(is_string($keys))
+ − 1497 $keys .= $key;
+ − 1498 else
+ − 1499 $keys = $key;
+ − 1500 setConfig('login_key_cache', $keys);
+ − 1501 return $key;
+ − 1502 }
+ − 1503
+ − 1504 /**
+ − 1505 * Generate a totally random 128-bit value for MD5 challenges
+ − 1506 * @return string
+ − 1507 */
+ − 1508
+ − 1509 function dss_rand()
+ − 1510 {
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1511 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1512 $random = $aes->randkey(128);
+ − 1513 unset($aes);
+ − 1514 return md5(microtime() . $random);
+ − 1515 }
+ − 1516
+ − 1517 /**
+ − 1518 * Fetch a cached login public key using the MD5sum as an identifier. Each key can only be fetched once before it is destroyed.
+ − 1519 * @param string $md5 The MD5 sum of the key
+ − 1520 * @return string, or bool false on failure
+ − 1521 */
+ − 1522
+ − 1523 function fetch_public_key($md5)
+ − 1524 {
+ − 1525 $keys = getConfig('login_key_cache');
+ − 1526 $keys = enano_str_split($keys, AES_BITS / 4);
+ − 1527
+ − 1528 foreach($keys as $i => $k)
+ − 1529 {
+ − 1530 if(md5($k) == $md5)
+ − 1531 {
+ − 1532 unset($keys[$i]);
+ − 1533 if(count($keys) > 0)
+ − 1534 {
+ − 1535 if ( strlen(getConfig('login_key_cache') ) > 64000 )
+ − 1536 {
+ − 1537 // This should only need to be done once every month or so for an average-size site
+ − 1538 setConfig('login_key_cache', '');
+ − 1539 }
+ − 1540 else
+ − 1541 {
+ − 1542 $keys = implode('', array_values($keys));
+ − 1543 setConfig('login_key_cache', $keys);
+ − 1544 }
+ − 1545 }
+ − 1546 else
+ − 1547 {
+ − 1548 setConfig('login_key_cache', '');
+ − 1549 }
+ − 1550 return $k;
+ − 1551 }
+ − 1552 }
+ − 1553 // Couldn't find the key...
+ − 1554 return false;
+ − 1555 }
+ − 1556
+ − 1557 /**
+ − 1558 * Adds a user to a group.
+ − 1559 * @param int User ID
+ − 1560 * @param int Group ID
+ − 1561 * @param bool Group moderator - defaults to false
+ − 1562 * @return bool True on success, false on failure
+ − 1563 */
+ − 1564
+ − 1565 function add_user_to_group($user_id, $group_id, $is_mod = false)
+ − 1566 {
+ − 1567 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1568
+ − 1569 // Validation
+ − 1570 if ( !is_int($user_id) || !is_int($group_id) || !is_bool($is_mod) )
+ − 1571 return false;
+ − 1572 if ( $user_id < 1 || $group_id < 1 )
+ − 1573 return false;
+ − 1574
+ − 1575 $mod_switch = ( $is_mod ) ? '1' : '0';
+ − 1576 $q = $this->sql('SELECT member_id,is_mod FROM '.table_prefix.'group_members WHERE user_id=' . $user_id . ' AND group_id=' . $group_id . ';');
+ − 1577 if ( !$q )
+ − 1578 $db->_die();
+ − 1579 if ( $db->numrows() < 1 )
+ − 1580 {
+ − 1581 // User is not in group
+ − 1582 $this->sql('INSERT INTO '.table_prefix.'group_members(user_id,group_id,is_mod) VALUES(' . $user_id . ', ' . $group_id . ', ' . $mod_switch . ');');
+ − 1583 return true;
+ − 1584 }
+ − 1585 else
+ − 1586 {
+ − 1587 $row = $db->fetchrow();
+ − 1588 // Update modship status
+ − 1589 if ( strval($row['is_mod']) == $mod_switch )
+ − 1590 {
+ − 1591 // Modship unchanged
+ − 1592 return true;
+ − 1593 }
+ − 1594 else
+ − 1595 {
+ − 1596 // Modship changed
+ − 1597 $this->sql('UPDATE '.table_prefix.'group_members SET is_mod=' . $mod_switch . ' WHERE member_id=' . $row['member_id'] . ';');
+ − 1598 return true;
+ − 1599 }
+ − 1600 }
+ − 1601 return false;
+ − 1602 }
+ − 1603
+ − 1604 /**
+ − 1605 * Removes a user from a group.
+ − 1606 * @param int User ID
+ − 1607 * @param int Group ID
+ − 1608 * @return bool True on success, false on failure
+ − 1609 * @todo put a little more error checking in...
+ − 1610 */
+ − 1611
+ − 1612 function remove_user_from_group($user_id, $group_id)
+ − 1613 {
+ − 1614 if ( !is_int($user_id) || !is_int($group_id) )
+ − 1615 return false;
+ − 1616 $this->sql('DELETE FROM '.table_prefix."group_members WHERE user_id=$user_id AND group_id=$group_id;");
+ − 1617 return true;
+ − 1618 }
+ − 1619
+ − 1620 /**
+ − 1621 * Checks the banlist to ensure that we're an allowed user. Doesn't return anything because it dies if the user is banned.
+ − 1622 */
+ − 1623
+ − 1624 function check_banlist()
+ − 1625 {
+ − 1626 global $db, $session, $paths, $template, $plugins; // Common objects
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1627 global $lang;
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1628
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1629 $col_reason = ( $this->compat ) ? '"No reason entered (session manager is in compatibility mode)" AS reason' : 'reason';
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1630 $banned = false;
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1631 if ( $this->user_logged_in )
1
+ − 1632 {
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1633 // check by IP, email, and username
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1634 if ( ENANO_DBLAYER == 'MYSQL' )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1635 {
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1636 $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1637 . " ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1638 . " ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' REGEXP ban_value ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1639 . " ( ban_type = " . BAN_USER . " AND is_regex = 0 AND ban_value = '{$this->username}' ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1640 . " ( ban_type = " . BAN_USER . " AND is_regex = 1 AND '{$this->username}' REGEXP ban_value ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1641 . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 0 AND ban_value = '{$this->email}' ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1642 . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 1 AND '{$this->email}' REGEXP ban_value ) \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1643 . " ORDER BY ban_type ASC;";
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1644 }
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1645 else if ( ENANO_DBLAYER == 'PGSQL' )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1646 {
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1647 $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1648 . " ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR \n"
322
+ − 1649 . " ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' ~ ban_value ) OR \n"
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1650 . " ( ban_type = " . BAN_USER . " AND is_regex = 0 AND ban_value = '{$this->username}' ) OR \n"
322
+ − 1651 . " ( ban_type = " . BAN_USER . " AND is_regex = 1 AND '{$this->username}' ~ ban_value ) OR \n"
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1652 . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 0 AND ban_value = '{$this->email}' ) OR \n"
322
+ − 1653 . " ( ban_type = " . BAN_EMAIL . " AND is_regex = 1 AND '{$this->email}' ~ ban_value ) \n"
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1654 . " ORDER BY ban_type ASC;";
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1655 }
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1656 $q = $this->sql($sql);
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1657 if ( $db->numrows() > 0 )
1
+ − 1658 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1659 while ( list($reason_temp, $ban_value, $ban_type, $is_regex) = $db->fetchrow_num() )
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1660 {
425
+ − 1661 if ( $ban_type == BAN_IP && $is_regex != 1 )
1
+ − 1662 {
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1663 // check range
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1664 $regexp = parse_ip_range_regex($ban_value);
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1665 if ( !$regexp )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1666 {
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1667 continue;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1668 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1669 if ( preg_match("/$regexp/", $_SERVER['REMOTE_ADDR']) )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1670 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1671 $reason = $reason_temp;
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1672 $banned = true;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1673 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1674 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1675 else
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1676 {
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1677 // User is banned
1
+ − 1678 $banned = true;
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1679 $reason = $reason_temp;
1
+ − 1680 }
+ − 1681 }
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1682 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1683 $db->free_result();
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1684 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1685 else
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1686 {
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1687 // check by IP only
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1688 if ( ENANO_DBLAYER == 'MYSQL' )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1689 {
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1690 $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1691 ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1692 ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' REGEXP ban_value )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1693 ORDER BY ban_type ASC;";
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1694 }
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1695 else if ( ENANO_DBLAYER == 'PGSQL' )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1696 {
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1697 $sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1698 ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR
322
+ − 1699 ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' ~ ban_value )
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1700 ORDER BY ban_type ASC;";
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1701 }
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1702 $q = $this->sql($sql);
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1703 if ( $db->numrows() > 0 )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1704 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1705 while ( list($reason_temp, $ban_value, $ban_type, $is_regex) = $db->fetchrow_num() )
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1706 {
495
+ − 1707 if ( $ban_type == BAN_IP && $is_regex != 1 )
1
+ − 1708 {
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1709 // check range
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1710 $regexp = parse_ip_range_regex($ban_value);
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1711 if ( !$regexp )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1712 continue;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1713 if ( preg_match("/$regexp/", $_SERVER['REMOTE_ADDR']) )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1714 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1715 $reason = $reason_temp;
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1716 $banned = true;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1717 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1718 }
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1719 else
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1720 {
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1721 // User is banned
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1722 $reason = $reason_temp;
1
+ − 1723 $banned = true;
+ − 1724 }
+ − 1725 }
+ − 1726 }
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1727 $db->free_result();
1
+ − 1728 }
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1729 if ( $banned && $paths->get_pageid_from_url() != $paths->nslist['Special'].'CSS' )
1
+ − 1730 {
+ − 1731 // This guy is banned - kill the session, kill the database connection, bail out, and be pretty about it
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1732 die_semicritical($lang->get('user_ban_msg_title'), '<p>' . $lang->get('user_ban_msg_body') . '</p><div class="error-box"><b>' . $lang->get('user_ban_lbl_reason') . '</b><br />' . $reason . '</div>');
1
+ − 1733 exit;
+ − 1734 }
+ − 1735 }
+ − 1736
+ − 1737 # Registration
+ − 1738
+ − 1739 /**
+ − 1740 * Registers a user. This does not perform any type of login.
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1741 * @param string New user's username
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1742 * @param string This should be unencrypted.
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1743 * @param string E-mail address.
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1744 * @param string Optional, defaults to ''.
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1745 * @param bool Optional. If true, the account is not activated initially and an admin activation request is sent. The caller is responsible for sending the address info and notice.
1
+ − 1746 */
+ − 1747
30
+ − 1748 function create_user($username, $password, $email, $real_name = '', $coppa = false)
13
fdd6b9dd42c3
Installer actually works now on dev servers; minor language change in template.php; code cleanliness fix in sessions.php
Dan
diff
changeset
+ − 1749 {
1
+ − 1750 global $db, $session, $paths, $template, $plugins; // Common objects
370
+ − 1751 global $lang;
1
+ − 1752
+ − 1753 // Initialize AES
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1754 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1755
359
+ − 1756 // Since we're recording IP addresses, make sure the user's IP is safe.
+ − 1757 $ip =& $_SERVER['REMOTE_ADDR'];
+ − 1758 if ( !is_valid_ip($ip) )
+ − 1759 return 'Invalid IP';
+ − 1760
+ − 1761 if ( !preg_match('#^'.$this->valid_username.'$#', $username) )
370
+ − 1762 return $lang->get('user_reg_err_username_banned_chars');
359
+ − 1763
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1764 $username = str_replace('_', ' ', $username);
135
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1765 $user_orig = $username;
1
+ − 1766 $username = $this->prepare_text($username);
+ − 1767 $email = $this->prepare_text($email);
+ − 1768 $real_name = $this->prepare_text($real_name);
+ − 1769
+ − 1770 $nameclause = ( $real_name != '' ) ? ' OR real_name=\''.$real_name.'\'' : '';
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1771 $q = $this->sql('SELECT * FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=\''.strtolower($username).'\' OR email=\''.$email.'\''.$nameclause.';');
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1772 if($db->numrows() > 0)
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1773 {
1
+ − 1774 $row = $db->fetchrow();
370
+ − 1775 $str = 'user_reg_err_dupe';
+ − 1776
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1777 if ( $row['username'] == $username )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1778 {
370
+ − 1779 $str .= '_username';
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1780 }
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1781 if ( $row['email'] == $email )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1782 {
370
+ − 1783 $str .= '_email';
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1784 }
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1785 if ( $row['real_name'] == $real_name && $real_name != '' )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1786 {
370
+ − 1787 $str .= '_realname';
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1788 }
370
+ − 1789
371
dc6026376919
Improved compatibility with PostgreSQL and fixed a number of installer bugs; fixed missing "meta" category declaration in language files
Dan
diff
changeset
+ − 1790 return $lang->get($str);
1
+ − 1791 }
+ − 1792
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1793 // Is the password strong enough?
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1794 if ( getConfig('pw_strength_enable') )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1795 {
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1796 $min_score = intval( getConfig('pw_strength_minimum') );
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1797 $pass_score = password_score($password);
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1798 if ( $pass_score < $min_score )
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1799 {
370
+ − 1800 return $lang->get('user_reg_err_password_too_weak');
133
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1801 }
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1802 }
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1803
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1804 $password = $aes->encrypt($password, $this->private_key, ENC_HEX);
af0f6ec48de3
Fully implemented password complexity enforcement; added encryption for passwords on registration form; some baby steps taken towards supporting international usernames - this is not working very well, we might need a hackish fix; TODO: implement password strength meter into installer UI and get international usernames 100% working
Dan
diff
changeset
+ − 1805
1
+ − 1806 // Require the account to be activated?
+ − 1807 switch(getConfig('account_activation'))
+ − 1808 {
+ − 1809 case 'none':
+ − 1810 default:
+ − 1811 $active = '1';
+ − 1812 break;
+ − 1813 case 'user':
+ − 1814 $active = '0';
+ − 1815 break;
+ − 1816 case 'admin':
+ − 1817 $active = '0';
+ − 1818 break;
+ − 1819 }
30
+ − 1820 if ( $coppa )
+ − 1821 $active = '0';
+ − 1822
+ − 1823 $coppa_col = ( $coppa ) ? '1' : '0';
1
+ − 1824
+ − 1825 // Generate a totally random activation key
+ − 1826 $actkey = sha1 ( microtime() . mt_rand() );
+ − 1827
30
+ − 1828 // We good, create the user
359
+ − 1829 $this->sql('INSERT INTO '.table_prefix.'users ( username, password, email, real_name, theme, style, reg_time, account_active, activation_key, user_level, user_coppa, user_registration_ip ) VALUES ( \''.$username.'\', \''.$password.'\', \''.$email.'\', \''.$real_name.'\', \''.$template->default_theme.'\', \''.$template->default_style.'\', '.time().', '.$active.', \''.$actkey.'\', '.USER_LEVEL_CHPREF.', ' . $coppa_col . ', \'' . $ip . '\' );');
1
+ − 1830
31
+ − 1831 // Get user ID and create users_extra entry
+ − 1832 $q = $this->sql('SELECT user_id FROM '.table_prefix."users WHERE username='$username';");
+ − 1833 if ( $db->numrows() > 0 )
+ − 1834 {
359
+ − 1835 list($user_id) = $db->fetchrow_num();
31
+ − 1836 $db->free_result();
+ − 1837
42
45ebe475ff75
I dunno how many times I'm gonna have to fix the "problem seems to be the hex conversion" bug, but this is at least the fourth try.
Dan
diff
changeset
+ − 1838 $this->sql('INSERT INTO '.table_prefix.'users_extra(user_id) VALUES(' . $user_id . ');');
31
+ − 1839 }
+ − 1840
135
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1841 // Grant edit and very limited mod access to the userpage
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1842 $acl_data = array(
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1843 'read' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1844 'view_source' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1845 'edit_page' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1846 'post_comments' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1847 'edit_comments' => AUTH_ALLOW, // only allows editing own comments
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1848 'history_view' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1849 'history_rollback' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1850 'rename' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1851 'delete_page' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1852 'tag_create' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1853 'tag_delete_own' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1854 'tag_delete_other' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1855 'edit_cat' => AUTH_ALLOW,
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1856 'create_page' => AUTH_ALLOW
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1857 );
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1858 $acl_data = $db->escape($this->perm_to_string($acl_data));
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1859 $userpage = $db->escape(sanitize_page_id($user_orig));
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1860 $cols = "target_type, target_id, page_id, namespace, rules";
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1861 $vals = ACL_TYPE_USER . ", $user_id, '$userpage', 'User', '$acl_data'";
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1862 $q = "INSERT INTO ".table_prefix."acl($cols) VALUES($vals);";
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1863 $this->sql($q);
c5dbad7ec2d0
Enano should now fully support UTF-8 usernames; newly registered users are now granted automatic edit access to their user pages (admins can still use protection on the page)
Dan
diff
changeset
+ − 1864
1
+ − 1865 // Require the account to be activated?
30
+ − 1866 if ( $coppa )
+ − 1867 {
+ − 1868 $this->admin_activation_request($username);
+ − 1869 $this->send_coppa_mail($username,$email);
+ − 1870 }
+ − 1871 else
1
+ − 1872 {
30
+ − 1873 switch(getConfig('account_activation'))
+ − 1874 {
+ − 1875 case 'none':
+ − 1876 default:
+ − 1877 break;
+ − 1878 case 'user':
+ − 1879 $a = $this->send_activation_mail($username);
+ − 1880 if(!$a)
+ − 1881 {
+ − 1882 $this->admin_activation_request($username);
370
+ − 1883 return $lang->get('user_reg_err_actmail_failed') . ' ' . $a;
30
+ − 1884 }
+ − 1885 break;
+ − 1886 case 'admin':
1
+ − 1887 $this->admin_activation_request($username);
30
+ − 1888 break;
+ − 1889 }
1
+ − 1890 }
+ − 1891
+ − 1892 // Leave some data behind for the hook
+ − 1893 $code = $plugins->setHook('user_registered'); // , Array('username'=>$username));
+ − 1894 foreach ( $code as $cmd )
+ − 1895 {
+ − 1896 eval($cmd);
+ − 1897 }
+ − 1898
+ − 1899 // $this->register_session($username, $password);
+ − 1900 return 'success';
+ − 1901 }
+ − 1902
+ − 1903 /**
+ − 1904 * Attempts to send an e-mail to the specified user with activation instructions.
+ − 1905 * @param string $u The usernamd of the user requesting activation
+ − 1906 * @return bool true on success, false on failure
+ − 1907 */
+ − 1908
+ − 1909 function send_activation_mail($u, $actkey = false)
+ − 1910 {
+ − 1911 global $db, $session, $paths, $template, $plugins; // Common objects
370
+ − 1912 global $lang;
131
+ − 1913 $q = $this->sql('SELECT username,email FROM '.table_prefix.'users WHERE user_id=2 OR user_level=' . USER_LEVEL_ADMIN . ' ORDER BY user_id ASC;');
1
+ − 1914 $un = $db->fetchrow();
+ − 1915 $admin_user = $un['username'];
+ − 1916 $q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
+ − 1917 $r = $db->fetchrow();
+ − 1918 if ( empty($r['email']) )
+ − 1919 $db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
+ − 1920
370
+ − 1921 $aklink = makeUrlComplete('Special', 'ActivateAccount/'.str_replace(' ', '_', $u).'/'. ( ( is_string($actkey) ) ? $actkey : $r['activation_key'] ) );
+ − 1922 $message = $lang->get('user_reg_activation_email', array(
+ − 1923 'activation_link' => $aklink,
+ − 1924 'admin_user' => $admin_user,
+ − 1925 'username' => $u
+ − 1926 ));
+ − 1927
1
+ − 1928 if(getConfig('smtp_enabled') == '1')
+ − 1929 {
370
+ − 1930 $result = smtp_send_email($r['email'], $lang->get('user_reg_activation_email_subject'), preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
1
+ − 1931 if($result == 'success') $result = true;
+ − 1932 else { echo $result; $result = false; }
+ − 1933 } else {
370
+ − 1934 $result = mail($r['email'], $lang->get('user_reg_activation_email_subject'), preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
1
+ − 1935 }
+ − 1936 return $result;
+ − 1937 }
+ − 1938
+ − 1939 /**
30
+ − 1940 * Attempts to send an e-mail to the specified user's e-mail address on file intended for the parents
+ − 1941 * @param string $u The usernamd of the user requesting activation
+ − 1942 * @return bool true on success, false on failure
+ − 1943 */
+ − 1944
+ − 1945 function send_coppa_mail($u, $actkey = false)
+ − 1946 {
+ − 1947 global $db, $session, $paths, $template, $plugins; // Common objects
370
+ − 1948 global $lang;
30
+ − 1949
+ − 1950 $q = $this->sql('SELECT username,email FROM '.table_prefix.'users WHERE user_id=2 OR user_level=' . USER_LEVEL_ADMIN . ' ORDER BY user_id ASC;');
+ − 1951 $un = $db->fetchrow();
+ − 1952 $admin_user = $un['username'];
+ − 1953
+ − 1954 $q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
+ − 1955 $r = $db->fetchrow();
+ − 1956 if ( empty($r['email']) )
+ − 1957 $db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
+ − 1958
+ − 1959 if(isset($_SERVER['HTTPS'])) $prot = 'https';
+ − 1960 else $prot = 'http';
+ − 1961 if($_SERVER['SERVER_PORT'] == '80') $p = '';
+ − 1962 else $p = ':'.$_SERVER['SERVER_PORT'];
+ − 1963 $sidbak = false;
+ − 1964 if($this->sid_super)
+ − 1965 $sidbak = $this->sid_super;
+ − 1966 $this->sid_super = false;
+ − 1967 if($sidbak)
+ − 1968 $this->sid_super = $sidbak;
+ − 1969 unset($sidbak);
+ − 1970 $link = "$prot://".$_SERVER['HTTP_HOST'].scriptPath;
+ − 1971
370
+ − 1972 $message = $lang->get(
+ − 1973 'user_reg_activation_email_coppa',
+ − 1974 array(
+ − 1975 'username' => $u,
+ − 1976 'admin_user' => $admin_user,
+ − 1977 'site_link' => $link
+ − 1978 )
+ − 1979 );
30
+ − 1980
+ − 1981
+ − 1982 if(getConfig('smtp_enabled') == '1')
+ − 1983 {
+ − 1984 $result = smtp_send_email($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
+ − 1985 if($result == 'success')
+ − 1986 {
+ − 1987 $result = true;
+ − 1988 }
+ − 1989 else
+ − 1990 {
+ − 1991 echo $result;
+ − 1992 $result = false;
+ − 1993 }
+ − 1994 }
+ − 1995 else
+ − 1996 {
+ − 1997 $result = mail($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
+ − 1998 }
+ − 1999 return $result;
+ − 2000 }
+ − 2001
+ − 2002 /**
1
+ − 2003 * Sends an e-mail to a user so they can reset their password.
+ − 2004 * @param int $user The user ID, or username if it's a string
+ − 2005 * @return bool true on success, false on failure
+ − 2006 */
+ − 2007
+ − 2008 function mail_password_reset($user)
+ − 2009 {
+ − 2010 global $db, $session, $paths, $template, $plugins; // Common objects
335
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2011 global $lang;
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2012
1
+ − 2013 if(is_int($user))
+ − 2014 {
+ − 2015 $q = $this->sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE user_id='.$user.';'); // This is SAFE! This is only called if $user is an integer
+ − 2016 }
+ − 2017 elseif(is_string($user))
+ − 2018 {
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 2019 $q = $this->sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=' . ENANO_SQLFUNC_LOWERCASE . '(\''.$db->escape($user).'\');');
1
+ − 2020 }
+ − 2021 else
+ − 2022 {
+ − 2023 return false;
+ − 2024 }
+ − 2025
+ − 2026 $row = $db->fetchrow();
+ − 2027 $temp_pass = $this->random_pass();
+ − 2028
+ − 2029 $this->register_temp_password($row['user_id'], $temp_pass);
+ − 2030
+ − 2031 $site_name = getConfig('site_name');
335
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2032
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2033 $message = $lang->get('userfuncs_passreset_email', array(
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2034 'username' => $row['username'],
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2035 'site_name' => $site_name,
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2036 'remote_addr' => $_SERVER['REMOTE_ADDR'],
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2037 'temp_pass' => $temp_pass
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2038 ));
1
+ − 2039
+ − 2040 if(getConfig('smtp_enabled') == '1')
+ − 2041 {
+ − 2042 $result = smtp_send_email($row['email'], getConfig('site_name').' password reset', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
+ − 2043 if($result == 'success')
+ − 2044 {
+ − 2045 $result = true;
+ − 2046 }
+ − 2047 else
+ − 2048 {
+ − 2049 echo '<p>'.$result.'</p>';
+ − 2050 $result = false;
+ − 2051 }
+ − 2052 } else {
+ − 2053 $result = mail($row['email'], getConfig('site_name').' password reset', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
+ − 2054 }
+ − 2055 return $result;
+ − 2056 }
+ − 2057
+ − 2058 /**
+ − 2059 * Sets the temporary password for the specified user to whatever is specified.
+ − 2060 * @param int $user_id
+ − 2061 * @param string $password
+ − 2062 * @return bool
+ − 2063 */
+ − 2064
+ − 2065 function register_temp_password($user_id, $password)
+ − 2066 {
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2067 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 2068 $temp_pass = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 2069 $this->sql('UPDATE '.table_prefix.'users SET temp_password=\'' . $temp_pass . '\',temp_password_time='.time().' WHERE user_id='.intval($user_id).';');
+ − 2070 }
+ − 2071
+ − 2072 /**
+ − 2073 * Sends a request to the admin panel to have the username $u activated.
+ − 2074 * @param string $u The username of the user requesting activation
+ − 2075 */
+ − 2076
+ − 2077 function admin_activation_request($u)
+ − 2078 {
+ − 2079 global $db;
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2080 $this->sql('INSERT INTO '.table_prefix.'logs(log_type, action, time_id, date_string, author, edit_summary) VALUES(\'admin\', \'activ_req\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$this->username.'\', \''.$db->escape($u).'\');');
1
+ − 2081 }
+ − 2082
+ − 2083 /**
+ − 2084 * Activates a user account. If the action fails, a report is sent to the admin.
+ − 2085 * @param string $user The username of the user requesting activation
+ − 2086 * @param string $key The activation key
+ − 2087 */
+ − 2088
+ − 2089 function activate_account($user, $key)
+ − 2090 {
+ − 2091 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2092 $this->sql('UPDATE '.table_prefix.'users SET account_active=1 WHERE username=\''.$db->escape($user).'\' AND activation_key=\''.$db->escape($key).'\';');
+ − 2093 $r = mysql_affected_rows();
+ − 2094 if ( $r > 0 )
+ − 2095 {
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2096 $e = $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'activ_good\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($user).'\', \''.$_SERVER['REMOTE_ADDR'].'\')');
1
+ − 2097 }
+ − 2098 else
+ − 2099 {
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2100 $e = $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'activ_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($user).'\', \''.$_SERVER['REMOTE_ADDR'].'\')');
1
+ − 2101 }
+ − 2102 return $r;
+ − 2103 }
+ − 2104
+ − 2105 /**
+ − 2106 * For a given user level identifier (USER_LEVEL_*), returns a string describing that user level.
+ − 2107 * @param int User level
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2108 * @param bool If true, returns a shorter string. Optional.
1
+ − 2109 * @return string
+ − 2110 */
+ − 2111
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2112 function userlevel_to_string($user_level, $short = false)
1
+ − 2113 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2114 global $lang;
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2115
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2116 static $levels = array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2117 'short' => array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2118 USER_LEVEL_GUEST => 'Guest',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2119 USER_LEVEL_MEMBER => 'Member',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2120 USER_LEVEL_CHPREF => 'Sensitive preferences changeable',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2121 USER_LEVEL_MOD => 'Moderator',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2122 USER_LEVEL_ADMIN => 'Administrative'
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2123 ),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2124 'long' => array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2125 USER_LEVEL_GUEST => 'Low - guest privileges',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2126 USER_LEVEL_MEMBER => 'Standard - normal member level',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2127 USER_LEVEL_CHPREF => 'Medium - user can change his/her own e-mail address and password',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2128 USER_LEVEL_MOD => 'High - moderator privileges',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2129 USER_LEVEL_ADMIN => 'Highest - administrative privileges'
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2130 ),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2131 'l10n' => false
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2132 );
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2133
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2134 if ( is_object($lang) && !$levels['l10n'] )
1
+ − 2135 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2136 $levels = array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2137 'short' => array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2138 USER_LEVEL_GUEST => $lang->get('user_level_short_guest'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2139 USER_LEVEL_MEMBER => $lang->get('user_level_short_member'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2140 USER_LEVEL_CHPREF => $lang->get('user_level_short_chpref'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2141 USER_LEVEL_MOD => $lang->get('user_level_short_mod'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2142 USER_LEVEL_ADMIN => $lang->get('user_level_short_admin')
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2143 ),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2144 'long' => array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2145 USER_LEVEL_GUEST => $lang->get('user_level_long_guest'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2146 USER_LEVEL_MEMBER => $lang->get('user_level_long_member'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2147 USER_LEVEL_CHPREF => $lang->get('user_level_long_chpref'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2148 USER_LEVEL_MOD => $lang->get('user_level_long_mod'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2149 USER_LEVEL_ADMIN => $lang->get('user_level_long_admin')
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2150 ),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2151 'l10n' => true
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2152 );
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2153 }
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2154
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2155 $key = ( $short ) ? 'short' : 'long';
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2156 if ( isset($levels[$key][$user_level]) )
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2157 {
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2158 return $levels[$key][$user_level];
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2159 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2160 else
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2161 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2162 if ( $short )
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2163 {
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2164 return ( is_object($lang) ) ? $lang->get('user_level_short_unknown', array('user_level' => $user_level)) : "Unknown - $user_level";
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2165 }
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2166 else
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2167 {
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2168 return ( is_object($lang) ) ? $lang->get('user_level_long_unknown', array('user_level' => $user_level)) : "Unknown level ($user_level)";
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2169 }
1
+ − 2170 }
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2171
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2172 return 'Linux rocks!';
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2173
1
+ − 2174 }
+ − 2175
+ − 2176 /**
+ − 2177 * Updates a user's information in the database. Note that any of the values except $user_id can be false if you want to preserve the old values.
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2178 * Not localized because this really isn't used a whole lot anymore.
1
+ − 2179 * @param int $user_id The user ID of the user to update - this cannot be changed
+ − 2180 * @param string $username The new username
+ − 2181 * @param string $old_pass The current password - only required if sessionManager::$user_level < USER_LEVEL_ADMIN. This should usually be an UNENCRYPTED string. This can also be an array - if it is, key 0 is treated as data AES-encrypted with key 1
+ − 2182 * @param string $password The new password
+ − 2183 * @param string $email The new e-mail address
+ − 2184 * @param string $realname The new real name
+ − 2185 * @param string $signature The updated forum/comment signature
+ − 2186 * @param int $user_level The updated user level
+ − 2187 * @return string 'success' if successful, or array of error strings on failure
+ − 2188 */
+ − 2189
+ − 2190 function update_user($user_id, $username = false, $old_pass = false, $password = false, $email = false, $realname = false, $signature = false, $user_level = false)
+ − 2191 {
+ − 2192 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2193
+ − 2194 // Create some arrays
+ − 2195
+ − 2196 $errors = Array(); // Used to hold error strings
+ − 2197 $strs = Array(); // Sub-query statements
+ − 2198
+ − 2199 // Scan the user ID for problems
+ − 2200 if(intval($user_id) < 1) $errors[] = 'SQL injection attempt';
+ − 2201
+ − 2202 // Instanciate the AES encryption class
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2203 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 2204
+ − 2205 // If all of our input vars are false, then we've effectively done our job so get out of here
+ − 2206 if($username === false && $password === false && $email === false && $realname === false && $signature === false && $user_level === false)
+ − 2207 {
+ − 2208 // echo 'debug: $session->update_user(): success (no changes requested)';
+ − 2209 return 'success';
+ − 2210 }
+ − 2211
+ − 2212 // Initialize our authentication check
+ − 2213 $authed = false;
+ − 2214
+ − 2215 // Verify the inputted password
+ − 2216 if(is_string($old_pass))
+ − 2217 {
+ − 2218 $q = $this->sql('SELECT password FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 2219 if($db->numrows() < 1)
+ − 2220 {
+ − 2221 $errors[] = 'The password data could not be selected for verification.';
+ − 2222 }
+ − 2223 else
+ − 2224 {
+ − 2225 $row = $db->fetchrow();
+ − 2226 $real = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 2227 if($real == $old_pass)
+ − 2228 $authed = true;
+ − 2229 }
+ − 2230 }
+ − 2231
+ − 2232 elseif(is_array($old_pass))
+ − 2233 {
+ − 2234 $old_pass = $aes->decrypt($old_pass[0], $old_pass[1]);
+ − 2235 $q = $this->sql('SELECT password FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 2236 if($db->numrows() < 1)
+ − 2237 {
+ − 2238 $errors[] = 'The password data could not be selected for verification.';
+ − 2239 }
+ − 2240 else
+ − 2241 {
+ − 2242 $row = $db->fetchrow();
+ − 2243 $real = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 2244 if($real == $old_pass)
+ − 2245 $authed = true;
+ − 2246 }
+ − 2247 }
+ − 2248
+ − 2249 // Initialize our query
+ − 2250 $q = 'UPDATE '.table_prefix.'users SET ';
+ − 2251
+ − 2252 if($this->auth_level >= USER_LEVEL_ADMIN || $authed) // Need the current password in order to update the e-mail address, change the username, or reset the password
+ − 2253 {
+ − 2254 // Username
+ − 2255 if(is_string($username))
+ − 2256 {
+ − 2257 // Check the username for problems
+ − 2258 if(!preg_match('#^'.$this->valid_username.'$#', $username))
+ − 2259 $errors[] = 'The username you entered contains invalid characters.';
+ − 2260 $strs[] = 'username=\''.$db->escape($username).'\'';
+ − 2261 }
+ − 2262 // Password
+ − 2263 if(is_string($password) && strlen($password) >= 6)
+ − 2264 {
+ − 2265 // Password needs to be encrypted before being stashed
+ − 2266 $encpass = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 2267 if(!$encpass)
+ − 2268 $errors[] = 'The password could not be encrypted due to an internal error.';
+ − 2269 $strs[] = 'password=\''.$encpass.'\'';
+ − 2270 }
+ − 2271 // E-mail addy
+ − 2272 if(is_string($email))
+ − 2273 {
504
bc8e0e9ee01d
Added support for embedding language data into plugins; updated all version numbers on plugin files
Dan
diff
changeset
+ − 2274 if(!check_email_address($email))
1
+ − 2275 $errors[] = 'The e-mail address you entered is invalid.';
+ − 2276 $strs[] = 'email=\''.$db->escape($email).'\'';
+ − 2277 }
+ − 2278 }
+ − 2279 // Real name
+ − 2280 if(is_string($realname))
+ − 2281 {
+ − 2282 $strs[] = 'real_name=\''.$db->escape($realname).'\'';
+ − 2283 }
+ − 2284 // Forum/comment signature
+ − 2285 if(is_string($signature))
+ − 2286 {
+ − 2287 $strs[] = 'signature=\''.$db->escape($signature).'\'';
+ − 2288 }
+ − 2289 // User level
+ − 2290 if(is_int($user_level))
+ − 2291 {
+ − 2292 $strs[] = 'user_level='.$user_level;
+ − 2293 }
+ − 2294
+ − 2295 // Add our generated query to the query string
+ − 2296 $q .= implode(',', $strs);
+ − 2297
+ − 2298 // One last error check
+ − 2299 if(sizeof($strs) < 1) $errors[] = 'An internal error occured building the SQL query, this is a bug';
+ − 2300 if(sizeof($errors) > 0) return $errors;
+ − 2301
+ − 2302 // Free our temp arrays
+ − 2303 unset($strs, $errors);
+ − 2304
+ − 2305 // Finalize the query and run it
+ − 2306 $q .= ' WHERE user_id='.$user_id.';';
+ − 2307 $this->sql($q);
+ − 2308
+ − 2309 // We also need to trigger re-activation.
+ − 2310 if ( is_string($email) )
+ − 2311 {
+ − 2312 switch(getConfig('account_activation'))
+ − 2313 {
+ − 2314 case 'user':
+ − 2315 case 'admin':
+ − 2316
+ − 2317 if ( $session->user_level >= USER_LEVEL_MOD && getConfig('account_activation') == 'admin' )
+ − 2318 // Don't require re-activation by admins for admins
+ − 2319 break;
+ − 2320
+ − 2321 // retrieve username
+ − 2322 if ( !$username )
+ − 2323 {
+ − 2324 $q = $this->sql('SELECT username FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 2325 if($db->numrows() < 1)
+ − 2326 {
+ − 2327 $errors[] = 'The username could not be selected.';
+ − 2328 }
+ − 2329 else
+ − 2330 {
+ − 2331 $row = $db->fetchrow();
+ − 2332 $username = $row['username'];
+ − 2333 }
+ − 2334 }
+ − 2335 if ( !$username )
+ − 2336 return $errors;
+ − 2337
+ − 2338 // Generate a totally random activation key
+ − 2339 $actkey = sha1 ( microtime() . mt_rand() );
+ − 2340 $a = $this->send_activation_mail($username, $actkey);
+ − 2341 if(!$a)
+ − 2342 {
+ − 2343 $this->admin_activation_request($username);
+ − 2344 }
+ − 2345 // Deactivate the account until e-mail is confirmed
+ − 2346 $q = $db->sql_query('UPDATE '.table_prefix.'users SET account_active=0,activation_key=\'' . $actkey . '\' WHERE user_id=' . $user_id . ';');
+ − 2347 break;
+ − 2348 }
+ − 2349 }
+ − 2350
+ − 2351 // Yay! We're done
+ − 2352 return 'success';
+ − 2353 }
+ − 2354
+ − 2355 #
+ − 2356 # Access Control Lists
+ − 2357 #
+ − 2358
+ − 2359 /**
+ − 2360 * Creates a new permission field in memory. If the permissions are set in the database, they are used. Otherwise, $default_perm is used.
+ − 2361 * @param string $acl_type An identifier for this field
+ − 2362 * @param int $default_perm Whether permission should be granted or not if it's not specified in the ACLs.
+ − 2363 * @param string $desc A human readable name for the permission type
+ − 2364 * @param array $deps The list of dependencies - this should be an array of ACL types
+ − 2365 * @param string $scope Which namespaces this field should apply to. This should be either a pipe-delimited list of namespace IDs or just "All".
+ − 2366 */
+ − 2367
+ − 2368 function register_acl_type($acl_type, $default_perm = AUTH_DISALLOW, $desc = false, $deps = Array(), $scope = 'All')
+ − 2369 {
+ − 2370 if(isset($this->acl_types[$acl_type]))
+ − 2371 return false;
+ − 2372 else
+ − 2373 {
+ − 2374 if(!$desc)
+ − 2375 {
+ − 2376 $desc = capitalize_first_letter(str_replace('_', ' ', $acl_type));
+ − 2377 }
+ − 2378 $this->acl_types[$acl_type] = $default_perm;
+ − 2379 $this->acl_descs[$acl_type] = $desc;
+ − 2380 $this->acl_deps[$acl_type] = $deps;
+ − 2381 $this->acl_scope[$acl_type] = explode('|', $scope);
+ − 2382 }
+ − 2383 return true;
+ − 2384 }
+ − 2385
+ − 2386 /**
+ − 2387 * Tells us whether permission $type is allowed or not based on the current rules.
+ − 2388 * @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
+ − 2389 * @param bool $no_deps If true, disables dependency checking
+ − 2390 * @return bool True if allowed, false if denied or if an error occured
+ − 2391 */
+ − 2392
+ − 2393 function get_permissions($type, $no_deps = false)
+ − 2394 {
+ − 2395 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2396 if ( isset( $this->perms[$type] ) )
+ − 2397 {
+ − 2398 if ( $this->perms[$type] == AUTH_DENY )
+ − 2399 $ret = false;
+ − 2400 else if ( $this->perms[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 2401 $ret = true;
+ − 2402 else if ( $this->perms[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 2403 $ret = false;
+ − 2404 else if ( $this->perms[$type] == AUTH_ALLOW )
+ − 2405 $ret = true;
+ − 2406 else if ( $this->perms[$type] == AUTH_DISALLOW )
+ − 2407 $ret = false;
+ − 2408 }
+ − 2409 else if(isset($this->acl_types[$type]))
+ − 2410 {
+ − 2411 if ( $this->acl_types[$type] == AUTH_DENY )
+ − 2412 $ret = false;
+ − 2413 else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 2414 $ret = true;
+ − 2415 else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 2416 $ret = false;
+ − 2417 else if ( $this->acl_types[$type] == AUTH_ALLOW )
+ − 2418 $ret = true;
+ − 2419 else if ( $this->acl_types[$type] == AUTH_DISALLOW )
+ − 2420 $ret = false;
+ − 2421 }
+ − 2422 else
+ − 2423 {
+ − 2424 // ACL type is undefined
+ − 2425 trigger_error('Unknown access type "' . $type . '"', E_USER_WARNING);
+ − 2426 return false; // Be on the safe side and deny access
+ − 2427 }
+ − 2428 if ( !$no_deps )
+ − 2429 {
+ − 2430 if ( !$this->acl_check_deps($type) )
+ − 2431 return false;
+ − 2432 }
+ − 2433 return $ret;
+ − 2434 }
+ − 2435
+ − 2436 /**
+ − 2437 * Fetch the permissions that apply to the current user for the page specified. The object you get will have the get_permissions method
+ − 2438 * and several other abilities.
+ − 2439 * @param string $page_id
+ − 2440 * @param string $namespace
+ − 2441 * @return object
+ − 2442 */
+ − 2443
+ − 2444 function fetch_page_acl($page_id, $namespace)
+ − 2445 {
+ − 2446 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2447
+ − 2448 if ( count ( $this->acl_base_cache ) < 1 )
+ − 2449 {
+ − 2450 // Permissions table not yet initialized
+ − 2451 return false;
+ − 2452 }
+ − 2453
156
+ − 2454 // cache of permission objects (to save RAM and SQL queries)
+ − 2455 static $objcache = array();
+ − 2456
+ − 2457 if ( count($objcache) == 0 )
+ − 2458 {
+ − 2459 foreach ( $paths->nslist as $key => $_ )
+ − 2460 {
+ − 2461 $objcache[$key] = array();
+ − 2462 }
+ − 2463 }
+ − 2464
+ − 2465 if ( isset($objcache[$namespace][$page_id]) )
+ − 2466 {
+ − 2467 return $objcache[$namespace][$page_id];
+ − 2468 }
+ − 2469
1
+ − 2470 //if ( !isset( $paths->pages[$paths->nslist[$namespace] . $page_id] ) )
+ − 2471 //{
+ − 2472 // // Page does not exist
+ − 2473 // return false;
+ − 2474 //}
+ − 2475
156
+ − 2476 $objcache[$namespace][$page_id] = new Session_ACLPageInfo( $page_id, $namespace, $this->acl_types, $this->acl_descs, $this->acl_deps, $this->acl_base_cache );
+ − 2477 $object =& $objcache[$namespace][$page_id];
1
+ − 2478
+ − 2479 return $object;
+ − 2480
+ − 2481 }
+ − 2482
+ − 2483 /**
+ − 2484 * Read all of our permissions from the database and process/apply them. This should be called after the page is determined.
+ − 2485 * @access private
+ − 2486 */
+ − 2487
+ − 2488 function init_permissions()
+ − 2489 {
+ − 2490 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2491 // Initialize the permissions list with some defaults
+ − 2492 $this->perms = $this->acl_types;
+ − 2493 $this->acl_defaults_used = $this->perms;
+ − 2494
+ − 2495 // Fetch sitewide defaults from the permissions table
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2496 $bs = 'SELECT rules, target_type, target_id FROM '.table_prefix.'acl' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2497 . ' WHERE page_id IS NULL AND namespace IS NULL AND' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2498 . ' ( ';
1
+ − 2499
+ − 2500 $q = Array();
+ − 2501 $q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
+ − 2502 if(count($this->groups) > 0)
+ − 2503 {
+ − 2504 foreach($this->groups as $g_id => $g_name)
+ − 2505 {
+ − 2506 $q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 2507 }
+ − 2508 }
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2509 $bs .= implode(" OR \n ", $q) . " ) \n ORDER BY target_type ASC, target_id ASC;";
1
+ − 2510 $q = $this->sql($bs);
+ − 2511 if ( $row = $db->fetchrow() )
+ − 2512 {
+ − 2513 do {
+ − 2514 $rules = $this->string_to_perm($row['rules']);
+ − 2515 $is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
+ − 2516 $this->acl_merge_with_current($rules, $is_everyone);
+ − 2517 } while ( $row = $db->fetchrow() );
+ − 2518 }
+ − 2519
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2520 // Cache the sitewide permissions for later use
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2521 $this->acl_base_cache = $this->perms;
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2522
1
+ − 2523 // Eliminate types that don't apply to this namespace
+ − 2524 foreach ( $this->perms AS $i => $perm )
+ − 2525 {
+ − 2526 if ( !in_array ( $paths->namespace, $this->acl_scope[$i] ) && !in_array('All', $this->acl_scope[$i]) )
+ − 2527 {
+ − 2528 unset($this->perms[$i]);
+ − 2529 }
+ − 2530 }
+ − 2531
73
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2532 // PAGE group info
322
+ − 2533 $pg_list = $paths->get_page_groups($paths->page_id, $paths->namespace);
73
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2534 $pg_info = '';
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2535 foreach ( $pg_list as $g_id )
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2536 {
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2537 $pg_info .= ' ( page_id=\'' . $g_id . '\' AND namespace=\'__PageGroup\' ) OR';
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2538 }
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 2539
1
+ − 2540 // Build a query to grab ACL info
+ − 2541 $bs = 'SELECT rules,target_type,target_id FROM '.table_prefix.'acl WHERE ( ';
+ − 2542 $q = Array();
+ − 2543 $q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
+ − 2544 if(count($this->groups) > 0)
+ − 2545 {
+ − 2546 foreach($this->groups as $g_id => $g_name)
+ − 2547 {
+ − 2548 $q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 2549 }
+ − 2550 }
+ − 2551 // The reason we're using an ORDER BY statement here is because ACL_TYPE_GROUP is less than ACL_TYPE_USER, causing the user's individual
+ − 2552 // permissions to override group permissions.
322
+ − 2553 $bs .= implode(" OR\n ", $q) . " )\n AND (" . $pg_info . ' ( page_id=\''.$db->escape($paths->page_id).'\' AND namespace=\''.$db->escape($paths->namespace).'\' ) )
1
+ − 2554 ORDER BY target_type ASC, page_id ASC, namespace ASC;';
+ − 2555 $q = $this->sql($bs);
+ − 2556 if ( $row = $db->fetchrow() )
+ − 2557 {
+ − 2558 do {
+ − 2559 $rules = $this->string_to_perm($row['rules']);
+ − 2560 $is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
+ − 2561 $this->acl_merge_with_current($rules, $is_everyone);
+ − 2562 } while ( $row = $db->fetchrow() );
+ − 2563 }
+ − 2564
+ − 2565 }
+ − 2566
+ − 2567 /**
+ − 2568 * Extends the scope of a permission type.
+ − 2569 * @param string The name of the permission type
+ − 2570 * @param string The namespace(s) that should be covered. This can be either one namespace ID or a pipe-delimited list.
+ − 2571 * @param object Optional - the current $paths object, in case we're doing this from the acl_rule_init hook
+ − 2572 */
+ − 2573
+ − 2574 function acl_extend_scope($perm_type, $namespaces, &$p_in)
+ − 2575 {
+ − 2576 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2577 $p_obj = ( is_object($p_in) ) ? $p_in : $paths;
+ − 2578 $nslist = explode('|', $namespaces);
+ − 2579 foreach ( $nslist as $i => $ns )
+ − 2580 {
+ − 2581 if ( !isset($p_obj->nslist[$ns]) )
+ − 2582 {
+ − 2583 unset($nslist[$i]);
+ − 2584 }
+ − 2585 else
+ − 2586 {
+ − 2587 $this->acl_scope[$perm_type][] = $ns;
+ − 2588 if ( isset($this->acl_types[$perm_type]) && !isset($this->perms[$perm_type]) )
+ − 2589 {
+ − 2590 $this->perms[$perm_type] = $this->acl_types[$perm_type];
+ − 2591 }
+ − 2592 }
+ − 2593 }
+ − 2594 }
+ − 2595
+ − 2596 /**
+ − 2597 * Converts a permissions field into a string for database insertion. Similar in spirit to serialize().
+ − 2598 * @param array $perms An associative array with only integers as values
+ − 2599 * @return string
+ − 2600 */
+ − 2601
+ − 2602 function perm_to_string($perms)
+ − 2603 {
+ − 2604 $s = '';
+ − 2605 foreach($perms as $perm => $ac)
+ − 2606 {
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2607 if ( $ac == 'i' )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2608 continue;
1
+ − 2609 $s .= "$perm=$ac;";
+ − 2610 }
+ − 2611 return $s;
+ − 2612 }
+ − 2613
+ − 2614 /**
+ − 2615 * Converts a permissions string back to an array.
+ − 2616 * @param string $perms The result from sessionManager::perm_to_string()
+ − 2617 * @return array
+ − 2618 */
+ − 2619
+ − 2620 function string_to_perm($perms)
+ − 2621 {
+ − 2622 $ret = Array();
+ − 2623 preg_match_all('#([a-z0-9_-]+)=([0-9]+);#i', $perms, $matches);
+ − 2624 foreach($matches[1] as $i => $t)
+ − 2625 {
+ − 2626 $ret[$t] = intval($matches[2][$i]);
+ − 2627 }
+ − 2628 return $ret;
+ − 2629 }
+ − 2630
+ − 2631 /**
+ − 2632 * Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence over the first, but AUTH_DENY always prevails.
+ − 2633 * @param array $perm1 The first set of permissions
+ − 2634 * @param array $perm2 The second set of permissions
+ − 2635 * @return array
+ − 2636 */
+ − 2637
+ − 2638 function acl_merge($perm1, $perm2)
+ − 2639 {
+ − 2640 $ret = $perm1;
+ − 2641 foreach ( $perm2 as $type => $level )
+ − 2642 {
+ − 2643 if ( isset( $ret[$type] ) )
+ − 2644 {
+ − 2645 if ( $ret[$type] != AUTH_DENY )
+ − 2646 $ret[$type] = $level;
+ − 2647 }
+ − 2648 // else
+ − 2649 // {
+ − 2650 // $ret[$type] = $level;
+ − 2651 // }
+ − 2652 }
+ − 2653 return $ret;
+ − 2654 }
+ − 2655
+ − 2656 /**
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2657 * Merges two ACL arrays, but instead of calculating inheritance for missing permission types, just returns 'i' for that type. Useful
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2658 * for explicitly requiring inheritance in ACL editing interfaces
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2659 * @param array $perm1 The first set of permissions
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2660 * @param array $perm2 The second, authoritative set of permissions
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2661 */
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2662
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2663 function acl_merge_inherit($perm1, $perm2)
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2664 {
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2665 foreach ( $perm1 as $type => $level )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2666 {
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2667 $perm1[$type][$level] = 'i';
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2668 }
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2669 $ret = $perm1;
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2670 foreach ( $perm2 as $type => $level )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2671 {
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2672 if ( isset( $ret[$type] ) )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2673 {
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2674 if ( $ret[$type] != AUTH_DENY )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2675 $ret[$type] = $level;
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2676 }
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2677 }
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2678 return $ret;
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2679 }
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2680
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2681 /**
1
+ − 2682 * Merges the ACL array sent with the current permissions table, deciding precedence based on whether defaults are in effect or not.
+ − 2683 * @param array The array to merge into the master ACL list
+ − 2684 * @param bool If true, $perm is treated as the "new default"
+ − 2685 * @param int 1 if this is a site-wide ACL, 2 if page-specific. Defaults to 2.
+ − 2686 */
+ − 2687
+ − 2688 function acl_merge_with_current($perm, $is_everyone = false, $scope = 2)
+ − 2689 {
+ − 2690 foreach ( $this->perms as $i => $p )
+ − 2691 {
+ − 2692 if ( isset($perm[$i]) )
+ − 2693 {
+ − 2694 if ( $is_everyone && !$this->acl_defaults_used[$i] )
+ − 2695 continue;
+ − 2696 // Decide precedence
+ − 2697 if ( isset($this->acl_defaults_used[$i]) )
+ − 2698 {
511
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2699 // echo "$i: default in use, overriding to: {$perm[$i]}<br />";
1
+ − 2700 // Defaults are in use, override
511
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2701
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2702 // CHANGED - 1.1.4:
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2703 // For some time this has been intentionally relaxed so that the following
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2704 // exception is available to Deny permissions:
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2705 // If the rule applies to the group "Everyone" on the entire site,
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2706 // Deny settings could be overriden.
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2707 // This is documented at: http://docs.enanocms.org/Help:4.2
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2708 if ( $this->perms[$i] != AUTH_DENY )
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2709 {
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2710 $this->perms[$i] = $perm[$i];
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2711 $this->acl_defaults_used[$i] = ( $is_everyone );
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2712 }
1
+ − 2713 }
+ − 2714 else
+ − 2715 {
511
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2716 // echo "$i: default NOT in use";
1
+ − 2717 // Defaults are not in use, merge as normal
+ − 2718 if ( $this->perms[$i] != AUTH_DENY )
+ − 2719 {
511
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2720 // echo ", but overriding";
1
+ − 2721 $this->perms[$i] = $perm[$i];
+ − 2722 }
511
f88c8c79d784
Made some improvements to ACL system including: warning on setting Deny for Everyone on the entire site, added ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL, and changed behavior as noted in the docs so that Deny for Everyone is no longer able to be overridden
Dan
diff
changeset
+ − 2723 // echo "<br />";
1
+ − 2724 }
+ − 2725 }
+ − 2726 }
+ − 2727 }
+ − 2728
+ − 2729 /**
+ − 2730 * Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence
+ − 2731 * over the first, without exceptions. This is used to merge the hardcoded defaults with admin-specified
+ − 2732 * defaults, which take precedence.
+ − 2733 * @param array $perm1 The first set of permissions
+ − 2734 * @param array $perm2 The second set of permissions
+ − 2735 * @return array
+ − 2736 */
+ − 2737
+ − 2738 function acl_merge_complete($perm1, $perm2)
+ − 2739 {
+ − 2740 $ret = $perm1;
+ − 2741 foreach ( $perm2 as $type => $level )
+ − 2742 {
+ − 2743 $ret[$type] = $level;
+ − 2744 }
+ − 2745 return $ret;
+ − 2746 }
+ − 2747
+ − 2748 /**
+ − 2749 * Tell us if the dependencies for a given permission are met.
+ − 2750 * @param string The ACL permission ID
+ − 2751 * @return bool
+ − 2752 */
+ − 2753
+ − 2754 function acl_check_deps($type)
+ − 2755 {
+ − 2756 if(!isset($this->acl_deps[$type])) // This will only happen if the permissions table is hacked or improperly accessed
+ − 2757 return true;
+ − 2758 if(sizeof($this->acl_deps[$type]) < 1)
+ − 2759 return true;
+ − 2760 $deps = $this->acl_deps[$type];
+ − 2761 while(true)
+ − 2762 {
+ − 2763 $full_resolved = true;
+ − 2764 $j = sizeof($deps);
+ − 2765 for ( $i = 0; $i < $j; $i++ )
+ − 2766 {
+ − 2767 $b = $deps;
+ − 2768 $deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
+ − 2769 if( $b == $deps )
+ − 2770 {
+ − 2771 break 2;
+ − 2772 }
+ − 2773 $j = sizeof($deps);
+ − 2774 }
+ − 2775 }
+ − 2776 //die('<pre>'.print_r($deps, true).'</pre>');
+ − 2777 foreach($deps as $d)
+ − 2778 {
+ − 2779 if ( !$this->get_permissions($d) )
+ − 2780 {
+ − 2781 return false;
+ − 2782 }
+ − 2783 }
+ − 2784 return true;
+ − 2785 }
+ − 2786
+ − 2787 /**
+ − 2788 * Makes a CAPTCHA code and caches the code in the database
+ − 2789 * @param int $len The length of the code, in bytes
402
+ − 2790 * @param string Optional, the hash to reuse
1
+ − 2791 * @return string A unique identifier assigned to the code. This hash should be passed to sessionManager::getCaptcha() to retrieve the code.
+ − 2792 */
+ − 2793
402
+ − 2794 function make_captcha($len = 7, $hash = '')
1
+ − 2795 {
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2796 global $db, $session, $paths, $template, $plugins; // Common objects
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2797 $code = $this->generate_captcha_code($len);
402
+ − 2798 if ( !preg_match('/^[a-f0-9]{32}([a-z0-9]{8})?$/', $hash) )
+ − 2799 $hash = md5(microtime() . mt_rand());
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2800 $session_data = $db->escape(serialize(array()));
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2801
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2802 // sanity check
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2803 if ( !is_valid_ip(@$_SERVER['REMOTE_ADDR']) || !is_int($this->user_id) )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2804 return false;
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2805
402
+ − 2806 $this->sql('DELETE FROM ' . table_prefix . "captcha WHERE session_id = '$hash';");
+ − 2807 $this->sql('INSERT INTO ' . table_prefix . 'captcha(session_id, code, session_data, source_ip, user_id)' . " VALUES('$hash', '$code', '$session_data', '{$_SERVER['REMOTE_ADDR']}', {$this->user_id});");
1
+ − 2808 return $hash;
+ − 2809 }
+ − 2810
+ − 2811 /**
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2812 * Generates a "pronouncable" or "human-friendly" word using various phonics rules
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2813 * @param int Optional. The length of the word.
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2814 * @return string
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2815 */
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2816
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2817 function generate_captcha_code($len = 7)
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2818 {
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2819 // don't use k and x, they get mixed up a lot
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2820 $consonants = 'bcdfghmnpqrsvwyz';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2821 $vowels = 'aeiou';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2822 $prev = 'vowel';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2823 $prev_l = '';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2824 $word = '';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2825 $allow_next_vowel = true;
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2826 for ( $i = 0; $i < $len; $i++ )
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2827 {
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2828 if ( $prev == 'vowel' )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2829 {
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2830 $allow_next_vowel = false;
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2831 if ( $prev_l == 'o' && mt_rand(0, 3) == 3 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2832 $word .= 'i';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2833 else if ( $prev_l == 'q' && mt_rand(0, 3) != 1 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2834 $word .= 'u';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2835 else if ( $prev_l == 'o' && mt_rand(0, 3) == 2 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2836 $word .= 'u';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2837 else if ( $prev_l == 'a' && mt_rand(0, 3) == 3 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2838 $word .= 'i';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2839 else if ( $prev_l == 'a' && mt_rand(0, 10) == 7 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2840 $word .= 'o';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2841 else if ( $prev_l == 'a' && mt_rand(0, 7) == 2 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2842 $word .= 'u';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2843 else
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2844 {
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2845 $allow_next_vowel = true;
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2846 $word .= $consonants{mt_rand(0, (strlen($consonants)-1))};
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2847 }
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2848 }
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2849 else if ( $prev == 'consonant' )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2850 {
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2851 if ( $prev_l == 'p' && mt_rand(0, 7) == 4 )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2852 $word .= 't';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2853 else if ( $prev_l == 'p' && mt_rand(0, 5) == 1 )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2854 $word .= 'h';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2855 else
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2856 $word .= $vowels{mt_rand(0, (strlen($vowels)-1))};
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2857 }
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2858 $prev_l = substr($word, -1);
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2859 $l = ( mt_rand(0, 1) == 1 ) ? strtoupper($prev_l) : strtolower($prev_l);
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2860 $word = substr($word, 0, -1) . $l;
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2861 if ( strstr('aeiou', $prev_l) )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2862 $prev = 'vowel';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2863 else
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2864 $prev = 'consonant';
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2865 }
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2866 return $word;
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2867 }
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2868
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2869 /**
1
+ − 2870 * For the given code ID, returns the correct CAPTCHA code, or false on failure
+ − 2871 * @param string $hash The unique ID assigned to the code
+ − 2872 * @return string The correct confirmation code
+ − 2873 */
+ − 2874
+ − 2875 function get_captcha($hash)
+ − 2876 {
+ − 2877 global $db, $session, $paths, $template, $plugins; // Common objects
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2878
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2879 if ( !preg_match('/^[a-f0-9]{32}([a-z0-9]{8})?$/', $hash) )
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2880 {
436
+ − 2881 die("session manager: bad captcha_hash $hash");
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2882 return false;
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2883 }
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2884
402
+ − 2885 // sanity check
436
+ − 2886 if ( !is_valid_ip(@$_SERVER['REMOTE_ADDR']) )
+ − 2887 {
+ − 2888 die("session manager insanity: bad REMOTE_ADDR or invalid UID");
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2889 return false;
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2890 }
402
+ − 2891
436
+ − 2892 $q = $this->sql('SELECT code_id, code FROM ' . table_prefix . "captcha WHERE session_id = '$hash' AND source_ip = '{$_SERVER['REMOTE_ADDR']}';");
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2893 if ( $db->numrows() < 1 )
436
+ − 2894 {
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2895 return false;
436
+ − 2896 }
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2897
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2898 list($code_id, $code) = $db->fetchrow_num();
436
+ − 2899
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2900 $db->free_result();
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2901 $this->sql('DELETE FROM ' . table_prefix . "captcha WHERE code_id = $code_id;");
436
+ − 2902
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2903 return $code;
1
+ − 2904 }
+ − 2905
+ − 2906 /**
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2907 * (AS OF 1.0.2: Deprecated. Captcha codes are now killed on first fetch for security.) Deletes all CAPTCHA codes cached in the DB for this user.
1
+ − 2908 */
+ − 2909
+ − 2910 function kill_captcha()
+ − 2911 {
263
d57af0b0302e
Major improvements in the security of the CAPTCHA system (no SQL injection or anything like that); fixed denied form submission due to _af_acting on form object wrongly switched to true
Dan
diff
changeset
+ − 2912 return true;
1
+ − 2913 }
+ − 2914
+ − 2915 /**
+ − 2916 * Generates a random password.
+ − 2917 * @param int $length Optional - length of password
+ − 2918 * @return string
+ − 2919 */
+ − 2920
+ − 2921 function random_pass($length = 10)
+ − 2922 {
+ − 2923 $valid_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_+@#%&<>';
+ − 2924 $valid_chars = enano_str_split($valid_chars);
+ − 2925 $ret = '';
+ − 2926 for ( $i = 0; $i < $length; $i++ )
+ − 2927 {
+ − 2928 $ret .= $valid_chars[mt_rand(0, count($valid_chars)-1)];
+ − 2929 }
+ − 2930 return $ret;
+ − 2931 }
+ − 2932
+ − 2933 /**
+ − 2934 * Generates some Javascript that calls the AES encryption library.
+ − 2935 * @param string The name of the form
+ − 2936 * @param string The name of the password field
+ − 2937 * @param string The name of the field that switches encryption on or off
+ − 2938 * @param string The name of the field that contains the encryption key
+ − 2939 * @param string The name of the field that will contain the encrypted password
+ − 2940 * @param string The name of the field that handles MD5 challenge data
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2941 * @param string The name of the field that tells if the server supports DiffieHellman
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2942 * @param string The name of the field with the DiffieHellman public key
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2943 * @param string The name of the field that the client should populate with its public key
1
+ − 2944 * @return string
+ − 2945 */
+ − 2946
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2947 function aes_javascript($form_name, $pw_field, $use_crypt, $crypt_key, $crypt_data, $challenge, $dh_supported = false, $dh_pubkey = false, $dh_client_pubkey = false)
1
+ − 2948 {
+ − 2949 $code = '
+ − 2950 <script type="text/javascript">
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2951
1
+ − 2952 function runEncryption()
+ − 2953 {
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2954 var testpassed = ' . ( ( isset($_GET['use_crypt']) && $_GET['use_crypt']=='0') ? 'false; // CRYPTO-AUTH DISABLED ON USER REQUEST // ' : '' ) . '( aes_self_test() && md5_vm_test() );
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2955 var frm = document.forms.'.$form_name.';
507
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2956 var use_diffiehellman = false;' . "\n";
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2957 if ( $dh_supported && $dh_pubkey )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2958 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2959 $code .= <<<EOF
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2960 if ( frm.$dh_supported.value == 'true' )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2961 use_diffiehellman = true;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2962 EOF;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2963 }
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2964 $code .= '
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2965
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2966 if ( frm[\'' . $dh_supported . '\'] )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2967 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2968 frm[\'' . $dh_supported . '\'].value = ( use_diffiehellman ) ? "true" : "false";
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2969 }
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2970
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2971 if ( testpassed && use_diffiehellman )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2972 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2973 // try to blank out the table to prevent double submits and what have you
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2974 var el = frm.' . $pw_field . ';
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2975 while ( el.tagName != "BODY" && el.tagName != "TABLE" )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2976 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2977 el = el.parentNode;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2978 }
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2979 if ( el.tagName == "TABLE" )
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2980 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2981 whiteOutElement(el);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2982 }
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2983
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2984 frm.'.$use_crypt.'.value = \'yes_dh\';
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2985
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2986 // Perform Diffie Hellman stuff
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2987 // console.info("DiffieHellman: started keygen process");
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2988 var dh_priv = dh_gen_private();
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2989 var dh_pub = dh_gen_public(dh_priv);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2990 var secret = dh_gen_shared_secret(dh_priv, frm.' . $dh_pubkey . '.value);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2991 // console.info("DiffieHellman: finished keygen process");
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2992
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2993 // secret_hash is used to verify that the server guesses the correct secret
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2994 var secret_hash = hex_sha1(secret);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2995
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2996 // give the server our values
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2997 frm.' . $crypt_key . '.value = secret_hash;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2998 frm.' . $dh_client_pubkey . '.value = dh_pub;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 2999
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3000 // console.info("DiffieHellman: set public values");
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3001
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3002 // crypt_key is the actual AES key
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3003 var crypt_key = (hex_sha256(secret)).substr(0, (keySizeInBits / 4));
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3004
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3005 // Perform encryption
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3006 crypt_key = hexToByteArray(crypt_key);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3007 var pass = frm.'.$pw_field.'.value;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3008 pass = stringToByteArray(pass);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3009 var cryptstring = rijndaelEncrypt(pass, crypt_key, \'ECB\');
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3010 if(!cryptstring)
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3011 {
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3012 return false;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3013 }
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3014 cryptstring = byteArrayToHex(cryptstring);
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3015 // console.info("DiffieHellman: finished AES");
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3016 frm.'.$crypt_data.'.value = cryptstring;
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3017 frm.'.$pw_field.'.value = \'\';
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3018 // console.info("DiffieHellman: ready to submit");
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3019 }
586fd7d3202d
Fixed some stray version numbers (again!); added support for Diffie-Hellman logins in the normal login form (not AJAX) - even works in IE
Dan
diff
changeset
+ − 3020 else if ( testpassed && !use_diffiehellman )
1
+ − 3021 {
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3022 frm.'.$use_crypt.'.value = \'yes\';
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3023 var cryptkey = frm.'.$crypt_key.'.value;
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3024 frm.'.$crypt_key.'.value = hex_md5(cryptkey);
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3025 cryptkey = hexToByteArray(cryptkey);
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3026 if(!cryptkey || ( ( typeof cryptkey == \'string\' || typeof cryptkey == \'object\' ) ) && cryptkey.length != keySizeInBits / 8 )
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3027 {
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3028 if ( frm._login ) frm._login.disabled = true;
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3029 len = ( typeof cryptkey == \'string\' || typeof cryptkey == \'object\' ) ? \'\\nLen: \'+cryptkey.length : \'\';
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3030 alert(\'The key is messed up\\nType: \'+typeof(cryptkey)+len);
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3031 }
1
+ − 3032 pass = frm.'.$pw_field.'.value;
+ − 3033 chal = frm.'.$challenge.'.value;
+ − 3034 challenge = hex_md5(pass + chal) + chal;
+ − 3035 frm.'.$challenge.'.value = challenge;
+ − 3036 pass = stringToByteArray(pass);
+ − 3037 cryptstring = rijndaelEncrypt(pass, cryptkey, \'ECB\');
+ − 3038 if(!cryptstring)
+ − 3039 {
+ − 3040 return false;
+ − 3041 }
+ − 3042 cryptstring = byteArrayToHex(cryptstring);
+ − 3043 frm.'.$crypt_data.'.value = cryptstring;
+ − 3044 frm.'.$pw_field.'.value = \'\';
+ − 3045 }
+ − 3046 return false;
+ − 3047 }
+ − 3048 </script>
+ − 3049 ';
+ − 3050 return $code;
+ − 3051 }
+ − 3052
436
+ − 3053 /**
+ − 3054 * Backend code for the JSON login interface. Basically a frontend to the session API that takes all parameters in one huge array.
+ − 3055 * @param array LoginAPI request
+ − 3056 * @return array LoginAPI response
+ − 3057 */
+ − 3058
+ − 3059 function process_login_request($req)
+ − 3060 {
+ − 3061 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 3062
+ − 3063 // Setup EnanoMath and Diffie-Hellman
+ − 3064 global $dh_supported;
+ − 3065 $dh_supported = true;
+ − 3066 try
+ − 3067 {
+ − 3068 require_once(ENANO_ROOT . '/includes/diffiehellman.php');
+ − 3069 }
+ − 3070 catch ( Exception $e )
+ − 3071 {
+ − 3072 $dh_supported = false;
+ − 3073 }
+ − 3074 global $_math;
+ − 3075
+ − 3076 // Check for the mode
+ − 3077 if ( !isset($req['mode']) )
+ − 3078 {
+ − 3079 return array(
+ − 3080 'mode' => 'error',
+ − 3081 'error' => 'ERR_JSON_NO_MODE'
+ − 3082 );
+ − 3083 }
+ − 3084
+ − 3085 // Main processing switch
+ − 3086 switch ( $req['mode'] )
+ − 3087 {
+ − 3088 default:
+ − 3089 return array(
+ − 3090 'mode' => 'error',
+ − 3091 'error' => 'ERR_JSON_INVALID_MODE'
+ − 3092 );
+ − 3093 break;
+ − 3094 case 'getkey':
+ − 3095
+ − 3096 $this->start();
+ − 3097
+ − 3098 // Query database for lockout info
+ − 3099 $locked_out = false;
+ − 3100 // are we locked out?
+ − 3101 $threshold = ( $_ = getConfig('lockout_threshold') ) ? intval($_) : 5;
+ − 3102 $duration = ( $_ = getConfig('lockout_duration') ) ? intval($_) : 15;
+ − 3103 // convert to minutes
+ − 3104 $duration = $duration * 60;
+ − 3105 $policy = ( $x = getConfig('lockout_policy') && in_array(getConfig('lockout_policy'), array('lockout', 'disable', 'captcha')) ) ? getConfig('lockout_policy') : 'lockout';
+ − 3106 if ( $policy != 'disable' )
+ − 3107 {
+ − 3108 $ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
+ − 3109 $timestamp_cutoff = time() - $duration;
+ − 3110 $q = $this->sql('SELECT timestamp FROM '.table_prefix.'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;');
+ − 3111 $fails = $db->numrows();
+ − 3112 $row = $db->fetchrow();
+ − 3113 $locked_out = ( $fails >= $threshold );
+ − 3114 $lockdata = array(
+ − 3115 'locked_out' => $locked_out,
+ − 3116 'lockout_threshold' => $threshold,
+ − 3117 'lockout_duration' => ( $duration / 60 ),
+ − 3118 'lockout_fails' => $fails,
+ − 3119 'lockout_policy' => $policy,
+ − 3120 'lockout_last_time' => $row['timestamp'],
+ − 3121 'time_rem' => ( $duration / 60 ) - round( ( time() - $row['timestamp'] ) / 60 ),
+ − 3122 'captcha' => ''
+ − 3123 );
+ − 3124 $db->free_result();
+ − 3125 }
+ − 3126
+ − 3127 $response = array('mode' => 'build_box');
+ − 3128 $response['allow_diffiehellman'] = $dh_supported;
+ − 3129
+ − 3130 $response['username'] = ( $this->user_logged_in ) ? $this->username : false;
+ − 3131 $response['aes_key'] = $this->rijndael_genkey();
+ − 3132
+ − 3133 // Lockout info
+ − 3134 $response['locked_out'] = $locked_out;
+ − 3135
+ − 3136 $response['lockout_info'] = $lockdata;
+ − 3137 if ( $policy == 'captcha' && $locked_out )
+ − 3138 {
+ − 3139 $response['lockout_info']['captcha'] = $this->make_captcha();
+ − 3140 }
+ − 3141
+ − 3142 // Can we do Diffie-Hellman? If so, generate and stash a public/private key pair.
+ − 3143 if ( $dh_supported )
+ − 3144 {
+ − 3145 $dh_key_priv = dh_gen_private();
+ − 3146 $dh_key_pub = dh_gen_public($dh_key_priv);
+ − 3147 $dh_key_priv = $_math->str($dh_key_priv);
+ − 3148 $dh_key_pub = $_math->str($dh_key_pub);
+ − 3149 $response['dh_public_key'] = $dh_key_pub;
+ − 3150 // store the keys in the DB
+ − 3151 $q = $db->sql_query('INSERT INTO ' . table_prefix . "diffiehellman( public_key, private_key ) VALUES ( '$dh_key_pub', '$dh_key_priv' );");
+ − 3152 if ( !$q )
+ − 3153 $db->die_json();
+ − 3154 }
+ − 3155
+ − 3156 return $response;
+ − 3157 break;
+ − 3158 case 'login_dh':
+ − 3159 // User is requesting a login and has sent Diffie-Hellman data.
+ − 3160
+ − 3161 //
+ − 3162 // KEY RECONSTRUCTION
+ − 3163 //
+ − 3164
+ − 3165 $userinfo_crypt = $req['userinfo'];
+ − 3166 $dh_public = $req['dh_public_key'];
+ − 3167 $dh_hash = $req['dh_secret_hash'];
+ − 3168
+ − 3169 // Check the key
+ − 3170 if ( !preg_match('/^[0-9]+$/', $dh_public) || !preg_match('/^[0-9]+$/', $req['dh_client_key']) )
+ − 3171 {
+ − 3172 return array(
+ − 3173 'mode' => 'error',
+ − 3174 'error' => 'ERR_DH_KEY_NOT_NUMERIC'
+ − 3175 );
+ − 3176 }
+ − 3177
+ − 3178 // Fetch private key
+ − 3179 $q = $db->sql_query('SELECT private_key, key_id FROM ' . table_prefix . "diffiehellman WHERE public_key = '$dh_public';");
+ − 3180 if ( !$q )
+ − 3181 $db->die_json();
+ − 3182
+ − 3183 if ( $db->numrows() < 1 )
+ − 3184 {
+ − 3185 return array(
+ − 3186 'mode' => 'error',
+ − 3187 'error' => 'ERR_DH_KEY_NOT_FOUND'
+ − 3188 );
+ − 3189 }
+ − 3190
+ − 3191 list($dh_private, $dh_key_id) = $db->fetchrow_num();
+ − 3192 $db->free_result();
+ − 3193
+ − 3194 // We have the private key, now delete the key pair, we no longer need it
+ − 3195 $q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE key_id = $dh_key_id;");
+ − 3196 if ( !$q )
+ − 3197 $db->die_json();
+ − 3198
+ − 3199 // Generate the shared secret
+ − 3200 $dh_secret = dh_gen_shared_secret($dh_private, $req['dh_client_key']);
+ − 3201 $dh_secret = $_math->str($dh_secret);
+ − 3202
+ − 3203 // Did we get all our math right?
+ − 3204 $dh_secret_check = sha1($dh_secret);
+ − 3205 if ( $dh_secret_check !== $dh_hash )
+ − 3206 {
+ − 3207 return array(
+ − 3208 'mode' => 'error',
+ − 3209 'error' => 'ERR_DH_HASH_NO_MATCH'
+ − 3210 );
+ − 3211 }
+ − 3212
+ − 3213 // All good! Generate the AES key
+ − 3214 $aes_key = substr(sha256($dh_secret), 0, ( AES_BITS / 4 ));
+ − 3215 case 'login_aes':
+ − 3216 if ( $req['mode'] == 'login_aes' )
+ − 3217 {
+ − 3218 // login_aes-specific code
+ − 3219 $aes_key = $this->fetch_public_key($req['key_aes']);
+ − 3220 if ( !$aes_key )
+ − 3221 {
+ − 3222 return array(
+ − 3223 'mode' => 'error',
+ − 3224 'error' => 'ERR_AES_LOOKUP_FAILED'
+ − 3225 );
+ − 3226 }
+ − 3227 $userinfo_crypt = $req['userinfo'];
+ − 3228 }
+ − 3229 // shared between the two systems from here on out
+ − 3230
+ − 3231 // decrypt user info
+ − 3232 $aes_key = hexdecode($aes_key);
+ − 3233 $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
518
+ − 3234 // using "true" here disables caching of the decrypted login info (which includes the password)
+ − 3235 $userinfo_json = $aes->decrypt($userinfo_crypt, $aes_key, ENC_HEX, true);
436
+ − 3236 if ( !$userinfo_json )
+ − 3237 {
+ − 3238 return array(
+ − 3239 'mode' => 'error',
+ − 3240 'error' => 'ERR_AES_DECRYPT_FAILED'
+ − 3241 );
+ − 3242 }
+ − 3243 // de-JSON user info
+ − 3244 try
+ − 3245 {
+ − 3246 $userinfo = enano_json_decode($userinfo_json);
+ − 3247 }
+ − 3248 catch ( Exception $e )
+ − 3249 {
+ − 3250 return array(
+ − 3251 'mode' => 'error',
+ − 3252 'error' => 'ERR_USERINFO_DECODE_FAILED'
+ − 3253 );
+ − 3254 }
+ − 3255
+ − 3256 if ( !isset($userinfo['username']) || !isset($userinfo['password']) )
+ − 3257 {
+ − 3258 return array(
+ − 3259 'mode' => 'error',
+ − 3260 'error' => 'ERR_USERINFO_MISSING_VALUES'
+ − 3261 );
+ − 3262 }
+ − 3263
+ − 3264 $username =& $userinfo['username'];
+ − 3265 $password =& $userinfo['password'];
+ − 3266
472
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3267 // If we're logging in with a temp password, attach to the login_password_reset hook to send our JSON response
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3268 // A bit hackish since it just dies with the response :-(
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3269 $plugins->attachHook('login_password_reset', '$this->process_login_request(array(\'mode\' => \'respond_password_reset\', \'user_id\' => $row[\'user_id\'], \'temp_password\' => $row[\'temp_password\']));');
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3270
436
+ − 3271 // attempt the login
+ − 3272 // function login_without_crypto($username, $password, $already_md5ed = false, $level = USER_LEVEL_MEMBER, $captcha_hash = false, $captcha_code = false)
+ − 3273 $login_result = $this->login_without_crypto($username, $password, false, intval($req['level']), @$req['captcha_hash'], @$req['captcha_code']);
+ − 3274
+ − 3275 if ( $login_result['success'] )
+ − 3276 {
+ − 3277 return array(
+ − 3278 'mode' => 'login_success',
+ − 3279 'key' => ( $this->sid_super ) ? $this->sid_super : false
+ − 3280 );
+ − 3281 }
+ − 3282 else
+ − 3283 {
+ − 3284 return array(
+ − 3285 'mode' => 'login_failure',
+ − 3286 'error_code' => $login_result['error'],
+ − 3287 // Use this to provide a way to respawn the login box
+ − 3288 'respawn_info' => $this->process_login_request(array('mode' => 'getkey'))
+ − 3289 );
+ − 3290 }
+ − 3291
+ − 3292 break;
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3293 case 'clean_key':
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3294 // Clean out a key, since it won't be used.
472
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3295 // This is called when the user clicks Cancel in the AJAX login interface.
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3296 if ( !empty($req['key_aes']) )
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3297 {
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3298 $this->fetch_public_key($req['key_aes']);
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3299 }
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3300 if ( !empty($req['key_dh']) )
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3301 {
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3302 $pk = $db->escape($req['key_dh']);
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3303 $q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE public_key = '$pk';");
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3304 if ( !$q )
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3305 $db->die_json();
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3306 }
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3307 return array(
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3308 'mode' => 'noop'
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3309 );
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3310 break;
472
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3311 case 'respond_password_reset':
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3312 die(enano_json_encode(array(
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3313 'mode' => 'login_success_reset',
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3314 'user_id' => $req['user_id'],
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3315 'temp_password' => $req['temp_password'],
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3316 'respawn_info' => $this->process_login_request(array('mode' => 'getkey'))
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3317 )));
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
diff
changeset
+ − 3318 break;
436
+ − 3319 }
+ − 3320
+ − 3321 }
+ − 3322
1
+ − 3323 }
+ − 3324
+ − 3325 /**
+ − 3326 * Class used to fetch permissions for a specific page. Used internally by SessionManager.
+ − 3327 * @package Enano
+ − 3328 * @subpackage Session manager
+ − 3329 * @license http://www.gnu.org/copyleft/gpl.html
+ − 3330 * @access private
+ − 3331 */
+ − 3332
+ − 3333 class Session_ACLPageInfo {
+ − 3334
+ − 3335 /**
+ − 3336 * The page ID of this ACL info package
+ − 3337 * @var string
+ − 3338 */
+ − 3339
+ − 3340 var $page_id;
+ − 3341
+ − 3342 /**
+ − 3343 * The namespace of the page being checked
+ − 3344 * @var string
+ − 3345 */
+ − 3346
+ − 3347 var $namespace;
+ − 3348
+ − 3349 /**
+ − 3350 * Our list of permission types.
+ − 3351 * @access private
+ − 3352 * @var array
+ − 3353 */
+ − 3354
+ − 3355 var $acl_types = Array();
+ − 3356
+ − 3357 /**
+ − 3358 * The list of descriptions for the permission types
+ − 3359 * @var array
+ − 3360 */
+ − 3361
+ − 3362 var $acl_descs = Array();
+ − 3363
+ − 3364 /**
+ − 3365 * A list of dependencies for ACL types.
+ − 3366 * @var array
+ − 3367 */
+ − 3368
+ − 3369 var $acl_deps = Array();
+ − 3370
+ − 3371 /**
246
+ − 3372 * Our tell-all list of permissions. Do not even try to change this.
+ − 3373 * @access private
1
+ − 3374 * @var array
+ − 3375 */
+ − 3376
+ − 3377 var $perms = Array();
+ − 3378
+ − 3379 /**
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3380 * Array to track which default permissions are being used
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3381 * @var array
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3382 * @access private
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3383 */
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3384
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3385 var $acl_defaults_used = Array();
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3386
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3387 /**
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3388 * Tracks whether Wiki Mode is on for the page we're operating on.
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3389 * @var bool
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3390 */
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3391
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3392 var $wiki_mode = false;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3393
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3394 /**
1
+ − 3395 * Constructor.
+ − 3396 * @param string $page_id The ID of the page to check
+ − 3397 * @param string $namespace The namespace of the page to check.
+ − 3398 * @param array $acl_types List of ACL types
+ − 3399 * @param array $acl_descs List of human-readable descriptions for permissions (associative)
+ − 3400 * @param array $acl_deps List of dependencies for permissions. For example, viewing history/diffs depends on the ability to read the page.
+ − 3401 * @param array $base What to start with - this is an attempt to reduce the number of SQL queries.
+ − 3402 */
+ − 3403
+ − 3404 function Session_ACLPageInfo($page_id, $namespace, $acl_types, $acl_descs, $acl_deps, $base)
+ − 3405 {
+ − 3406 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 3407
+ − 3408 $this->acl_deps = $acl_deps;
+ − 3409 $this->acl_types = $acl_types;
+ − 3410 $this->acl_descs = $acl_descs;
+ − 3411
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3412 $this->perms = $acl_types;
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3413 $this->perms = $session->acl_merge_complete($this->perms, $base);
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3414
73
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 3415 // PAGE group info
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 3416 $pg_list = $paths->get_page_groups($page_id, $namespace);
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 3417 $pg_info = '';
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 3418 foreach ( $pg_list as $g_id )
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 3419 {
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 3420 $pg_info .= ' ( page_id=\'' . $g_id . '\' AND namespace=\'__PageGroup\' ) OR';
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 3421 }
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 3422
1
+ − 3423 // Build a query to grab ACL info
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 3424 $bs = 'SELECT rules,target_type,target_id FROM '.table_prefix.'acl WHERE ' . "\n"
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 3425 . ' ( ';
1
+ − 3426 $q = Array();
+ − 3427 $q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$session->user_id.' )';
+ − 3428 if(count($session->groups) > 0)
+ − 3429 {
+ − 3430 foreach($session->groups as $g_id => $g_name)
+ − 3431 {
+ − 3432 $q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 3433 }
+ − 3434 }
+ − 3435 // The reason we're using an ORDER BY statement here is because ACL_TYPE_GROUP is less than ACL_TYPE_USER, causing the user's individual
+ − 3436 // permissions to override group permissions.
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 3437 $bs .= implode(" OR\n ", $q) . ' ) AND (' . $pg_info . ' page_id=\''.$db->escape($page_id).'\' AND namespace=\''.$db->escape($namespace).'\' )
1
+ − 3438 ORDER BY target_type ASC, page_id ASC, namespace ASC;';
+ − 3439 $q = $session->sql($bs);
+ − 3440 if ( $row = $db->fetchrow() )
+ − 3441 {
+ − 3442 do {
+ − 3443 $rules = $session->string_to_perm($row['rules']);
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3444 $is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3445 $this->acl_merge_with_current($rules, $is_everyone);
1
+ − 3446 } while ( $row = $db->fetchrow() );
+ − 3447 }
+ − 3448
+ − 3449 $this->page_id = $page_id;
+ − 3450 $this->namespace = $namespace;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3451
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3452 $pathskey = $paths->nslist[$this->namespace].$this->page_id;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3453 $ppwm = 2;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3454 if ( isset($paths->pages[$pathskey]) )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3455 {
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3456 if ( isset($paths->pages[$pathskey]['wiki_mode']) )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3457 $ppwm = $paths->pages[$pathskey]['wiki_mode'];
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3458 }
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3459 if ( $ppwm == 1 && ( $session->user_logged_in || getConfig('wiki_mode_require_login') != '1' ) )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3460 $this->wiki_mode = true;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3461 else if ( $ppwm == 1 && !$session->user_logged_in && getConfig('wiki_mode_require_login') == '1' )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3462 $this->wiki_mode = true;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3463 else if ( $ppwm == 0 )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3464 $this->wiki_mode = false;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3465 else if ( $ppwm == 2 )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3466 {
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3467 if ( $session->user_logged_in )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3468 {
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3469 $this->wiki_mode = ( getConfig('wiki_mode') == '1' );
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3470 }
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3471 else
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3472 {
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3473 $this->wiki_mode = ( getConfig('wiki_mode') == '1' && getConfig('wiki_mode_require_login') != '1' );
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3474 }
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3475 }
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3476 else
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3477 {
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3478 // Ech. Internal logic failure, this should never happen.
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3479 return false;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3480 }
1
+ − 3481 }
+ − 3482
+ − 3483 /**
+ − 3484 * Tells us whether permission $type is allowed or not based on the current rules.
+ − 3485 * @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
+ − 3486 * @param bool $no_deps If true, disables dependency checking
+ − 3487 * @return bool True if allowed, false if denied or if an error occured
+ − 3488 */
+ − 3489
+ − 3490 function get_permissions($type, $no_deps = false)
+ − 3491 {
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3492 // echo '<pre>' . print_r($this->perms, true) . '</pre>';
1
+ − 3493 global $db, $session, $paths, $template, $plugins; // Common objects
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3494
1
+ − 3495 if ( isset( $this->perms[$type] ) )
+ − 3496 {
+ − 3497 if ( $this->perms[$type] == AUTH_DENY )
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3498 {
1
+ − 3499 $ret = false;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3500 }
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3501 else if ( $this->perms[$type] == AUTH_WIKIMODE && $this->wiki_mode )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3502 {
1
+ − 3503 $ret = true;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3504 }
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3505 else if ( $this->perms[$type] == AUTH_WIKIMODE && !$this->wiki_mode )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3506 {
1
+ − 3507 $ret = false;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3508 }
1
+ − 3509 else if ( $this->perms[$type] == AUTH_ALLOW )
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3510 {
1
+ − 3511 $ret = true;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3512 }
1
+ − 3513 else if ( $this->perms[$type] == AUTH_DISALLOW )
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3514 {
1
+ − 3515 $ret = false;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3516 }
1
+ − 3517 }
+ − 3518 else if(isset($this->acl_types[$type]))
+ − 3519 {
+ − 3520 if ( $this->acl_types[$type] == AUTH_DENY )
+ − 3521 $ret = false;
+ − 3522 else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 3523 $ret = true;
+ − 3524 else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 3525 $ret = false;
+ − 3526 else if ( $this->acl_types[$type] == AUTH_ALLOW )
+ − 3527 $ret = true;
+ − 3528 else if ( $this->acl_types[$type] == AUTH_DISALLOW )
+ − 3529 $ret = false;
+ − 3530 }
+ − 3531 else
+ − 3532 {
+ − 3533 // ACL type is undefined
+ − 3534 trigger_error('Unknown access type "' . $type . '"', E_USER_WARNING);
+ − 3535 return false; // Be on the safe side and deny access
+ − 3536 }
+ − 3537 if ( !$no_deps )
+ − 3538 {
+ − 3539 if ( !$this->acl_check_deps($type) )
+ − 3540 return false;
+ − 3541 }
+ − 3542 return $ret;
+ − 3543 }
+ − 3544
+ − 3545 /**
+ − 3546 * Tell us if the dependencies for a given permission are met.
+ − 3547 * @param string The ACL permission ID
+ − 3548 * @return bool
+ − 3549 */
+ − 3550
+ − 3551 function acl_check_deps($type)
+ − 3552 {
+ − 3553 if(!isset($this->acl_deps[$type])) // This will only happen if the permissions table is hacked or improperly accessed
+ − 3554 return true;
+ − 3555 if(sizeof($this->acl_deps[$type]) < 1)
+ − 3556 return true;
+ − 3557 $deps = $this->acl_deps[$type];
+ − 3558 while(true)
+ − 3559 {
+ − 3560 $full_resolved = true;
+ − 3561 $j = sizeof($deps);
+ − 3562 for ( $i = 0; $i < $j; $i++ )
+ − 3563 {
+ − 3564 $b = $deps;
+ − 3565 $deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
+ − 3566 if( $b == $deps )
+ − 3567 {
+ − 3568 break 2;
+ − 3569 }
+ − 3570 $j = sizeof($deps);
+ − 3571 }
+ − 3572 }
+ − 3573 //die('<pre>'.print_r($deps, true).'</pre>');
+ − 3574 foreach($deps as $d)
+ − 3575 {
+ − 3576 if ( !$this->get_permissions($d) )
+ − 3577 {
+ − 3578 return false;
+ − 3579 }
+ − 3580 }
+ − 3581 return true;
+ − 3582 }
+ − 3583
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3584 /**
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3585 * Merges the ACL array sent with the current permissions table, deciding precedence based on whether defaults are in effect or not.
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3586 * @param array The array to merge into the master ACL list
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3587 * @param bool If true, $perm is treated as the "new default"
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3588 * @param int 1 if this is a site-wide ACL, 2 if page-specific. Defaults to 2.
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3589 */
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3590
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3591 function acl_merge_with_current($perm, $is_everyone = false, $scope = 2)
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3592 {
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3593 foreach ( $this->perms as $i => $p )
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3594 {
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3595 if ( isset($perm[$i]) )
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3596 {
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
diff
changeset
+ − 3597 if ( $is_everyone && !@$this->acl_defaults_used[$i] )
72
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3598 continue;
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3599 // Decide precedence
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3600 if ( isset($this->acl_defaults_used[$i]) )
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3601 {
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3602 //echo "$i: default in use, overriding to: {$perm[$i]}<br />";
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3603 // Defaults are in use, override
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3604 $this->perms[$i] = $perm[$i];
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3605 $this->acl_defaults_used[$i] = ( $is_everyone );
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3606 }
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3607 else
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3608 {
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3609 //echo "$i: default NOT in use";
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3610 // Defaults are not in use, merge as normal
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3611 if ( $this->perms[$i] != AUTH_DENY )
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3612 {
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3613 //echo ", but overriding";
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3614 $this->perms[$i] = $perm[$i];
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3615 }
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3616 //echo "<br />";
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3617 }
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3618 }
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3619 }
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3620 }
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3621
1
+ − 3622 }
+ − 3623
466
+ − 3624 /**
+ − 3625 * Cron task - clears out the database of Diffie-Hellman keys
+ − 3626 */
+ − 3627
+ − 3628 function cron_clean_login_cache()
+ − 3629 {
+ − 3630 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 3631
+ − 3632 if ( !$db->sql_query('DELETE FROM ' . table_prefix . 'diffiehellman;') )
+ − 3633 $db->_die();
+ − 3634
+ − 3635 setConfig('login_key_cache', '');
+ − 3636 }
+ − 3637
+ − 3638 register_cron_task('cron_clean_login_cache', 72);
+ − 3639
480
+ − 3640 /**
+ − 3641 * Cron task - clears out outdated high-auth session keys
+ − 3642 */
+ − 3643
+ − 3644 function cron_clean_old_admin_keys()
+ − 3645 {
+ − 3646 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 3647
+ − 3648 $threshold = time() - ( 15 * 60 );
+ − 3649 $ul_member = USER_LEVEL_MEMBER;
+ − 3650 if ( !$db->sql_query('DELETE FROM ' . table_prefix . "session_keys WHERE time < $threshold AND auth_level > $ul_member;") )
+ − 3651 $db->_die();
+ − 3652 }
+ − 3653
+ − 3654 // Once a week
+ − 3655 register_cron_task('cron_clean_old_admin_keys', 168);
+ − 3656
1
+ − 3657 ?>