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