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