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