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