1
+ − 1
<?php
+ − 2
+ − 3
/*
+ − 4
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
317
+ − 5
* Version 1.0.3 (Dyrad)
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
// Prepare a string for insertion into a MySQL database
359
+ − 17
function filter($str) { global $db; return $db->escape($str); }
1
+ − 18
+ − 19
/**
+ − 20
* Anything and everything related to security and user management. This includes AES encryption, which is illegal in some countries.
+ − 21
* Documenting the API was not easy - I hope you folks enjoy it.
+ − 22
* @package Enano
+ − 23
* @subpackage Session manager
+ − 24
* @category security, user management, logins, etc.
+ − 25
*/
+ − 26
+ − 27
class sessionManager {
+ − 28
+ − 29
# Variables
+ − 30
+ − 31
/**
+ − 32
* Whether we're logged in or not
+ − 33
* @var bool
+ − 34
*/
+ − 35
+ − 36
var $user_logged_in = false;
+ − 37
+ − 38
/**
+ − 39
* Our current low-privilege session key
+ − 40
* @var string
+ − 41
*/
+ − 42
+ − 43
var $sid;
+ − 44
+ − 45
/**
+ − 46
* Username of currently logged-in user, or IP address if not logged in
+ − 47
* @var string
+ − 48
*/
+ − 49
+ − 50
var $username;
+ − 51
+ − 52
/**
+ − 53
* User ID of currently logged-in user, or -1 if not logged in
+ − 54
* @var int
+ − 55
*/
+ − 56
+ − 57
var $user_id;
+ − 58
+ − 59
/**
+ − 60
* Real name of currently logged-in user, or blank if not logged in
+ − 61
* @var string
+ − 62
*/
+ − 63
+ − 64
var $real_name;
+ − 65
+ − 66
/**
+ − 67
* E-mail address of currently logged-in user, or blank if not logged in
+ − 68
* @var string
+ − 69
*/
+ − 70
+ − 71
var $email;
+ − 72
+ − 73
/**
31
+ − 74
* List of "extra" user information fields (IM handles, etc.)
+ − 75
* @var array (associative)
+ − 76
*/
+ − 77
+ − 78
var $user_extra;
+ − 79
+ − 80
/**
1
+ − 81
* User level of current user
+ − 82
* USER_LEVEL_GUEST: guest
+ − 83
* USER_LEVEL_MEMBER: regular user
+ − 84
* USER_LEVEL_CHPREF: default - pseudo-level that allows changing password and e-mail address (requires re-authentication)
+ − 85
* USER_LEVEL_MOD: moderator
+ − 86
* USER_LEVEL_ADMIN: administrator
+ − 87
* @var int
+ − 88
*/
+ − 89
+ − 90
var $user_level;
+ − 91
+ − 92
/**
+ − 93
* High-privilege session key
+ − 94
* @var string or false if not running on high-level authentication
+ − 95
*/
+ − 96
+ − 97
var $sid_super;
+ − 98
+ − 99
/**
+ − 100
* The user's theme preference, defaults to $template->default_theme
+ − 101
* @var string
+ − 102
*/
+ − 103
+ − 104
var $theme;
+ − 105
+ − 106
/**
+ − 107
* The user's style preference, or style auto-detected based on theme if not logged in
+ − 108
* @var string
+ − 109
*/
+ − 110
+ − 111
var $style;
+ − 112
+ − 113
/**
+ − 114
* Signature of current user - appended to comments, etc.
+ − 115
* @var string
+ − 116
*/
+ − 117
+ − 118
var $signature;
+ − 119
+ − 120
/**
+ − 121
* UNIX timestamp of when we were registered, or 0 if not logged in
+ − 122
* @var int
+ − 123
*/
+ − 124
+ − 125
var $reg_time;
+ − 126
+ − 127
/**
+ − 128
* MD5 hash of the current user's password, if applicable
+ − 129
* @var string OR bool false
+ − 130
*/
+ − 131
+ − 132
var $password_hash;
+ − 133
+ − 134
/**
+ − 135
* The number of unread private messages this user has.
+ − 136
* @var int
+ − 137
*/
+ − 138
+ − 139
var $unread_pms = 0;
+ − 140
+ − 141
/**
+ − 142
* AES key used to encrypt passwords and session key info - irreversibly destroyed when disallow_password_grab() is called
+ − 143
* @var string
+ − 144
*/
+ − 145
+ − 146
var $private_key;
+ − 147
+ − 148
/**
+ − 149
* Regex that defines a valid username, minus the ^ and $, these are added later
+ − 150
* @var string
+ − 151
*/
+ − 152
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 153
var $valid_username = '([^<>&\?\'"%\n\r\t\a\/]+)';
1
+ − 154
+ − 155
/**
+ − 156
* What we're allowed to do as far as permissions go. This changes based on the value of the "auth" URI param.
+ − 157
* @var string
+ − 158
*/
+ − 159
+ − 160
var $auth_level = -1;
+ − 161
+ − 162
/**
+ − 163
* State variable to track if a session timed out
+ − 164
* @var bool
+ − 165
*/
+ − 166
+ − 167
var $sw_timed_out = false;
+ − 168
+ − 169
/**
+ − 170
* Switch to track if we're started or not.
+ − 171
* @access private
+ − 172
* @var bool
+ − 173
*/
+ − 174
+ − 175
var $started = false;
+ − 176
+ − 177
/**
+ − 178
* Switch to control compatibility mode (for older Enano websites being upgraded)
+ − 179
* @access private
+ − 180
* @var bool
+ − 181
*/
+ − 182
+ − 183
var $compat = false;
+ − 184
+ − 185
/**
+ − 186
* Our list of permission types.
+ − 187
* @access private
+ − 188
* @var array
+ − 189
*/
+ − 190
+ − 191
var $acl_types = Array();
+ − 192
+ − 193
/**
+ − 194
* The list of descriptions for the permission types
+ − 195
* @var array
+ − 196
*/
+ − 197
+ − 198
var $acl_descs = Array();
+ − 199
+ − 200
/**
+ − 201
* A list of dependencies for ACL types.
+ − 202
* @var array
+ − 203
*/
+ − 204
+ − 205
var $acl_deps = Array();
+ − 206
+ − 207
/**
246
+ − 208
* Our tell-all list of permissions. Do not even try to change this.
+ − 209
* @access private
1
+ − 210
* @var array
+ − 211
*/
+ − 212
+ − 213
var $perms = Array();
+ − 214
+ − 215
/**
+ − 216
* A cache variable - saved after sitewide permissions are checked but before page-specific permissions.
+ − 217
* @var array
+ − 218
* @access private
+ − 219
*/
+ − 220
+ − 221
var $acl_base_cache = Array();
+ − 222
+ − 223
/**
+ − 224
* Stores the scope information for ACL types.
+ − 225
* @var array
+ − 226
* @access private
+ − 227
*/
+ − 228
+ − 229
var $acl_scope = Array();
+ − 230
+ − 231
/**
+ − 232
* Array to track which default permissions are being used
+ − 233
* @var array
+ − 234
* @access private
+ − 235
*/
+ − 236
+ − 237
var $acl_defaults_used = Array();
+ − 238
+ − 239
/**
+ − 240
* Array to track group membership.
+ − 241
* @var array
+ − 242
*/
+ − 243
+ − 244
var $groups = Array();
+ − 245
+ − 246
/**
+ − 247
* Associative array to track group modship.
+ − 248
* @var array
+ − 249
*/
+ − 250
+ − 251
var $group_mod = Array();
+ − 252
+ − 253
# Basic functions
+ − 254
+ − 255
/**
+ − 256
* Constructor.
+ − 257
*/
+ − 258
+ − 259
function __construct()
+ − 260
{
+ − 261
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
+ − 262
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
+ − 263
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
+ − 264
{
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
@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
+ − 266
}
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
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
+ − 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
+ − 269
@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
+ − 270
}
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
+ − 271
1
+ − 272
unset($dbhost, $dbname, $dbuser, $dbpasswd);
+ − 273
if(isset($crypto_key))
+ − 274
{
+ − 275
$this->private_key = $crypto_key;
+ − 276
$this->private_key = hexdecode($this->private_key);
+ − 277
}
+ − 278
else
+ − 279
{
+ − 280
if(is_writable(ENANO_ROOT.'/config.php'))
+ − 281
{
+ − 282
// Generate and stash a private key
+ − 283
// 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
+ − 284
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 285
$this->private_key = $aes->gen_readymade_key();
+ − 286
+ − 287
$config = file_get_contents(ENANO_ROOT.'/config.php');
+ − 288
if(!$config)
+ − 289
{
+ − 290
die('$session->__construct(): can\'t get the contents of config.php');
+ − 291
}
+ − 292
+ − 293
$config = str_replace("?>", "\$crypto_key = '{$this->private_key}';\n?>", $config);
+ − 294
// And while we're at it...
+ − 295
$config = str_replace('MIDGET_INSTALLED', 'ENANO_INSTALLED', $config);
+ − 296
$fh = @fopen(ENANO_ROOT.'/config.php', 'w');
+ − 297
if ( !$fh )
+ − 298
{
+ − 299
die('$session->__construct(): Couldn\'t open config file for writing to store the private key, I tried to avoid something like this...');
+ − 300
}
+ − 301
+ − 302
fwrite($fh, $config);
+ − 303
fclose($fh);
+ − 304
}
+ − 305
else
+ − 306
{
+ − 307
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>');
+ − 308
}
+ − 309
}
+ − 310
// Check for compatibility mode
+ − 311
if(defined('IN_ENANO_INSTALL'))
+ − 312
{
+ − 313
$q = $db->sql_query('SELECT old_encryption FROM '.table_prefix.'users LIMIT 1;');
+ − 314
if(!$q)
+ − 315
{
+ − 316
$error = mysql_error();
+ − 317
if(strstr($error, "Unknown column 'old_encryption'"))
+ − 318
$this->compat = true;
+ − 319
else
+ − 320
$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)');
+ − 321
}
+ − 322
$db->free_result();
+ − 323
}
+ − 324
}
+ − 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
* PHP 4 compatible constructor. Deprecated in 1.1.x.
1
+ − 328
*/
+ − 329
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
+ − 330
/*
1
+ − 331
function sessionManager()
+ − 332
{
+ − 333
$this->__construct();
+ − 334
}
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
+ − 335
*/
1
+ − 336
+ − 337
/**
+ − 338
* Wrapper function to sanitize strings for MySQL and HTML
+ − 339
* @param string $text The text to sanitize
+ − 340
* @return string
+ − 341
*/
+ − 342
+ − 343
function prepare_text($text)
+ − 344
{
+ − 345
global $db;
+ − 346
return $db->escape(htmlspecialchars($text));
+ − 347
}
+ − 348
+ − 349
/**
+ − 350
* Makes a SQL query and handles error checking
+ − 351
* @param string $query The SQL query to make
+ − 352
* @return resource
+ − 353
*/
+ − 354
+ − 355
function sql($query)
+ − 356
{
+ − 357
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 358
$result = $db->sql_query($query);
+ − 359
if(!$result)
+ − 360
{
+ − 361
$db->_die('The error seems to have occurred somewhere in the session management code.');
+ − 362
}
+ − 363
return $result;
+ − 364
}
+ − 365
+ − 366
# Session restoration and permissions
+ − 367
+ − 368
/**
+ − 369
* Initializes the basic state of things, including most user prefs, login data, cookie stuff
+ − 370
*/
+ − 371
+ − 372
function start()
+ − 373
{
+ − 374
global $db, $session, $paths, $template, $plugins; // Common objects
209
+ − 375
global $lang;
1
+ − 376
if($this->started) return;
+ − 377
$this->started = true;
+ − 378
$user = false;
+ − 379
if(isset($_COOKIE['sid']))
+ − 380
{
+ − 381
if($this->compat)
+ − 382
{
+ − 383
$userdata = $this->compat_validate_session($_COOKIE['sid']);
+ − 384
}
+ − 385
else
+ − 386
{
+ − 387
$userdata = $this->validate_session($_COOKIE['sid']);
+ − 388
}
+ − 389
if(is_array($userdata))
+ − 390
{
+ − 391
$data = RenderMan::strToPageID($paths->get_pageid_from_url());
+ − 392
+ − 393
if(!$this->compat && $userdata['account_active'] != 1 && $data[1] != 'Special' && $data[1] != 'Admin')
+ − 394
{
209
+ − 395
$language = intval(getConfig('default_language'));
+ − 396
$lang = new Language($language);
+ − 397
1
+ − 398
$this->logout();
+ − 399
$a = getConfig('account_activation');
+ − 400
switch($a)
+ − 401
{
+ − 402
case 'none':
+ − 403
default:
+ − 404
$solution = 'Your account was most likely deactivated by an administrator. Please contact the site administration for further assistance.';
+ − 405
break;
+ − 406
case 'user':
+ − 407
$solution = 'Please check your e-mail; you should have been sent a message with instructions on how to activate your account. If you do not receive an e-mail from this site within 24 hours, please contact the site administration for further assistance.';
+ − 408
break;
+ − 409
case 'admin':
127
+ − 410
$solution = 'This website has been configured so that all user accounts must be activated by the administrator before they can be used, so your account will most likely be activated the next time an administrator visits the site.';
1
+ − 411
break;
+ − 412
}
127
+ − 413
+ − 414
// admin activation request opportunity
+ − 415
$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']) . '\';');
+ − 416
if ( !$q )
+ − 417
$db->_die();
+ − 418
+ − 419
$can_request = ( $db->numrows() < 1 );
+ − 420
$db->free_result();
+ − 421
+ − 422
if ( isset($_POST['logout']) )
+ − 423
{
+ − 424
$this->sid = $_COOKIE['sid'];
+ − 425
$this->user_logged_in = true;
+ − 426
$this->user_id = intval($userdata['user_id']);
+ − 427
$this->username = $userdata['username'];
+ − 428
$this->auth_level = USER_LEVEL_MEMBER;
+ − 429
$this->user_level = USER_LEVEL_MEMBER;
+ − 430
$this->logout();
+ − 431
redirect(scriptPath . '/', 'Logged out', 'You have successfully been logged out. All cookies cleared.', 4);
+ − 432
}
+ − 433
+ − 434
if ( $can_request && !isset($_POST['activation_request']) )
+ − 435
{
+ − 436
$form = '<p>If you are having trouble or did not receive the e-mail, you can request account activation from the administrators of this site.</p>
+ − 437
<form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
+ − 438
<p><input type="submit" name="activation_request" value="Request account activation" /> <input type="submit" name="logout" value="Log out" /></p>
+ − 439
</form>';
+ − 440
}
+ − 441
else
+ − 442
{
+ − 443
if ( $can_request && isset($_POST['activation_request']) )
+ − 444
{
+ − 445
$this->admin_activation_request($userdata['username']);
+ − 446
$form = '<p>A request has just been sent to the administrators of this site. They will be able to activate your account or send you another activation e-mail if needed.</p>
+ − 447
<form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
+ − 448
<p><input type="submit" name="logout" value="Log out" /></p>
+ − 449
</form>';
+ − 450
}
+ − 451
else
+ − 452
{
+ − 453
$form = '<p>There is an active request in the administrators\' control panel for your account to be activated.</p>
+ − 454
<form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
+ − 455
<p><input type="submit" name="logout" value="Log out" /></p>
+ − 456
</form>';
+ − 457
}
+ − 458
}
+ − 459
+ − 460
die_semicritical('Account error', '<p>It appears that your user account has not yet been activated. '.$solution.'</p>' . $form);
1
+ − 461
}
+ − 462
+ − 463
$this->sid = $_COOKIE['sid'];
+ − 464
$this->user_logged_in = true;
+ − 465
$this->user_id = intval($userdata['user_id']);
+ − 466
$this->username = $userdata['username'];
+ − 467
$this->password_hash = $userdata['password'];
+ − 468
$this->user_level = intval($userdata['user_level']);
+ − 469
$this->real_name = $userdata['real_name'];
+ − 470
$this->email = $userdata['email'];
+ − 471
$this->unread_pms = $userdata['num_pms'];
+ − 472
if(!$this->compat)
+ − 473
{
+ − 474
$this->theme = $userdata['theme'];
+ − 475
$this->style = $userdata['style'];
+ − 476
$this->signature = $userdata['signature'];
+ − 477
$this->reg_time = $userdata['reg_time'];
+ − 478
}
+ − 479
// Small security risk here - it allows someone who has already authenticated as an administrator to store the "super" key in
+ − 480
// the cookie. Change this to USER_LEVEL_MEMBER to override that. The same 15-minute restriction applies to this "exploit".
+ − 481
$this->auth_level = $userdata['auth_level'];
+ − 482
if(!isset($template->named_theme_list[$this->theme]))
+ − 483
{
+ − 484
if($this->compat || !is_object($template))
+ − 485
{
+ − 486
$this->theme = 'oxygen';
+ − 487
$this->style = 'bleu';
+ − 488
}
+ − 489
else
+ − 490
{
+ − 491
$this->theme = $template->default_theme;
+ − 492
$this->style = $template->default_style;
+ − 493
}
+ − 494
}
+ − 495
$user = true;
+ − 496
209
+ − 497
// Set language
+ − 498
if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ − 499
{
+ − 500
$lang_id = intval($userdata['user_lang']);
+ − 501
$lang = new Language($lang_id);
+ − 502
}
+ − 503
1
+ − 504
if(isset($_REQUEST['auth']) && !$this->sid_super)
+ − 505
{
+ − 506
// Now he thinks he's a moderator. Or maybe even an administrator. Let's find out if he's telling the truth.
+ − 507
if($this->compat)
+ − 508
{
+ − 509
$key = $_REQUEST['auth'];
+ − 510
$super = $this->compat_validate_session($key);
+ − 511
}
+ − 512
else
+ − 513
{
+ − 514
$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
+ − 515
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
+ − 516
{
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
$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
+ − 518
}
1
+ − 519
}
+ − 520
if(is_array($super))
+ − 521
{
+ − 522
$this->auth_level = intval($super['auth_level']);
+ − 523
$this->sid_super = $_REQUEST['auth'];
+ − 524
}
+ − 525
}
+ − 526
}
+ − 527
}
+ − 528
if(!$user)
+ − 529
{
+ − 530
//exit;
+ − 531
$this->register_guest_session();
+ − 532
}
+ − 533
if(!$this->compat)
+ − 534
{
+ − 535
// 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
+ − 536
$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
+ − 537
. ' 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
+ − 538
. ' 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
+ − 539
. ' 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
+ − 540
. ' 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
+ − 541
. ' ' . ( 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
+ − 542
. ' ORDER BY group_id ASC;'); // Make sure "Everyone" comes first so the permissions can be overridden
1
+ − 543
if($row = $db->fetchrow())
+ − 544
{
+ − 545
do {
+ − 546
$this->groups[$row['group_id']] = $row['group_name'];
+ − 547
$this->group_mod[$row['group_id']] = ( intval($row['is_mod']) == 1 );
+ − 548
} while($row = $db->fetchrow());
+ − 549
}
+ − 550
else
+ − 551
{
+ − 552
die('No group info');
+ − 553
}
+ − 554
}
+ − 555
$this->check_banlist();
+ − 556
+ − 557
if ( isset ( $_GET['printable'] ) )
+ − 558
{
+ − 559
$this->theme = 'printable';
+ − 560
$this->style = 'default';
+ − 561
}
+ − 562
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
+ − 563
profiler_log('Sessions started');
1
+ − 564
}
+ − 565
+ − 566
# Logins
+ − 567
+ − 568
/**
+ − 569
* Attempts to perform a login using crypto functions
+ − 570
* @param string $username The username
+ − 571
* @param string $aes_data The encrypted password, hex-encoded
+ − 572
* @param string $aes_key The MD5 hash of the encryption key, hex-encoded
+ − 573
* @param string $challenge The 256-bit MD5 challenge string - first 128 bits should be the hash, the last 128 should be the challenge salt
+ − 574
* @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
+ − 575
* @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
+ − 576
* @param array $captcha_code Optional. If we're locked out and the lockout policy is captcha, this should be the code the user entered.
1
+ − 577
* @return string 'success' on success, or error string on failure
+ − 578
*/
+ − 579
271
+ − 580
function login_with_crypto($username, $aes_data, $aes_key_id, $challenge, $level = USER_LEVEL_MEMBER, $captcha_hash = false, $captcha_code = false)
1
+ − 581
{
+ − 582
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 583
+ − 584
$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
+ − 585
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
+ − 586
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
+ − 587
{
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
+ − 588
// 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
+ − 589
$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
+ − 590
$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
+ − 591
// 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
+ − 592
$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
+ − 593
$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
+ − 594
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
+ − 595
{
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
+ − 596
// 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
+ − 597
$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
+ − 598
}
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
+ − 599
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
+ − 600
{
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
+ − 601
$ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
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
$timestamp_cutoff = time() - $duration;
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
$q = $this->sql('SELECT timestamp FROM '.table_prefix.'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;');
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
$fails = $db->numrows();
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
+ − 605
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
+ − 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
// 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
+ − 608
$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
+ − 609
$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
+ − 610
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
+ − 611
'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
+ − 612
'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
+ − 613
'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
+ − 614
'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
+ − 615
'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
+ − 616
'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
+ − 617
'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
+ − 618
'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
+ − 619
);
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
}
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
+ − 621
$db->free_result();
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
+ − 622
}
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
+ − 623
}
1
+ − 624
+ − 625
// 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
+ − 626
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 627
+ − 628
// Fetch our decryption key
+ − 629
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 630
$aes_key = $this->fetch_public_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
+ − 631
if ( !$aes_key )
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
+ − 632
{
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
+ − 633
// It could be that our key cache is full. If it seems larger than 65KB, clear it
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
+ − 634
if ( strlen(getConfig('login_key_cache')) > 65000 )
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
+ − 635
{
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
+ − 636
setConfig('login_key_cache', '');
304
+ − 637
return array(
+ − 638
'success' => false,
+ − 639
'error' => 'key_not_found_cleared',
+ − 640
);
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
+ − 641
}
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
+ − 642
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
+ − 643
'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
+ − 644
'error' => 'key_not_found'
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
+ − 645
);
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
+ − 646
}
1
+ − 647
+ − 648
// Convert the key to a binary string
+ − 649
$bin_key = hexdecode($aes_key);
+ − 650
+ − 651
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
+ − 652
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
+ − 653
'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
+ − 654
'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
+ − 655
);
1
+ − 656
+ − 657
// Decrypt our password
+ − 658
$password = $aes->decrypt($aes_data, $bin_key, ENC_HEX);
+ − 659
+ − 660
// Initialize our success switch
+ − 661
$success = false;
+ − 662
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
+ − 663
// 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
+ − 664
$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
+ − 665
$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
+ − 666
$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
+ − 667
1
+ − 668
// 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
+ − 669
$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
+ − 670
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
+ − 671
{
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
+ − 672
// 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
+ − 673
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
+ − 674
$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
+ − 675
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
+ − 676
$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
+ − 677
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
+ − 678
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
+ − 679
{
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
+ − 680
$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
+ − 681
// 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
+ − 682
$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
+ − 683
$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
+ − 684
// 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
+ − 685
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
+ − 686
'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
+ − 687
'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
+ − 688
'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
+ − 689
'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
+ − 690
'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
+ − 691
'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
+ − 692
'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
+ − 693
);
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
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
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
+ − 697
'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
+ − 698
'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
+ − 699
);
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
+ − 700
}
1
+ − 701
$row = $db->fetchrow();
+ − 702
+ − 703
// Check to see if we're logging in using a temporary password
+ − 704
+ − 705
if((intval($row['temp_password_time']) + 3600*24) > time() )
+ − 706
{
+ − 707
$temp_pass = $aes->decrypt( $row['temp_password'], $this->private_key, ENC_HEX );
+ − 708
if( $temp_pass == $password )
+ − 709
{
+ − 710
$url = makeUrlComplete('Special', 'PasswordReset/stage2/' . $row['user_id'] . '/' . $row['temp_password']);
+ − 711
+ − 712
$code = $plugins->setHook('login_password_reset');
+ − 713
foreach ( $code as $cmd )
+ − 714
{
+ − 715
eval($cmd);
+ − 716
}
+ − 717
+ − 718
redirect($url, 'Login sucessful', 'Please wait while you are transferred to the Password Reset form.');
+ − 719
exit;
+ − 720
}
+ − 721
}
+ − 722
+ − 723
if($row['old_encryption'] == 1)
+ − 724
{
+ − 725
// The user's password is stored using the obsolete and insecure MD5 algorithm, so we'll update the field with the new password
+ − 726
if(md5($password) == $row['password'])
+ − 727
{
+ − 728
$pass_stashed = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 729
$this->sql('UPDATE '.table_prefix.'users SET password=\''.$pass_stashed.'\',old_encryption=0 WHERE user_id='.$row['user_id'].';');
+ − 730
$success = true;
+ − 731
}
+ − 732
}
+ − 733
else
+ − 734
{
+ − 735
// 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
+ − 736
$real_pass = $aes->decrypt(hexdecode($row['password']), $this->private_key, ENC_BINARY);
+ − 737
if($password == $real_pass)
+ − 738
{
+ − 739
// Yay! We passed AES authentication, now do an MD5 challenge check to make sure we weren't spoofed
+ − 740
$chal = substr($challenge, 0, 32);
+ − 741
$salt = substr($challenge, 32, 32);
+ − 742
$correct_challenge = md5( $real_pass . $salt );
+ − 743
if($chal == $correct_challenge)
+ − 744
$success = true;
+ − 745
}
+ − 746
}
+ − 747
if($success)
+ − 748
{
+ − 749
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
+ − 750
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
+ − 751
'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
+ − 752
'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
+ − 753
);
1
+ − 754
+ − 755
$sess = $this->register_session(intval($row['user_id']), $username, $password, $level);
+ − 756
if($sess)
+ − 757
{
+ − 758
$this->username = $username;
+ − 759
$this->user_id = intval($row['user_id']);
+ − 760
$this->theme = $row['theme'];
+ − 761
$this->style = $row['style'];
+ − 762
+ − 763
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
+ − 764
$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
+ − 765
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
+ − 766
$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
+ − 767
+ − 768
$code = $plugins->setHook('login_success');
+ − 769
foreach ( $code as $cmd )
+ − 770
{
+ − 771
eval($cmd);
+ − 772
}
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
+ − 773
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
+ − 774
'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
+ − 775
);
1
+ − 776
}
+ − 777
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
+ − 778
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
+ − 779
'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
+ − 780
'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
+ − 781
);
1
+ − 782
}
+ − 783
else
+ − 784
{
+ − 785
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
+ − 786
$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
+ − 787
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
+ − 788
$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
+ − 789
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
+ − 790
// 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
+ − 791
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
+ − 792
{
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
$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
+ − 794
// 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
+ − 795
$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
+ − 796
$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
+ − 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' => ( $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
+ − 800
'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
+ − 801
'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
+ − 802
'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
+ − 803
'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
+ − 804
'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
+ − 805
);
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
+ − 806
}
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
+ − 807
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
+ − 808
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
+ − 809
'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
+ − 810
'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
+ − 811
);
1
+ − 812
}
+ − 813
}
+ − 814
+ − 815
/**
+ − 816
* Attempts to login without using crypto stuff, mainly for use when the other side doesn't like Javascript
+ − 817
* 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
+ − 818
* Technically it still uses crypto, but it only decrypts the password already stored, which is (obviously) required for authentication
+ − 819
* @param string $username The username
+ − 820
* @param string $password The password -OR- the MD5 hash of the password if $already_md5ed is true
+ − 821
* @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.
+ − 822
* @param int $level The privilege level we're authenticating for, defaults to 0
+ − 823
*/
+ − 824
+ − 825
function login_without_crypto($username, $password, $already_md5ed = false, $level = USER_LEVEL_MEMBER)
+ − 826
{
+ − 827
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 828
+ − 829
$pass_hashed = ( $already_md5ed ) ? $password : md5($password);
+ − 830
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 831
// 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
+ − 832
// (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
+ − 833
$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
+ − 834
1
+ − 835
// Perhaps we're upgrading Enano?
+ − 836
if($this->compat)
+ − 837
{
+ − 838
return $this->login_compat($username, $pass_hashed, $level);
+ − 839
}
+ − 840
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
+ − 841
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
+ − 842
{
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
+ − 843
// 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
+ − 844
$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
+ − 845
$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
+ − 846
// 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
+ − 847
$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
+ − 848
$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
+ − 849
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
+ − 850
{
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
+ − 851
// 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
+ − 852
$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
+ − 853
}
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
+ − 854
if ( $policy != 'disable' && !( $policy == 'captcha' && isset($real_code) && $real_code == $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
+ − 855
{
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
+ − 856
$ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
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
+ − 857
$timestamp_cutoff = time() - $duration;
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
+ − 858
$q = $this->sql('SELECT timestamp FROM '.table_prefix.'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;');
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
+ − 859
$fails = $db->numrows();
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 ( $fails > $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
+ − 861
{
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
// 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
+ − 863
$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
+ − 864
$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
+ − 865
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
+ − 866
'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
+ − 867
'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
+ − 868
'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
+ − 869
'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
+ − 870
'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
+ − 871
'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
+ − 872
'time_rem' => $duration - 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
+ − 873
'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
+ − 874
);
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
}
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
+ − 876
$db->free_result();
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
+ − 877
}
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
+ − 878
}
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
+ − 879
1
+ − 880
// 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
+ − 881
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 882
+ − 883
// Initialize our success switch
+ − 884
$success = false;
+ − 885
+ − 886
// 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
+ − 887
$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
+ − 888
if($db->numrows() < 1)
188
+ − 889
{
+ − 890
// This wasn't logged in <1.0.2, dunno how it slipped through
+ − 891
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
+ − 892
$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
+ − 893
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
+ − 894
$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
+ − 895
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
+ − 896
// 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
+ − 897
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
+ − 898
{
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
+ − 899
$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
+ − 900
// 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
+ − 901
$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
+ − 902
$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
+ − 903
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
+ − 904
'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
+ − 905
'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
+ − 906
'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
+ − 907
'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
+ − 908
'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
+ − 909
'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
+ − 910
);
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
+ − 911
}
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
+ − 912
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
+ − 913
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
+ − 914
'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
+ − 915
'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
+ − 916
);
188
+ − 917
}
1
+ − 918
$row = $db->fetchrow();
+ − 919
+ − 920
// Check to see if we're logging in using a temporary password
+ − 921
+ − 922
if((intval($row['temp_password_time']) + 3600*24) > time() )
+ − 923
{
+ − 924
$temp_pass = $aes->decrypt( $row['temp_password'], $this->private_key, ENC_HEX );
+ − 925
if( md5($temp_pass) == $pass_hashed )
+ − 926
{
+ − 927
$code = $plugins->setHook('login_password_reset');
+ − 928
foreach ( $code as $cmd )
+ − 929
{
+ − 930
eval($cmd);
+ − 931
}
+ − 932
+ − 933
header('Location: ' . makeUrlComplete('Special', 'PasswordReset/stage2/' . $row['user_id'] . '/' . $row['temp_password']) );
+ − 934
+ − 935
exit;
+ − 936
}
+ − 937
}
+ − 938
+ − 939
if($row['old_encryption'] == 1)
+ − 940
{
+ − 941
// The user's password is stored using the obsolete and insecure MD5 algorithm - we'll update the field with the new password
+ − 942
if($pass_hashed == $row['password'] && !$already_md5ed)
+ − 943
{
+ − 944
$pass_stashed = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 945
$this->sql('UPDATE '.table_prefix.'users SET password=\''.$pass_stashed.'\',old_encryption=0 WHERE user_id='.$row['user_id'].';');
+ − 946
$success = true;
+ − 947
}
+ − 948
elseif($pass_hashed == $row['password'] && $already_md5ed)
+ − 949
{
+ − 950
// We don't have the real password so don't bother with encrypting it, just call it success and get out of here
+ − 951
$success = true;
+ − 952
}
+ − 953
}
+ − 954
else
+ − 955
{
+ − 956
// 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
+ − 957
$real_pass = $aes->decrypt($row['password'], $this->private_key);
+ − 958
if($pass_hashed == md5($real_pass))
+ − 959
{
+ − 960
$success = true;
+ − 961
}
+ − 962
}
+ − 963
if($success)
+ − 964
{
+ − 965
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
+ − 966
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
+ − 967
'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
+ − 968
'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
+ − 969
);
1
+ − 970
$sess = $this->register_session(intval($row['user_id']), $username, $real_pass, $level);
+ − 971
if($sess)
+ − 972
{
+ − 973
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
+ − 974
$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
+ − 975
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
+ − 976
$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
+ − 977
+ − 978
$code = $plugins->setHook('login_success');
+ − 979
foreach ( $code as $cmd )
+ − 980
{
+ − 981
eval($cmd);
+ − 982
}
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
+ − 983
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
+ − 984
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
+ − 985
'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
+ − 986
);
1
+ − 987
}
+ − 988
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
+ − 989
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
+ − 990
'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
+ − 991
'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
+ − 992
);
1
+ − 993
}
+ − 994
else
+ − 995
{
+ − 996
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
+ − 997
$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
+ − 998
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
+ − 999
$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
+ − 1000
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
+ − 1001
// 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
+ − 1002
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
+ − 1003
{
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
+ − 1004
$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
+ − 1005
// 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
+ − 1006
$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
+ − 1007
$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
+ − 1008
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
+ − 1009
'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
+ − 1010
'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
+ − 1011
'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
+ − 1012
'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
+ − 1013
'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
+ − 1014
'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
+ − 1015
);
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
}
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
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
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
+ − 1019
'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
+ − 1020
'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
+ − 1021
);
1
+ − 1022
}
+ − 1023
}
+ − 1024
+ − 1025
/**
+ − 1026
* Attempts to log in using the old table structure and algorithm.
+ − 1027
* @param string $username
+ − 1028
* @param string $password This should be an MD5 hash
+ − 1029
* @return string 'success' if successful, or error message on failure
+ − 1030
*/
+ − 1031
+ − 1032
function login_compat($username, $password, $level = 0)
+ − 1033
{
+ − 1034
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1035
$pass_hashed =& $password;
+ − 1036
$this->sql('SELECT password,user_id,user_level FROM '.table_prefix.'users WHERE username=\''.$this->prepare_text($username).'\';');
+ − 1037
if($db->numrows() < 1)
+ − 1038
return 'The username and/or password is incorrect.';
+ − 1039
$row = $db->fetchrow();
+ − 1040
if($row['password'] == $password)
+ − 1041
{
+ − 1042
if((int)$level > (int)$row['user_level'])
+ − 1043
return 'You are not authorized for this level of access.';
+ − 1044
$sess = $this->register_session_compat(intval($row['user_id']), $username, $password, $level);
+ − 1045
if($sess)
+ − 1046
return 'success';
+ − 1047
else
+ − 1048
return 'Your login credentials were correct, but an internal error occured while registering the session key in the database.';
+ − 1049
}
+ − 1050
else
+ − 1051
{
+ − 1052
return 'The username and/or password is incorrect.';
+ − 1053
}
+ − 1054
}
+ − 1055
+ − 1056
/**
+ − 1057
* 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
+ − 1058
* 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
+ − 1059
* @param int $user_id
+ − 1060
* @param string $username
+ − 1061
* @param string $password
+ − 1062
* @param int $level The level of access to grant, defaults to USER_LEVEL_MEMBER
+ − 1063
* @return bool
+ − 1064
*/
+ − 1065
+ − 1066
function register_session($user_id, $username, $password, $level = USER_LEVEL_MEMBER)
+ − 1067
{
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
+ − 1068
// Random key identifier
1
+ − 1069
$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
+ − 1070
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
+ − 1071
// SHA1 hash of password, stored in the key
1
+ − 1072
$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
+ − 1073
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
+ − 1074
// Unencrypted session key
1
+ − 1075
$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
+ − 1076
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
+ − 1077
// 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
+ − 1078
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1079
$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
+ − 1080
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
+ − 1081
// If we're registering an elevated-privilege key, it needs to be on GET
1
+ − 1082
if($level > USER_LEVEL_MEMBER)
+ − 1083
{
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
+ − 1084
// Reverse it - cosmetic only ;-)
1
+ − 1085
$hexkey = strrev($session_key);
+ − 1086
$this->sid_super = $hexkey;
+ − 1087
$_GET['auth'] = $hexkey;
+ − 1088
}
+ − 1089
else
+ − 1090
{
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
+ − 1091
// 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
+ − 1092
// For now, make the cookie last forever, we can change this in 1.1.x
259
+ − 1093
setcookie( 'sid', $session_key, time()+315360000, scriptPath.'/', null, ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ) );
1
+ − 1094
$_COOKIE['sid'] = $session_key;
+ − 1095
}
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
// $keyhash is stored in the database, this is for compatibility with the older DB structure
1
+ − 1097
$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
+ − 1098
// Record the user's IP
1
+ − 1099
$ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 1100
if(!$ip)
+ − 1101
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
+ − 1102
// The time needs to be stashed to enforce the 15-minute limit on elevated session keys
1
+ − 1103
$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
+ − 1104
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
+ − 1105
// Sanity check
1
+ − 1106
if(!is_int($user_id))
+ − 1107
die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
+ − 1108
if(!is_int($level))
+ − 1109
die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
+ − 1110
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
+ − 1111
// All done!
1
+ − 1112
$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.');');
+ − 1113
return true;
+ − 1114
}
+ − 1115
+ − 1116
/**
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1117
* 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
+ − 1118
* @see sessionManager::register_session()
+ − 1119
* @access private
+ − 1120
*/
+ − 1121
+ − 1122
function register_session_compat($user_id, $username, $password, $level = 0)
+ − 1123
{
+ − 1124
$salt = md5(microtime() . mt_rand());
+ − 1125
$thekey = md5($password . $salt);
+ − 1126
if($level > 0)
+ − 1127
{
+ − 1128
$this->sid_super = $thekey;
+ − 1129
}
+ − 1130
else
+ − 1131
{
+ − 1132
setcookie( 'sid', $thekey, time()+315360000, scriptPath.'/' );
+ − 1133
$_COOKIE['sid'] = $thekey;
+ − 1134
}
+ − 1135
$ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 1136
if(!$ip)
+ − 1137
die('$session->register_session: Remote-Addr was spoofed');
+ − 1138
$time = time();
+ − 1139
if(!is_int($user_id))
+ − 1140
die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
+ − 1141
if(!is_int($level))
+ − 1142
die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
+ − 1143
$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.');');
+ − 1144
return true;
+ − 1145
}
+ − 1146
+ − 1147
/**
+ − 1148
* Creates/restores a guest session
+ − 1149
* @todo implement real session management for guests
+ − 1150
*/
+ − 1151
+ − 1152
function register_guest_session()
+ − 1153
{
+ − 1154
global $db, $session, $paths, $template, $plugins; // Common objects
209
+ − 1155
global $lang;
1
+ − 1156
$this->username = $_SERVER['REMOTE_ADDR'];
+ − 1157
$this->user_level = USER_LEVEL_GUEST;
+ − 1158
if($this->compat || defined('IN_ENANO_INSTALL'))
+ − 1159
{
+ − 1160
$this->theme = 'oxygen';
+ − 1161
$this->style = 'bleu';
+ − 1162
}
+ − 1163
else
+ − 1164
{
+ − 1165
$this->theme = ( isset($_GET['theme']) && isset($template->named_theme_list[$_GET['theme']])) ? $_GET['theme'] : $template->default_theme;
+ − 1166
$this->style = ( isset($_GET['style']) && file_exists(ENANO_ROOT.'/themes/'.$this->theme . '/css/'.$_GET['style'].'.css' )) ? $_GET['style'] : substr($template->named_theme_list[$this->theme]['default_style'], 0, strlen($template->named_theme_list[$this->theme]['default_style'])-4);
+ − 1167
}
+ − 1168
$this->user_id = 1;
209
+ − 1169
if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ − 1170
{
+ − 1171
// This is a VERY special case we are allowing. It lets the installer create languages using the Enano API.
+ − 1172
$language = intval(getConfig('default_language'));
+ − 1173
$lang = new Language($language);
+ − 1174
}
1
+ − 1175
}
+ − 1176
+ − 1177
/**
+ − 1178
* Validates a session key, and returns the userdata associated with the key or false
+ − 1179
* @param string $key The session key to validate
+ − 1180
* @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.
+ − 1181
*/
+ − 1182
+ − 1183
function validate_session($key)
+ − 1184
{
+ − 1185
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1186
$aes = new AESCrypt(AES_BITS, AES_BLOCKSIZE, true);
+ − 1187
$decrypted_key = $aes->decrypt($key, $this->private_key, ENC_HEX);
+ − 1188
+ − 1189
if ( !$decrypted_key )
+ − 1190
{
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
+ − 1191
// 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
+ − 1192
return false;
1
+ − 1193
}
+ − 1194
+ − 1195
$n = preg_match('/^u='.$this->valid_username.';p=([A-Fa-f0-9]+?);s=([A-Fa-f0-9]+?)$/', $decrypted_key, $keydata);
+ − 1196
if($n < 1)
+ − 1197
{
+ − 1198
// echo '(debug) $session->validate_session: Key does not match regex<br />Decrypted key: '.$decrypted_key;
+ − 1199
return false;
+ − 1200
}
+ − 1201
$keyhash = md5($key);
+ − 1202
$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
+ − 1203
// 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
+ − 1204
$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
+ − 1205
. ' 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"
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
+ − 1206
. ' x.* FROM '.table_prefix.'session_keys AS k' . "\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
+ − 1207
. ' 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
+ − 1208
. ' 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
+ − 1209
. ' 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
+ − 1210
. ' 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
+ − 1211
. ' 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
+ − 1212
. ' 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
+ − 1213
. ' 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
+ − 1214
. ' AND k.salt=\''.$salt.'\'' . "\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
+ − 1215
. ' 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,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
+ − 1216
18
+ − 1217
if ( !$query )
+ − 1218
{
+ − 1219
$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 FROM '.table_prefix.'session_keys AS k
+ − 1220
LEFT JOIN '.table_prefix.'users AS u
+ − 1221
ON ( u.user_id=k.user_id )
+ − 1222
LEFT JOIN '.table_prefix.'privmsgs AS p
+ − 1223
ON ( p.message_to=u.username AND p.message_read=0 )
+ − 1224
WHERE k.session_key=\''.$keyhash.'\'
+ − 1225
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
+ − 1226
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
+ − 1227
}
1
+ − 1228
if($db->numrows() < 1)
+ − 1229
{
+ − 1230
// echo '(debug) $session->validate_session: Key was not found in database<br />';
+ − 1231
return false;
+ − 1232
}
+ − 1233
$row = $db->fetchrow();
+ − 1234
$row['user_id'] =& $row['uid'];
+ − 1235
$ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 1236
if($row['auth_level'] > $row['user_level'])
+ − 1237
{
+ − 1238
// Failed authorization check
+ − 1239
// echo '(debug) $session->validate_session: access to this auth level denied<br />';
+ − 1240
return false;
+ − 1241
}
+ − 1242
if($ip != $row['source_ip'])
+ − 1243
{
+ − 1244
// Failed IP address check
+ − 1245
// echo '(debug) $session->validate_session: IP address mismatch<br />';
+ − 1246
return false;
+ − 1247
}
+ − 1248
+ − 1249
// Do the password validation
+ − 1250
$real_pass = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 1251
+ − 1252
//die('<pre>'.print_r($keydata, true).'</pre>');
+ − 1253
if(sha1($real_pass) != $keydata[2])
+ − 1254
{
+ − 1255
// Failed password check
+ − 1256
// 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];
+ − 1257
return false;
+ − 1258
}
+ − 1259
+ − 1260
$time_now = time();
+ − 1261
$time_key = $row['time'] + 900;
+ − 1262
if($time_now > $time_key && $row['auth_level'] > USER_LEVEL_MEMBER)
+ − 1263
{
+ − 1264
// Session timed out
+ − 1265
// echo '(debug) $session->validate_session: super session timed out<br />';
+ − 1266
$this->sw_timed_out = true;
+ − 1267
return false;
+ − 1268
}
+ − 1269
+ − 1270
// If this is an elevated-access session key, update the time
+ − 1271
if( $row['auth_level'] > USER_LEVEL_MEMBER )
+ − 1272
{
+ − 1273
$this->sql('UPDATE '.table_prefix.'session_keys SET time='.time().' WHERE session_key=\''.$keyhash.'\';');
+ − 1274
}
+ − 1275
31
+ − 1276
$user_extra = array();
+ − 1277
foreach ( array('user_aim', 'user_yahoo', 'user_msn', 'user_xmpp', 'user_homepage', 'user_location', 'user_job', 'user_hobbies', 'email_public') as $column )
+ − 1278
{
+ − 1279
$user_extra[$column] = $row[$column];
+ − 1280
}
+ − 1281
+ − 1282
$this->user_extra = $user_extra;
+ − 1283
// Leave the rest to PHP's automatic garbage collector ;-)
+ − 1284
1
+ − 1285
$row['password'] = md5($real_pass);
+ − 1286
return $row;
+ − 1287
}
+ − 1288
+ − 1289
/**
+ − 1290
* Validates a session key, and returns the userdata associated with the key or false. Optimized for compatibility with the old MD5-based auth system.
+ − 1291
* @param string $key The session key to validate
+ − 1292
* @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.
+ − 1293
*/
+ − 1294
+ − 1295
function compat_validate_session($key)
+ − 1296
{
+ − 1297
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1298
$key = $db->escape($key);
+ − 1299
+ − 1300
$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 FROM '.table_prefix.'session_keys AS k
+ − 1301
LEFT JOIN '.table_prefix.'users AS u
+ − 1302
ON u.user_id=k.user_id
+ − 1303
WHERE k.session_key=\''.$key.'\';');
+ − 1304
if($db->numrows() < 1)
+ − 1305
{
+ − 1306
// echo '(debug) $session->validate_session: Key '.$key.' was not found in database<br />';
+ − 1307
return false;
+ − 1308
}
+ − 1309
$row = $db->fetchrow();
+ − 1310
$ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 1311
if($row['auth_level'] > $row['user_level'])
+ − 1312
{
+ − 1313
// Failed authorization check
+ − 1314
// echo '(debug) $session->validate_session: user not authorized for this access level';
+ − 1315
return false;
+ − 1316
}
+ − 1317
if($ip != $row['source_ip'])
+ − 1318
{
+ − 1319
// Failed IP address check
+ − 1320
// echo '(debug) $session->validate_session: IP address mismatch; IP in table: '.$row['source_ip'].'; reported IP: '.$ip.'';
+ − 1321
return false;
+ − 1322
}
+ − 1323
+ − 1324
// Do the password validation
+ − 1325
$real_key = md5($row['password'] . $row['salt']);
+ − 1326
+ − 1327
//die('<pre>'.print_r($keydata, true).'</pre>');
+ − 1328
if($real_key != $key)
+ − 1329
{
+ − 1330
// Failed password check
+ − 1331
// echo '(debug) $session->validate_session: supplied password is wrong<br />Real key: '.$real_key.'<br />User key: '.$key;
+ − 1332
return false;
+ − 1333
}
+ − 1334
+ − 1335
$time_now = time();
+ − 1336
$time_key = $row['time'] + 900;
+ − 1337
if($time_now > $time_key && $row['auth_level'] >= 1)
+ − 1338
{
+ − 1339
$this->sw_timed_out = true;
+ − 1340
// Session timed out
+ − 1341
// echo '(debug) $session->validate_session: super session timed out<br />';
+ − 1342
return false;
+ − 1343
}
+ − 1344
+ − 1345
return $row;
+ − 1346
}
+ − 1347
+ − 1348
/**
+ − 1349
* Demotes us to one less than the specified auth level. AKA destroys elevated authentication and/or logs out the user, depending on $level
+ − 1350
* @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
+ − 1351
* @return string 'success' if successful, or error on failure
+ − 1352
*/
+ − 1353
+ − 1354
function logout($level = USER_LEVEL_MEMBER)
+ − 1355
{
+ − 1356
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1357
$ou = $this->username;
+ − 1358
$oid = $this->user_id;
+ − 1359
if($level > USER_LEVEL_CHPREF)
+ − 1360
{
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
+ − 1361
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
221
+ − 1362
if(!$this->user_logged_in || $this->auth_level < USER_LEVEL_MOD)
+ − 1363
{
+ − 1364
return 'success';
+ − 1365
}
1
+ − 1366
// Destroy elevated privileges
+ − 1367
$keyhash = md5(strrev($this->sid_super));
+ − 1368
$this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.$keyhash.'\' AND user_id=\'' . $this->user_id . '\';');
+ − 1369
$this->sid_super = false;
+ − 1370
$this->auth_level = USER_LEVEL_MEMBER;
+ − 1371
}
+ − 1372
else
+ − 1373
{
+ − 1374
if($this->user_logged_in)
+ − 1375
{
+ − 1376
// Completely destroy our session
+ − 1377
if($this->auth_level > USER_LEVEL_CHPREF)
+ − 1378
{
+ − 1379
$this->logout(USER_LEVEL_ADMIN);
+ − 1380
}
+ − 1381
$this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.md5($this->sid).'\';');
+ − 1382
setcookie( 'sid', '', time()-(3600*24), scriptPath.'/' );
+ − 1383
}
+ − 1384
}
+ − 1385
$code = $plugins->setHook('logout_success'); // , Array('level'=>$level,'old_username'=>$ou,'old_user_id'=>$oid));
+ − 1386
foreach ( $code as $cmd )
+ − 1387
{
+ − 1388
eval($cmd);
+ − 1389
}
+ − 1390
return 'success';
+ − 1391
}
+ − 1392
+ − 1393
# Miscellaneous stuff
+ − 1394
+ − 1395
/**
+ − 1396
* Appends the high-privilege session key to the URL if we are authorized to do high-privilege stuff
+ − 1397
* @param string $url The URL to add session data to
+ − 1398
* @return string
+ − 1399
*/
+ − 1400
+ − 1401
function append_sid($url)
+ − 1402
{
+ − 1403
$sep = ( strstr($url, '?') ) ? '&' : '?';
+ − 1404
if ( $this->sid_super )
+ − 1405
{
+ − 1406
$url = $url . $sep . 'auth=' . urlencode($this->sid_super);
+ − 1407
// echo($this->sid_super.'<br/>');
+ − 1408
}
+ − 1409
return $url;
+ − 1410
}
+ − 1411
+ − 1412
/**
+ − 1413
* Grabs the user's password MD5
+ − 1414
* @return string, or bool false if access denied
+ − 1415
*/
+ − 1416
+ − 1417
function grab_password_hash()
+ − 1418
{
+ − 1419
if(!$this->password_hash) return false;
+ − 1420
return $this->password_hash;
+ − 1421
}
+ − 1422
+ − 1423
/**
+ − 1424
* Destroys the user's password MD5 in memory
+ − 1425
*/
+ − 1426
+ − 1427
function disallow_password_grab()
+ − 1428
{
+ − 1429
$this->password_hash = false;
+ − 1430
return false;
+ − 1431
}
+ − 1432
+ − 1433
/**
+ − 1434
* Generates an AES key and stashes it in the database
+ − 1435
* @return string Hex-encoded AES key
+ − 1436
*/
+ − 1437
+ − 1438
function rijndael_genkey()
+ − 1439
{
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
+ − 1440
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1441
$key = $aes->gen_readymade_key();
+ − 1442
$keys = getConfig('login_key_cache');
+ − 1443
if(is_string($keys))
+ − 1444
$keys .= $key;
+ − 1445
else
+ − 1446
$keys = $key;
+ − 1447
setConfig('login_key_cache', $keys);
+ − 1448
return $key;
+ − 1449
}
+ − 1450
+ − 1451
/**
+ − 1452
* Generate a totally random 128-bit value for MD5 challenges
+ − 1453
* @return string
+ − 1454
*/
+ − 1455
+ − 1456
function dss_rand()
+ − 1457
{
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
+ − 1458
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1459
$random = $aes->randkey(128);
+ − 1460
unset($aes);
+ − 1461
return md5(microtime() . $random);
+ − 1462
}
+ − 1463
+ − 1464
/**
+ − 1465
* Fetch a cached login public key using the MD5sum as an identifier. Each key can only be fetched once before it is destroyed.
+ − 1466
* @param string $md5 The MD5 sum of the key
+ − 1467
* @return string, or bool false on failure
+ − 1468
*/
+ − 1469
+ − 1470
function fetch_public_key($md5)
+ − 1471
{
+ − 1472
$keys = getConfig('login_key_cache');
+ − 1473
$keys = enano_str_split($keys, AES_BITS / 4);
+ − 1474
+ − 1475
foreach($keys as $i => $k)
+ − 1476
{
+ − 1477
if(md5($k) == $md5)
+ − 1478
{
+ − 1479
unset($keys[$i]);
+ − 1480
if(count($keys) > 0)
+ − 1481
{
+ − 1482
if ( strlen(getConfig('login_key_cache') ) > 64000 )
+ − 1483
{
+ − 1484
// This should only need to be done once every month or so for an average-size site
+ − 1485
setConfig('login_key_cache', '');
+ − 1486
}
+ − 1487
else
+ − 1488
{
+ − 1489
$keys = implode('', array_values($keys));
+ − 1490
setConfig('login_key_cache', $keys);
+ − 1491
}
+ − 1492
}
+ − 1493
else
+ − 1494
{
+ − 1495
setConfig('login_key_cache', '');
+ − 1496
}
+ − 1497
return $k;
+ − 1498
}
+ − 1499
}
+ − 1500
// Couldn't find the key...
+ − 1501
return false;
+ − 1502
}
+ − 1503
+ − 1504
/**
+ − 1505
* Adds a user to a group.
+ − 1506
* @param int User ID
+ − 1507
* @param int Group ID
+ − 1508
* @param bool Group moderator - defaults to false
+ − 1509
* @return bool True on success, false on failure
+ − 1510
*/
+ − 1511
+ − 1512
function add_user_to_group($user_id, $group_id, $is_mod = false)
+ − 1513
{
+ − 1514
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1515
+ − 1516
// Validation
+ − 1517
if ( !is_int($user_id) || !is_int($group_id) || !is_bool($is_mod) )
+ − 1518
return false;
+ − 1519
if ( $user_id < 1 || $group_id < 1 )
+ − 1520
return false;
+ − 1521
+ − 1522
$mod_switch = ( $is_mod ) ? '1' : '0';
+ − 1523
$q = $this->sql('SELECT member_id,is_mod FROM '.table_prefix.'group_members WHERE user_id=' . $user_id . ' AND group_id=' . $group_id . ';');
+ − 1524
if ( !$q )
+ − 1525
$db->_die();
+ − 1526
if ( $db->numrows() < 1 )
+ − 1527
{
+ − 1528
// User is not in group
+ − 1529
$this->sql('INSERT INTO '.table_prefix.'group_members(user_id,group_id,is_mod) VALUES(' . $user_id . ', ' . $group_id . ', ' . $mod_switch . ');');
+ − 1530
return true;
+ − 1531
}
+ − 1532
else
+ − 1533
{
+ − 1534
$row = $db->fetchrow();
+ − 1535
// Update modship status
+ − 1536
if ( strval($row['is_mod']) == $mod_switch )
+ − 1537
{
+ − 1538
// Modship unchanged
+ − 1539
return true;
+ − 1540
}
+ − 1541
else
+ − 1542
{
+ − 1543
// Modship changed
+ − 1544
$this->sql('UPDATE '.table_prefix.'group_members SET is_mod=' . $mod_switch . ' WHERE member_id=' . $row['member_id'] . ';');
+ − 1545
return true;
+ − 1546
}
+ − 1547
}
+ − 1548
return false;
+ − 1549
}
+ − 1550
+ − 1551
/**
+ − 1552
* Removes a user from a group.
+ − 1553
* @param int User ID
+ − 1554
* @param int Group ID
+ − 1555
* @return bool True on success, false on failure
+ − 1556
* @todo put a little more error checking in...
+ − 1557
*/
+ − 1558
+ − 1559
function remove_user_from_group($user_id, $group_id)
+ − 1560
{
+ − 1561
if ( !is_int($user_id) || !is_int($group_id) )
+ − 1562
return false;
+ − 1563
$this->sql('DELETE FROM '.table_prefix."group_members WHERE user_id=$user_id AND group_id=$group_id;");
+ − 1564
return true;
+ − 1565
}
+ − 1566
+ − 1567
/**
+ − 1568
* Checks the banlist to ensure that we're an allowed user. Doesn't return anything because it dies if the user is banned.
+ − 1569
*/
+ − 1570
+ − 1571
function check_banlist()
+ − 1572
{
+ − 1573
global $db, $session, $paths, $template, $plugins; // Common objects
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1574
$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
+ − 1575
$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
+ − 1576
if ( $this->user_logged_in )
1
+ − 1577
{
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1578
// 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
+ − 1579
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
+ − 1580
{
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
+ − 1581
$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
+ − 1582
. " ( 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
+ − 1583
. " ( 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
+ − 1584
. " ( 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
+ − 1585
. " ( 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
+ − 1586
. " ( 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
+ − 1587
. " ( 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
+ − 1588
. " 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
+ − 1589
}
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
+ − 1590
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
+ − 1591
{
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
+ − 1592
$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
+ − 1593
. " ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR \n"
322
+ − 1594
. " ( 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
+ − 1595
. " ( ban_type = " . BAN_USER . " AND is_regex = 0 AND ban_value = '{$this->username}' ) OR \n"
322
+ − 1596
. " ( 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
+ − 1597
. " ( ban_type = " . BAN_EMAIL . " AND is_regex = 0 AND ban_value = '{$this->email}' ) OR \n"
322
+ − 1598
. " ( 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
+ − 1599
. " 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
+ − 1600
}
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1601
$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
+ − 1602
if ( $db->numrows() > 0 )
1
+ − 1603
{
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1604
while ( list($reason, $ban_value, $ban_type, $is_regex) = $db->fetchrow_num() )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1605
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1606
if ( $ban_type == BAN_IP && $row['is_regex'] != 1 )
1
+ − 1607
{
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1608
// check range
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1609
$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
+ − 1610
if ( !$regexp )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1611
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1612
continue;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1613
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1614
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
+ − 1615
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1616
$banned = true;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1617
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1618
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1619
else
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1620
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1621
// User is banned
1
+ − 1622
$banned = true;
+ − 1623
}
+ − 1624
}
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1625
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1626
$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
+ − 1627
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1628
else
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1629
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1630
// 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
+ − 1631
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
+ − 1632
{
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
+ − 1633
$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
+ − 1634
( 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
+ − 1635
( 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
+ − 1636
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
+ − 1637
}
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
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
+ − 1639
{
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
$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
+ − 1641
( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR
322
+ − 1642
( 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
+ − 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
}
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1645
$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
+ − 1646
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
+ − 1647
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1648
while ( list($reason, $ban_value, $ban_type, $is_regex) = $db->fetchrow_num() )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1649
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1650
if ( $ban_type == BAN_IP && $row['is_regex'] != 1 )
1
+ − 1651
{
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1652
// check range
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1653
$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
+ − 1654
if ( !$regexp )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1655
continue;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1656
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
+ − 1657
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1658
$banned = true;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1659
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1660
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1661
else
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1662
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1663
// User is banned
1
+ − 1664
$banned = true;
+ − 1665
}
+ − 1666
}
+ − 1667
}
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1668
$db->free_result();
1
+ − 1669
}
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1670
if ( $banned && $paths->get_pageid_from_url() != $paths->nslist['Special'].'CSS' )
1
+ − 1671
{
+ − 1672
// This guy is banned - kill the session, kill the database connection, bail out, and be pretty about it
+ − 1673
die_semicritical('Ban notice', '<div class="error-box">You have been banned from this website. Please contact the site administrator for more information.<br /><br />Reason:<br />'.$reason.'</div>');
+ − 1674
exit;
+ − 1675
}
+ − 1676
}
+ − 1677
+ − 1678
# Registration
+ − 1679
+ − 1680
/**
+ − 1681
* 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
+ − 1682
* @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
+ − 1683
* @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
+ − 1684
* @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
+ − 1685
* @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
+ − 1686
* @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
+ − 1687
*/
+ − 1688
30
+ − 1689
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
+ − 1690
{
1
+ − 1691
global $db, $session, $paths, $template, $plugins; // Common objects
370
+ − 1692
global $lang;
1
+ − 1693
+ − 1694
// 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
+ − 1695
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1696
359
+ − 1697
// Since we're recording IP addresses, make sure the user's IP is safe.
+ − 1698
$ip =& $_SERVER['REMOTE_ADDR'];
+ − 1699
if ( !is_valid_ip($ip) )
+ − 1700
return 'Invalid IP';
+ − 1701
+ − 1702
if ( !preg_match('#^'.$this->valid_username.'$#', $username) )
370
+ − 1703
return $lang->get('user_reg_err_username_banned_chars');
359
+ − 1704
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1705
$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
+ − 1706
$user_orig = $username;
1
+ − 1707
$username = $this->prepare_text($username);
+ − 1708
$email = $this->prepare_text($email);
+ − 1709
$real_name = $this->prepare_text($real_name);
+ − 1710
+ − 1711
$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
+ − 1712
$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
+ − 1713
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
+ − 1714
{
1
+ − 1715
$row = $db->fetchrow();
370
+ − 1716
$str = 'user_reg_err_dupe';
+ − 1717
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
+ − 1718
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
+ − 1719
{
370
+ − 1720
$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
+ − 1721
}
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
+ − 1722
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
+ − 1723
{
370
+ − 1724
$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
+ − 1725
}
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
+ − 1726
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
+ − 1727
{
370
+ − 1728
$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
+ − 1729
}
370
+ − 1730
371
dc6026376919
Improved compatibility with PostgreSQL and fixed a number of installer bugs; fixed missing "meta" category declaration in language files
Dan
diff
changeset
+ − 1731
return $lang->get($str);
1
+ − 1732
}
+ − 1733
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
+ − 1734
// 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
+ − 1735
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
+ − 1736
{
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
+ − 1737
$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
+ − 1738
$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
+ − 1739
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
+ − 1740
{
370
+ − 1741
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
+ − 1742
}
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
+ − 1743
}
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
+ − 1744
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
+ − 1745
$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
+ − 1746
1
+ − 1747
// Require the account to be activated?
+ − 1748
switch(getConfig('account_activation'))
+ − 1749
{
+ − 1750
case 'none':
+ − 1751
default:
+ − 1752
$active = '1';
+ − 1753
break;
+ − 1754
case 'user':
+ − 1755
$active = '0';
+ − 1756
break;
+ − 1757
case 'admin':
+ − 1758
$active = '0';
+ − 1759
break;
+ − 1760
}
30
+ − 1761
if ( $coppa )
+ − 1762
$active = '0';
+ − 1763
+ − 1764
$coppa_col = ( $coppa ) ? '1' : '0';
1
+ − 1765
+ − 1766
// Generate a totally random activation key
+ − 1767
$actkey = sha1 ( microtime() . mt_rand() );
+ − 1768
30
+ − 1769
// We good, create the user
359
+ − 1770
$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
+ − 1771
31
+ − 1772
// Get user ID and create users_extra entry
+ − 1773
$q = $this->sql('SELECT user_id FROM '.table_prefix."users WHERE username='$username';");
+ − 1774
if ( $db->numrows() > 0 )
+ − 1775
{
359
+ − 1776
list($user_id) = $db->fetchrow_num();
31
+ − 1777
$db->free_result();
+ − 1778
+ − 1779
$user_id =& $row['user_id'];
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
+ − 1780
$this->sql('INSERT INTO '.table_prefix.'users_extra(user_id) VALUES(' . $user_id . ');');
31
+ − 1781
}
+ − 1782
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
+ − 1783
// 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
+ − 1784
$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
+ − 1785
'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
+ − 1786
'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
+ − 1787
'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
+ − 1788
'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
+ − 1789
'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
+ − 1790
'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
+ − 1791
'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
+ − 1792
'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
+ − 1793
'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
+ − 1794
'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
+ − 1795
'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
+ − 1796
'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
+ − 1797
'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
+ − 1798
'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
+ − 1799
);
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
+ − 1800
$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
+ − 1801
$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
+ − 1802
$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
+ − 1803
$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
+ − 1804
$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
+ − 1805
$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
+ − 1806
1
+ − 1807
// Require the account to be activated?
30
+ − 1808
if ( $coppa )
+ − 1809
{
+ − 1810
$this->admin_activation_request($username);
+ − 1811
$this->send_coppa_mail($username,$email);
+ − 1812
}
+ − 1813
else
1
+ − 1814
{
30
+ − 1815
switch(getConfig('account_activation'))
+ − 1816
{
+ − 1817
case 'none':
+ − 1818
default:
+ − 1819
break;
+ − 1820
case 'user':
+ − 1821
$a = $this->send_activation_mail($username);
+ − 1822
if(!$a)
+ − 1823
{
+ − 1824
$this->admin_activation_request($username);
370
+ − 1825
return $lang->get('user_reg_err_actmail_failed') . ' ' . $a;
30
+ − 1826
}
+ − 1827
break;
+ − 1828
case 'admin':
1
+ − 1829
$this->admin_activation_request($username);
30
+ − 1830
break;
+ − 1831
}
1
+ − 1832
}
+ − 1833
+ − 1834
// Leave some data behind for the hook
+ − 1835
$code = $plugins->setHook('user_registered'); // , Array('username'=>$username));
+ − 1836
foreach ( $code as $cmd )
+ − 1837
{
+ − 1838
eval($cmd);
+ − 1839
}
+ − 1840
+ − 1841
// $this->register_session($username, $password);
+ − 1842
return 'success';
+ − 1843
}
+ − 1844
+ − 1845
/**
+ − 1846
* Attempts to send an e-mail to the specified user with activation instructions.
+ − 1847
* @param string $u The usernamd of the user requesting activation
+ − 1848
* @return bool true on success, false on failure
+ − 1849
*/
+ − 1850
+ − 1851
function send_activation_mail($u, $actkey = false)
+ − 1852
{
+ − 1853
global $db, $session, $paths, $template, $plugins; // Common objects
370
+ − 1854
global $lang;
131
+ − 1855
$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
+ − 1856
$un = $db->fetchrow();
+ − 1857
$admin_user = $un['username'];
+ − 1858
$q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
+ − 1859
$r = $db->fetchrow();
+ − 1860
if ( empty($r['email']) )
+ − 1861
$db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
+ − 1862
370
+ − 1863
$aklink = makeUrlComplete('Special', 'ActivateAccount/'.str_replace(' ', '_', $u).'/'. ( ( is_string($actkey) ) ? $actkey : $r['activation_key'] ) );
+ − 1864
$message = $lang->get('user_reg_activation_email', array(
+ − 1865
'activation_link' => $aklink,
+ − 1866
'admin_user' => $admin_user,
+ − 1867
'username' => $u
+ − 1868
));
+ − 1869
1
+ − 1870
error_reporting(E_ALL);
+ − 1871
if(getConfig('smtp_enabled') == '1')
+ − 1872
{
370
+ − 1873
$result = smtp_send_email($r['email'], $lang->get('user_reg_activation_email_subject'), preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
1
+ − 1874
if($result == 'success') $result = true;
+ − 1875
else { echo $result; $result = false; }
+ − 1876
} else {
370
+ − 1877
$result = mail($r['email'], $lang->get('user_reg_activation_email_subject'), preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
1
+ − 1878
}
+ − 1879
return $result;
+ − 1880
}
+ − 1881
+ − 1882
/**
30
+ − 1883
* Attempts to send an e-mail to the specified user's e-mail address on file intended for the parents
+ − 1884
* @param string $u The usernamd of the user requesting activation
+ − 1885
* @return bool true on success, false on failure
+ − 1886
*/
+ − 1887
+ − 1888
function send_coppa_mail($u, $actkey = false)
+ − 1889
{
+ − 1890
global $db, $session, $paths, $template, $plugins; // Common objects
370
+ − 1891
global $lang;
30
+ − 1892
+ − 1893
$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;');
+ − 1894
$un = $db->fetchrow();
+ − 1895
$admin_user = $un['username'];
+ − 1896
+ − 1897
$q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
+ − 1898
$r = $db->fetchrow();
+ − 1899
if ( empty($r['email']) )
+ − 1900
$db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
+ − 1901
+ − 1902
if(isset($_SERVER['HTTPS'])) $prot = 'https';
+ − 1903
else $prot = 'http';
+ − 1904
if($_SERVER['SERVER_PORT'] == '80') $p = '';
+ − 1905
else $p = ':'.$_SERVER['SERVER_PORT'];
+ − 1906
$sidbak = false;
+ − 1907
if($this->sid_super)
+ − 1908
$sidbak = $this->sid_super;
+ − 1909
$this->sid_super = false;
+ − 1910
if($sidbak)
+ − 1911
$this->sid_super = $sidbak;
+ − 1912
unset($sidbak);
+ − 1913
$link = "$prot://".$_SERVER['HTTP_HOST'].scriptPath;
+ − 1914
370
+ − 1915
$message = $lang->get(
+ − 1916
'user_reg_activation_email_coppa',
+ − 1917
array(
+ − 1918
'username' => $u,
+ − 1919
'admin_user' => $admin_user,
+ − 1920
'site_link' => $link
+ − 1921
)
+ − 1922
);
30
+ − 1923
+ − 1924
error_reporting(E_ALL);
+ − 1925
+ − 1926
if(getConfig('smtp_enabled') == '1')
+ − 1927
{
+ − 1928
$result = smtp_send_email($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
+ − 1929
if($result == 'success')
+ − 1930
{
+ − 1931
$result = true;
+ − 1932
}
+ − 1933
else
+ − 1934
{
+ − 1935
echo $result;
+ − 1936
$result = false;
+ − 1937
}
+ − 1938
}
+ − 1939
else
+ − 1940
{
+ − 1941
$result = mail($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
+ − 1942
}
+ − 1943
return $result;
+ − 1944
}
+ − 1945
+ − 1946
/**
1
+ − 1947
* Sends an e-mail to a user so they can reset their password.
+ − 1948
* @param int $user The user ID, or username if it's a string
+ − 1949
* @return bool true on success, false on failure
+ − 1950
*/
+ − 1951
+ − 1952
function mail_password_reset($user)
+ − 1953
{
+ − 1954
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
+ − 1955
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
+ − 1956
1
+ − 1957
if(is_int($user))
+ − 1958
{
+ − 1959
$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
+ − 1960
}
+ − 1961
elseif(is_string($user))
+ − 1962
{
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
+ − 1963
$q = $this->sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=' . ENANO_SQLFUNC_LOWERCASE . '(\''.$db->escape($user).'\');');
1
+ − 1964
}
+ − 1965
else
+ − 1966
{
+ − 1967
return false;
+ − 1968
}
+ − 1969
+ − 1970
$row = $db->fetchrow();
+ − 1971
$temp_pass = $this->random_pass();
+ − 1972
+ − 1973
$this->register_temp_password($row['user_id'], $temp_pass);
+ − 1974
+ − 1975
$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
+ − 1976
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
+ − 1977
$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
+ − 1978
'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
+ − 1979
'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
+ − 1980
'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
+ − 1981
'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
+ − 1982
));
1
+ − 1983
+ − 1984
if(getConfig('smtp_enabled') == '1')
+ − 1985
{
+ − 1986
$result = smtp_send_email($row['email'], getConfig('site_name').' password reset', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
+ − 1987
if($result == 'success')
+ − 1988
{
+ − 1989
$result = true;
+ − 1990
}
+ − 1991
else
+ − 1992
{
+ − 1993
echo '<p>'.$result.'</p>';
+ − 1994
$result = false;
+ − 1995
}
+ − 1996
} else {
+ − 1997
$result = mail($row['email'], getConfig('site_name').' password reset', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
+ − 1998
}
+ − 1999
return $result;
+ − 2000
}
+ − 2001
+ − 2002
/**
+ − 2003
* Sets the temporary password for the specified user to whatever is specified.
+ − 2004
* @param int $user_id
+ − 2005
* @param string $password
+ − 2006
* @return bool
+ − 2007
*/
+ − 2008
+ − 2009
function register_temp_password($user_id, $password)
+ − 2010
{
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
+ − 2011
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 2012
$temp_pass = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 2013
$this->sql('UPDATE '.table_prefix.'users SET temp_password=\'' . $temp_pass . '\',temp_password_time='.time().' WHERE user_id='.intval($user_id).';');
+ − 2014
}
+ − 2015
+ − 2016
/**
+ − 2017
* Sends a request to the admin panel to have the username $u activated.
+ − 2018
* @param string $u The username of the user requesting activation
+ − 2019
*/
+ − 2020
+ − 2021
function admin_activation_request($u)
+ − 2022
{
+ − 2023
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
+ − 2024
$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
+ − 2025
}
+ − 2026
+ − 2027
/**
+ − 2028
* Activates a user account. If the action fails, a report is sent to the admin.
+ − 2029
* @param string $user The username of the user requesting activation
+ − 2030
* @param string $key The activation key
+ − 2031
*/
+ − 2032
+ − 2033
function activate_account($user, $key)
+ − 2034
{
+ − 2035
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2036
$this->sql('UPDATE '.table_prefix.'users SET account_active=1 WHERE username=\''.$db->escape($user).'\' AND activation_key=\''.$db->escape($key).'\';');
+ − 2037
$r = mysql_affected_rows();
+ − 2038
if ( $r > 0 )
+ − 2039
{
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
+ − 2040
$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
+ − 2041
}
+ − 2042
else
+ − 2043
{
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
+ − 2044
$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
+ − 2045
}
+ − 2046
return $r;
+ − 2047
}
+ − 2048
+ − 2049
/**
+ − 2050
* For a given user level identifier (USER_LEVEL_*), returns a string describing that user level.
+ − 2051
* @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
+ − 2052
* @param bool If true, returns a shorter string. Optional.
1
+ − 2053
* @return string
+ − 2054
*/
+ − 2055
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
+ − 2056
function userlevel_to_string($user_level, $short = false)
1
+ − 2057
{
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
+ − 2058
if ( $short )
1
+ − 2059
{
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
+ − 2060
switch ( $user_level )
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
+ − 2061
{
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
+ − 2062
case USER_LEVEL_GUEST:
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
+ − 2063
return 'Guest';
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
+ − 2064
case USER_LEVEL_MEMBER:
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
+ − 2065
return 'Member';
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
+ − 2066
case USER_LEVEL_CHPREF:
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
+ − 2067
return 'Sensitive preferences changeable';
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
+ − 2068
case USER_LEVEL_MOD:
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
+ − 2069
return 'Moderator';
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
+ − 2070
case USER_LEVEL_ADMIN:
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
+ − 2071
return 'Administrative';
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
+ − 2072
default:
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
+ − 2073
return "Level $user_level";
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
+ − 2074
}
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
+ − 2075
}
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
+ − 2076
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
+ − 2077
{
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
+ − 2078
switch ( $user_level )
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
+ − 2079
{
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
+ − 2080
case USER_LEVEL_GUEST:
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
+ − 2081
return 'Low - guest privileges';
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
+ − 2082
case USER_LEVEL_MEMBER:
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
+ − 2083
return 'Standard - normal member level';
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
+ − 2084
case USER_LEVEL_CHPREF:
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
+ − 2085
return 'Medium - user can change his/her own e-mail address and password';
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
+ − 2086
case USER_LEVEL_MOD:
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
+ − 2087
return 'High - moderator privileges';
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
+ − 2088
case USER_LEVEL_ADMIN:
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
+ − 2089
return 'Highest - administrative privileges';
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
+ − 2090
default:
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
+ − 2091
return "Unknown ($user_level)";
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
+ − 2092
}
1
+ − 2093
}
+ − 2094
}
+ − 2095
+ − 2096
/**
+ − 2097
* 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.
+ − 2098
* @param int $user_id The user ID of the user to update - this cannot be changed
+ − 2099
* @param string $username The new username
+ − 2100
* @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
+ − 2101
* @param string $password The new password
+ − 2102
* @param string $email The new e-mail address
+ − 2103
* @param string $realname The new real name
+ − 2104
* @param string $signature The updated forum/comment signature
+ − 2105
* @param int $user_level The updated user level
+ − 2106
* @return string 'success' if successful, or array of error strings on failure
+ − 2107
*/
+ − 2108
+ − 2109
function update_user($user_id, $username = false, $old_pass = false, $password = false, $email = false, $realname = false, $signature = false, $user_level = false)
+ − 2110
{
+ − 2111
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2112
+ − 2113
// Create some arrays
+ − 2114
+ − 2115
$errors = Array(); // Used to hold error strings
+ − 2116
$strs = Array(); // Sub-query statements
+ − 2117
+ − 2118
// Scan the user ID for problems
+ − 2119
if(intval($user_id) < 1) $errors[] = 'SQL injection attempt';
+ − 2120
+ − 2121
// 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
+ − 2122
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 2123
+ − 2124
// If all of our input vars are false, then we've effectively done our job so get out of here
+ − 2125
if($username === false && $password === false && $email === false && $realname === false && $signature === false && $user_level === false)
+ − 2126
{
+ − 2127
// echo 'debug: $session->update_user(): success (no changes requested)';
+ − 2128
return 'success';
+ − 2129
}
+ − 2130
+ − 2131
// Initialize our authentication check
+ − 2132
$authed = false;
+ − 2133
+ − 2134
// Verify the inputted password
+ − 2135
if(is_string($old_pass))
+ − 2136
{
+ − 2137
$q = $this->sql('SELECT password FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 2138
if($db->numrows() < 1)
+ − 2139
{
+ − 2140
$errors[] = 'The password data could not be selected for verification.';
+ − 2141
}
+ − 2142
else
+ − 2143
{
+ − 2144
$row = $db->fetchrow();
+ − 2145
$real = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 2146
if($real == $old_pass)
+ − 2147
$authed = true;
+ − 2148
}
+ − 2149
}
+ − 2150
+ − 2151
elseif(is_array($old_pass))
+ − 2152
{
+ − 2153
$old_pass = $aes->decrypt($old_pass[0], $old_pass[1]);
+ − 2154
$q = $this->sql('SELECT password FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 2155
if($db->numrows() < 1)
+ − 2156
{
+ − 2157
$errors[] = 'The password data could not be selected for verification.';
+ − 2158
}
+ − 2159
else
+ − 2160
{
+ − 2161
$row = $db->fetchrow();
+ − 2162
$real = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 2163
if($real == $old_pass)
+ − 2164
$authed = true;
+ − 2165
}
+ − 2166
}
+ − 2167
+ − 2168
// Initialize our query
+ − 2169
$q = 'UPDATE '.table_prefix.'users SET ';
+ − 2170
+ − 2171
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
+ − 2172
{
+ − 2173
// Username
+ − 2174
if(is_string($username))
+ − 2175
{
+ − 2176
// Check the username for problems
+ − 2177
if(!preg_match('#^'.$this->valid_username.'$#', $username))
+ − 2178
$errors[] = 'The username you entered contains invalid characters.';
+ − 2179
$strs[] = 'username=\''.$db->escape($username).'\'';
+ − 2180
}
+ − 2181
// Password
+ − 2182
if(is_string($password) && strlen($password) >= 6)
+ − 2183
{
+ − 2184
// Password needs to be encrypted before being stashed
+ − 2185
$encpass = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 2186
if(!$encpass)
+ − 2187
$errors[] = 'The password could not be encrypted due to an internal error.';
+ − 2188
$strs[] = 'password=\''.$encpass.'\'';
+ − 2189
}
+ − 2190
// E-mail addy
+ − 2191
if(is_string($email))
+ − 2192
{
+ − 2193
// I didn't write this regex.
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
+ − 2194
if(!preg_match('/^(?:[\w\d]+\.?)+@((?:(?:[\w\d]\-?)+\.)+\w{2,4}|localhost)$/', $email))
1
+ − 2195
$errors[] = 'The e-mail address you entered is invalid.';
+ − 2196
$strs[] = 'email=\''.$db->escape($email).'\'';
+ − 2197
}
+ − 2198
}
+ − 2199
// Real name
+ − 2200
if(is_string($realname))
+ − 2201
{
+ − 2202
$strs[] = 'real_name=\''.$db->escape($realname).'\'';
+ − 2203
}
+ − 2204
// Forum/comment signature
+ − 2205
if(is_string($signature))
+ − 2206
{
+ − 2207
$strs[] = 'signature=\''.$db->escape($signature).'\'';
+ − 2208
}
+ − 2209
// User level
+ − 2210
if(is_int($user_level))
+ − 2211
{
+ − 2212
$strs[] = 'user_level='.$user_level;
+ − 2213
}
+ − 2214
+ − 2215
// Add our generated query to the query string
+ − 2216
$q .= implode(',', $strs);
+ − 2217
+ − 2218
// One last error check
+ − 2219
if(sizeof($strs) < 1) $errors[] = 'An internal error occured building the SQL query, this is a bug';
+ − 2220
if(sizeof($errors) > 0) return $errors;
+ − 2221
+ − 2222
// Free our temp arrays
+ − 2223
unset($strs, $errors);
+ − 2224
+ − 2225
// Finalize the query and run it
+ − 2226
$q .= ' WHERE user_id='.$user_id.';';
+ − 2227
$this->sql($q);
+ − 2228
+ − 2229
// We also need to trigger re-activation.
+ − 2230
if ( is_string($email) )
+ − 2231
{
+ − 2232
switch(getConfig('account_activation'))
+ − 2233
{
+ − 2234
case 'user':
+ − 2235
case 'admin':
+ − 2236
+ − 2237
if ( $session->user_level >= USER_LEVEL_MOD && getConfig('account_activation') == 'admin' )
+ − 2238
// Don't require re-activation by admins for admins
+ − 2239
break;
+ − 2240
+ − 2241
// retrieve username
+ − 2242
if ( !$username )
+ − 2243
{
+ − 2244
$q = $this->sql('SELECT username FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 2245
if($db->numrows() < 1)
+ − 2246
{
+ − 2247
$errors[] = 'The username could not be selected.';
+ − 2248
}
+ − 2249
else
+ − 2250
{
+ − 2251
$row = $db->fetchrow();
+ − 2252
$username = $row['username'];
+ − 2253
}
+ − 2254
}
+ − 2255
if ( !$username )
+ − 2256
return $errors;
+ − 2257
+ − 2258
// Generate a totally random activation key
+ − 2259
$actkey = sha1 ( microtime() . mt_rand() );
+ − 2260
$a = $this->send_activation_mail($username, $actkey);
+ − 2261
if(!$a)
+ − 2262
{
+ − 2263
$this->admin_activation_request($username);
+ − 2264
}
+ − 2265
// Deactivate the account until e-mail is confirmed
+ − 2266
$q = $db->sql_query('UPDATE '.table_prefix.'users SET account_active=0,activation_key=\'' . $actkey . '\' WHERE user_id=' . $user_id . ';');
+ − 2267
break;
+ − 2268
}
+ − 2269
}
+ − 2270
+ − 2271
// Yay! We're done
+ − 2272
return 'success';
+ − 2273
}
+ − 2274
+ − 2275
#
+ − 2276
# Access Control Lists
+ − 2277
#
+ − 2278
+ − 2279
/**
+ − 2280
* Creates a new permission field in memory. If the permissions are set in the database, they are used. Otherwise, $default_perm is used.
+ − 2281
* @param string $acl_type An identifier for this field
+ − 2282
* @param int $default_perm Whether permission should be granted or not if it's not specified in the ACLs.
+ − 2283
* @param string $desc A human readable name for the permission type
+ − 2284
* @param array $deps The list of dependencies - this should be an array of ACL types
+ − 2285
* @param string $scope Which namespaces this field should apply to. This should be either a pipe-delimited list of namespace IDs or just "All".
+ − 2286
*/
+ − 2287
+ − 2288
function register_acl_type($acl_type, $default_perm = AUTH_DISALLOW, $desc = false, $deps = Array(), $scope = 'All')
+ − 2289
{
+ − 2290
if(isset($this->acl_types[$acl_type]))
+ − 2291
return false;
+ − 2292
else
+ − 2293
{
+ − 2294
if(!$desc)
+ − 2295
{
+ − 2296
$desc = capitalize_first_letter(str_replace('_', ' ', $acl_type));
+ − 2297
}
+ − 2298
$this->acl_types[$acl_type] = $default_perm;
+ − 2299
$this->acl_descs[$acl_type] = $desc;
+ − 2300
$this->acl_deps[$acl_type] = $deps;
+ − 2301
$this->acl_scope[$acl_type] = explode('|', $scope);
+ − 2302
}
+ − 2303
return true;
+ − 2304
}
+ − 2305
+ − 2306
/**
+ − 2307
* Tells us whether permission $type is allowed or not based on the current rules.
+ − 2308
* @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
+ − 2309
* @param bool $no_deps If true, disables dependency checking
+ − 2310
* @return bool True if allowed, false if denied or if an error occured
+ − 2311
*/
+ − 2312
+ − 2313
function get_permissions($type, $no_deps = false)
+ − 2314
{
+ − 2315
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2316
if ( isset( $this->perms[$type] ) )
+ − 2317
{
+ − 2318
if ( $this->perms[$type] == AUTH_DENY )
+ − 2319
$ret = false;
+ − 2320
else if ( $this->perms[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 2321
$ret = true;
+ − 2322
else if ( $this->perms[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 2323
$ret = false;
+ − 2324
else if ( $this->perms[$type] == AUTH_ALLOW )
+ − 2325
$ret = true;
+ − 2326
else if ( $this->perms[$type] == AUTH_DISALLOW )
+ − 2327
$ret = false;
+ − 2328
}
+ − 2329
else if(isset($this->acl_types[$type]))
+ − 2330
{
+ − 2331
if ( $this->acl_types[$type] == AUTH_DENY )
+ − 2332
$ret = false;
+ − 2333
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 2334
$ret = true;
+ − 2335
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 2336
$ret = false;
+ − 2337
else if ( $this->acl_types[$type] == AUTH_ALLOW )
+ − 2338
$ret = true;
+ − 2339
else if ( $this->acl_types[$type] == AUTH_DISALLOW )
+ − 2340
$ret = false;
+ − 2341
}
+ − 2342
else
+ − 2343
{
+ − 2344
// ACL type is undefined
+ − 2345
trigger_error('Unknown access type "' . $type . '"', E_USER_WARNING);
+ − 2346
return false; // Be on the safe side and deny access
+ − 2347
}
+ − 2348
if ( !$no_deps )
+ − 2349
{
+ − 2350
if ( !$this->acl_check_deps($type) )
+ − 2351
return false;
+ − 2352
}
+ − 2353
return $ret;
+ − 2354
}
+ − 2355
+ − 2356
/**
+ − 2357
* Fetch the permissions that apply to the current user for the page specified. The object you get will have the get_permissions method
+ − 2358
* and several other abilities.
+ − 2359
* @param string $page_id
+ − 2360
* @param string $namespace
+ − 2361
* @return object
+ − 2362
*/
+ − 2363
+ − 2364
function fetch_page_acl($page_id, $namespace)
+ − 2365
{
+ − 2366
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2367
+ − 2368
if ( count ( $this->acl_base_cache ) < 1 )
+ − 2369
{
+ − 2370
// Permissions table not yet initialized
+ − 2371
return false;
+ − 2372
}
+ − 2373
156
+ − 2374
// cache of permission objects (to save RAM and SQL queries)
+ − 2375
static $objcache = array();
+ − 2376
+ − 2377
if ( count($objcache) == 0 )
+ − 2378
{
+ − 2379
foreach ( $paths->nslist as $key => $_ )
+ − 2380
{
+ − 2381
$objcache[$key] = array();
+ − 2382
}
+ − 2383
}
+ − 2384
+ − 2385
if ( isset($objcache[$namespace][$page_id]) )
+ − 2386
{
+ − 2387
return $objcache[$namespace][$page_id];
+ − 2388
}
+ − 2389
1
+ − 2390
//if ( !isset( $paths->pages[$paths->nslist[$namespace] . $page_id] ) )
+ − 2391
//{
+ − 2392
// // Page does not exist
+ − 2393
// return false;
+ − 2394
//}
+ − 2395
156
+ − 2396
$objcache[$namespace][$page_id] = new Session_ACLPageInfo( $page_id, $namespace, $this->acl_types, $this->acl_descs, $this->acl_deps, $this->acl_base_cache );
+ − 2397
$object =& $objcache[$namespace][$page_id];
1
+ − 2398
+ − 2399
return $object;
+ − 2400
+ − 2401
}
+ − 2402
+ − 2403
/**
+ − 2404
* Read all of our permissions from the database and process/apply them. This should be called after the page is determined.
+ − 2405
* @access private
+ − 2406
*/
+ − 2407
+ − 2408
function init_permissions()
+ − 2409
{
+ − 2410
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2411
// Initialize the permissions list with some defaults
+ − 2412
$this->perms = $this->acl_types;
+ − 2413
$this->acl_defaults_used = $this->perms;
+ − 2414
+ − 2415
// 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
+ − 2416
$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
+ − 2417
. ' 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
+ − 2418
. ' ( ';
1
+ − 2419
+ − 2420
$q = Array();
+ − 2421
$q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
+ − 2422
if(count($this->groups) > 0)
+ − 2423
{
+ − 2424
foreach($this->groups as $g_id => $g_name)
+ − 2425
{
+ − 2426
$q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 2427
}
+ − 2428
}
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
+ − 2429
$bs .= implode(" OR \n ", $q) . " ) \n ORDER BY target_type ASC, target_id ASC;";
1
+ − 2430
$q = $this->sql($bs);
+ − 2431
if ( $row = $db->fetchrow() )
+ − 2432
{
+ − 2433
do {
+ − 2434
$rules = $this->string_to_perm($row['rules']);
+ − 2435
$is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
+ − 2436
$this->acl_merge_with_current($rules, $is_everyone);
+ − 2437
} while ( $row = $db->fetchrow() );
+ − 2438
}
+ − 2439
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
+ − 2440
// 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
+ − 2441
$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
+ − 2442
1
+ − 2443
// Eliminate types that don't apply to this namespace
+ − 2444
foreach ( $this->perms AS $i => $perm )
+ − 2445
{
+ − 2446
if ( !in_array ( $paths->namespace, $this->acl_scope[$i] ) && !in_array('All', $this->acl_scope[$i]) )
+ − 2447
{
+ − 2448
unset($this->perms[$i]);
+ − 2449
}
+ − 2450
}
+ − 2451
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
+ − 2452
// PAGE group info
322
+ − 2453
$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
+ − 2454
$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
+ − 2455
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
+ − 2456
{
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
+ − 2457
$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
+ − 2458
}
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
+ − 2459
1
+ − 2460
// Build a query to grab ACL info
+ − 2461
$bs = 'SELECT rules,target_type,target_id FROM '.table_prefix.'acl WHERE ( ';
+ − 2462
$q = Array();
+ − 2463
$q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
+ − 2464
if(count($this->groups) > 0)
+ − 2465
{
+ − 2466
foreach($this->groups as $g_id => $g_name)
+ − 2467
{
+ − 2468
$q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 2469
}
+ − 2470
}
+ − 2471
// 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
+ − 2472
// permissions to override group permissions.
322
+ − 2473
$bs .= implode(" OR\n ", $q) . " )\n AND (" . $pg_info . ' ( page_id=\''.$db->escape($paths->page_id).'\' AND namespace=\''.$db->escape($paths->namespace).'\' ) )
1
+ − 2474
ORDER BY target_type ASC, page_id ASC, namespace ASC;';
+ − 2475
$q = $this->sql($bs);
+ − 2476
if ( $row = $db->fetchrow() )
+ − 2477
{
+ − 2478
do {
+ − 2479
$rules = $this->string_to_perm($row['rules']);
+ − 2480
$is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
+ − 2481
$this->acl_merge_with_current($rules, $is_everyone);
+ − 2482
} while ( $row = $db->fetchrow() );
+ − 2483
}
+ − 2484
+ − 2485
}
+ − 2486
+ − 2487
/**
+ − 2488
* Extends the scope of a permission type.
+ − 2489
* @param string The name of the permission type
+ − 2490
* @param string The namespace(s) that should be covered. This can be either one namespace ID or a pipe-delimited list.
+ − 2491
* @param object Optional - the current $paths object, in case we're doing this from the acl_rule_init hook
+ − 2492
*/
+ − 2493
+ − 2494
function acl_extend_scope($perm_type, $namespaces, &$p_in)
+ − 2495
{
+ − 2496
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2497
$p_obj = ( is_object($p_in) ) ? $p_in : $paths;
+ − 2498
$nslist = explode('|', $namespaces);
+ − 2499
foreach ( $nslist as $i => $ns )
+ − 2500
{
+ − 2501
if ( !isset($p_obj->nslist[$ns]) )
+ − 2502
{
+ − 2503
unset($nslist[$i]);
+ − 2504
}
+ − 2505
else
+ − 2506
{
+ − 2507
$this->acl_scope[$perm_type][] = $ns;
+ − 2508
if ( isset($this->acl_types[$perm_type]) && !isset($this->perms[$perm_type]) )
+ − 2509
{
+ − 2510
$this->perms[$perm_type] = $this->acl_types[$perm_type];
+ − 2511
}
+ − 2512
}
+ − 2513
}
+ − 2514
}
+ − 2515
+ − 2516
/**
+ − 2517
* Converts a permissions field into a string for database insertion. Similar in spirit to serialize().
+ − 2518
* @param array $perms An associative array with only integers as values
+ − 2519
* @return string
+ − 2520
*/
+ − 2521
+ − 2522
function perm_to_string($perms)
+ − 2523
{
+ − 2524
$s = '';
+ − 2525
foreach($perms as $perm => $ac)
+ − 2526
{
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
+ − 2527
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
+ − 2528
continue;
1
+ − 2529
$s .= "$perm=$ac;";
+ − 2530
}
+ − 2531
return $s;
+ − 2532
}
+ − 2533
+ − 2534
/**
+ − 2535
* Converts a permissions string back to an array.
+ − 2536
* @param string $perms The result from sessionManager::perm_to_string()
+ − 2537
* @return array
+ − 2538
*/
+ − 2539
+ − 2540
function string_to_perm($perms)
+ − 2541
{
+ − 2542
$ret = Array();
+ − 2543
preg_match_all('#([a-z0-9_-]+)=([0-9]+);#i', $perms, $matches);
+ − 2544
foreach($matches[1] as $i => $t)
+ − 2545
{
+ − 2546
$ret[$t] = intval($matches[2][$i]);
+ − 2547
}
+ − 2548
return $ret;
+ − 2549
}
+ − 2550
+ − 2551
/**
+ − 2552
* Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence over the first, but AUTH_DENY always prevails.
+ − 2553
* @param array $perm1 The first set of permissions
+ − 2554
* @param array $perm2 The second set of permissions
+ − 2555
* @return array
+ − 2556
*/
+ − 2557
+ − 2558
function acl_merge($perm1, $perm2)
+ − 2559
{
+ − 2560
$ret = $perm1;
+ − 2561
foreach ( $perm2 as $type => $level )
+ − 2562
{
+ − 2563
if ( isset( $ret[$type] ) )
+ − 2564
{
+ − 2565
if ( $ret[$type] != AUTH_DENY )
+ − 2566
$ret[$type] = $level;
+ − 2567
}
+ − 2568
// else
+ − 2569
// {
+ − 2570
// $ret[$type] = $level;
+ − 2571
// }
+ − 2572
}
+ − 2573
return $ret;
+ − 2574
}
+ − 2575
+ − 2576
/**
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
+ − 2577
* 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
+ − 2578
* 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
+ − 2579
* @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
+ − 2580
* @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
+ − 2581
*/
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
+ − 2582
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
+ − 2583
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
+ − 2584
{
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
+ − 2585
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
+ − 2586
{
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
+ − 2587
$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
+ − 2588
}
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
+ − 2589
$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
+ − 2590
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
+ − 2591
{
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
+ − 2592
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
+ − 2593
{
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
+ − 2594
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
+ − 2595
$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
+ − 2596
}
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
+ − 2597
}
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
+ − 2598
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
+ − 2599
}
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
+ − 2600
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
+ − 2601
/**
1
+ − 2602
* Merges the ACL array sent with the current permissions table, deciding precedence based on whether defaults are in effect or not.
+ − 2603
* @param array The array to merge into the master ACL list
+ − 2604
* @param bool If true, $perm is treated as the "new default"
+ − 2605
* @param int 1 if this is a site-wide ACL, 2 if page-specific. Defaults to 2.
+ − 2606
*/
+ − 2607
+ − 2608
function acl_merge_with_current($perm, $is_everyone = false, $scope = 2)
+ − 2609
{
+ − 2610
foreach ( $this->perms as $i => $p )
+ − 2611
{
+ − 2612
if ( isset($perm[$i]) )
+ − 2613
{
+ − 2614
if ( $is_everyone && !$this->acl_defaults_used[$i] )
+ − 2615
continue;
+ − 2616
// Decide precedence
+ − 2617
if ( isset($this->acl_defaults_used[$i]) )
+ − 2618
{
+ − 2619
//echo "$i: default in use, overriding to: {$perm[$i]}<br />";
+ − 2620
// Defaults are in use, override
+ − 2621
$this->perms[$i] = $perm[$i];
+ − 2622
$this->acl_defaults_used[$i] = ( $is_everyone );
+ − 2623
}
+ − 2624
else
+ − 2625
{
+ − 2626
//echo "$i: default NOT in use";
+ − 2627
// Defaults are not in use, merge as normal
+ − 2628
if ( $this->perms[$i] != AUTH_DENY )
+ − 2629
{
+ − 2630
//echo ", but overriding";
+ − 2631
$this->perms[$i] = $perm[$i];
+ − 2632
}
+ − 2633
//echo "<br />";
+ − 2634
}
+ − 2635
}
+ − 2636
}
+ − 2637
}
+ − 2638
+ − 2639
/**
+ − 2640
* Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence
+ − 2641
* over the first, without exceptions. This is used to merge the hardcoded defaults with admin-specified
+ − 2642
* defaults, which take precedence.
+ − 2643
* @param array $perm1 The first set of permissions
+ − 2644
* @param array $perm2 The second set of permissions
+ − 2645
* @return array
+ − 2646
*/
+ − 2647
+ − 2648
function acl_merge_complete($perm1, $perm2)
+ − 2649
{
+ − 2650
$ret = $perm1;
+ − 2651
foreach ( $perm2 as $type => $level )
+ − 2652
{
+ − 2653
$ret[$type] = $level;
+ − 2654
}
+ − 2655
return $ret;
+ − 2656
}
+ − 2657
+ − 2658
/**
+ − 2659
* Tell us if the dependencies for a given permission are met.
+ − 2660
* @param string The ACL permission ID
+ − 2661
* @return bool
+ − 2662
*/
+ − 2663
+ − 2664
function acl_check_deps($type)
+ − 2665
{
+ − 2666
if(!isset($this->acl_deps[$type])) // This will only happen if the permissions table is hacked or improperly accessed
+ − 2667
return true;
+ − 2668
if(sizeof($this->acl_deps[$type]) < 1)
+ − 2669
return true;
+ − 2670
$deps = $this->acl_deps[$type];
+ − 2671
while(true)
+ − 2672
{
+ − 2673
$full_resolved = true;
+ − 2674
$j = sizeof($deps);
+ − 2675
for ( $i = 0; $i < $j; $i++ )
+ − 2676
{
+ − 2677
$b = $deps;
+ − 2678
$deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
+ − 2679
if( $b == $deps )
+ − 2680
{
+ − 2681
break 2;
+ − 2682
}
+ − 2683
$j = sizeof($deps);
+ − 2684
}
+ − 2685
}
+ − 2686
//die('<pre>'.print_r($deps, true).'</pre>');
+ − 2687
foreach($deps as $d)
+ − 2688
{
+ − 2689
if ( !$this->get_permissions($d) )
+ − 2690
{
+ − 2691
return false;
+ − 2692
}
+ − 2693
}
+ − 2694
return true;
+ − 2695
}
+ − 2696
+ − 2697
/**
+ − 2698
* Makes a CAPTCHA code and caches the code in the database
+ − 2699
* @param int $len The length of the code, in bytes
+ − 2700
* @return string A unique identifier assigned to the code. This hash should be passed to sessionManager::getCaptcha() to retrieve the code.
+ − 2701
*/
+ − 2702
+ − 2703
function make_captcha($len = 7)
+ − 2704
{
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
+ − 2705
$code = $this->generate_captcha_code($len);
1
+ − 2706
$hash = md5(microtime() . mt_rand());
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
+ − 2707
$this->sql('INSERT INTO '.table_prefix.'session_keys(session_key,salt,auth_level,source_ip,user_id) VALUES(\''.$hash.'\', \'\', -1, \''.ip2hex($_SERVER['REMOTE_ADDR']).'\', -2);');
1
+ − 2708
return $hash;
+ − 2709
}
+ − 2710
+ − 2711
/**
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
+ − 2712
* Generates the actual confirmation code text.
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
+ − 2713
* @param int String length
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
+ − 2714
* @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
+ − 2715
*/
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
+ − 2716
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
+ − 2717
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
+ − 2718
{
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
+ − 2719
$chars = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '1', '2', '3', '4', '5', '6', '7', '8', '9');
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
+ − 2720
$s = '';
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
+ − 2721
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
+ − 2722
{
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
+ − 2723
$s .= $chars[mt_rand(0, count($chars)-1)];
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
+ − 2724
}
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
+ − 2725
return $s;
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
+ − 2726
}
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
+ − 2727
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
+ − 2728
/**
1
+ − 2729
* For the given code ID, returns the correct CAPTCHA code, or false on failure
+ − 2730
* @param string $hash The unique ID assigned to the code
+ − 2731
* @return string The correct confirmation code
+ − 2732
*/
+ − 2733
+ − 2734
function get_captcha($hash)
+ − 2735
{
+ − 2736
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2737
$s = $this->sql('SELECT salt FROM '.table_prefix.'session_keys WHERE session_key=\''.$db->escape($hash).'\' AND source_ip=\''.ip2hex($_SERVER['REMOTE_ADDR']).'\';');
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
+ − 2738
if ( $db->numrows() < 1 )
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
+ − 2739
{
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
+ − 2740
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
+ − 2741
}
1
+ − 2742
$r = $db->fetchrow();
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
+ − 2743
$db->free_result();
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
+ − 2744
$this->sql('DELETE FROM ' . table_prefix . 'session_keys WHERE salt=\'' . $db->escape($r['salt']) . '\';');
1
+ − 2745
return $r['salt'];
+ − 2746
}
+ − 2747
+ − 2748
/**
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
+ − 2749
* (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
+ − 2750
*/
+ − 2751
+ − 2752
function kill_captcha()
+ − 2753
{
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
+ − 2754
// $this->sql('DELETE FROM '.table_prefix.'session_keys WHERE user_id=-2 AND source_ip=\''.ip2hex($_SERVER['REMOTE_ADDR']).'\';');
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
+ − 2755
return true;
1
+ − 2756
}
+ − 2757
+ − 2758
/**
+ − 2759
* Generates a random password.
+ − 2760
* @param int $length Optional - length of password
+ − 2761
* @return string
+ − 2762
*/
+ − 2763
+ − 2764
function random_pass($length = 10)
+ − 2765
{
+ − 2766
$valid_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_+@#%&<>';
+ − 2767
$valid_chars = enano_str_split($valid_chars);
+ − 2768
$ret = '';
+ − 2769
for ( $i = 0; $i < $length; $i++ )
+ − 2770
{
+ − 2771
$ret .= $valid_chars[mt_rand(0, count($valid_chars)-1)];
+ − 2772
}
+ − 2773
return $ret;
+ − 2774
}
+ − 2775
+ − 2776
/**
+ − 2777
* Generates some Javascript that calls the AES encryption library.
+ − 2778
* @param string The name of the form
+ − 2779
* @param string The name of the password field
+ − 2780
* @param string The name of the field that switches encryption on or off
+ − 2781
* @param string The name of the field that contains the encryption key
+ − 2782
* @param string The name of the field that will contain the encrypted password
+ − 2783
* @param string The name of the field that handles MD5 challenge data
+ − 2784
* @return string
+ − 2785
*/
+ − 2786
+ − 2787
function aes_javascript($form_name, $pw_field, $use_crypt, $crypt_key, $crypt_data, $challenge)
+ − 2788
{
+ − 2789
$code = '
+ − 2790
<script type="text/javascript">
+ − 2791
disableJSONExts();
+ − 2792
str = \'\';
+ − 2793
for(i=0;i<keySizeInBits/4;i++) str+=\'0\';
+ − 2794
var key = hexToByteArray(str);
+ − 2795
var pt = hexToByteArray(str);
+ − 2796
var ct = rijndaelEncrypt(pt, key, \'ECB\');
+ − 2797
var ct = byteArrayToHex(ct);
+ − 2798
switch(keySizeInBits)
+ − 2799
{
+ − 2800
case 128:
+ − 2801
v = \'66e94bd4ef8a2c3b884cfa59ca342b2e\';
+ − 2802
break;
+ − 2803
case 192:
+ − 2804
v = \'aae06992acbf52a3e8f4a96ec9300bd7aae06992acbf52a3e8f4a96ec9300bd7\';
+ − 2805
break;
+ − 2806
case 256:
+ − 2807
v = \'dc95c078a2408989ad48a21492842087dc95c078a2408989ad48a21492842087\';
+ − 2808
break;
+ − 2809
}
+ − 2810
var testpassed = ' . ( ( isset($_GET['use_crypt']) && $_GET['use_crypt']=='0') ? 'false; // CRYPTO-AUTH DISABLED ON USER REQUEST // ' : '' ) . '( ct == v && md5_vm_test() );
+ − 2811
var frm = document.forms.'.$form_name.';
+ − 2812
function runEncryption()
+ − 2813
{
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
+ − 2814
var frm = document.forms.'.$form_name.';
1
+ − 2815
if(testpassed)
+ − 2816
{
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
+ − 2817
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
+ − 2818
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
+ − 2819
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
+ − 2820
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
+ − 2821
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
+ − 2822
{
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
+ − 2823
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
+ − 2824
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
+ − 2825
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
+ − 2826
}
1
+ − 2827
pass = frm.'.$pw_field.'.value;
+ − 2828
chal = frm.'.$challenge.'.value;
+ − 2829
challenge = hex_md5(pass + chal) + chal;
+ − 2830
frm.'.$challenge.'.value = challenge;
+ − 2831
pass = stringToByteArray(pass);
+ − 2832
cryptstring = rijndaelEncrypt(pass, cryptkey, \'ECB\');
+ − 2833
if(!cryptstring)
+ − 2834
{
+ − 2835
return false;
+ − 2836
}
+ − 2837
cryptstring = byteArrayToHex(cryptstring);
+ − 2838
frm.'.$crypt_data.'.value = cryptstring;
+ − 2839
frm.'.$pw_field.'.value = \'\';
+ − 2840
}
+ − 2841
return false;
+ − 2842
}
+ − 2843
</script>
+ − 2844
';
+ − 2845
return $code;
+ − 2846
}
+ − 2847
+ − 2848
}
+ − 2849
+ − 2850
/**
+ − 2851
* Class used to fetch permissions for a specific page. Used internally by SessionManager.
+ − 2852
* @package Enano
+ − 2853
* @subpackage Session manager
+ − 2854
* @license http://www.gnu.org/copyleft/gpl.html
+ − 2855
* @access private
+ − 2856
*/
+ − 2857
+ − 2858
class Session_ACLPageInfo {
+ − 2859
+ − 2860
/**
+ − 2861
* The page ID of this ACL info package
+ − 2862
* @var string
+ − 2863
*/
+ − 2864
+ − 2865
var $page_id;
+ − 2866
+ − 2867
/**
+ − 2868
* The namespace of the page being checked
+ − 2869
* @var string
+ − 2870
*/
+ − 2871
+ − 2872
var $namespace;
+ − 2873
+ − 2874
/**
+ − 2875
* Our list of permission types.
+ − 2876
* @access private
+ − 2877
* @var array
+ − 2878
*/
+ − 2879
+ − 2880
var $acl_types = Array();
+ − 2881
+ − 2882
/**
+ − 2883
* The list of descriptions for the permission types
+ − 2884
* @var array
+ − 2885
*/
+ − 2886
+ − 2887
var $acl_descs = Array();
+ − 2888
+ − 2889
/**
+ − 2890
* A list of dependencies for ACL types.
+ − 2891
* @var array
+ − 2892
*/
+ − 2893
+ − 2894
var $acl_deps = Array();
+ − 2895
+ − 2896
/**
246
+ − 2897
* Our tell-all list of permissions. Do not even try to change this.
+ − 2898
* @access private
1
+ − 2899
* @var array
+ − 2900
*/
+ − 2901
+ − 2902
var $perms = Array();
+ − 2903
+ − 2904
/**
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
+ − 2905
* 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
+ − 2906
* @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
+ − 2907
* @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
+ − 2908
*/
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
+ − 2909
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
+ − 2910
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
+ − 2911
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
+ − 2912
/**
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
+ − 2913
* 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
+ − 2914
* @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
+ − 2915
*/
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
+ − 2916
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
+ − 2917
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
+ − 2918
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
+ − 2919
/**
1
+ − 2920
* Constructor.
+ − 2921
* @param string $page_id The ID of the page to check
+ − 2922
* @param string $namespace The namespace of the page to check.
+ − 2923
* @param array $acl_types List of ACL types
+ − 2924
* @param array $acl_descs List of human-readable descriptions for permissions (associative)
+ − 2925
* @param array $acl_deps List of dependencies for permissions. For example, viewing history/diffs depends on the ability to read the page.
+ − 2926
* @param array $base What to start with - this is an attempt to reduce the number of SQL queries.
+ − 2927
*/
+ − 2928
+ − 2929
function Session_ACLPageInfo($page_id, $namespace, $acl_types, $acl_descs, $acl_deps, $base)
+ − 2930
{
+ − 2931
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2932
+ − 2933
$this->acl_deps = $acl_deps;
+ − 2934
$this->acl_types = $acl_types;
+ − 2935
$this->acl_descs = $acl_descs;
+ − 2936
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
+ − 2937
$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
+ − 2938
$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
+ − 2939
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
+ − 2940
// 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
+ − 2941
$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
+ − 2942
$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
+ − 2943
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
+ − 2944
{
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
+ − 2945
$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
+ − 2946
}
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
+ − 2947
1
+ − 2948
// 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
+ − 2949
$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
+ − 2950
. ' ( ';
1
+ − 2951
$q = Array();
+ − 2952
$q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$session->user_id.' )';
+ − 2953
if(count($session->groups) > 0)
+ − 2954
{
+ − 2955
foreach($session->groups as $g_id => $g_name)
+ − 2956
{
+ − 2957
$q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 2958
}
+ − 2959
}
+ − 2960
// 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
+ − 2961
// 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
+ − 2962
$bs .= implode(" OR\n ", $q) . ' ) AND (' . $pg_info . ' page_id=\''.$db->escape($page_id).'\' AND namespace=\''.$db->escape($namespace).'\' )
1
+ − 2963
ORDER BY target_type ASC, page_id ASC, namespace ASC;';
+ − 2964
$q = $session->sql($bs);
+ − 2965
if ( $row = $db->fetchrow() )
+ − 2966
{
+ − 2967
do {
+ − 2968
$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
+ − 2969
$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
+ − 2970
$this->acl_merge_with_current($rules, $is_everyone);
1
+ − 2971
} while ( $row = $db->fetchrow() );
+ − 2972
}
+ − 2973
+ − 2974
$this->page_id = $page_id;
+ − 2975
$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
+ − 2976
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
+ − 2977
$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
+ − 2978
$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
+ − 2979
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
+ − 2980
{
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
+ − 2981
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
+ − 2982
$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
+ − 2983
}
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
+ − 2984
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
+ − 2985
$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
+ − 2986
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
+ − 2987
$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
+ − 2988
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
+ − 2989
$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
+ − 2990
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
+ − 2991
{
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
+ − 2992
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
+ − 2993
{
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
+ − 2994
$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
+ − 2995
}
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
+ − 2996
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
+ − 2997
{
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
+ − 2998
$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
+ − 2999
}
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
+ − 3000
}
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
+ − 3001
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
+ − 3002
{
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
+ − 3003
// 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
+ − 3004
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
+ − 3005
}
1
+ − 3006
}
+ − 3007
+ − 3008
/**
+ − 3009
* Tells us whether permission $type is allowed or not based on the current rules.
+ − 3010
* @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
+ − 3011
* @param bool $no_deps If true, disables dependency checking
+ − 3012
* @return bool True if allowed, false if denied or if an error occured
+ − 3013
*/
+ − 3014
+ − 3015
function get_permissions($type, $no_deps = false)
+ − 3016
{
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
+ − 3017
// echo '<pre>' . print_r($this->perms, true) . '</pre>';
1
+ − 3018
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
+ − 3019
1
+ − 3020
if ( isset( $this->perms[$type] ) )
+ − 3021
{
+ − 3022
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
+ − 3023
{
1
+ − 3024
$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
+ − 3025
}
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
+ − 3026
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
+ − 3027
{
1
+ − 3028
$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
+ − 3029
}
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
+ − 3030
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
+ − 3031
{
1
+ − 3032
$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
+ − 3033
}
1
+ − 3034
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
+ − 3035
{
1
+ − 3036
$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
+ − 3037
}
1
+ − 3038
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
+ − 3039
{
1
+ − 3040
$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
+ − 3041
}
1
+ − 3042
}
+ − 3043
else if(isset($this->acl_types[$type]))
+ − 3044
{
+ − 3045
if ( $this->acl_types[$type] == AUTH_DENY )
+ − 3046
$ret = false;
+ − 3047
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 3048
$ret = true;
+ − 3049
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 3050
$ret = false;
+ − 3051
else if ( $this->acl_types[$type] == AUTH_ALLOW )
+ − 3052
$ret = true;
+ − 3053
else if ( $this->acl_types[$type] == AUTH_DISALLOW )
+ − 3054
$ret = false;
+ − 3055
}
+ − 3056
else
+ − 3057
{
+ − 3058
// ACL type is undefined
+ − 3059
trigger_error('Unknown access type "' . $type . '"', E_USER_WARNING);
+ − 3060
return false; // Be on the safe side and deny access
+ − 3061
}
+ − 3062
if ( !$no_deps )
+ − 3063
{
+ − 3064
if ( !$this->acl_check_deps($type) )
+ − 3065
return false;
+ − 3066
}
+ − 3067
return $ret;
+ − 3068
}
+ − 3069
+ − 3070
/**
+ − 3071
* Tell us if the dependencies for a given permission are met.
+ − 3072
* @param string The ACL permission ID
+ − 3073
* @return bool
+ − 3074
*/
+ − 3075
+ − 3076
function acl_check_deps($type)
+ − 3077
{
+ − 3078
if(!isset($this->acl_deps[$type])) // This will only happen if the permissions table is hacked or improperly accessed
+ − 3079
return true;
+ − 3080
if(sizeof($this->acl_deps[$type]) < 1)
+ − 3081
return true;
+ − 3082
$deps = $this->acl_deps[$type];
+ − 3083
while(true)
+ − 3084
{
+ − 3085
$full_resolved = true;
+ − 3086
$j = sizeof($deps);
+ − 3087
for ( $i = 0; $i < $j; $i++ )
+ − 3088
{
+ − 3089
$b = $deps;
+ − 3090
$deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
+ − 3091
if( $b == $deps )
+ − 3092
{
+ − 3093
break 2;
+ − 3094
}
+ − 3095
$j = sizeof($deps);
+ − 3096
}
+ − 3097
}
+ − 3098
//die('<pre>'.print_r($deps, true).'</pre>');
+ − 3099
foreach($deps as $d)
+ − 3100
{
+ − 3101
if ( !$this->get_permissions($d) )
+ − 3102
{
+ − 3103
return false;
+ − 3104
}
+ − 3105
}
+ − 3106
return true;
+ − 3107
}
+ − 3108
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
+ − 3109
/**
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
+ − 3110
* 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
+ − 3111
* @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
+ − 3112
* @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
+ − 3113
* @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
+ − 3114
*/
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
+ − 3115
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
+ − 3116
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
+ − 3117
{
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
+ − 3118
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
+ − 3119
{
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
+ − 3120
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
+ − 3121
{
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
+ − 3122
if ( $is_everyone && !$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
+ − 3123
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
+ − 3124
// 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
+ − 3125
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
+ − 3126
{
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
+ − 3127
//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
+ − 3128
// 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
+ − 3129
$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
+ − 3130
$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
+ − 3131
}
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
+ − 3132
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
+ − 3133
{
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
+ − 3134
//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
+ − 3135
// 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
+ − 3136
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
+ − 3137
{
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
+ − 3138
//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
+ − 3139
$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
+ − 3140
}
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
+ − 3141
//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
+ − 3142
}
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
+ − 3143
}
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
+ − 3144
}
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
+ − 3145
}
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
+ − 3146
1
+ − 3147
}
+ − 3148
+ − 3149
?>