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