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