1
+ − 1
<?php
+ − 2
+ − 3
/*
+ − 4
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
411
+ − 5
* Version 1.1.2 (Caoineag alpha 2)
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
/**
+ − 17
* Anything and everything related to security and user management. This includes AES encryption, which is illegal in some countries.
+ − 18
* Documenting the API was not easy - I hope you folks enjoy it.
+ − 19
* @package Enano
+ − 20
* @subpackage Session manager
+ − 21
* @category security, user management, logins, etc.
+ − 22
*/
+ − 23
+ − 24
class sessionManager {
+ − 25
+ − 26
# Variables
+ − 27
+ − 28
/**
+ − 29
* Whether we're logged in or not
+ − 30
* @var bool
+ − 31
*/
+ − 32
+ − 33
var $user_logged_in = false;
+ − 34
+ − 35
/**
+ − 36
* Our current low-privilege session key
+ − 37
* @var string
+ − 38
*/
+ − 39
+ − 40
var $sid;
+ − 41
+ − 42
/**
+ − 43
* Username of currently logged-in user, or IP address if not logged in
+ − 44
* @var string
+ − 45
*/
+ − 46
+ − 47
var $username;
+ − 48
+ − 49
/**
436
+ − 50
* User ID of currently logged-in user, or 1 if not logged in
1
+ − 51
* @var int
+ − 52
*/
+ − 53
436
+ − 54
var $user_id = 1;
1
+ − 55
+ − 56
/**
+ − 57
* Real name of currently logged-in user, or blank if not logged in
+ − 58
* @var string
+ − 59
*/
+ − 60
+ − 61
var $real_name;
+ − 62
+ − 63
/**
+ − 64
* E-mail address of currently logged-in user, or blank if not logged in
+ − 65
* @var string
+ − 66
*/
+ − 67
+ − 68
var $email;
+ − 69
+ − 70
/**
31
+ − 71
* List of "extra" user information fields (IM handles, etc.)
+ − 72
* @var array (associative)
+ − 73
*/
+ − 74
+ − 75
var $user_extra;
+ − 76
+ − 77
/**
1
+ − 78
* User level of current user
+ − 79
* USER_LEVEL_GUEST: guest
+ − 80
* USER_LEVEL_MEMBER: regular user
+ − 81
* USER_LEVEL_CHPREF: default - pseudo-level that allows changing password and e-mail address (requires re-authentication)
+ − 82
* USER_LEVEL_MOD: moderator
+ − 83
* USER_LEVEL_ADMIN: administrator
+ − 84
* @var int
+ − 85
*/
+ − 86
+ − 87
var $user_level;
+ − 88
+ − 89
/**
+ − 90
* High-privilege session key
+ − 91
* @var string or false if not running on high-level authentication
+ − 92
*/
+ − 93
+ − 94
var $sid_super;
+ − 95
+ − 96
/**
+ − 97
* The user's theme preference, defaults to $template->default_theme
+ − 98
* @var string
+ − 99
*/
+ − 100
+ − 101
var $theme;
+ − 102
+ − 103
/**
+ − 104
* The user's style preference, or style auto-detected based on theme if not logged in
+ − 105
* @var string
+ − 106
*/
+ − 107
+ − 108
var $style;
+ − 109
+ − 110
/**
+ − 111
* Signature of current user - appended to comments, etc.
+ − 112
* @var string
+ − 113
*/
+ − 114
+ − 115
var $signature;
+ − 116
+ − 117
/**
+ − 118
* UNIX timestamp of when we were registered, or 0 if not logged in
+ − 119
* @var int
+ − 120
*/
+ − 121
+ − 122
var $reg_time;
+ − 123
+ − 124
/**
+ − 125
* MD5 hash of the current user's password, if applicable
+ − 126
* @var string OR bool false
+ − 127
*/
+ − 128
+ − 129
var $password_hash;
+ − 130
+ − 131
/**
+ − 132
* The number of unread private messages this user has.
+ − 133
* @var int
+ − 134
*/
+ − 135
+ − 136
var $unread_pms = 0;
+ − 137
+ − 138
/**
+ − 139
* AES key used to encrypt passwords and session key info - irreversibly destroyed when disallow_password_grab() is called
+ − 140
* @var string
+ − 141
*/
+ − 142
+ − 143
var $private_key;
+ − 144
+ − 145
/**
+ − 146
* Regex that defines a valid username, minus the ^ and $, these are added later
+ − 147
* @var string
+ − 148
*/
+ − 149
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 150
var $valid_username = '([^<>&\?\'"%\n\r\t\a\/]+)';
1
+ − 151
+ − 152
/**
+ − 153
* What we're allowed to do as far as permissions go. This changes based on the value of the "auth" URI param.
+ − 154
* @var string
+ − 155
*/
+ − 156
436
+ − 157
var $auth_level = 1;
1
+ − 158
+ − 159
/**
+ − 160
* State variable to track if a session timed out
+ − 161
* @var bool
+ − 162
*/
+ − 163
+ − 164
var $sw_timed_out = false;
+ − 165
+ − 166
/**
+ − 167
* Switch to track if we're started or not.
+ − 168
* @access private
+ − 169
* @var bool
+ − 170
*/
+ − 171
+ − 172
var $started = false;
+ − 173
+ − 174
/**
+ − 175
* Switch to control compatibility mode (for older Enano websites being upgraded)
+ − 176
* @access private
+ − 177
* @var bool
+ − 178
*/
+ − 179
+ − 180
var $compat = false;
+ − 181
+ − 182
/**
+ − 183
* Our list of permission types.
+ − 184
* @access private
+ − 185
* @var array
+ − 186
*/
+ − 187
+ − 188
var $acl_types = Array();
+ − 189
+ − 190
/**
+ − 191
* The list of descriptions for the permission types
+ − 192
* @var array
+ − 193
*/
+ − 194
+ − 195
var $acl_descs = Array();
+ − 196
+ − 197
/**
+ − 198
* A list of dependencies for ACL types.
+ − 199
* @var array
+ − 200
*/
+ − 201
+ − 202
var $acl_deps = Array();
+ − 203
+ − 204
/**
246
+ − 205
* Our tell-all list of permissions. Do not even try to change this.
+ − 206
* @access private
1
+ − 207
* @var array
+ − 208
*/
+ − 209
+ − 210
var $perms = Array();
+ − 211
+ − 212
/**
+ − 213
* A cache variable - saved after sitewide permissions are checked but before page-specific permissions.
+ − 214
* @var array
+ − 215
* @access private
+ − 216
*/
+ − 217
+ − 218
var $acl_base_cache = Array();
+ − 219
+ − 220
/**
+ − 221
* Stores the scope information for ACL types.
+ − 222
* @var array
+ − 223
* @access private
+ − 224
*/
+ − 225
+ − 226
var $acl_scope = Array();
+ − 227
+ − 228
/**
+ − 229
* Array to track which default permissions are being used
+ − 230
* @var array
+ − 231
* @access private
+ − 232
*/
+ − 233
+ − 234
var $acl_defaults_used = Array();
+ − 235
+ − 236
/**
+ − 237
* Array to track group membership.
+ − 238
* @var array
+ − 239
*/
+ − 240
+ − 241
var $groups = Array();
+ − 242
+ − 243
/**
+ − 244
* Associative array to track group modship.
+ − 245
* @var array
+ − 246
*/
+ − 247
+ − 248
var $group_mod = Array();
+ − 249
+ − 250
# Basic functions
+ − 251
+ − 252
/**
+ − 253
* Constructor.
+ − 254
*/
+ − 255
+ − 256
function __construct()
+ − 257
{
+ − 258
global $db, $session, $paths, $template, $plugins; // Common objects
268
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 259
289
2b60c89dc27f
Fixed a few major bugs with the upgrade script and the config file not getting loaded properly due to IN_ENANO_INSTALL
Dan
diff
changeset
+ − 260
if ( defined('IN_ENANO_INSTALL') && !defined('IN_ENANO_UPGRADE') )
268
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 261
{
58477ab3937f
Hopefully managed to put enough hacks in there to make renaming the config file the last step, so if it fails, it can be done manually
Dan
diff
changeset
+ − 262
@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
+ − 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
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
+ − 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.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
1
+ − 269
unset($dbhost, $dbname, $dbuser, $dbpasswd);
+ − 270
if(isset($crypto_key))
+ − 271
{
+ − 272
$this->private_key = $crypto_key;
+ − 273
$this->private_key = hexdecode($this->private_key);
+ − 274
}
+ − 275
else
+ − 276
{
+ − 277
if(is_writable(ENANO_ROOT.'/config.php'))
+ − 278
{
+ − 279
// Generate and stash a private key
+ − 280
// This should only happen during an automated silent gradual migration to the new encryption platform.
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 281
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 282
$this->private_key = $aes->gen_readymade_key();
+ − 283
+ − 284
$config = file_get_contents(ENANO_ROOT.'/config.php');
+ − 285
if(!$config)
+ − 286
{
+ − 287
die('$session->__construct(): can\'t get the contents of config.php');
+ − 288
}
+ − 289
+ − 290
$config = str_replace("?>", "\$crypto_key = '{$this->private_key}';\n?>", $config);
+ − 291
// And while we're at it...
+ − 292
$config = str_replace('MIDGET_INSTALLED', 'ENANO_INSTALLED', $config);
+ − 293
$fh = @fopen(ENANO_ROOT.'/config.php', 'w');
+ − 294
if ( !$fh )
+ − 295
{
+ − 296
die('$session->__construct(): Couldn\'t open config file for writing to store the private key, I tried to avoid something like this...');
+ − 297
}
+ − 298
+ − 299
fwrite($fh, $config);
+ − 300
fclose($fh);
+ − 301
}
+ − 302
else
+ − 303
{
+ − 304
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>');
+ − 305
}
+ − 306
}
+ − 307
// Check for compatibility mode
+ − 308
if(defined('IN_ENANO_INSTALL'))
+ − 309
{
+ − 310
$q = $db->sql_query('SELECT old_encryption FROM '.table_prefix.'users LIMIT 1;');
+ − 311
if(!$q)
+ − 312
{
+ − 313
$error = mysql_error();
+ − 314
if(strstr($error, "Unknown column 'old_encryption'"))
+ − 315
$this->compat = true;
+ − 316
else
+ − 317
$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)');
+ − 318
}
+ − 319
$db->free_result();
+ − 320
}
+ − 321
}
+ − 322
+ − 323
/**
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 324
* PHP 4 compatible constructor. Deprecated in 1.1.x.
1
+ − 325
*/
+ − 326
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 327
/*
1
+ − 328
function sessionManager()
+ − 329
{
+ − 330
$this->__construct();
+ − 331
}
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 332
*/
1
+ − 333
+ − 334
/**
+ − 335
* Wrapper function to sanitize strings for MySQL and HTML
+ − 336
* @param string $text The text to sanitize
+ − 337
* @return string
+ − 338
*/
+ − 339
+ − 340
function prepare_text($text)
+ − 341
{
+ − 342
global $db;
+ − 343
return $db->escape(htmlspecialchars($text));
+ − 344
}
+ − 345
+ − 346
/**
+ − 347
* Makes a SQL query and handles error checking
+ − 348
* @param string $query The SQL query to make
+ − 349
* @return resource
+ − 350
*/
+ − 351
+ − 352
function sql($query)
+ − 353
{
+ − 354
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 355
$result = $db->sql_query($query);
+ − 356
if(!$result)
+ − 357
{
+ − 358
$db->_die('The error seems to have occurred somewhere in the session management code.');
+ − 359
}
+ − 360
return $result;
+ − 361
}
+ − 362
+ − 363
# Session restoration and permissions
+ − 364
+ − 365
/**
+ − 366
* Initializes the basic state of things, including most user prefs, login data, cookie stuff
+ − 367
*/
+ − 368
+ − 369
function start()
+ − 370
{
+ − 371
global $db, $session, $paths, $template, $plugins; // Common objects
209
+ − 372
global $lang;
406
+ − 373
global $timezone;
1
+ − 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
{
209
+ − 393
$language = intval(getConfig('default_language'));
+ − 394
$lang = new Language($language);
406
+ − 395
@setlocale(LC_ALL, $lang->lang_code);
209
+ − 396
1
+ − 397
$this->logout();
+ − 398
$a = getConfig('account_activation');
+ − 399
switch($a)
+ − 400
{
+ − 401
case 'none':
+ − 402
default:
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 403
$solution = $lang->get('user_login_noact_solution_none');
1
+ − 404
break;
+ − 405
case 'user':
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 406
$solution = $lang->get('user_login_noact_solution_user');
1
+ − 407
break;
+ − 408
case 'admin':
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 409
$solution = $lang->get('user_login_noact_solution_admin');
1
+ − 410
break;
+ − 411
}
127
+ − 412
+ − 413
// admin activation request opportunity
+ − 414
$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']) . '\';');
+ − 415
if ( !$q )
+ − 416
$db->_die();
+ − 417
+ − 418
$can_request = ( $db->numrows() < 1 );
+ − 419
$db->free_result();
+ − 420
+ − 421
if ( isset($_POST['logout']) )
+ − 422
{
+ − 423
$this->sid = $_COOKIE['sid'];
+ − 424
$this->user_logged_in = true;
+ − 425
$this->user_id = intval($userdata['user_id']);
+ − 426
$this->username = $userdata['username'];
+ − 427
$this->auth_level = USER_LEVEL_MEMBER;
+ − 428
$this->user_level = USER_LEVEL_MEMBER;
+ − 429
$this->logout();
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 430
redirect(scriptPath . '/', $lang->get('user_login_noact_msg_logout_success_title'), $lang->get('user_login_noact_msg_logout_success_body'), 5);
127
+ − 431
}
+ − 432
+ − 433
if ( $can_request && !isset($_POST['activation_request']) )
+ − 434
{
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 435
$form = '<p>' . $lang->get('user_login_noact_msg_ask_admins') . '</p>
127
+ − 436
<form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 437
<p><input type="submit" name="activation_request" value="' . $lang->get('user_login_noact_btn_request_activation') . '" /> <input type="submit" name="logout" value="' . $lang->get('user_login_noact_btn_log_out') . '" /></p>
127
+ − 438
</form>';
+ − 439
}
+ − 440
else
+ − 441
{
+ − 442
if ( $can_request && isset($_POST['activation_request']) )
+ − 443
{
+ − 444
$this->admin_activation_request($userdata['username']);
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 445
$form = '<p>' . $lang->get('user_login_noact_msg_admins_just_asked') . '</p>
127
+ − 446
<form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 447
<p><input type="submit" name="logout" value="' . $lang->get('user_login_noact_btn_log_out') . '" /></p>
127
+ − 448
</form>';
+ − 449
}
+ − 450
else
+ − 451
{
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 452
$form = '<p>' . $lang->get('user_login_noact_msg_admins_asked') . '</p>
127
+ − 453
<form action="' . makeUrlNS('System', 'ActivateStub') . '" method="post">
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 454
<p><input type="submit" name="logout" value="' . $lang->get('user_login_noact_btn_log_out') . '" /></p>
127
+ − 455
</form>';
+ − 456
}
+ − 457
}
+ − 458
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 459
die_semicritical($lang->get('user_login_noact_title'), '<p>' . $lang->get('user_login_noact_msg_intro') . ' '.$solution.'</p>' . $form);
1
+ − 460
}
+ − 461
+ − 462
$this->sid = $_COOKIE['sid'];
+ − 463
$this->user_logged_in = true;
+ − 464
$this->user_id = intval($userdata['user_id']);
+ − 465
$this->username = $userdata['username'];
+ − 466
$this->password_hash = $userdata['password'];
+ − 467
$this->user_level = intval($userdata['user_level']);
+ − 468
$this->real_name = $userdata['real_name'];
+ − 469
$this->email = $userdata['email'];
+ − 470
$this->unread_pms = $userdata['num_pms'];
+ − 471
if(!$this->compat)
+ − 472
{
+ − 473
$this->theme = $userdata['theme'];
+ − 474
$this->style = $userdata['style'];
+ − 475
$this->signature = $userdata['signature'];
+ − 476
$this->reg_time = $userdata['reg_time'];
+ − 477
}
436
+ − 478
$this->auth_level = USER_LEVEL_MEMBER;
1
+ − 479
if(!isset($template->named_theme_list[$this->theme]))
+ − 480
{
+ − 481
if($this->compat || !is_object($template))
+ − 482
{
+ − 483
$this->theme = 'oxygen';
+ − 484
$this->style = 'bleu';
+ − 485
}
+ − 486
else
+ − 487
{
+ − 488
$this->theme = $template->default_theme;
+ − 489
$this->style = $template->default_style;
+ − 490
}
+ − 491
}
+ − 492
$user = true;
406
+ − 493
$GLOBALS['timezone'] = $userdata['user_timezone'];
1
+ − 494
209
+ − 495
// Set language
+ − 496
if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ − 497
{
+ − 498
$lang_id = intval($userdata['user_lang']);
+ − 499
$lang = new Language($lang_id);
406
+ − 500
@setlocale(LC_ALL, $lang->lang_code);
209
+ − 501
}
1
+ − 502
+ − 503
if(isset($_REQUEST['auth']) && !$this->sid_super)
+ − 504
{
+ − 505
// Now he thinks he's a moderator. Or maybe even an administrator. Let's find out if he's telling the truth.
+ − 506
if($this->compat)
+ − 507
{
+ − 508
$key = $_REQUEST['auth'];
+ − 509
$super = $this->compat_validate_session($key);
+ − 510
}
+ − 511
else
+ − 512
{
+ − 513
$key = strrev($_REQUEST['auth']);
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 514
if ( !empty($key) && ( strlen($key) / 2 ) % 4 == 0 )
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 515
{
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 516
$super = $this->validate_session($key);
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 517
}
1
+ − 518
}
+ − 519
if(is_array($super))
+ − 520
{
+ − 521
$this->auth_level = intval($super['auth_level']);
+ − 522
$this->sid_super = $_REQUEST['auth'];
+ − 523
}
+ − 524
}
+ − 525
}
+ − 526
}
+ − 527
if(!$user)
+ − 528
{
+ − 529
//exit;
+ − 530
$this->register_guest_session();
+ − 531
}
+ − 532
if(!$this->compat)
+ − 533
{
+ − 534
// init groups
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 535
$q = $this->sql('SELECT g.group_name,g.group_id,m.is_mod FROM '.table_prefix.'groups AS g' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 536
. ' LEFT JOIN '.table_prefix.'group_members AS m' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 537
. ' ON g.group_id=m.group_id' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 538
. ' WHERE ( m.user_id='.$this->user_id.'' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 539
. ' OR g.group_name=\'Everyone\')' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 540
. ' ' . ( enano_version() == '1.0RC1' ? '' : 'AND ( m.pending != 1 OR m.pending IS NULL )' ) . '' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 541
. ' ORDER BY group_id ASC;'); // Make sure "Everyone" comes first so the permissions can be overridden
1
+ − 542
if($row = $db->fetchrow())
+ − 543
{
+ − 544
do {
+ − 545
$this->groups[$row['group_id']] = $row['group_name'];
+ − 546
$this->group_mod[$row['group_id']] = ( intval($row['is_mod']) == 1 );
+ − 547
} while($row = $db->fetchrow());
+ − 548
}
+ − 549
else
+ − 550
{
+ − 551
die('No group info');
+ − 552
}
+ − 553
}
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 554
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 555
// make sure we aren't banned
1
+ − 556
$this->check_banlist();
+ − 557
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 558
// Printable page view? Probably the wrong place to control
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 559
// it but $template is pretty dumb, it will just about always
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 560
// do what you ask it to do, which isn't always what we want
1
+ − 561
if ( isset ( $_GET['printable'] ) )
+ − 562
{
+ − 563
$this->theme = 'printable';
+ − 564
$this->style = 'default';
+ − 565
}
+ − 566
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 567
// setup theme ACLs
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 568
$template->process_theme_acls();
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 569
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
diff
changeset
+ − 570
profiler_log('Sessions started');
1
+ − 571
}
+ − 572
+ − 573
# Logins
+ − 574
+ − 575
/**
+ − 576
* Attempts to perform a login using crypto functions
+ − 577
* @param string $username The username
+ − 578
* @param string $aes_data The encrypted password, hex-encoded
+ − 579
* @param string $aes_key The MD5 hash of the encryption key, hex-encoded
+ − 580
* @param string $challenge The 256-bit MD5 challenge string - first 128 bits should be the hash, the last 128 should be the challenge salt
+ − 581
* @param int $level The privilege level we're authenticating for, defaults to 0
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 582
* @param array $captcha_hash Optional. If we're locked out and the lockout policy is captcha, this should be the identifier for the code.
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 583
* @param array $captcha_code Optional. If we're locked out and the lockout policy is captcha, this should be the code the user entered.
436
+ − 584
* @param bool $lookup_key Optional. If true (default) this queries the database for the "real" encryption key. Else, uses what is given.
1
+ − 585
* @return string 'success' on success, or error string on failure
+ − 586
*/
+ − 587
436
+ − 588
function login_with_crypto($username, $aes_data, $aes_key_id, $challenge, $level = USER_LEVEL_MEMBER, $captcha_hash = false, $captcha_code = false, $lookup_key = true)
1
+ − 589
{
+ − 590
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 591
+ − 592
$privcache = $this->private_key;
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 593
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 594
if ( !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 595
{
436
+ − 596
$timestamp_cutoff = time() - $duration;
+ − 597
$q = $this->sql('SELECT timestamp FROM '.table_prefix.'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;');
+ − 598
$fails = $db->numrows();
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 599
// Lockout stuff
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 600
$threshold = ( $_ = getConfig('lockout_threshold') ) ? intval($_) : 5;
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 601
$duration = ( $_ = getConfig('lockout_duration') ) ? intval($_) : 15;
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 602
// convert to minutes
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 603
$duration = $duration * 60;
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 604
$policy = ( $x = getConfig('lockout_policy') && in_array(getConfig('lockout_policy'), array('lockout', 'disable', 'captcha')) ) ? getConfig('lockout_policy') : 'lockout';
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 605
if ( $policy == 'captcha' && $captcha_hash && $captcha_code )
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 606
{
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 607
// policy is captcha -- check if it's correct, and if so, bypass lockout check
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 608
$real_code = $this->get_captcha($captcha_hash);
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 609
}
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 610
if ( $policy != 'disable' && !( $policy == 'captcha' && isset($real_code) && strtolower($real_code) == strtolower($captcha_code) ) )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 611
{
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 612
$ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
182
c69730750be3
Fixed the security hole (really, I'm a moron - used $failed > $threshold instead of $failed >= $threashold) and patched up some...erm... math issues
Dan
diff
changeset
+ − 613
if ( $fails >= $threshold )
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 614
{
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 615
// ooh boy, somebody's in trouble ;-)
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 616
$row = $db->fetchrow();
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 617
$db->free_result();
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 618
return array(
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 619
'success' => false,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 620
'error' => 'locked_out',
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 621
'lockout_threshold' => $threshold,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 622
'lockout_duration' => ( $duration / 60 ),
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 623
'lockout_fails' => $fails,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 624
'lockout_policy' => $policy,
182
c69730750be3
Fixed the security hole (really, I'm a moron - used $failed > $threshold instead of $failed >= $threashold) and patched up some...erm... math issues
Dan
diff
changeset
+ − 625
'time_rem' => ( $duration / 60 ) - round( ( time() - $row['timestamp'] ) / 60 ),
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 626
'lockout_last_time' => $row['timestamp']
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 627
);
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 628
}
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 629
}
436
+ − 630
$db->free_result();
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 631
}
1
+ − 632
+ − 633
// Instanciate the Rijndael encryption object
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 634
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 635
+ − 636
// Fetch our decryption key
+ − 637
436
+ − 638
if ( $lookup_key )
292
b3cfaf0a505c
Fixed highlighting in search results; changed search algorithm to give more score for terms found in page title; hopefully (hackishly) fixed login_key_cache getting too long
Dan
diff
changeset
+ − 639
{
436
+ − 640
$aes_key = $this->fetch_public_key($aes_key_id);
+ − 641
if ( !$aes_key )
292
b3cfaf0a505c
Fixed highlighting in search results; changed search algorithm to give more score for terms found in page title; hopefully (hackishly) fixed login_key_cache getting too long
Dan
diff
changeset
+ − 642
{
436
+ − 643
// It could be that our key cache is full. If it seems larger than 65KB, clear it
+ − 644
if ( strlen(getConfig('login_key_cache')) > 65000 )
+ − 645
{
+ − 646
setConfig('login_key_cache', '');
+ − 647
return array(
+ − 648
'success' => false,
+ − 649
'error' => 'key_not_found_cleared',
+ − 650
);
+ − 651
}
304
+ − 652
return array(
+ − 653
'success' => false,
436
+ − 654
'error' => 'key_not_found'
304
+ − 655
);
292
b3cfaf0a505c
Fixed highlighting in search results; changed search algorithm to give more score for terms found in page title; hopefully (hackishly) fixed login_key_cache getting too long
Dan
diff
changeset
+ − 656
}
436
+ − 657
}
+ − 658
else
+ − 659
{
+ − 660
$aes_key =& $aes_key_id;
292
b3cfaf0a505c
Fixed highlighting in search results; changed search algorithm to give more score for terms found in page title; hopefully (hackishly) fixed login_key_cache getting too long
Dan
diff
changeset
+ − 661
}
1
+ − 662
+ − 663
// Convert the key to a binary string
+ − 664
$bin_key = hexdecode($aes_key);
+ − 665
+ − 666
if(strlen($bin_key) != AES_BITS / 8)
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 667
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 668
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 669
'error' => 'key_wrong_length'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 670
);
1
+ − 671
+ − 672
// Decrypt our password
+ − 673
$password = $aes->decrypt($aes_data, $bin_key, ENC_HEX);
+ − 674
+ − 675
// Initialize our success switch
+ − 676
$success = false;
+ − 677
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
+ − 678
// Escaped username
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 679
$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
+ − 680
$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
+ − 681
$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
+ − 682
1
+ − 683
// Select the user data from the table, and decrypt that so we can verify the password
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 684
$this->sql('SELECT password,old_encryption,user_id,user_level,theme,style,temp_password,temp_password_time FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=\''.$db_username_lower.'\' OR username=\'' . $db_username . '\';');
1
+ − 685
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
+ − 686
{
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
+ − 687
// 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
+ − 688
if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 689
$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().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
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
+ − 690
else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 691
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 692
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 693
if ( $policy != 'disable' && !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 694
{
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 695
$ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 696
// increment fail count
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
diff
changeset
+ − 697
$this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\');');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 698
$fails++;
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 699
// ooh boy, somebody's in trouble ;-)
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 700
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 701
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 702
'error' => ( $fails >= $threshold ) ? 'locked_out' : 'invalid_credentials',
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 703
'lockout_threshold' => $threshold,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 704
'lockout_duration' => ( $duration / 60 ),
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 705
'lockout_fails' => $fails,
182
c69730750be3
Fixed the security hole (really, I'm a moron - used $failed > $threshold instead of $failed >= $threashold) and patched up some...erm... math issues
Dan
diff
changeset
+ − 706
'time_rem' => ( $duration / 60 ),
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 707
'lockout_policy' => $policy
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 708
);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 709
}
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 710
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 711
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 712
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 713
'error' => 'invalid_credentials'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 714
);
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
+ − 715
}
1
+ − 716
$row = $db->fetchrow();
+ − 717
+ − 718
// Check to see if we're logging in using a temporary password
+ − 719
+ − 720
if((intval($row['temp_password_time']) + 3600*24) > time() )
+ − 721
{
+ − 722
$temp_pass = $aes->decrypt( $row['temp_password'], $this->private_key, ENC_HEX );
+ − 723
if( $temp_pass == $password )
+ − 724
{
+ − 725
$url = makeUrlComplete('Special', 'PasswordReset/stage2/' . $row['user_id'] . '/' . $row['temp_password']);
+ − 726
+ − 727
$code = $plugins->setHook('login_password_reset');
+ − 728
foreach ( $code as $cmd )
+ − 729
{
+ − 730
eval($cmd);
+ − 731
}
+ − 732
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 733
redirect($url, '', '', 0);
1
+ − 734
exit;
+ − 735
}
+ − 736
}
+ − 737
+ − 738
if($row['old_encryption'] == 1)
+ − 739
{
+ − 740
// The user's password is stored using the obsolete and insecure MD5 algorithm, so we'll update the field with the new password
+ − 741
if(md5($password) == $row['password'])
+ − 742
{
+ − 743
$pass_stashed = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 744
$this->sql('UPDATE '.table_prefix.'users SET password=\''.$pass_stashed.'\',old_encryption=0 WHERE user_id='.$row['user_id'].';');
+ − 745
$success = true;
+ − 746
}
+ − 747
}
+ − 748
else
+ − 749
{
+ − 750
// 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
+ − 751
$real_pass = $aes->decrypt(hexdecode($row['password']), $this->private_key, ENC_BINARY);
436
+ − 752
if($password === $real_pass && is_string($password))
1
+ − 753
{
436
+ − 754
// Yay! We passed AES authentication. Previously an MD5 challenge was done here, this was deemed redundant in 1.1.3.
+ − 755
// It didn't seem to provide any additional security...
+ − 756
$success = true;
1
+ − 757
}
+ − 758
}
+ − 759
if($success)
+ − 760
{
+ − 761
if($level > $row['user_level'])
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 762
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 763
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 764
'error' => 'too_big_for_britches'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 765
);
436
+ − 766
+ − 767
/*
+ − 768
return array(
+ − 769
'success' => false,
+ − 770
'error' => 'Successful authentication, but session manager is in debug mode - remove the "return array(...);" in includes/sessions.php:' . ( __LINE__ - 2 )
+ − 771
);
+ − 772
*/
1
+ − 773
+ − 774
$sess = $this->register_session(intval($row['user_id']), $username, $password, $level);
+ − 775
if($sess)
+ − 776
{
+ − 777
$this->username = $username;
+ − 778
$this->user_id = intval($row['user_id']);
+ − 779
$this->theme = $row['theme'];
+ − 780
$this->style = $row['style'];
+ − 781
+ − 782
if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 783
$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().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
1
+ − 784
else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 785
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_good\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
1
+ − 786
+ − 787
$code = $plugins->setHook('login_success');
+ − 788
foreach ( $code as $cmd )
+ − 789
{
+ − 790
eval($cmd);
+ − 791
}
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 792
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 793
'success' => true
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 794
);
1
+ − 795
}
+ − 796
else
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 797
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 798
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 799
'error' => 'backend_fail'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 800
);
1
+ − 801
}
+ − 802
else
+ − 803
{
+ − 804
if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 805
$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().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
1
+ − 806
else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 807
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
1
+ − 808
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 809
// Do we also need to increment the lockout countdown?
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 810
if ( $policy != 'disable' && !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 811
{
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 812
$ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 813
// increment fail count
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
diff
changeset
+ − 814
$this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\');');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 815
$fails++;
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 816
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 817
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 818
'error' => ( $fails >= $threshold ) ? 'locked_out' : 'invalid_credentials',
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 819
'lockout_threshold' => $threshold,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 820
'lockout_duration' => ( $duration / 60 ),
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 821
'lockout_fails' => $fails,
182
c69730750be3
Fixed the security hole (really, I'm a moron - used $failed > $threshold instead of $failed >= $threashold) and patched up some...erm... math issues
Dan
diff
changeset
+ − 822
'time_rem' => ( $duration / 60 ),
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 823
'lockout_policy' => $policy
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 824
);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 825
}
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 826
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 827
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 828
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 829
'error' => 'invalid_credentials'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 830
);
1
+ − 831
}
+ − 832
}
+ − 833
+ − 834
/**
+ − 835
* Attempts to login without using crypto stuff, mainly for use when the other side doesn't like Javascript
+ − 836
* 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
+ − 837
* Technically it still uses crypto, but it only decrypts the password already stored, which is (obviously) required for authentication
+ − 838
* @param string $username The username
+ − 839
* @param string $password The password -OR- the MD5 hash of the password if $already_md5ed is true
+ − 840
* @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.
+ − 841
* @param int $level The privilege level we're authenticating for, defaults to 0
+ − 842
*/
+ − 843
436
+ − 844
function login_without_crypto($username, $password, $already_md5ed = false, $level = USER_LEVEL_MEMBER, $captcha_hash = false, $captcha_code = false)
1
+ − 845
{
+ − 846
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 847
+ − 848
$pass_hashed = ( $already_md5ed ) ? $password : md5($password);
+ − 849
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 850
// 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
+ − 851
// (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
+ − 852
$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
+ − 853
1
+ − 854
// Perhaps we're upgrading Enano?
+ − 855
if($this->compat)
+ − 856
{
+ − 857
return $this->login_compat($username, $pass_hashed, $level);
+ − 858
}
+ − 859
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 860
if ( !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 861
{
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 862
// Lockout stuff
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 863
$threshold = ( $_ = getConfig('lockout_threshold') ) ? intval($_) : 5;
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 864
$duration = ( $_ = getConfig('lockout_duration') ) ? intval($_) : 15;
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 865
// convert to minutes
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 866
$duration = $duration * 60;
436
+ − 867
+ − 868
// get the lockout status
+ − 869
$timestamp_cutoff = time() - $duration;
+ − 870
$ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
+ − 871
$q = $this->sql('SELECT timestamp FROM '.table_prefix.'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;');
+ − 872
$fails = $db->numrows();
+ − 873
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 874
$policy = ( $x = getConfig('lockout_policy') && in_array(getConfig('lockout_policy'), array('lockout', 'disable', 'captcha')) ) ? getConfig('lockout_policy') : 'lockout';
436
+ − 875
$captcha_good = false;
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 876
if ( $policy == 'captcha' && $captcha_hash && $captcha_code )
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 877
{
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 878
// policy is captcha -- check if it's correct, and if so, bypass lockout check
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 879
$real_code = $this->get_captcha($captcha_hash);
436
+ − 880
$captcha_good = ( strtolower($real_code) === strtolower($captcha_code) );
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 881
}
436
+ − 882
if ( $policy != 'disable' && !$captcha_good )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 883
{
436
+ − 884
if ( $fails >= $threshold )
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 885
{
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 886
// ooh boy, somebody's in trouble ;-)
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 887
$row = $db->fetchrow();
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 888
$db->free_result();
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 889
return array(
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 890
'success' => false,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 891
'error' => 'locked_out',
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 892
'lockout_threshold' => $threshold,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 893
'lockout_duration' => ( $duration / 60 ),
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 894
'lockout_fails' => $fails,
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 895
'lockout_policy' => $policy,
436
+ − 896
'time_rem' => ( $duration / 60 ) - round( ( time() - $row['timestamp'] ) / 60 ),
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 897
'lockout_last_time' => $row['timestamp']
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 898
);
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 899
}
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 900
}
436
+ − 901
$db->free_result();
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 902
}
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 903
1
+ − 904
// Instanciate the Rijndael encryption object
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 905
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 906
+ − 907
// Initialize our success switch
+ − 908
$success = false;
+ − 909
+ − 910
// Retrieve the real password from the database
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 911
$this->sql('SELECT password,old_encryption,user_id,user_level,temp_password,temp_password_time FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=\''.$this->prepare_text(strtolower($username)).'\';');
1
+ − 912
if($db->numrows() < 1)
188
+ − 913
{
+ − 914
// This wasn't logged in <1.0.2, dunno how it slipped through
+ − 915
if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 916
$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().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
188
+ − 917
else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 918
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 919
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 920
// Do we also need to increment the lockout countdown?
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
diff
changeset
+ − 921
if ( @$policy != 'disable' && !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 922
{
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 923
$ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 924
// increment fail count
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
diff
changeset
+ − 925
$this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\');');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 926
$fails++;
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 927
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 928
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 929
'error' => ( $fails >= $threshold ) ? 'locked_out' : 'invalid_credentials',
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 930
'lockout_threshold' => $threshold,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 931
'lockout_duration' => ( $duration / 60 ),
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 932
'lockout_fails' => $fails,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 933
'lockout_policy' => $policy
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 934
);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 935
}
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 936
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 937
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 938
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 939
'error' => 'invalid_credentials'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 940
);
188
+ − 941
}
1
+ − 942
$row = $db->fetchrow();
+ − 943
+ − 944
// Check to see if we're logging in using a temporary password
+ − 945
+ − 946
if((intval($row['temp_password_time']) + 3600*24) > time() )
+ − 947
{
+ − 948
$temp_pass = $aes->decrypt( $row['temp_password'], $this->private_key, ENC_HEX );
+ − 949
if( md5($temp_pass) == $pass_hashed )
+ − 950
{
+ − 951
$code = $plugins->setHook('login_password_reset');
+ − 952
foreach ( $code as $cmd )
+ − 953
{
+ − 954
eval($cmd);
+ − 955
}
+ − 956
+ − 957
header('Location: ' . makeUrlComplete('Special', 'PasswordReset/stage2/' . $row['user_id'] . '/' . $row['temp_password']) );
+ − 958
+ − 959
exit;
+ − 960
}
+ − 961
}
+ − 962
+ − 963
if($row['old_encryption'] == 1)
+ − 964
{
+ − 965
// The user's password is stored using the obsolete and insecure MD5 algorithm - we'll update the field with the new password
+ − 966
if($pass_hashed == $row['password'] && !$already_md5ed)
+ − 967
{
+ − 968
$pass_stashed = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 969
$this->sql('UPDATE '.table_prefix.'users SET password=\''.$pass_stashed.'\',old_encryption=0 WHERE user_id='.$row['user_id'].';');
+ − 970
$success = true;
+ − 971
}
+ − 972
elseif($pass_hashed == $row['password'] && $already_md5ed)
+ − 973
{
+ − 974
// We don't have the real password so don't bother with encrypting it, just call it success and get out of here
+ − 975
$success = true;
+ − 976
}
+ − 977
}
+ − 978
else
+ − 979
{
+ − 980
// 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
+ − 981
$real_pass = $aes->decrypt($row['password'], $this->private_key);
+ − 982
if($pass_hashed == md5($real_pass))
+ − 983
{
+ − 984
$success = true;
+ − 985
}
+ − 986
}
+ − 987
if($success)
+ − 988
{
+ − 989
if((int)$level > (int)$row['user_level'])
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 990
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 991
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 992
'error' => 'too_big_for_britches'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 993
);
1
+ − 994
$sess = $this->register_session(intval($row['user_id']), $username, $real_pass, $level);
+ − 995
if($sess)
+ − 996
{
+ − 997
if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 998
$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().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
1
+ − 999
else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 1000
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_good\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
1
+ − 1001
+ − 1002
$code = $plugins->setHook('login_success');
+ − 1003
foreach ( $code as $cmd )
+ − 1004
{
+ − 1005
eval($cmd);
+ − 1006
}
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
+ − 1007
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1008
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1009
'success' => true
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1010
);
1
+ − 1011
}
+ − 1012
else
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1013
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1014
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1015
'error' => 'backend_fail'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1016
);
1
+ − 1017
}
+ − 1018
else
+ − 1019
{
+ − 1020
if($level > USER_LEVEL_MEMBER)
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 1021
$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().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', ' . intval($level) . ')');
1
+ − 1022
else
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 1023
$this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'auth_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\')');
1
+ − 1024
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1025
// Do we also need to increment the lockout countdown?
181
06bdbdfec160
Upgrade UI should work now (upgrades still don't work); do not pull this revision as there is a security hole in the lockout system pending a fix
Dan
diff
changeset
+ − 1026
if ( $policy != 'disable' && !defined('IN_ENANO_INSTALL') )
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1027
{
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1028
$ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1029
// increment fail count
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
diff
changeset
+ − 1030
$this->sql('INSERT INTO '.table_prefix.'lockout(ipaddr, timestamp, action) VALUES(\'' . $ipaddr . '\', ' . time() . ', \'credential\');');
179
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1031
$fails++;
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1032
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1033
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1034
'error' => ( $fails >= $threshold ) ? 'locked_out' : 'invalid_credentials',
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1035
'lockout_threshold' => $threshold,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1036
'lockout_duration' => ( $duration / 60 ),
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1037
'lockout_fails' => $fails,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1038
'lockout_policy' => $policy
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1039
);
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1040
}
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1041
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1042
return array(
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1043
'success' => false,
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1044
'error' => 'invalid_credentials'
36b287f1d85c
[F] Added support for account lockouts. User is locked out or required to complete a CAPTCHA after specified threshold for specified period.
Dan
diff
changeset
+ − 1045
);
1
+ − 1046
}
+ − 1047
}
+ − 1048
+ − 1049
/**
+ − 1050
* Attempts to log in using the old table structure and algorithm.
+ − 1051
* @param string $username
+ − 1052
* @param string $password This should be an MD5 hash
+ − 1053
* @return string 'success' if successful, or error message on failure
+ − 1054
*/
+ − 1055
+ − 1056
function login_compat($username, $password, $level = 0)
+ − 1057
{
+ − 1058
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1059
$pass_hashed =& $password;
+ − 1060
$this->sql('SELECT password,user_id,user_level FROM '.table_prefix.'users WHERE username=\''.$this->prepare_text($username).'\';');
+ − 1061
if($db->numrows() < 1)
+ − 1062
return 'The username and/or password is incorrect.';
+ − 1063
$row = $db->fetchrow();
+ − 1064
if($row['password'] == $password)
+ − 1065
{
+ − 1066
if((int)$level > (int)$row['user_level'])
+ − 1067
return 'You are not authorized for this level of access.';
+ − 1068
$sess = $this->register_session_compat(intval($row['user_id']), $username, $password, $level);
+ − 1069
if($sess)
+ − 1070
return 'success';
+ − 1071
else
+ − 1072
return 'Your login credentials were correct, but an internal error occured while registering the session key in the database.';
+ − 1073
}
+ − 1074
else
+ − 1075
{
+ − 1076
return 'The username and/or password is incorrect.';
+ − 1077
}
+ − 1078
}
+ − 1079
+ − 1080
/**
+ − 1081
* Registers a session key in the database. This function *ASSUMES* that the username and password have already been validated!
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1082
* 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
+ − 1083
* @param int $user_id
+ − 1084
* @param string $username
+ − 1085
* @param string $password
+ − 1086
* @param int $level The level of access to grant, defaults to USER_LEVEL_MEMBER
+ − 1087
* @return bool
+ − 1088
*/
+ − 1089
+ − 1090
function register_session($user_id, $username, $password, $level = USER_LEVEL_MEMBER)
+ − 1091
{
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
+ − 1092
// Random key identifier
1
+ − 1093
$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
+ − 1094
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1095
// SHA1 hash of password, stored in the key
1
+ − 1096
$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
+ − 1097
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1098
// Unencrypted session key
1
+ − 1099
$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
+ − 1100
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1101
// Encrypt the key
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1102
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1103
$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
+ − 1104
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1105
// If we're registering an elevated-privilege key, it needs to be on GET
1
+ − 1106
if($level > USER_LEVEL_MEMBER)
+ − 1107
{
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
+ − 1108
// Reverse it - cosmetic only ;-)
1
+ − 1109
$hexkey = strrev($session_key);
+ − 1110
$this->sid_super = $hexkey;
+ − 1111
$_GET['auth'] = $hexkey;
+ − 1112
}
+ − 1113
else
+ − 1114
{
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
+ − 1115
// 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
+ − 1116
// For now, make the cookie last forever, we can change this in 1.1.x
259
+ − 1117
setcookie( 'sid', $session_key, time()+315360000, scriptPath.'/', null, ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ) );
1
+ − 1118
$_COOKIE['sid'] = $session_key;
+ − 1119
}
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
+ − 1120
// $keyhash is stored in the database, this is for compatibility with the older DB structure
1
+ − 1121
$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
+ − 1122
// Record the user's IP
466
+ − 1123
$ip = $_SERVER['REMOTE_ADDR'];
+ − 1124
if(!is_valid_ip($ip))
1
+ − 1125
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
+ − 1126
// The time needs to be stashed to enforce the 15-minute limit on elevated session keys
1
+ − 1127
$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
+ − 1128
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1129
// Sanity check
1
+ − 1130
if(!is_int($user_id))
+ − 1131
die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
+ − 1132
if(!is_int($level))
+ − 1133
die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
+ − 1134
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
+ − 1135
// All done!
1
+ − 1136
$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.');');
+ − 1137
return true;
+ − 1138
}
+ − 1139
+ − 1140
/**
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1141
* 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
+ − 1142
* @see sessionManager::register_session()
+ − 1143
* @access private
+ − 1144
*/
+ − 1145
+ − 1146
function register_session_compat($user_id, $username, $password, $level = 0)
+ − 1147
{
+ − 1148
$salt = md5(microtime() . mt_rand());
+ − 1149
$thekey = md5($password . $salt);
+ − 1150
if($level > 0)
+ − 1151
{
+ − 1152
$this->sid_super = $thekey;
+ − 1153
}
+ − 1154
else
+ − 1155
{
+ − 1156
setcookie( 'sid', $thekey, time()+315360000, scriptPath.'/' );
+ − 1157
$_COOKIE['sid'] = $thekey;
+ − 1158
}
+ − 1159
$ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 1160
if(!$ip)
+ − 1161
die('$session->register_session: Remote-Addr was spoofed');
+ − 1162
$time = time();
+ − 1163
if(!is_int($user_id))
+ − 1164
die('Somehow an SQL injection attempt crawled into our session registrar! (1)');
+ − 1165
if(!is_int($level))
+ − 1166
die('Somehow an SQL injection attempt crawled into our session registrar! (2)');
+ − 1167
$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.');');
+ − 1168
return true;
+ − 1169
}
+ − 1170
+ − 1171
/**
+ − 1172
* Creates/restores a guest session
+ − 1173
* @todo implement real session management for guests
+ − 1174
*/
+ − 1175
+ − 1176
function register_guest_session()
+ − 1177
{
+ − 1178
global $db, $session, $paths, $template, $plugins; // Common objects
209
+ − 1179
global $lang;
1
+ − 1180
$this->username = $_SERVER['REMOTE_ADDR'];
+ − 1181
$this->user_level = USER_LEVEL_GUEST;
+ − 1182
if($this->compat || defined('IN_ENANO_INSTALL'))
+ − 1183
{
+ − 1184
$this->theme = 'oxygen';
+ − 1185
$this->style = 'bleu';
+ − 1186
}
+ − 1187
else
+ − 1188
{
+ − 1189
$this->theme = ( isset($_GET['theme']) && isset($template->named_theme_list[$_GET['theme']])) ? $_GET['theme'] : $template->default_theme;
466
+ − 1190
$this->style = ( isset($_GET['style']) && file_exists(ENANO_ROOT.'/themes/'.$this->theme . '/css/'.$_GET['style'].'.css' )) ? $_GET['style'] : preg_replace('/\.css$/', '', $template->named_theme_list[$this->theme]['default_style']);
1
+ − 1191
}
+ − 1192
$this->user_id = 1;
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
diff
changeset
+ − 1193
// This is a VERY special case we are allowing. It lets the installer create languages using the Enano API.
209
+ − 1194
if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
+ − 1195
{
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
diff
changeset
+ − 1196
$language = ( isset($_GET['lang']) && preg_match('/^[a-z0-9_]+$/', @$_GET['lang']) ) ? $_GET['lang'] : intval(getConfig('default_language'));
209
+ − 1197
$lang = new Language($language);
406
+ − 1198
@setlocale(LC_ALL, $lang->lang_code);
209
+ − 1199
}
1
+ − 1200
}
+ − 1201
+ − 1202
/**
+ − 1203
* Validates a session key, and returns the userdata associated with the key or false
+ − 1204
* @param string $key The session key to validate
+ − 1205
* @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.
+ − 1206
*/
+ − 1207
+ − 1208
function validate_session($key)
+ − 1209
{
+ − 1210
global $db, $session, $paths, $template, $plugins; // Common objects
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1211
profiler_log("SessionManager: checking session: " . sha1($key));
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1212
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1213
$decrypted_key = $aes->decrypt($key, $this->private_key, ENC_HEX);
+ − 1214
+ − 1215
if ( !$decrypted_key )
+ − 1216
{
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1217
// die_semicritical('AES encryption error', '<p>Something went wrong during the AES decryption process.</p><pre>'.print_r($decrypted_key, true).'</pre>');
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1218
return false;
1
+ − 1219
}
+ − 1220
+ − 1221
$n = preg_match('/^u='.$this->valid_username.';p=([A-Fa-f0-9]+?);s=([A-Fa-f0-9]+?)$/', $decrypted_key, $keydata);
+ − 1222
if($n < 1)
+ − 1223
{
+ − 1224
// echo '(debug) $session->validate_session: Key does not match regex<br />Decrypted key: '.$decrypted_key;
+ − 1225
return false;
+ − 1226
}
+ − 1227
$keyhash = md5($key);
+ − 1228
$salt = $db->escape($keydata[3]);
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1229
// using a normal call to $db->sql_query to avoid failing on errors here
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1230
$query = $db->sql_query('SELECT u.user_id AS uid,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,' . "\n"
371
dc6026376919
Improved compatibility with PostgreSQL and fixed a number of installer bugs; fixed missing "meta" category declaration in language files
Dan
diff
changeset
+ − 1231
. ' u.reg_time,u.account_active,u.activation_key,u.user_lang,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms,' . "\n"
406
+ − 1232
. ' u.user_timezone, x.* FROM '.table_prefix.'session_keys AS k' . "\n"
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1233
. ' LEFT JOIN '.table_prefix.'users AS u' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1234
. ' ON ( u.user_id=k.user_id )' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1235
. ' LEFT JOIN '.table_prefix.'users_extra AS x' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1236
. ' ON ( u.user_id=x.user_id OR x.user_id IS NULL )' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1237
. ' LEFT JOIN '.table_prefix.'privmsgs AS p' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1238
. ' ON ( p.message_to=u.username AND p.message_read=0 )' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1239
. ' WHERE k.session_key=\''.$keyhash.'\'' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1240
. ' AND k.salt=\''.$salt.'\'' . "\n"
371
dc6026376919
Improved compatibility with PostgreSQL and fixed a number of installer bugs; fixed missing "meta" category declaration in language files
Dan
diff
changeset
+ − 1241
. ' GROUP BY u.user_id,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,u.user_lang,k.source_ip,k.time,k.auth_level,x.user_id, x.user_aim, x.user_yahoo, x.user_msn, x.user_xmpp, x.user_homepage, x.user_location, x.user_job, x.user_hobbies, x.email_public;');
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1242
18
+ − 1243
if ( !$query )
+ − 1244
{
406
+ − 1245
$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, 1440 AS user_timezone FROM '.table_prefix.'session_keys AS k
18
+ − 1246
LEFT JOIN '.table_prefix.'users AS u
+ − 1247
ON ( u.user_id=k.user_id )
+ − 1248
LEFT JOIN '.table_prefix.'privmsgs AS p
+ − 1249
ON ( p.message_to=u.username AND p.message_read=0 )
+ − 1250
WHERE k.session_key=\''.$keyhash.'\'
+ − 1251
AND k.salt=\''.$salt.'\'
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1252
GROUP BY u.user_id,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;');
18
+ − 1253
}
1
+ − 1254
if($db->numrows() < 1)
+ − 1255
{
+ − 1256
// echo '(debug) $session->validate_session: Key was not found in database<br />';
+ − 1257
return false;
+ − 1258
}
+ − 1259
$row = $db->fetchrow();
+ − 1260
$row['user_id'] =& $row['uid'];
466
+ − 1261
$ip = $_SERVER['REMOTE_ADDR'];
1
+ − 1262
if($row['auth_level'] > $row['user_level'])
+ − 1263
{
+ − 1264
// Failed authorization check
+ − 1265
// echo '(debug) $session->validate_session: access to this auth level denied<br />';
+ − 1266
return false;
+ − 1267
}
+ − 1268
if($ip != $row['source_ip'])
+ − 1269
{
+ − 1270
// Failed IP address check
+ − 1271
// echo '(debug) $session->validate_session: IP address mismatch<br />';
+ − 1272
return false;
+ − 1273
}
+ − 1274
+ − 1275
// Do the password validation
+ − 1276
$real_pass = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 1277
+ − 1278
//die('<pre>'.print_r($keydata, true).'</pre>');
+ − 1279
if(sha1($real_pass) != $keydata[2])
+ − 1280
{
+ − 1281
// Failed password check
+ − 1282
// 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];
+ − 1283
return false;
+ − 1284
}
+ − 1285
+ − 1286
$time_now = time();
+ − 1287
$time_key = $row['time'] + 900;
+ − 1288
if($time_now > $time_key && $row['auth_level'] > USER_LEVEL_MEMBER)
+ − 1289
{
+ − 1290
// Session timed out
+ − 1291
// echo '(debug) $session->validate_session: super session timed out<br />';
+ − 1292
$this->sw_timed_out = true;
+ − 1293
return false;
+ − 1294
}
+ − 1295
+ − 1296
// If this is an elevated-access session key, update the time
+ − 1297
if( $row['auth_level'] > USER_LEVEL_MEMBER )
+ − 1298
{
+ − 1299
$this->sql('UPDATE '.table_prefix.'session_keys SET time='.time().' WHERE session_key=\''.$keyhash.'\';');
+ − 1300
}
+ − 1301
31
+ − 1302
$user_extra = array();
+ − 1303
foreach ( array('user_aim', 'user_yahoo', 'user_msn', 'user_xmpp', 'user_homepage', 'user_location', 'user_job', 'user_hobbies', 'email_public') as $column )
+ − 1304
{
375
8d0e3a5a6990
[minor] Trying to be a little more careful with values from users_extra in validate_session()
Dan
diff
changeset
+ − 1305
if ( isset($row[$column]) )
8d0e3a5a6990
[minor] Trying to be a little more careful with values from users_extra in validate_session()
Dan
diff
changeset
+ − 1306
$user_extra[$column] = $row[$column];
31
+ − 1307
}
+ − 1308
+ − 1309
$this->user_extra = $user_extra;
+ − 1310
// Leave the rest to PHP's automatic garbage collector ;-)
+ − 1311
1
+ − 1312
$row['password'] = md5($real_pass);
406
+ − 1313
$row['user_timezone'] = intval($row['user_timezone']) - 1440;
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1314
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1315
profiler_log("SessionManager: finished session check");
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1316
1
+ − 1317
return $row;
+ − 1318
}
+ − 1319
+ − 1320
/**
+ − 1321
* Validates a session key, and returns the userdata associated with the key or false. Optimized for compatibility with the old MD5-based auth system.
+ − 1322
* @param string $key The session key to validate
+ − 1323
* @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.
+ − 1324
*/
+ − 1325
+ − 1326
function compat_validate_session($key)
+ − 1327
{
+ − 1328
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1329
$key = $db->escape($key);
+ − 1330
406
+ − 1331
$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,1440 AS user_timezone FROM '.table_prefix.'session_keys AS k
1
+ − 1332
LEFT JOIN '.table_prefix.'users AS u
+ − 1333
ON u.user_id=k.user_id
+ − 1334
WHERE k.session_key=\''.$key.'\';');
+ − 1335
if($db->numrows() < 1)
+ − 1336
{
+ − 1337
// echo '(debug) $session->validate_session: Key '.$key.' was not found in database<br />';
+ − 1338
return false;
+ − 1339
}
+ − 1340
$row = $db->fetchrow();
+ − 1341
$ip = ip2hex($_SERVER['REMOTE_ADDR']);
+ − 1342
if($row['auth_level'] > $row['user_level'])
+ − 1343
{
+ − 1344
// Failed authorization check
+ − 1345
// echo '(debug) $session->validate_session: user not authorized for this access level';
+ − 1346
return false;
+ − 1347
}
+ − 1348
if($ip != $row['source_ip'])
+ − 1349
{
+ − 1350
// Failed IP address check
+ − 1351
// echo '(debug) $session->validate_session: IP address mismatch; IP in table: '.$row['source_ip'].'; reported IP: '.$ip.'';
+ − 1352
return false;
+ − 1353
}
+ − 1354
+ − 1355
// Do the password validation
+ − 1356
$real_key = md5($row['password'] . $row['salt']);
+ − 1357
+ − 1358
//die('<pre>'.print_r($keydata, true).'</pre>');
+ − 1359
if($real_key != $key)
+ − 1360
{
+ − 1361
// Failed password check
+ − 1362
// echo '(debug) $session->validate_session: supplied password is wrong<br />Real key: '.$real_key.'<br />User key: '.$key;
+ − 1363
return false;
+ − 1364
}
+ − 1365
+ − 1366
$time_now = time();
+ − 1367
$time_key = $row['time'] + 900;
+ − 1368
if($time_now > $time_key && $row['auth_level'] >= 1)
+ − 1369
{
+ − 1370
$this->sw_timed_out = true;
+ − 1371
// Session timed out
+ − 1372
// echo '(debug) $session->validate_session: super session timed out<br />';
+ − 1373
return false;
+ − 1374
}
+ − 1375
406
+ − 1376
$row['user_timezone'] = intval($row['user_timezone']) - 1440;
+ − 1377
1
+ − 1378
return $row;
+ − 1379
}
+ − 1380
+ − 1381
/**
+ − 1382
* Demotes us to one less than the specified auth level. AKA destroys elevated authentication and/or logs out the user, depending on $level
+ − 1383
* @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
+ − 1384
* @return string 'success' if successful, or error on failure
+ − 1385
*/
+ − 1386
+ − 1387
function logout($level = USER_LEVEL_MEMBER)
+ − 1388
{
+ − 1389
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1390
$ou = $this->username;
+ − 1391
$oid = $this->user_id;
+ − 1392
if($level > USER_LEVEL_CHPREF)
+ − 1393
{
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1394
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1395
if(!$this->user_logged_in || $this->auth_level < ( USER_LEVEL_MEMBER + 1))
221
+ − 1396
{
+ − 1397
return 'success';
+ − 1398
}
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1399
// See if we can get rid of the cached decrypted session key
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1400
$key_bin = $aes->hextostring(strrev($this->sid_super));
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1401
$key_hash = sha1($key_bin . '::' . $this->private_key);
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1402
aes_decrypt_cache_destroy($key_hash);
1
+ − 1403
// Destroy elevated privileges
+ − 1404
$keyhash = md5(strrev($this->sid_super));
+ − 1405
$this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.$keyhash.'\' AND user_id=\'' . $this->user_id . '\';');
+ − 1406
$this->sid_super = false;
+ − 1407
$this->auth_level = USER_LEVEL_MEMBER;
+ − 1408
}
+ − 1409
else
+ − 1410
{
+ − 1411
if($this->user_logged_in)
+ − 1412
{
378
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1413
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1414
// See if we can get rid of the cached decrypted session key
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1415
$key_bin = $aes->hextostring($this->sid);
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1416
$key_hash = sha1($key_bin . '::' . $this->private_key);
c1c7fa6b329f
Got Enano to load even if there are no plugins; added caching for decrypted session keys to significantly improve performance (in theory at least)
Dan
diff
changeset
+ − 1417
aes_decrypt_cache_destroy($key_hash);
1
+ − 1418
// Completely destroy our session
+ − 1419
if($this->auth_level > USER_LEVEL_CHPREF)
+ − 1420
{
+ − 1421
$this->logout(USER_LEVEL_ADMIN);
+ − 1422
}
+ − 1423
$this->sql('DELETE FROM '.table_prefix.'session_keys WHERE session_key=\''.md5($this->sid).'\';');
+ − 1424
setcookie( 'sid', '', time()-(3600*24), scriptPath.'/' );
+ − 1425
}
+ − 1426
}
+ − 1427
$code = $plugins->setHook('logout_success'); // , Array('level'=>$level,'old_username'=>$ou,'old_user_id'=>$oid));
+ − 1428
foreach ( $code as $cmd )
+ − 1429
{
+ − 1430
eval($cmd);
+ − 1431
}
+ − 1432
return 'success';
+ − 1433
}
+ − 1434
+ − 1435
# Miscellaneous stuff
+ − 1436
+ − 1437
/**
+ − 1438
* Appends the high-privilege session key to the URL if we are authorized to do high-privilege stuff
+ − 1439
* @param string $url The URL to add session data to
+ − 1440
* @return string
+ − 1441
*/
+ − 1442
+ − 1443
function append_sid($url)
+ − 1444
{
+ − 1445
$sep = ( strstr($url, '?') ) ? '&' : '?';
+ − 1446
if ( $this->sid_super )
+ − 1447
{
+ − 1448
$url = $url . $sep . 'auth=' . urlencode($this->sid_super);
+ − 1449
// echo($this->sid_super.'<br/>');
+ − 1450
}
+ − 1451
return $url;
+ − 1452
}
+ − 1453
+ − 1454
/**
+ − 1455
* Grabs the user's password MD5
+ − 1456
* @return string, or bool false if access denied
+ − 1457
*/
+ − 1458
+ − 1459
function grab_password_hash()
+ − 1460
{
+ − 1461
if(!$this->password_hash) return false;
+ − 1462
return $this->password_hash;
+ − 1463
}
+ − 1464
+ − 1465
/**
+ − 1466
* Destroys the user's password MD5 in memory
+ − 1467
*/
+ − 1468
+ − 1469
function disallow_password_grab()
+ − 1470
{
+ − 1471
$this->password_hash = false;
+ − 1472
return false;
+ − 1473
}
+ − 1474
+ − 1475
/**
+ − 1476
* Generates an AES key and stashes it in the database
+ − 1477
* @return string Hex-encoded AES key
+ − 1478
*/
+ − 1479
+ − 1480
function rijndael_genkey()
+ − 1481
{
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1482
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1483
$key = $aes->gen_readymade_key();
+ − 1484
$keys = getConfig('login_key_cache');
+ − 1485
if(is_string($keys))
+ − 1486
$keys .= $key;
+ − 1487
else
+ − 1488
$keys = $key;
+ − 1489
setConfig('login_key_cache', $keys);
+ − 1490
return $key;
+ − 1491
}
+ − 1492
+ − 1493
/**
+ − 1494
* Generate a totally random 128-bit value for MD5 challenges
+ − 1495
* @return string
+ − 1496
*/
+ − 1497
+ − 1498
function dss_rand()
+ − 1499
{
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1500
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1501
$random = $aes->randkey(128);
+ − 1502
unset($aes);
+ − 1503
return md5(microtime() . $random);
+ − 1504
}
+ − 1505
+ − 1506
/**
+ − 1507
* Fetch a cached login public key using the MD5sum as an identifier. Each key can only be fetched once before it is destroyed.
+ − 1508
* @param string $md5 The MD5 sum of the key
+ − 1509
* @return string, or bool false on failure
+ − 1510
*/
+ − 1511
+ − 1512
function fetch_public_key($md5)
+ − 1513
{
+ − 1514
$keys = getConfig('login_key_cache');
+ − 1515
$keys = enano_str_split($keys, AES_BITS / 4);
+ − 1516
+ − 1517
foreach($keys as $i => $k)
+ − 1518
{
+ − 1519
if(md5($k) == $md5)
+ − 1520
{
+ − 1521
unset($keys[$i]);
+ − 1522
if(count($keys) > 0)
+ − 1523
{
+ − 1524
if ( strlen(getConfig('login_key_cache') ) > 64000 )
+ − 1525
{
+ − 1526
// This should only need to be done once every month or so for an average-size site
+ − 1527
setConfig('login_key_cache', '');
+ − 1528
}
+ − 1529
else
+ − 1530
{
+ − 1531
$keys = implode('', array_values($keys));
+ − 1532
setConfig('login_key_cache', $keys);
+ − 1533
}
+ − 1534
}
+ − 1535
else
+ − 1536
{
+ − 1537
setConfig('login_key_cache', '');
+ − 1538
}
+ − 1539
return $k;
+ − 1540
}
+ − 1541
}
+ − 1542
// Couldn't find the key...
+ − 1543
return false;
+ − 1544
}
+ − 1545
+ − 1546
/**
+ − 1547
* Adds a user to a group.
+ − 1548
* @param int User ID
+ − 1549
* @param int Group ID
+ − 1550
* @param bool Group moderator - defaults to false
+ − 1551
* @return bool True on success, false on failure
+ − 1552
*/
+ − 1553
+ − 1554
function add_user_to_group($user_id, $group_id, $is_mod = false)
+ − 1555
{
+ − 1556
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1557
+ − 1558
// Validation
+ − 1559
if ( !is_int($user_id) || !is_int($group_id) || !is_bool($is_mod) )
+ − 1560
return false;
+ − 1561
if ( $user_id < 1 || $group_id < 1 )
+ − 1562
return false;
+ − 1563
+ − 1564
$mod_switch = ( $is_mod ) ? '1' : '0';
+ − 1565
$q = $this->sql('SELECT member_id,is_mod FROM '.table_prefix.'group_members WHERE user_id=' . $user_id . ' AND group_id=' . $group_id . ';');
+ − 1566
if ( !$q )
+ − 1567
$db->_die();
+ − 1568
if ( $db->numrows() < 1 )
+ − 1569
{
+ − 1570
// User is not in group
+ − 1571
$this->sql('INSERT INTO '.table_prefix.'group_members(user_id,group_id,is_mod) VALUES(' . $user_id . ', ' . $group_id . ', ' . $mod_switch . ');');
+ − 1572
return true;
+ − 1573
}
+ − 1574
else
+ − 1575
{
+ − 1576
$row = $db->fetchrow();
+ − 1577
// Update modship status
+ − 1578
if ( strval($row['is_mod']) == $mod_switch )
+ − 1579
{
+ − 1580
// Modship unchanged
+ − 1581
return true;
+ − 1582
}
+ − 1583
else
+ − 1584
{
+ − 1585
// Modship changed
+ − 1586
$this->sql('UPDATE '.table_prefix.'group_members SET is_mod=' . $mod_switch . ' WHERE member_id=' . $row['member_id'] . ';');
+ − 1587
return true;
+ − 1588
}
+ − 1589
}
+ − 1590
return false;
+ − 1591
}
+ − 1592
+ − 1593
/**
+ − 1594
* Removes a user from a group.
+ − 1595
* @param int User ID
+ − 1596
* @param int Group ID
+ − 1597
* @return bool True on success, false on failure
+ − 1598
* @todo put a little more error checking in...
+ − 1599
*/
+ − 1600
+ − 1601
function remove_user_from_group($user_id, $group_id)
+ − 1602
{
+ − 1603
if ( !is_int($user_id) || !is_int($group_id) )
+ − 1604
return false;
+ − 1605
$this->sql('DELETE FROM '.table_prefix."group_members WHERE user_id=$user_id AND group_id=$group_id;");
+ − 1606
return true;
+ − 1607
}
+ − 1608
+ − 1609
/**
+ − 1610
* Checks the banlist to ensure that we're an allowed user. Doesn't return anything because it dies if the user is banned.
+ − 1611
*/
+ − 1612
+ − 1613
function check_banlist()
+ − 1614
{
+ − 1615
global $db, $session, $paths, $template, $plugins; // Common objects
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1616
global $lang;
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1617
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1618
$col_reason = ( $this->compat ) ? '"No reason entered (session manager is in compatibility mode)" AS reason' : 'reason';
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1619
$banned = false;
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1620
if ( $this->user_logged_in )
1
+ − 1621
{
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1622
// check by IP, email, and username
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1623
if ( ENANO_DBLAYER == 'MYSQL' )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1624
{
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1625
$sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1626
. " ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1627
. " ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' REGEXP ban_value ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1628
. " ( ban_type = " . BAN_USER . " AND is_regex = 0 AND ban_value = '{$this->username}' ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1629
. " ( ban_type = " . BAN_USER . " AND is_regex = 1 AND '{$this->username}' REGEXP ban_value ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1630
. " ( ban_type = " . BAN_EMAIL . " AND is_regex = 0 AND ban_value = '{$this->email}' ) OR \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1631
. " ( ban_type = " . BAN_EMAIL . " AND is_regex = 1 AND '{$this->email}' REGEXP ban_value ) \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1632
. " ORDER BY ban_type ASC;";
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1633
}
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1634
else if ( ENANO_DBLAYER == 'PGSQL' )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1635
{
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1636
$sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE \n"
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1637
. " ( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR \n"
322
+ − 1638
. " ( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' ~ ban_value ) OR \n"
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1639
. " ( ban_type = " . BAN_USER . " AND is_regex = 0 AND ban_value = '{$this->username}' ) OR \n"
322
+ − 1640
. " ( ban_type = " . BAN_USER . " AND is_regex = 1 AND '{$this->username}' ~ ban_value ) OR \n"
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1641
. " ( ban_type = " . BAN_EMAIL . " AND is_regex = 0 AND ban_value = '{$this->email}' ) OR \n"
322
+ − 1642
. " ( ban_type = " . BAN_EMAIL . " AND is_regex = 1 AND '{$this->email}' ~ ban_value ) \n"
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1643
. " ORDER BY ban_type ASC;";
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1644
}
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1645
$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
+ − 1646
if ( $db->numrows() > 0 )
1
+ − 1647
{
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1648
while ( list($reason_temp, $ban_value, $ban_type, $is_regex) = $db->fetchrow_num() )
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1649
{
425
+ − 1650
if ( $ban_type == BAN_IP && $is_regex != 1 )
1
+ − 1651
{
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1652
// check range
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1653
$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
+ − 1654
if ( !$regexp )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1655
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1656
continue;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1657
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1658
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
+ − 1659
{
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1660
$reason = $reason_temp;
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1661
$banned = true;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1662
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1663
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1664
else
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1665
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1666
// User is banned
1
+ − 1667
$banned = true;
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1668
$reason = $reason_temp;
1
+ − 1669
}
+ − 1670
}
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1671
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1672
$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
+ − 1673
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1674
else
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1675
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1676
// check by IP only
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1677
if ( ENANO_DBLAYER == 'MYSQL' )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1678
{
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1679
$sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1680
( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1681
( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' REGEXP ban_value )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1682
ORDER BY ban_type ASC;";
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1683
}
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1684
else if ( ENANO_DBLAYER == 'PGSQL' )
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1685
{
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1686
$sql = "SELECT $col_reason, ban_value, ban_type, is_regex FROM " . table_prefix . "banlist WHERE
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1687
( ban_type = " . BAN_IP . " AND is_regex = 0 ) OR
322
+ − 1688
( ban_type = " . BAN_IP . " AND is_regex = 1 AND '{$_SERVER['REMOTE_ADDR']}' ~ ban_value )
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1689
ORDER BY ban_type ASC;";
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1690
}
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1691
$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
+ − 1692
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
+ − 1693
{
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1694
while ( list($reason_temp, $ban_value, $ban_type, $is_regex) = $db->fetchrow_num() )
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1695
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1696
if ( $ban_type == BAN_IP && $row['is_regex'] != 1 )
1
+ − 1697
{
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1698
// check range
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1699
$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
+ − 1700
if ( !$regexp )
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1701
continue;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1702
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
+ − 1703
{
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1704
$reason = $reason_temp;
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1705
$banned = true;
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1706
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1707
}
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1708
else
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1709
{
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1710
// User is banned
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1711
$reason = $reason_temp;
1
+ − 1712
$banned = true;
+ − 1713
}
+ − 1714
}
+ − 1715
}
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1716
$db->free_result();
1
+ − 1717
}
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1718
if ( $banned && $paths->get_pageid_from_url() != $paths->nslist['Special'].'CSS' )
1
+ − 1719
{
+ − 1720
// This guy is banned - kill the session, kill the database connection, bail out, and be pretty about it
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 1721
die_semicritical($lang->get('user_ban_msg_title'), '<p>' . $lang->get('user_ban_msg_body') . '</p><div class="error-box"><b>' . $lang->get('user_ban_lbl_reason') . '</b><br />' . $reason . '</div>');
1
+ − 1722
exit;
+ − 1723
}
+ − 1724
}
+ − 1725
+ − 1726
# Registration
+ − 1727
+ − 1728
/**
+ − 1729
* Registers a user. This does not perform any type of login.
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1730
* @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
+ − 1731
* @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
+ − 1732
* @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
+ − 1733
* @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
+ − 1734
* @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
+ − 1735
*/
+ − 1736
30
+ − 1737
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
+ − 1738
{
1
+ − 1739
global $db, $session, $paths, $template, $plugins; // Common objects
370
+ − 1740
global $lang;
1
+ − 1741
+ − 1742
// Initialize AES
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 1743
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 1744
359
+ − 1745
// Since we're recording IP addresses, make sure the user's IP is safe.
+ − 1746
$ip =& $_SERVER['REMOTE_ADDR'];
+ − 1747
if ( !is_valid_ip($ip) )
+ − 1748
return 'Invalid IP';
+ − 1749
+ − 1750
if ( !preg_match('#^'.$this->valid_username.'$#', $username) )
370
+ − 1751
return $lang->get('user_reg_err_username_banned_chars');
359
+ − 1752
270
5bcdee999015
Major fixes to the ban system - large IP match lists don't slow down the server miserably anymore.
Dan
diff
changeset
+ − 1753
$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
+ − 1754
$user_orig = $username;
1
+ − 1755
$username = $this->prepare_text($username);
+ − 1756
$email = $this->prepare_text($email);
+ − 1757
$real_name = $this->prepare_text($real_name);
+ − 1758
+ − 1759
$nameclause = ( $real_name != '' ) ? ' OR real_name=\''.$real_name.'\'' : '';
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 1760
$q = $this->sql('SELECT * FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(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
+ − 1761
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
+ − 1762
{
1
+ − 1763
$row = $db->fetchrow();
370
+ − 1764
$str = 'user_reg_err_dupe';
+ − 1765
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
+ − 1766
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
+ − 1767
{
370
+ − 1768
$str .= '_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
+ − 1769
}
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
+ − 1770
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
+ − 1771
{
370
+ − 1772
$str .= '_email';
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
+ − 1773
}
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
+ − 1774
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
+ − 1775
{
370
+ − 1776
$str .= '_realname';
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
+ − 1777
}
370
+ − 1778
371
dc6026376919
Improved compatibility with PostgreSQL and fixed a number of installer bugs; fixed missing "meta" category declaration in language files
Dan
diff
changeset
+ − 1779
return $lang->get($str);
1
+ − 1780
}
+ − 1781
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
+ − 1782
// 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
+ − 1783
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
+ − 1784
{
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
+ − 1785
$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
+ − 1786
$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
+ − 1787
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
+ − 1788
{
370
+ − 1789
return $lang->get('user_reg_err_password_too_weak');
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
+ − 1790
}
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
+ − 1791
}
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
+ − 1792
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
+ − 1793
$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
+ − 1794
1
+ − 1795
// Require the account to be activated?
+ − 1796
switch(getConfig('account_activation'))
+ − 1797
{
+ − 1798
case 'none':
+ − 1799
default:
+ − 1800
$active = '1';
+ − 1801
break;
+ − 1802
case 'user':
+ − 1803
$active = '0';
+ − 1804
break;
+ − 1805
case 'admin':
+ − 1806
$active = '0';
+ − 1807
break;
+ − 1808
}
30
+ − 1809
if ( $coppa )
+ − 1810
$active = '0';
+ − 1811
+ − 1812
$coppa_col = ( $coppa ) ? '1' : '0';
1
+ − 1813
+ − 1814
// Generate a totally random activation key
+ − 1815
$actkey = sha1 ( microtime() . mt_rand() );
+ − 1816
30
+ − 1817
// We good, create the user
359
+ − 1818
$this->sql('INSERT INTO '.table_prefix.'users ( username, password, email, real_name, theme, style, reg_time, account_active, activation_key, user_level, user_coppa, user_registration_ip ) VALUES ( \''.$username.'\', \''.$password.'\', \''.$email.'\', \''.$real_name.'\', \''.$template->default_theme.'\', \''.$template->default_style.'\', '.time().', '.$active.', \''.$actkey.'\', '.USER_LEVEL_CHPREF.', ' . $coppa_col . ', \'' . $ip . '\' );');
1
+ − 1819
31
+ − 1820
// Get user ID and create users_extra entry
+ − 1821
$q = $this->sql('SELECT user_id FROM '.table_prefix."users WHERE username='$username';");
+ − 1822
if ( $db->numrows() > 0 )
+ − 1823
{
359
+ − 1824
list($user_id) = $db->fetchrow_num();
31
+ − 1825
$db->free_result();
+ − 1826
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
+ − 1827
$this->sql('INSERT INTO '.table_prefix.'users_extra(user_id) VALUES(' . $user_id . ');');
31
+ − 1828
}
+ − 1829
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
+ − 1830
// 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
+ − 1831
$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
+ − 1832
'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
+ − 1833
'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
+ − 1834
'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
+ − 1835
'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
+ − 1836
'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
+ − 1837
'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
+ − 1838
'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
+ − 1839
'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
+ − 1840
'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
+ − 1841
'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
+ − 1842
'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
+ − 1843
'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
+ − 1844
'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
+ − 1845
'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
+ − 1846
);
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
+ − 1847
$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
+ − 1848
$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
+ − 1849
$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
+ − 1850
$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
+ − 1851
$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
+ − 1852
$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
+ − 1853
1
+ − 1854
// Require the account to be activated?
30
+ − 1855
if ( $coppa )
+ − 1856
{
+ − 1857
$this->admin_activation_request($username);
+ − 1858
$this->send_coppa_mail($username,$email);
+ − 1859
}
+ − 1860
else
1
+ − 1861
{
30
+ − 1862
switch(getConfig('account_activation'))
+ − 1863
{
+ − 1864
case 'none':
+ − 1865
default:
+ − 1866
break;
+ − 1867
case 'user':
+ − 1868
$a = $this->send_activation_mail($username);
+ − 1869
if(!$a)
+ − 1870
{
+ − 1871
$this->admin_activation_request($username);
370
+ − 1872
return $lang->get('user_reg_err_actmail_failed') . ' ' . $a;
30
+ − 1873
}
+ − 1874
break;
+ − 1875
case 'admin':
1
+ − 1876
$this->admin_activation_request($username);
30
+ − 1877
break;
+ − 1878
}
1
+ − 1879
}
+ − 1880
+ − 1881
// Leave some data behind for the hook
+ − 1882
$code = $plugins->setHook('user_registered'); // , Array('username'=>$username));
+ − 1883
foreach ( $code as $cmd )
+ − 1884
{
+ − 1885
eval($cmd);
+ − 1886
}
+ − 1887
+ − 1888
// $this->register_session($username, $password);
+ − 1889
return 'success';
+ − 1890
}
+ − 1891
+ − 1892
/**
+ − 1893
* Attempts to send an e-mail to the specified user with activation instructions.
+ − 1894
* @param string $u The usernamd of the user requesting activation
+ − 1895
* @return bool true on success, false on failure
+ − 1896
*/
+ − 1897
+ − 1898
function send_activation_mail($u, $actkey = false)
+ − 1899
{
+ − 1900
global $db, $session, $paths, $template, $plugins; // Common objects
370
+ − 1901
global $lang;
131
+ − 1902
$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
+ − 1903
$un = $db->fetchrow();
+ − 1904
$admin_user = $un['username'];
+ − 1905
$q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
+ − 1906
$r = $db->fetchrow();
+ − 1907
if ( empty($r['email']) )
+ − 1908
$db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
+ − 1909
370
+ − 1910
$aklink = makeUrlComplete('Special', 'ActivateAccount/'.str_replace(' ', '_', $u).'/'. ( ( is_string($actkey) ) ? $actkey : $r['activation_key'] ) );
+ − 1911
$message = $lang->get('user_reg_activation_email', array(
+ − 1912
'activation_link' => $aklink,
+ − 1913
'admin_user' => $admin_user,
+ − 1914
'username' => $u
+ − 1915
));
+ − 1916
1
+ − 1917
if(getConfig('smtp_enabled') == '1')
+ − 1918
{
370
+ − 1919
$result = smtp_send_email($r['email'], $lang->get('user_reg_activation_email_subject'), preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
1
+ − 1920
if($result == 'success') $result = true;
+ − 1921
else { echo $result; $result = false; }
+ − 1922
} else {
370
+ − 1923
$result = mail($r['email'], $lang->get('user_reg_activation_email_subject'), preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
1
+ − 1924
}
+ − 1925
return $result;
+ − 1926
}
+ − 1927
+ − 1928
/**
30
+ − 1929
* Attempts to send an e-mail to the specified user's e-mail address on file intended for the parents
+ − 1930
* @param string $u The usernamd of the user requesting activation
+ − 1931
* @return bool true on success, false on failure
+ − 1932
*/
+ − 1933
+ − 1934
function send_coppa_mail($u, $actkey = false)
+ − 1935
{
+ − 1936
global $db, $session, $paths, $template, $plugins; // Common objects
370
+ − 1937
global $lang;
30
+ − 1938
+ − 1939
$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;');
+ − 1940
$un = $db->fetchrow();
+ − 1941
$admin_user = $un['username'];
+ − 1942
+ − 1943
$q = $this->sql('SELECT username,activation_key,account_active,email FROM '.table_prefix.'users WHERE username=\''.$db->escape($u).'\';');
+ − 1944
$r = $db->fetchrow();
+ − 1945
if ( empty($r['email']) )
+ − 1946
$db->_die('BUG: $session->send_activation_mail(): no e-mail address in row');
+ − 1947
+ − 1948
if(isset($_SERVER['HTTPS'])) $prot = 'https';
+ − 1949
else $prot = 'http';
+ − 1950
if($_SERVER['SERVER_PORT'] == '80') $p = '';
+ − 1951
else $p = ':'.$_SERVER['SERVER_PORT'];
+ − 1952
$sidbak = false;
+ − 1953
if($this->sid_super)
+ − 1954
$sidbak = $this->sid_super;
+ − 1955
$this->sid_super = false;
+ − 1956
if($sidbak)
+ − 1957
$this->sid_super = $sidbak;
+ − 1958
unset($sidbak);
+ − 1959
$link = "$prot://".$_SERVER['HTTP_HOST'].scriptPath;
+ − 1960
370
+ − 1961
$message = $lang->get(
+ − 1962
'user_reg_activation_email_coppa',
+ − 1963
array(
+ − 1964
'username' => $u,
+ − 1965
'admin_user' => $admin_user,
+ − 1966
'site_link' => $link
+ − 1967
)
+ − 1968
);
30
+ − 1969
+ − 1970
+ − 1971
if(getConfig('smtp_enabled') == '1')
+ − 1972
{
+ − 1973
$result = smtp_send_email($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
+ − 1974
if($result == 'success')
+ − 1975
{
+ − 1976
$result = true;
+ − 1977
}
+ − 1978
else
+ − 1979
{
+ − 1980
echo $result;
+ − 1981
$result = false;
+ − 1982
}
+ − 1983
}
+ − 1984
else
+ − 1985
{
+ − 1986
$result = mail($r['email'], getConfig('site_name').' website account activation', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
+ − 1987
}
+ − 1988
return $result;
+ − 1989
}
+ − 1990
+ − 1991
/**
1
+ − 1992
* Sends an e-mail to a user so they can reset their password.
+ − 1993
* @param int $user The user ID, or username if it's a string
+ − 1994
* @return bool true on success, false on failure
+ − 1995
*/
+ − 1996
+ − 1997
function mail_password_reset($user)
+ − 1998
{
+ − 1999
global $db, $session, $paths, $template, $plugins; // Common objects
335
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2000
global $lang;
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2001
1
+ − 2002
if(is_int($user))
+ − 2003
{
+ − 2004
$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
+ − 2005
}
+ − 2006
elseif(is_string($user))
+ − 2007
{
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 2008
$q = $this->sql('SELECT user_id,username,email FROM '.table_prefix.'users WHERE ' . ENANO_SQLFUNC_LOWERCASE . '(username)=' . ENANO_SQLFUNC_LOWERCASE . '(\''.$db->escape($user).'\');');
1
+ − 2009
}
+ − 2010
else
+ − 2011
{
+ − 2012
return false;
+ − 2013
}
+ − 2014
+ − 2015
$row = $db->fetchrow();
+ − 2016
$temp_pass = $this->random_pass();
+ − 2017
+ − 2018
$this->register_temp_password($row['user_id'], $temp_pass);
+ − 2019
+ − 2020
$site_name = getConfig('site_name');
335
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2021
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2022
$message = $lang->get('userfuncs_passreset_email', array(
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2023
'username' => $row['username'],
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2024
'site_name' => $site_name,
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2025
'remote_addr' => $_SERVER['REMOTE_ADDR'],
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2026
'temp_pass' => $temp_pass
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
diff
changeset
+ − 2027
));
1
+ − 2028
+ − 2029
if(getConfig('smtp_enabled') == '1')
+ − 2030
{
+ − 2031
$result = smtp_send_email($row['email'], getConfig('site_name').' password reset', preg_replace("#(?<!\r)\n#s", "\n", $message), getConfig('contact_email'));
+ − 2032
if($result == 'success')
+ − 2033
{
+ − 2034
$result = true;
+ − 2035
}
+ − 2036
else
+ − 2037
{
+ − 2038
echo '<p>'.$result.'</p>';
+ − 2039
$result = false;
+ − 2040
}
+ − 2041
} else {
+ − 2042
$result = mail($row['email'], getConfig('site_name').' password reset', preg_replace("#(?<!\r)\n#s", "\n", $message), 'From: '.getConfig('contact_email'));
+ − 2043
}
+ − 2044
return $result;
+ − 2045
}
+ − 2046
+ − 2047
/**
+ − 2048
* Sets the temporary password for the specified user to whatever is specified.
+ − 2049
* @param int $user_id
+ − 2050
* @param string $password
+ − 2051
* @return bool
+ − 2052
*/
+ − 2053
+ − 2054
function register_temp_password($user_id, $password)
+ − 2055
{
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2056
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 2057
$temp_pass = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 2058
$this->sql('UPDATE '.table_prefix.'users SET temp_password=\'' . $temp_pass . '\',temp_password_time='.time().' WHERE user_id='.intval($user_id).';');
+ − 2059
}
+ − 2060
+ − 2061
/**
+ − 2062
* Sends a request to the admin panel to have the username $u activated.
+ − 2063
* @param string $u The username of the user requesting activation
+ − 2064
*/
+ − 2065
+ − 2066
function admin_activation_request($u)
+ − 2067
{
+ − 2068
global $db;
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2069
$this->sql('INSERT INTO '.table_prefix.'logs(log_type, action, time_id, date_string, author, edit_summary) VALUES(\'admin\', \'activ_req\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$this->username.'\', \''.$db->escape($u).'\');');
1
+ − 2070
}
+ − 2071
+ − 2072
/**
+ − 2073
* Activates a user account. If the action fails, a report is sent to the admin.
+ − 2074
* @param string $user The username of the user requesting activation
+ − 2075
* @param string $key The activation key
+ − 2076
*/
+ − 2077
+ − 2078
function activate_account($user, $key)
+ − 2079
{
+ − 2080
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2081
$this->sql('UPDATE '.table_prefix.'users SET account_active=1 WHERE username=\''.$db->escape($user).'\' AND activation_key=\''.$db->escape($key).'\';');
+ − 2082
$r = mysql_affected_rows();
+ − 2083
if ( $r > 0 )
+ − 2084
{
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2085
$e = $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'activ_good\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($user).'\', \''.$_SERVER['REMOTE_ADDR'].'\')');
1
+ − 2086
}
+ − 2087
else
+ − 2088
{
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2089
$e = $this->sql('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary) VALUES(\'security\', \'activ_bad\', '.time().', \''.enano_date('d M Y h:i a').'\', \''.$db->escape($user).'\', \''.$_SERVER['REMOTE_ADDR'].'\')');
1
+ − 2090
}
+ − 2091
return $r;
+ − 2092
}
+ − 2093
+ − 2094
/**
+ − 2095
* For a given user level identifier (USER_LEVEL_*), returns a string describing that user level.
+ − 2096
* @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
+ − 2097
* @param bool If true, returns a shorter string. Optional.
1
+ − 2098
* @return string
+ − 2099
*/
+ − 2100
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
+ − 2101
function userlevel_to_string($user_level, $short = false)
1
+ − 2102
{
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2103
global $lang;
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2104
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2105
static $levels = array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2106
'short' => array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2107
USER_LEVEL_GUEST => 'Guest',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2108
USER_LEVEL_MEMBER => 'Member',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2109
USER_LEVEL_CHPREF => 'Sensitive preferences changeable',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2110
USER_LEVEL_MOD => 'Moderator',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2111
USER_LEVEL_ADMIN => 'Administrative'
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2112
),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2113
'long' => array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2114
USER_LEVEL_GUEST => 'Low - guest privileges',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2115
USER_LEVEL_MEMBER => 'Standard - normal member level',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2116
USER_LEVEL_CHPREF => 'Medium - user can change his/her own e-mail address and password',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2117
USER_LEVEL_MOD => 'High - moderator privileges',
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2118
USER_LEVEL_ADMIN => 'Highest - administrative privileges'
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2119
),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2120
'l10n' => false
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2121
);
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2122
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2123
if ( is_object($lang) && !$levels['l10n'] )
1
+ − 2124
{
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2125
$levels = array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2126
'short' => array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2127
USER_LEVEL_GUEST => $lang->get('user_level_short_guest'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2128
USER_LEVEL_MEMBER => $lang->get('user_level_short_member'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2129
USER_LEVEL_CHPREF => $lang->get('user_level_short_chpref'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2130
USER_LEVEL_MOD => $lang->get('user_level_short_mod'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2131
USER_LEVEL_ADMIN => $lang->get('user_level_short_admin')
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2132
),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2133
'long' => array(
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2134
USER_LEVEL_GUEST => $lang->get('user_level_long_guest'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2135
USER_LEVEL_MEMBER => $lang->get('user_level_long_member'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2136
USER_LEVEL_CHPREF => $lang->get('user_level_long_chpref'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2137
USER_LEVEL_MOD => $lang->get('user_level_long_mod'),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2138
USER_LEVEL_ADMIN => $lang->get('user_level_long_admin')
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2139
),
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2140
'l10n' => true
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2141
);
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2142
}
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2143
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2144
$key = ( $short ) ? 'short' : 'long';
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2145
if ( isset($levels[$key][$user_level]) )
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2146
{
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2147
return $levels[$key][$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
+ − 2148
}
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2149
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
+ − 2150
{
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2151
if ( $short )
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
+ − 2152
{
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2153
return ( is_object($lang) ) ? $lang->get('user_level_short_unknown', array('user_level' => $user_level)) : "Unknown - $user_level";
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2154
}
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2155
else
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2156
{
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2157
return ( is_object($lang) ) ? $lang->get('user_level_long_unknown', array('user_level' => $user_level)) : "Unknown level ($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
+ − 2158
}
1
+ − 2159
}
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2160
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2161
return 'Linux rocks!';
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2162
1
+ − 2163
}
+ − 2164
+ − 2165
/**
+ − 2166
* 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.
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
diff
changeset
+ − 2167
* Not localized because this really isn't used a whole lot anymore.
1
+ − 2168
* @param int $user_id The user ID of the user to update - this cannot be changed
+ − 2169
* @param string $username The new username
+ − 2170
* @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
+ − 2171
* @param string $password The new password
+ − 2172
* @param string $email The new e-mail address
+ − 2173
* @param string $realname The new real name
+ − 2174
* @param string $signature The updated forum/comment signature
+ − 2175
* @param int $user_level The updated user level
+ − 2176
* @return string 'success' if successful, or array of error strings on failure
+ − 2177
*/
+ − 2178
+ − 2179
function update_user($user_id, $username = false, $old_pass = false, $password = false, $email = false, $realname = false, $signature = false, $user_level = false)
+ − 2180
{
+ − 2181
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2182
+ − 2183
// Create some arrays
+ − 2184
+ − 2185
$errors = Array(); // Used to hold error strings
+ − 2186
$strs = Array(); // Sub-query statements
+ − 2187
+ − 2188
// Scan the user ID for problems
+ − 2189
if(intval($user_id) < 1) $errors[] = 'SQL injection attempt';
+ − 2190
+ − 2191
// Instanciate the AES encryption class
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2192
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
1
+ − 2193
+ − 2194
// If all of our input vars are false, then we've effectively done our job so get out of here
+ − 2195
if($username === false && $password === false && $email === false && $realname === false && $signature === false && $user_level === false)
+ − 2196
{
+ − 2197
// echo 'debug: $session->update_user(): success (no changes requested)';
+ − 2198
return 'success';
+ − 2199
}
+ − 2200
+ − 2201
// Initialize our authentication check
+ − 2202
$authed = false;
+ − 2203
+ − 2204
// Verify the inputted password
+ − 2205
if(is_string($old_pass))
+ − 2206
{
+ − 2207
$q = $this->sql('SELECT password FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 2208
if($db->numrows() < 1)
+ − 2209
{
+ − 2210
$errors[] = 'The password data could not be selected for verification.';
+ − 2211
}
+ − 2212
else
+ − 2213
{
+ − 2214
$row = $db->fetchrow();
+ − 2215
$real = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 2216
if($real == $old_pass)
+ − 2217
$authed = true;
+ − 2218
}
+ − 2219
}
+ − 2220
+ − 2221
elseif(is_array($old_pass))
+ − 2222
{
+ − 2223
$old_pass = $aes->decrypt($old_pass[0], $old_pass[1]);
+ − 2224
$q = $this->sql('SELECT password FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 2225
if($db->numrows() < 1)
+ − 2226
{
+ − 2227
$errors[] = 'The password data could not be selected for verification.';
+ − 2228
}
+ − 2229
else
+ − 2230
{
+ − 2231
$row = $db->fetchrow();
+ − 2232
$real = $aes->decrypt($row['password'], $this->private_key, ENC_HEX);
+ − 2233
if($real == $old_pass)
+ − 2234
$authed = true;
+ − 2235
}
+ − 2236
}
+ − 2237
+ − 2238
// Initialize our query
+ − 2239
$q = 'UPDATE '.table_prefix.'users SET ';
+ − 2240
+ − 2241
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
+ − 2242
{
+ − 2243
// Username
+ − 2244
if(is_string($username))
+ − 2245
{
+ − 2246
// Check the username for problems
+ − 2247
if(!preg_match('#^'.$this->valid_username.'$#', $username))
+ − 2248
$errors[] = 'The username you entered contains invalid characters.';
+ − 2249
$strs[] = 'username=\''.$db->escape($username).'\'';
+ − 2250
}
+ − 2251
// Password
+ − 2252
if(is_string($password) && strlen($password) >= 6)
+ − 2253
{
+ − 2254
// Password needs to be encrypted before being stashed
+ − 2255
$encpass = $aes->encrypt($password, $this->private_key, ENC_HEX);
+ − 2256
if(!$encpass)
+ − 2257
$errors[] = 'The password could not be encrypted due to an internal error.';
+ − 2258
$strs[] = 'password=\''.$encpass.'\'';
+ − 2259
}
+ − 2260
// E-mail addy
+ − 2261
if(is_string($email))
+ − 2262
{
+ − 2263
// 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
+ − 2264
if(!preg_match('/^(?:[\w\d]+\.?)+@((?:(?:[\w\d]\-?)+\.)+\w{2,4}|localhost)$/', $email))
1
+ − 2265
$errors[] = 'The e-mail address you entered is invalid.';
+ − 2266
$strs[] = 'email=\''.$db->escape($email).'\'';
+ − 2267
}
+ − 2268
}
+ − 2269
// Real name
+ − 2270
if(is_string($realname))
+ − 2271
{
+ − 2272
$strs[] = 'real_name=\''.$db->escape($realname).'\'';
+ − 2273
}
+ − 2274
// Forum/comment signature
+ − 2275
if(is_string($signature))
+ − 2276
{
+ − 2277
$strs[] = 'signature=\''.$db->escape($signature).'\'';
+ − 2278
}
+ − 2279
// User level
+ − 2280
if(is_int($user_level))
+ − 2281
{
+ − 2282
$strs[] = 'user_level='.$user_level;
+ − 2283
}
+ − 2284
+ − 2285
// Add our generated query to the query string
+ − 2286
$q .= implode(',', $strs);
+ − 2287
+ − 2288
// One last error check
+ − 2289
if(sizeof($strs) < 1) $errors[] = 'An internal error occured building the SQL query, this is a bug';
+ − 2290
if(sizeof($errors) > 0) return $errors;
+ − 2291
+ − 2292
// Free our temp arrays
+ − 2293
unset($strs, $errors);
+ − 2294
+ − 2295
// Finalize the query and run it
+ − 2296
$q .= ' WHERE user_id='.$user_id.';';
+ − 2297
$this->sql($q);
+ − 2298
+ − 2299
// We also need to trigger re-activation.
+ − 2300
if ( is_string($email) )
+ − 2301
{
+ − 2302
switch(getConfig('account_activation'))
+ − 2303
{
+ − 2304
case 'user':
+ − 2305
case 'admin':
+ − 2306
+ − 2307
if ( $session->user_level >= USER_LEVEL_MOD && getConfig('account_activation') == 'admin' )
+ − 2308
// Don't require re-activation by admins for admins
+ − 2309
break;
+ − 2310
+ − 2311
// retrieve username
+ − 2312
if ( !$username )
+ − 2313
{
+ − 2314
$q = $this->sql('SELECT username FROM '.table_prefix.'users WHERE user_id='.$user_id.';');
+ − 2315
if($db->numrows() < 1)
+ − 2316
{
+ − 2317
$errors[] = 'The username could not be selected.';
+ − 2318
}
+ − 2319
else
+ − 2320
{
+ − 2321
$row = $db->fetchrow();
+ − 2322
$username = $row['username'];
+ − 2323
}
+ − 2324
}
+ − 2325
if ( !$username )
+ − 2326
return $errors;
+ − 2327
+ − 2328
// Generate a totally random activation key
+ − 2329
$actkey = sha1 ( microtime() . mt_rand() );
+ − 2330
$a = $this->send_activation_mail($username, $actkey);
+ − 2331
if(!$a)
+ − 2332
{
+ − 2333
$this->admin_activation_request($username);
+ − 2334
}
+ − 2335
// Deactivate the account until e-mail is confirmed
+ − 2336
$q = $db->sql_query('UPDATE '.table_prefix.'users SET account_active=0,activation_key=\'' . $actkey . '\' WHERE user_id=' . $user_id . ';');
+ − 2337
break;
+ − 2338
}
+ − 2339
}
+ − 2340
+ − 2341
// Yay! We're done
+ − 2342
return 'success';
+ − 2343
}
+ − 2344
+ − 2345
#
+ − 2346
# Access Control Lists
+ − 2347
#
+ − 2348
+ − 2349
/**
+ − 2350
* Creates a new permission field in memory. If the permissions are set in the database, they are used. Otherwise, $default_perm is used.
+ − 2351
* @param string $acl_type An identifier for this field
+ − 2352
* @param int $default_perm Whether permission should be granted or not if it's not specified in the ACLs.
+ − 2353
* @param string $desc A human readable name for the permission type
+ − 2354
* @param array $deps The list of dependencies - this should be an array of ACL types
+ − 2355
* @param string $scope Which namespaces this field should apply to. This should be either a pipe-delimited list of namespace IDs or just "All".
+ − 2356
*/
+ − 2357
+ − 2358
function register_acl_type($acl_type, $default_perm = AUTH_DISALLOW, $desc = false, $deps = Array(), $scope = 'All')
+ − 2359
{
+ − 2360
if(isset($this->acl_types[$acl_type]))
+ − 2361
return false;
+ − 2362
else
+ − 2363
{
+ − 2364
if(!$desc)
+ − 2365
{
+ − 2366
$desc = capitalize_first_letter(str_replace('_', ' ', $acl_type));
+ − 2367
}
+ − 2368
$this->acl_types[$acl_type] = $default_perm;
+ − 2369
$this->acl_descs[$acl_type] = $desc;
+ − 2370
$this->acl_deps[$acl_type] = $deps;
+ − 2371
$this->acl_scope[$acl_type] = explode('|', $scope);
+ − 2372
}
+ − 2373
return true;
+ − 2374
}
+ − 2375
+ − 2376
/**
+ − 2377
* Tells us whether permission $type is allowed or not based on the current rules.
+ − 2378
* @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
+ − 2379
* @param bool $no_deps If true, disables dependency checking
+ − 2380
* @return bool True if allowed, false if denied or if an error occured
+ − 2381
*/
+ − 2382
+ − 2383
function get_permissions($type, $no_deps = false)
+ − 2384
{
+ − 2385
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2386
if ( isset( $this->perms[$type] ) )
+ − 2387
{
+ − 2388
if ( $this->perms[$type] == AUTH_DENY )
+ − 2389
$ret = false;
+ − 2390
else if ( $this->perms[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 2391
$ret = true;
+ − 2392
else if ( $this->perms[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 2393
$ret = false;
+ − 2394
else if ( $this->perms[$type] == AUTH_ALLOW )
+ − 2395
$ret = true;
+ − 2396
else if ( $this->perms[$type] == AUTH_DISALLOW )
+ − 2397
$ret = false;
+ − 2398
}
+ − 2399
else if(isset($this->acl_types[$type]))
+ − 2400
{
+ − 2401
if ( $this->acl_types[$type] == AUTH_DENY )
+ − 2402
$ret = false;
+ − 2403
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 2404
$ret = true;
+ − 2405
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 2406
$ret = false;
+ − 2407
else if ( $this->acl_types[$type] == AUTH_ALLOW )
+ − 2408
$ret = true;
+ − 2409
else if ( $this->acl_types[$type] == AUTH_DISALLOW )
+ − 2410
$ret = false;
+ − 2411
}
+ − 2412
else
+ − 2413
{
+ − 2414
// ACL type is undefined
+ − 2415
trigger_error('Unknown access type "' . $type . '"', E_USER_WARNING);
+ − 2416
return false; // Be on the safe side and deny access
+ − 2417
}
+ − 2418
if ( !$no_deps )
+ − 2419
{
+ − 2420
if ( !$this->acl_check_deps($type) )
+ − 2421
return false;
+ − 2422
}
+ − 2423
return $ret;
+ − 2424
}
+ − 2425
+ − 2426
/**
+ − 2427
* Fetch the permissions that apply to the current user for the page specified. The object you get will have the get_permissions method
+ − 2428
* and several other abilities.
+ − 2429
* @param string $page_id
+ − 2430
* @param string $namespace
+ − 2431
* @return object
+ − 2432
*/
+ − 2433
+ − 2434
function fetch_page_acl($page_id, $namespace)
+ − 2435
{
+ − 2436
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2437
+ − 2438
if ( count ( $this->acl_base_cache ) < 1 )
+ − 2439
{
+ − 2440
// Permissions table not yet initialized
+ − 2441
return false;
+ − 2442
}
+ − 2443
156
+ − 2444
// cache of permission objects (to save RAM and SQL queries)
+ − 2445
static $objcache = array();
+ − 2446
+ − 2447
if ( count($objcache) == 0 )
+ − 2448
{
+ − 2449
foreach ( $paths->nslist as $key => $_ )
+ − 2450
{
+ − 2451
$objcache[$key] = array();
+ − 2452
}
+ − 2453
}
+ − 2454
+ − 2455
if ( isset($objcache[$namespace][$page_id]) )
+ − 2456
{
+ − 2457
return $objcache[$namespace][$page_id];
+ − 2458
}
+ − 2459
1
+ − 2460
//if ( !isset( $paths->pages[$paths->nslist[$namespace] . $page_id] ) )
+ − 2461
//{
+ − 2462
// // Page does not exist
+ − 2463
// return false;
+ − 2464
//}
+ − 2465
156
+ − 2466
$objcache[$namespace][$page_id] = new Session_ACLPageInfo( $page_id, $namespace, $this->acl_types, $this->acl_descs, $this->acl_deps, $this->acl_base_cache );
+ − 2467
$object =& $objcache[$namespace][$page_id];
1
+ − 2468
+ − 2469
return $object;
+ − 2470
+ − 2471
}
+ − 2472
+ − 2473
/**
+ − 2474
* Read all of our permissions from the database and process/apply them. This should be called after the page is determined.
+ − 2475
* @access private
+ − 2476
*/
+ − 2477
+ − 2478
function init_permissions()
+ − 2479
{
+ − 2480
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2481
// Initialize the permissions list with some defaults
+ − 2482
$this->perms = $this->acl_types;
+ − 2483
$this->acl_defaults_used = $this->perms;
+ − 2484
+ − 2485
// Fetch sitewide defaults from the permissions table
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2486
$bs = 'SELECT rules, target_type, target_id FROM '.table_prefix.'acl' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2487
. ' WHERE page_id IS NULL AND namespace IS NULL AND' . "\n"
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2488
. ' ( ';
1
+ − 2489
+ − 2490
$q = Array();
+ − 2491
$q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
+ − 2492
if(count($this->groups) > 0)
+ − 2493
{
+ − 2494
foreach($this->groups as $g_id => $g_name)
+ − 2495
{
+ − 2496
$q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 2497
}
+ − 2498
}
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 2499
$bs .= implode(" OR \n ", $q) . " ) \n ORDER BY target_type ASC, target_id ASC;";
1
+ − 2500
$q = $this->sql($bs);
+ − 2501
if ( $row = $db->fetchrow() )
+ − 2502
{
+ − 2503
do {
+ − 2504
$rules = $this->string_to_perm($row['rules']);
+ − 2505
$is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
+ − 2506
$this->acl_merge_with_current($rules, $is_everyone);
+ − 2507
} while ( $row = $db->fetchrow() );
+ − 2508
}
+ − 2509
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
+ − 2510
// 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
+ − 2511
$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
+ − 2512
1
+ − 2513
// Eliminate types that don't apply to this namespace
+ − 2514
foreach ( $this->perms AS $i => $perm )
+ − 2515
{
+ − 2516
if ( !in_array ( $paths->namespace, $this->acl_scope[$i] ) && !in_array('All', $this->acl_scope[$i]) )
+ − 2517
{
+ − 2518
unset($this->perms[$i]);
+ − 2519
}
+ − 2520
}
+ − 2521
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
+ − 2522
// PAGE group info
322
+ − 2523
$pg_list = $paths->get_page_groups($paths->page_id, $paths->namespace);
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
+ − 2524
$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
+ − 2525
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
+ − 2526
{
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
+ − 2527
$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
+ − 2528
}
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
+ − 2529
1
+ − 2530
// Build a query to grab ACL info
+ − 2531
$bs = 'SELECT rules,target_type,target_id FROM '.table_prefix.'acl WHERE ( ';
+ − 2532
$q = Array();
+ − 2533
$q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
+ − 2534
if(count($this->groups) > 0)
+ − 2535
{
+ − 2536
foreach($this->groups as $g_id => $g_name)
+ − 2537
{
+ − 2538
$q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 2539
}
+ − 2540
}
+ − 2541
// 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
+ − 2542
// permissions to override group permissions.
322
+ − 2543
$bs .= implode(" OR\n ", $q) . " )\n AND (" . $pg_info . ' ( page_id=\''.$db->escape($paths->page_id).'\' AND namespace=\''.$db->escape($paths->namespace).'\' ) )
1
+ − 2544
ORDER BY target_type ASC, page_id ASC, namespace ASC;';
+ − 2545
$q = $this->sql($bs);
+ − 2546
if ( $row = $db->fetchrow() )
+ − 2547
{
+ − 2548
do {
+ − 2549
$rules = $this->string_to_perm($row['rules']);
+ − 2550
$is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
+ − 2551
$this->acl_merge_with_current($rules, $is_everyone);
+ − 2552
} while ( $row = $db->fetchrow() );
+ − 2553
}
+ − 2554
+ − 2555
}
+ − 2556
+ − 2557
/**
+ − 2558
* Extends the scope of a permission type.
+ − 2559
* @param string The name of the permission type
+ − 2560
* @param string The namespace(s) that should be covered. This can be either one namespace ID or a pipe-delimited list.
+ − 2561
* @param object Optional - the current $paths object, in case we're doing this from the acl_rule_init hook
+ − 2562
*/
+ − 2563
+ − 2564
function acl_extend_scope($perm_type, $namespaces, &$p_in)
+ − 2565
{
+ − 2566
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2567
$p_obj = ( is_object($p_in) ) ? $p_in : $paths;
+ − 2568
$nslist = explode('|', $namespaces);
+ − 2569
foreach ( $nslist as $i => $ns )
+ − 2570
{
+ − 2571
if ( !isset($p_obj->nslist[$ns]) )
+ − 2572
{
+ − 2573
unset($nslist[$i]);
+ − 2574
}
+ − 2575
else
+ − 2576
{
+ − 2577
$this->acl_scope[$perm_type][] = $ns;
+ − 2578
if ( isset($this->acl_types[$perm_type]) && !isset($this->perms[$perm_type]) )
+ − 2579
{
+ − 2580
$this->perms[$perm_type] = $this->acl_types[$perm_type];
+ − 2581
}
+ − 2582
}
+ − 2583
}
+ − 2584
}
+ − 2585
+ − 2586
/**
+ − 2587
* Converts a permissions field into a string for database insertion. Similar in spirit to serialize().
+ − 2588
* @param array $perms An associative array with only integers as values
+ − 2589
* @return string
+ − 2590
*/
+ − 2591
+ − 2592
function perm_to_string($perms)
+ − 2593
{
+ − 2594
$s = '';
+ − 2595
foreach($perms as $perm => $ac)
+ − 2596
{
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2597
if ( $ac == 'i' )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2598
continue;
1
+ − 2599
$s .= "$perm=$ac;";
+ − 2600
}
+ − 2601
return $s;
+ − 2602
}
+ − 2603
+ − 2604
/**
+ − 2605
* Converts a permissions string back to an array.
+ − 2606
* @param string $perms The result from sessionManager::perm_to_string()
+ − 2607
* @return array
+ − 2608
*/
+ − 2609
+ − 2610
function string_to_perm($perms)
+ − 2611
{
+ − 2612
$ret = Array();
+ − 2613
preg_match_all('#([a-z0-9_-]+)=([0-9]+);#i', $perms, $matches);
+ − 2614
foreach($matches[1] as $i => $t)
+ − 2615
{
+ − 2616
$ret[$t] = intval($matches[2][$i]);
+ − 2617
}
+ − 2618
return $ret;
+ − 2619
}
+ − 2620
+ − 2621
/**
+ − 2622
* Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence over the first, but AUTH_DENY always prevails.
+ − 2623
* @param array $perm1 The first set of permissions
+ − 2624
* @param array $perm2 The second set of permissions
+ − 2625
* @return array
+ − 2626
*/
+ − 2627
+ − 2628
function acl_merge($perm1, $perm2)
+ − 2629
{
+ − 2630
$ret = $perm1;
+ − 2631
foreach ( $perm2 as $type => $level )
+ − 2632
{
+ − 2633
if ( isset( $ret[$type] ) )
+ − 2634
{
+ − 2635
if ( $ret[$type] != AUTH_DENY )
+ − 2636
$ret[$type] = $level;
+ − 2637
}
+ − 2638
// else
+ − 2639
// {
+ − 2640
// $ret[$type] = $level;
+ − 2641
// }
+ − 2642
}
+ − 2643
return $ret;
+ − 2644
}
+ − 2645
+ − 2646
/**
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2647
* Merges two ACL arrays, but instead of calculating inheritance for missing permission types, just returns 'i' for that type. Useful
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2648
* for explicitly requiring inheritance in ACL editing interfaces
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2649
* @param array $perm1 The first set of permissions
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2650
* @param array $perm2 The second, authoritative set of permissions
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2651
*/
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2652
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2653
function acl_merge_inherit($perm1, $perm2)
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2654
{
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2655
foreach ( $perm1 as $type => $level )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2656
{
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2657
$perm1[$type][$level] = 'i';
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2658
}
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2659
$ret = $perm1;
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2660
foreach ( $perm2 as $type => $level )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2661
{
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2662
if ( isset( $ret[$type] ) )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2663
{
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2664
if ( $ret[$type] != AUTH_DENY )
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2665
$ret[$type] = $level;
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2666
}
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2667
}
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2668
return $ret;
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2669
}
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2670
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
diff
changeset
+ − 2671
/**
1
+ − 2672
* Merges the ACL array sent with the current permissions table, deciding precedence based on whether defaults are in effect or not.
+ − 2673
* @param array The array to merge into the master ACL list
+ − 2674
* @param bool If true, $perm is treated as the "new default"
+ − 2675
* @param int 1 if this is a site-wide ACL, 2 if page-specific. Defaults to 2.
+ − 2676
*/
+ − 2677
+ − 2678
function acl_merge_with_current($perm, $is_everyone = false, $scope = 2)
+ − 2679
{
+ − 2680
foreach ( $this->perms as $i => $p )
+ − 2681
{
+ − 2682
if ( isset($perm[$i]) )
+ − 2683
{
+ − 2684
if ( $is_everyone && !$this->acl_defaults_used[$i] )
+ − 2685
continue;
+ − 2686
// Decide precedence
+ − 2687
if ( isset($this->acl_defaults_used[$i]) )
+ − 2688
{
+ − 2689
//echo "$i: default in use, overriding to: {$perm[$i]}<br />";
+ − 2690
// Defaults are in use, override
+ − 2691
$this->perms[$i] = $perm[$i];
+ − 2692
$this->acl_defaults_used[$i] = ( $is_everyone );
+ − 2693
}
+ − 2694
else
+ − 2695
{
+ − 2696
//echo "$i: default NOT in use";
+ − 2697
// Defaults are not in use, merge as normal
+ − 2698
if ( $this->perms[$i] != AUTH_DENY )
+ − 2699
{
+ − 2700
//echo ", but overriding";
+ − 2701
$this->perms[$i] = $perm[$i];
+ − 2702
}
+ − 2703
//echo "<br />";
+ − 2704
}
+ − 2705
}
+ − 2706
}
+ − 2707
}
+ − 2708
+ − 2709
/**
+ − 2710
* Merges two ACL arrays. Both parameters should be permission list arrays. The second group takes precedence
+ − 2711
* over the first, without exceptions. This is used to merge the hardcoded defaults with admin-specified
+ − 2712
* defaults, which take precedence.
+ − 2713
* @param array $perm1 The first set of permissions
+ − 2714
* @param array $perm2 The second set of permissions
+ − 2715
* @return array
+ − 2716
*/
+ − 2717
+ − 2718
function acl_merge_complete($perm1, $perm2)
+ − 2719
{
+ − 2720
$ret = $perm1;
+ − 2721
foreach ( $perm2 as $type => $level )
+ − 2722
{
+ − 2723
$ret[$type] = $level;
+ − 2724
}
+ − 2725
return $ret;
+ − 2726
}
+ − 2727
+ − 2728
/**
+ − 2729
* Tell us if the dependencies for a given permission are met.
+ − 2730
* @param string The ACL permission ID
+ − 2731
* @return bool
+ − 2732
*/
+ − 2733
+ − 2734
function acl_check_deps($type)
+ − 2735
{
+ − 2736
if(!isset($this->acl_deps[$type])) // This will only happen if the permissions table is hacked or improperly accessed
+ − 2737
return true;
+ − 2738
if(sizeof($this->acl_deps[$type]) < 1)
+ − 2739
return true;
+ − 2740
$deps = $this->acl_deps[$type];
+ − 2741
while(true)
+ − 2742
{
+ − 2743
$full_resolved = true;
+ − 2744
$j = sizeof($deps);
+ − 2745
for ( $i = 0; $i < $j; $i++ )
+ − 2746
{
+ − 2747
$b = $deps;
+ − 2748
$deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
+ − 2749
if( $b == $deps )
+ − 2750
{
+ − 2751
break 2;
+ − 2752
}
+ − 2753
$j = sizeof($deps);
+ − 2754
}
+ − 2755
}
+ − 2756
//die('<pre>'.print_r($deps, true).'</pre>');
+ − 2757
foreach($deps as $d)
+ − 2758
{
+ − 2759
if ( !$this->get_permissions($d) )
+ − 2760
{
+ − 2761
return false;
+ − 2762
}
+ − 2763
}
+ − 2764
return true;
+ − 2765
}
+ − 2766
+ − 2767
/**
+ − 2768
* Makes a CAPTCHA code and caches the code in the database
+ − 2769
* @param int $len The length of the code, in bytes
402
+ − 2770
* @param string Optional, the hash to reuse
1
+ − 2771
* @return string A unique identifier assigned to the code. This hash should be passed to sessionManager::getCaptcha() to retrieve the code.
+ − 2772
*/
+ − 2773
402
+ − 2774
function make_captcha($len = 7, $hash = '')
1
+ − 2775
{
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2776
global $db, $session, $paths, $template, $plugins; // Common objects
263
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
+ − 2777
$code = $this->generate_captcha_code($len);
402
+ − 2778
if ( !preg_match('/^[a-f0-9]{32}([a-z0-9]{8})?$/', $hash) )
+ − 2779
$hash = md5(microtime() . mt_rand());
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2780
$session_data = $db->escape(serialize(array()));
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2781
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2782
// sanity check
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2783
if ( !is_valid_ip(@$_SERVER['REMOTE_ADDR']) || !is_int($this->user_id) )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2784
return false;
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2785
402
+ − 2786
$this->sql('DELETE FROM ' . table_prefix . "captcha WHERE session_id = '$hash';");
+ − 2787
$this->sql('INSERT INTO ' . table_prefix . 'captcha(session_id, code, session_data, source_ip, user_id)' . " VALUES('$hash', '$code', '$session_data', '{$_SERVER['REMOTE_ADDR']}', {$this->user_id});");
1
+ − 2788
return $hash;
+ − 2789
}
+ − 2790
+ − 2791
/**
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2792
* Generates a "pronouncable" or "human-friendly" word using various phonics rules
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2793
* @param int Optional. The length of the word.
263
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
+ − 2794
* @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
+ − 2795
*/
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
+ − 2796
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
+ − 2797
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
+ − 2798
{
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2799
// don't use k and x, they get mixed up a lot
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2800
$consonants = 'bcdfghmnpqrsvwyz';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2801
$vowels = 'aeiou';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2802
$prev = 'vowel';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2803
$prev_l = '';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2804
$word = '';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2805
$allow_next_vowel = true;
263
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
+ − 2806
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
+ − 2807
{
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2808
if ( $prev == 'vowel' )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2809
{
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2810
$allow_next_vowel = false;
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2811
if ( $prev_l == 'o' && mt_rand(0, 3) == 3 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2812
$word .= 'i';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2813
else if ( $prev_l == 'q' && mt_rand(0, 3) != 1 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2814
$word .= 'u';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2815
else if ( $prev_l == 'o' && mt_rand(0, 3) == 2 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2816
$word .= 'u';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2817
else if ( $prev_l == 'a' && mt_rand(0, 3) == 3 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2818
$word .= 'i';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2819
else if ( $prev_l == 'a' && mt_rand(0, 10) == 7 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2820
$word .= 'o';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2821
else if ( $prev_l == 'a' && mt_rand(0, 7) == 2 && $allow_next_vowel )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2822
$word .= 'u';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2823
else
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2824
{
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2825
$allow_next_vowel = true;
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2826
$word .= $consonants{mt_rand(0, (strlen($consonants)-1))};
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2827
}
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2828
}
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2829
else if ( $prev == 'consonant' )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2830
{
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2831
if ( $prev_l == 'p' && mt_rand(0, 7) == 4 )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2832
$word .= 't';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2833
else if ( $prev_l == 'p' && mt_rand(0, 5) == 1 )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2834
$word .= 'h';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2835
else
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2836
$word .= $vowels{mt_rand(0, (strlen($vowels)-1))};
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2837
}
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2838
$prev_l = substr($word, -1);
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2839
$l = ( mt_rand(0, 1) == 1 ) ? strtoupper($prev_l) : strtolower($prev_l);
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2840
$word = substr($word, 0, -1) . $l;
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2841
if ( strstr('aeiou', $prev_l) )
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2842
$prev = 'vowel';
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2843
else
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2844
$prev = 'consonant';
263
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
+ − 2845
}
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2846
return $word;
263
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
+ − 2847
}
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
+ − 2848
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
+ − 2849
/**
1
+ − 2850
* For the given code ID, returns the correct CAPTCHA code, or false on failure
+ − 2851
* @param string $hash The unique ID assigned to the code
+ − 2852
* @return string The correct confirmation code
+ − 2853
*/
+ − 2854
+ − 2855
function get_captcha($hash)
+ − 2856
{
+ − 2857
global $db, $session, $paths, $template, $plugins; // Common objects
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2858
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2859
if ( !preg_match('/^[a-f0-9]{32}([a-z0-9]{8})?$/', $hash) )
263
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
+ − 2860
{
436
+ − 2861
die("session manager: bad captcha_hash $hash");
263
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
+ − 2862
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
+ − 2863
}
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2864
402
+ − 2865
// sanity check
436
+ − 2866
if ( !is_valid_ip(@$_SERVER['REMOTE_ADDR']) )
+ − 2867
{
+ − 2868
die("session manager insanity: bad REMOTE_ADDR or invalid UID");
263
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
+ − 2869
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
+ − 2870
}
402
+ − 2871
436
+ − 2872
$q = $this->sql('SELECT code_id, code FROM ' . table_prefix . "captcha WHERE session_id = '$hash' AND source_ip = '{$_SERVER['REMOTE_ADDR']}';");
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2873
if ( $db->numrows() < 1 )
436
+ − 2874
{
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2875
return false;
436
+ − 2876
}
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2877
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2878
list($code_id, $code) = $db->fetchrow_num();
436
+ − 2879
263
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
+ − 2880
$db->free_result();
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2881
$this->sql('DELETE FROM ' . table_prefix . "captcha WHERE code_id = $code_id;");
436
+ − 2882
401
6ae6e387a0e3
Implemented a new CAPTCHA API; the frontend ($session->{make,get}_captcha) is API-compatible but the backend (the captcha class) is deprecated.
Dan
diff
changeset
+ − 2883
return $code;
1
+ − 2884
}
+ − 2885
+ − 2886
/**
263
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
+ − 2887
* (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
+ − 2888
*/
+ − 2889
+ − 2890
function kill_captcha()
+ − 2891
{
263
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
+ − 2892
return true;
1
+ − 2893
}
+ − 2894
+ − 2895
/**
+ − 2896
* Generates a random password.
+ − 2897
* @param int $length Optional - length of password
+ − 2898
* @return string
+ − 2899
*/
+ − 2900
+ − 2901
function random_pass($length = 10)
+ − 2902
{
+ − 2903
$valid_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_+@#%&<>';
+ − 2904
$valid_chars = enano_str_split($valid_chars);
+ − 2905
$ret = '';
+ − 2906
for ( $i = 0; $i < $length; $i++ )
+ − 2907
{
+ − 2908
$ret .= $valid_chars[mt_rand(0, count($valid_chars)-1)];
+ − 2909
}
+ − 2910
return $ret;
+ − 2911
}
+ − 2912
+ − 2913
/**
+ − 2914
* Generates some Javascript that calls the AES encryption library.
+ − 2915
* @param string The name of the form
+ − 2916
* @param string The name of the password field
+ − 2917
* @param string The name of the field that switches encryption on or off
+ − 2918
* @param string The name of the field that contains the encryption key
+ − 2919
* @param string The name of the field that will contain the encrypted password
+ − 2920
* @param string The name of the field that handles MD5 challenge data
+ − 2921
* @return string
+ − 2922
*/
+ − 2923
+ − 2924
function aes_javascript($form_name, $pw_field, $use_crypt, $crypt_key, $crypt_data, $challenge)
+ − 2925
{
+ − 2926
$code = '
+ − 2927
<script type="text/javascript">
+ − 2928
disableJSONExts();
+ − 2929
str = \'\';
+ − 2930
for(i=0;i<keySizeInBits/4;i++) str+=\'0\';
+ − 2931
var key = hexToByteArray(str);
+ − 2932
var pt = hexToByteArray(str);
+ − 2933
var ct = rijndaelEncrypt(pt, key, \'ECB\');
+ − 2934
var ct = byteArrayToHex(ct);
+ − 2935
switch(keySizeInBits)
+ − 2936
{
+ − 2937
case 128:
+ − 2938
v = \'66e94bd4ef8a2c3b884cfa59ca342b2e\';
+ − 2939
break;
+ − 2940
case 192:
+ − 2941
v = \'aae06992acbf52a3e8f4a96ec9300bd7aae06992acbf52a3e8f4a96ec9300bd7\';
+ − 2942
break;
+ − 2943
case 256:
+ − 2944
v = \'dc95c078a2408989ad48a21492842087dc95c078a2408989ad48a21492842087\';
+ − 2945
break;
+ − 2946
}
+ − 2947
var testpassed = ' . ( ( isset($_GET['use_crypt']) && $_GET['use_crypt']=='0') ? 'false; // CRYPTO-AUTH DISABLED ON USER REQUEST // ' : '' ) . '( ct == v && md5_vm_test() );
+ − 2948
var frm = document.forms.'.$form_name.';
+ − 2949
function runEncryption()
+ − 2950
{
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
+ − 2951
var frm = document.forms.'.$form_name.';
1
+ − 2952
if(testpassed)
+ − 2953
{
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
+ − 2954
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
+ − 2955
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
+ − 2956
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
+ − 2957
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
+ − 2958
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
+ − 2959
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 2960
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
+ − 2961
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
+ − 2962
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
+ − 2963
}
1
+ − 2964
pass = frm.'.$pw_field.'.value;
+ − 2965
chal = frm.'.$challenge.'.value;
+ − 2966
challenge = hex_md5(pass + chal) + chal;
+ − 2967
frm.'.$challenge.'.value = challenge;
+ − 2968
pass = stringToByteArray(pass);
+ − 2969
cryptstring = rijndaelEncrypt(pass, cryptkey, \'ECB\');
+ − 2970
if(!cryptstring)
+ − 2971
{
+ − 2972
return false;
+ − 2973
}
+ − 2974
cryptstring = byteArrayToHex(cryptstring);
+ − 2975
frm.'.$crypt_data.'.value = cryptstring;
+ − 2976
frm.'.$pw_field.'.value = \'\';
+ − 2977
}
+ − 2978
return false;
+ − 2979
}
+ − 2980
</script>
+ − 2981
';
+ − 2982
return $code;
+ − 2983
}
+ − 2984
436
+ − 2985
/**
+ − 2986
* Backend code for the JSON login interface. Basically a frontend to the session API that takes all parameters in one huge array.
+ − 2987
* @param array LoginAPI request
+ − 2988
* @return array LoginAPI response
+ − 2989
*/
+ − 2990
+ − 2991
function process_login_request($req)
+ − 2992
{
+ − 2993
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2994
+ − 2995
// Setup EnanoMath and Diffie-Hellman
+ − 2996
global $dh_supported;
+ − 2997
$dh_supported = true;
+ − 2998
try
+ − 2999
{
+ − 3000
require_once(ENANO_ROOT . '/includes/diffiehellman.php');
+ − 3001
}
+ − 3002
catch ( Exception $e )
+ − 3003
{
+ − 3004
$dh_supported = false;
+ − 3005
}
+ − 3006
global $_math;
+ − 3007
+ − 3008
// Check for the mode
+ − 3009
if ( !isset($req['mode']) )
+ − 3010
{
+ − 3011
return array(
+ − 3012
'mode' => 'error',
+ − 3013
'error' => 'ERR_JSON_NO_MODE'
+ − 3014
);
+ − 3015
}
+ − 3016
+ − 3017
// Main processing switch
+ − 3018
switch ( $req['mode'] )
+ − 3019
{
+ − 3020
default:
+ − 3021
return array(
+ − 3022
'mode' => 'error',
+ − 3023
'error' => 'ERR_JSON_INVALID_MODE'
+ − 3024
);
+ − 3025
break;
+ − 3026
case 'getkey':
+ − 3027
+ − 3028
$this->start();
+ − 3029
+ − 3030
// Query database for lockout info
+ − 3031
$locked_out = false;
+ − 3032
// are we locked out?
+ − 3033
$threshold = ( $_ = getConfig('lockout_threshold') ) ? intval($_) : 5;
+ − 3034
$duration = ( $_ = getConfig('lockout_duration') ) ? intval($_) : 15;
+ − 3035
// convert to minutes
+ − 3036
$duration = $duration * 60;
+ − 3037
$policy = ( $x = getConfig('lockout_policy') && in_array(getConfig('lockout_policy'), array('lockout', 'disable', 'captcha')) ) ? getConfig('lockout_policy') : 'lockout';
+ − 3038
if ( $policy != 'disable' )
+ − 3039
{
+ − 3040
$ipaddr = $db->escape($_SERVER['REMOTE_ADDR']);
+ − 3041
$timestamp_cutoff = time() - $duration;
+ − 3042
$q = $this->sql('SELECT timestamp FROM '.table_prefix.'lockout WHERE timestamp > ' . $timestamp_cutoff . ' AND ipaddr = \'' . $ipaddr . '\' ORDER BY timestamp DESC;');
+ − 3043
$fails = $db->numrows();
+ − 3044
$row = $db->fetchrow();
+ − 3045
$locked_out = ( $fails >= $threshold );
+ − 3046
$lockdata = array(
+ − 3047
'locked_out' => $locked_out,
+ − 3048
'lockout_threshold' => $threshold,
+ − 3049
'lockout_duration' => ( $duration / 60 ),
+ − 3050
'lockout_fails' => $fails,
+ − 3051
'lockout_policy' => $policy,
+ − 3052
'lockout_last_time' => $row['timestamp'],
+ − 3053
'time_rem' => ( $duration / 60 ) - round( ( time() - $row['timestamp'] ) / 60 ),
+ − 3054
'captcha' => ''
+ − 3055
);
+ − 3056
$db->free_result();
+ − 3057
}
+ − 3058
+ − 3059
$response = array('mode' => 'build_box');
+ − 3060
$response['allow_diffiehellman'] = $dh_supported;
+ − 3061
+ − 3062
$response['username'] = ( $this->user_logged_in ) ? $this->username : false;
+ − 3063
$response['aes_key'] = $this->rijndael_genkey();
+ − 3064
+ − 3065
// Lockout info
+ − 3066
$response['locked_out'] = $locked_out;
+ − 3067
+ − 3068
$response['lockout_info'] = $lockdata;
+ − 3069
if ( $policy == 'captcha' && $locked_out )
+ − 3070
{
+ − 3071
$response['lockout_info']['captcha'] = $this->make_captcha();
+ − 3072
}
+ − 3073
+ − 3074
// Can we do Diffie-Hellman? If so, generate and stash a public/private key pair.
+ − 3075
if ( $dh_supported )
+ − 3076
{
+ − 3077
$dh_key_priv = dh_gen_private();
+ − 3078
$dh_key_pub = dh_gen_public($dh_key_priv);
+ − 3079
$dh_key_priv = $_math->str($dh_key_priv);
+ − 3080
$dh_key_pub = $_math->str($dh_key_pub);
+ − 3081
$response['dh_public_key'] = $dh_key_pub;
+ − 3082
// store the keys in the DB
+ − 3083
$q = $db->sql_query('INSERT INTO ' . table_prefix . "diffiehellman( public_key, private_key ) VALUES ( '$dh_key_pub', '$dh_key_priv' );");
+ − 3084
if ( !$q )
+ − 3085
$db->die_json();
+ − 3086
}
+ − 3087
+ − 3088
return $response;
+ − 3089
break;
+ − 3090
case 'login_dh':
+ − 3091
// User is requesting a login and has sent Diffie-Hellman data.
+ − 3092
+ − 3093
//
+ − 3094
// KEY RECONSTRUCTION
+ − 3095
//
+ − 3096
+ − 3097
$userinfo_crypt = $req['userinfo'];
+ − 3098
$dh_public = $req['dh_public_key'];
+ − 3099
$dh_hash = $req['dh_secret_hash'];
+ − 3100
+ − 3101
// Check the key
+ − 3102
if ( !preg_match('/^[0-9]+$/', $dh_public) || !preg_match('/^[0-9]+$/', $req['dh_client_key']) )
+ − 3103
{
+ − 3104
return array(
+ − 3105
'mode' => 'error',
+ − 3106
'error' => 'ERR_DH_KEY_NOT_NUMERIC'
+ − 3107
);
+ − 3108
}
+ − 3109
+ − 3110
// Fetch private key
+ − 3111
$q = $db->sql_query('SELECT private_key, key_id FROM ' . table_prefix . "diffiehellman WHERE public_key = '$dh_public';");
+ − 3112
if ( !$q )
+ − 3113
$db->die_json();
+ − 3114
+ − 3115
if ( $db->numrows() < 1 )
+ − 3116
{
+ − 3117
return array(
+ − 3118
'mode' => 'error',
+ − 3119
'error' => 'ERR_DH_KEY_NOT_FOUND'
+ − 3120
);
+ − 3121
}
+ − 3122
+ − 3123
list($dh_private, $dh_key_id) = $db->fetchrow_num();
+ − 3124
$db->free_result();
+ − 3125
+ − 3126
// We have the private key, now delete the key pair, we no longer need it
+ − 3127
$q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE key_id = $dh_key_id;");
+ − 3128
if ( !$q )
+ − 3129
$db->die_json();
+ − 3130
+ − 3131
// Generate the shared secret
+ − 3132
$dh_secret = dh_gen_shared_secret($dh_private, $req['dh_client_key']);
+ − 3133
$dh_secret = $_math->str($dh_secret);
+ − 3134
+ − 3135
// Did we get all our math right?
+ − 3136
$dh_secret_check = sha1($dh_secret);
+ − 3137
if ( $dh_secret_check !== $dh_hash )
+ − 3138
{
+ − 3139
return array(
+ − 3140
'mode' => 'error',
+ − 3141
'error' => 'ERR_DH_HASH_NO_MATCH'
+ − 3142
);
+ − 3143
}
+ − 3144
+ − 3145
// All good! Generate the AES key
+ − 3146
$aes_key = substr(sha256($dh_secret), 0, ( AES_BITS / 4 ));
+ − 3147
case 'login_aes':
+ − 3148
if ( $req['mode'] == 'login_aes' )
+ − 3149
{
+ − 3150
// login_aes-specific code
+ − 3151
$aes_key = $this->fetch_public_key($req['key_aes']);
+ − 3152
if ( !$aes_key )
+ − 3153
{
+ − 3154
return array(
+ − 3155
'mode' => 'error',
+ − 3156
'error' => 'ERR_AES_LOOKUP_FAILED'
+ − 3157
);
+ − 3158
}
+ − 3159
$userinfo_crypt = $req['userinfo'];
+ − 3160
}
+ − 3161
// shared between the two systems from here on out
+ − 3162
+ − 3163
// decrypt user info
+ − 3164
$aes_key = hexdecode($aes_key);
+ − 3165
$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+ − 3166
$userinfo_json = $aes->decrypt($userinfo_crypt, $aes_key, ENC_HEX);
+ − 3167
if ( !$userinfo_json )
+ − 3168
{
+ − 3169
return array(
+ − 3170
'mode' => 'error',
+ − 3171
'error' => 'ERR_AES_DECRYPT_FAILED'
+ − 3172
);
+ − 3173
}
+ − 3174
// de-JSON user info
+ − 3175
try
+ − 3176
{
+ − 3177
$userinfo = enano_json_decode($userinfo_json);
+ − 3178
}
+ − 3179
catch ( Exception $e )
+ − 3180
{
+ − 3181
return array(
+ − 3182
'mode' => 'error',
+ − 3183
'error' => 'ERR_USERINFO_DECODE_FAILED'
+ − 3184
);
+ − 3185
}
+ − 3186
+ − 3187
if ( !isset($userinfo['username']) || !isset($userinfo['password']) )
+ − 3188
{
+ − 3189
return array(
+ − 3190
'mode' => 'error',
+ − 3191
'error' => 'ERR_USERINFO_MISSING_VALUES'
+ − 3192
);
+ − 3193
}
+ − 3194
+ − 3195
$username =& $userinfo['username'];
+ − 3196
$password =& $userinfo['password'];
+ − 3197
+ − 3198
// attempt the login
+ − 3199
// function login_without_crypto($username, $password, $already_md5ed = false, $level = USER_LEVEL_MEMBER, $captcha_hash = false, $captcha_code = false)
+ − 3200
$login_result = $this->login_without_crypto($username, $password, false, intval($req['level']), @$req['captcha_hash'], @$req['captcha_code']);
+ − 3201
+ − 3202
if ( $login_result['success'] )
+ − 3203
{
+ − 3204
return array(
+ − 3205
'mode' => 'login_success',
+ − 3206
'key' => ( $this->sid_super ) ? $this->sid_super : false
+ − 3207
);
+ − 3208
}
+ − 3209
else
+ − 3210
{
+ − 3211
return array(
+ − 3212
'mode' => 'login_failure',
+ − 3213
'error_code' => $login_result['error'],
+ − 3214
// Use this to provide a way to respawn the login box
+ − 3215
'respawn_info' => $this->process_login_request(array('mode' => 'getkey'))
+ − 3216
);
+ − 3217
}
+ − 3218
+ − 3219
break;
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3220
case 'clean_key':
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3221
// Clean out a key, since it won't be used.
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3222
if ( !empty($req['key_aes']) )
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3223
{
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3224
$this->fetch_public_key($req['key_aes']);
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3225
}
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3226
if ( !empty($req['key_dh']) )
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3227
{
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3228
$pk = $db->escape($req['key_dh']);
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3229
$q = $db->sql_query('DELETE FROM ' . table_prefix . "diffiehellman WHERE public_key = '$pk';");
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3230
if ( !$q )
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3231
$db->die_json();
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3232
}
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3233
return array(
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3234
'mode' => 'noop'
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3235
);
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
diff
changeset
+ − 3236
break;
436
+ − 3237
}
+ − 3238
+ − 3239
}
+ − 3240
1
+ − 3241
}
+ − 3242
+ − 3243
/**
+ − 3244
* Class used to fetch permissions for a specific page. Used internally by SessionManager.
+ − 3245
* @package Enano
+ − 3246
* @subpackage Session manager
+ − 3247
* @license http://www.gnu.org/copyleft/gpl.html
+ − 3248
* @access private
+ − 3249
*/
+ − 3250
+ − 3251
class Session_ACLPageInfo {
+ − 3252
+ − 3253
/**
+ − 3254
* The page ID of this ACL info package
+ − 3255
* @var string
+ − 3256
*/
+ − 3257
+ − 3258
var $page_id;
+ − 3259
+ − 3260
/**
+ − 3261
* The namespace of the page being checked
+ − 3262
* @var string
+ − 3263
*/
+ − 3264
+ − 3265
var $namespace;
+ − 3266
+ − 3267
/**
+ − 3268
* Our list of permission types.
+ − 3269
* @access private
+ − 3270
* @var array
+ − 3271
*/
+ − 3272
+ − 3273
var $acl_types = Array();
+ − 3274
+ − 3275
/**
+ − 3276
* The list of descriptions for the permission types
+ − 3277
* @var array
+ − 3278
*/
+ − 3279
+ − 3280
var $acl_descs = Array();
+ − 3281
+ − 3282
/**
+ − 3283
* A list of dependencies for ACL types.
+ − 3284
* @var array
+ − 3285
*/
+ − 3286
+ − 3287
var $acl_deps = Array();
+ − 3288
+ − 3289
/**
246
+ − 3290
* Our tell-all list of permissions. Do not even try to change this.
+ − 3291
* @access private
1
+ − 3292
* @var array
+ − 3293
*/
+ − 3294
+ − 3295
var $perms = Array();
+ − 3296
+ − 3297
/**
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
+ − 3298
* 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
+ − 3299
* @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
+ − 3300
* @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
+ − 3301
*/
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3302
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3303
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
+ − 3304
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3305
/**
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3306
* Tracks whether Wiki Mode is on for the page we're operating on.
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3307
* @var bool
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3308
*/
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3309
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3310
var $wiki_mode = false;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3311
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3312
/**
1
+ − 3313
* Constructor.
+ − 3314
* @param string $page_id The ID of the page to check
+ − 3315
* @param string $namespace The namespace of the page to check.
+ − 3316
* @param array $acl_types List of ACL types
+ − 3317
* @param array $acl_descs List of human-readable descriptions for permissions (associative)
+ − 3318
* @param array $acl_deps List of dependencies for permissions. For example, viewing history/diffs depends on the ability to read the page.
+ − 3319
* @param array $base What to start with - this is an attempt to reduce the number of SQL queries.
+ − 3320
*/
+ − 3321
+ − 3322
function Session_ACLPageInfo($page_id, $namespace, $acl_types, $acl_descs, $acl_deps, $base)
+ − 3323
{
+ − 3324
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 3325
+ − 3326
$this->acl_deps = $acl_deps;
+ − 3327
$this->acl_types = $acl_types;
+ − 3328
$this->acl_descs = $acl_descs;
+ − 3329
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
+ − 3330
$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
+ − 3331
$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
+ − 3332
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
+ − 3333
// 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
+ − 3334
$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
+ − 3335
$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
+ − 3336
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
+ − 3337
{
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
+ − 3338
$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
+ − 3339
}
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
+ − 3340
1
+ − 3341
// Build a query to grab ACL info
320
112debff64bd
SURPRISE! Preliminary PostgreSQL support added. The required schema file is not present in this commit and will be included at a later date. No installer support is implemented. Also in this commit: several fixes including <!-- SYSMSG ... --> was broken in template compiler; set fixed width on included images to prevent the thumbnail box from getting huge; added a much more friendly interface to AJAX responses that are invalid JSON
Dan
diff
changeset
+ − 3342
$bs = 'SELECT rules,target_type,target_id FROM '.table_prefix.'acl WHERE ' . "\n"
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 3343
. ' ( ';
1
+ − 3344
$q = Array();
+ − 3345
$q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$session->user_id.' )';
+ − 3346
if(count($session->groups) > 0)
+ − 3347
{
+ − 3348
foreach($session->groups as $g_id => $g_name)
+ − 3349
{
+ − 3350
$q[] = '( target_type='.ACL_TYPE_GROUP.' AND target_id='.intval($g_id).' )';
+ − 3351
}
+ − 3352
}
+ − 3353
// 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
+ − 3354
// permissions to override group permissions.
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
diff
changeset
+ − 3355
$bs .= implode(" OR\n ", $q) . ' ) AND (' . $pg_info . ' page_id=\''.$db->escape($page_id).'\' AND namespace=\''.$db->escape($namespace).'\' )
1
+ − 3356
ORDER BY target_type ASC, page_id ASC, namespace ASC;';
+ − 3357
$q = $session->sql($bs);
+ − 3358
if ( $row = $db->fetchrow() )
+ − 3359
{
+ − 3360
do {
+ − 3361
$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
+ − 3362
$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
+ − 3363
$this->acl_merge_with_current($rules, $is_everyone);
1
+ − 3364
} while ( $row = $db->fetchrow() );
+ − 3365
}
+ − 3366
+ − 3367
$this->page_id = $page_id;
+ − 3368
$this->namespace = $namespace;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3369
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3370
$pathskey = $paths->nslist[$this->namespace].$this->page_id;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3371
$ppwm = 2;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3372
if ( isset($paths->pages[$pathskey]) )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3373
{
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3374
if ( isset($paths->pages[$pathskey]['wiki_mode']) )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3375
$ppwm = $paths->pages[$pathskey]['wiki_mode'];
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3376
}
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3377
if ( $ppwm == 1 && ( $session->user_logged_in || getConfig('wiki_mode_require_login') != '1' ) )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3378
$this->wiki_mode = true;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3379
else if ( $ppwm == 1 && !$session->user_logged_in && getConfig('wiki_mode_require_login') == '1' )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3380
$this->wiki_mode = true;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3381
else if ( $ppwm == 0 )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3382
$this->wiki_mode = false;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3383
else if ( $ppwm == 2 )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3384
{
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3385
if ( $session->user_logged_in )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3386
{
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3387
$this->wiki_mode = ( getConfig('wiki_mode') == '1' );
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3388
}
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3389
else
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3390
{
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3391
$this->wiki_mode = ( getConfig('wiki_mode') == '1' && getConfig('wiki_mode_require_login') != '1' );
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3392
}
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3393
}
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3394
else
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3395
{
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3396
// Ech. Internal logic failure, this should never happen.
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3397
return false;
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3398
}
1
+ − 3399
}
+ − 3400
+ − 3401
/**
+ − 3402
* Tells us whether permission $type is allowed or not based on the current rules.
+ − 3403
* @param string $type The permission identifier ($acl_type passed to sessionManager::register_acl_type())
+ − 3404
* @param bool $no_deps If true, disables dependency checking
+ − 3405
* @return bool True if allowed, false if denied or if an error occured
+ − 3406
*/
+ − 3407
+ − 3408
function get_permissions($type, $no_deps = false)
+ − 3409
{
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
+ − 3410
// echo '<pre>' . print_r($this->perms, true) . '</pre>';
1
+ − 3411
global $db, $session, $paths, $template, $plugins; // Common objects
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3412
1
+ − 3413
if ( isset( $this->perms[$type] ) )
+ − 3414
{
+ − 3415
if ( $this->perms[$type] == AUTH_DENY )
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3416
{
1
+ − 3417
$ret = false;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3418
}
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3419
else if ( $this->perms[$type] == AUTH_WIKIMODE && $this->wiki_mode )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3420
{
1
+ − 3421
$ret = true;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3422
}
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3423
else if ( $this->perms[$type] == AUTH_WIKIMODE && !$this->wiki_mode )
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3424
{
1
+ − 3425
$ret = false;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3426
}
1
+ − 3427
else if ( $this->perms[$type] == AUTH_ALLOW )
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3428
{
1
+ − 3429
$ret = true;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3430
}
1
+ − 3431
else if ( $this->perms[$type] == AUTH_DISALLOW )
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3432
{
1
+ − 3433
$ret = false;
338
915d399dfdbf
Corrected licensing issue on YoungPup's DOM-Drag (it is now public domain -> GPLv2+ for Enano); fixed wrongful access denial under specific circumstances (fetch_page_acl() on nonexistent page + wiki mode)
Dan
diff
changeset
+ − 3434
}
1
+ − 3435
}
+ − 3436
else if(isset($this->acl_types[$type]))
+ − 3437
{
+ − 3438
if ( $this->acl_types[$type] == AUTH_DENY )
+ − 3439
$ret = false;
+ − 3440
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && $paths->wiki_mode )
+ − 3441
$ret = true;
+ − 3442
else if ( $this->acl_types[$type] == AUTH_WIKIMODE && !$paths->wiki_mode )
+ − 3443
$ret = false;
+ − 3444
else if ( $this->acl_types[$type] == AUTH_ALLOW )
+ − 3445
$ret = true;
+ − 3446
else if ( $this->acl_types[$type] == AUTH_DISALLOW )
+ − 3447
$ret = false;
+ − 3448
}
+ − 3449
else
+ − 3450
{
+ − 3451
// ACL type is undefined
+ − 3452
trigger_error('Unknown access type "' . $type . '"', E_USER_WARNING);
+ − 3453
return false; // Be on the safe side and deny access
+ − 3454
}
+ − 3455
if ( !$no_deps )
+ − 3456
{
+ − 3457
if ( !$this->acl_check_deps($type) )
+ − 3458
return false;
+ − 3459
}
+ − 3460
return $ret;
+ − 3461
}
+ − 3462
+ − 3463
/**
+ − 3464
* Tell us if the dependencies for a given permission are met.
+ − 3465
* @param string The ACL permission ID
+ − 3466
* @return bool
+ − 3467
*/
+ − 3468
+ − 3469
function acl_check_deps($type)
+ − 3470
{
+ − 3471
if(!isset($this->acl_deps[$type])) // This will only happen if the permissions table is hacked or improperly accessed
+ − 3472
return true;
+ − 3473
if(sizeof($this->acl_deps[$type]) < 1)
+ − 3474
return true;
+ − 3475
$deps = $this->acl_deps[$type];
+ − 3476
while(true)
+ − 3477
{
+ − 3478
$full_resolved = true;
+ − 3479
$j = sizeof($deps);
+ − 3480
for ( $i = 0; $i < $j; $i++ )
+ − 3481
{
+ − 3482
$b = $deps;
+ − 3483
$deps = array_merge($deps, $this->acl_deps[$deps[$i]]);
+ − 3484
if( $b == $deps )
+ − 3485
{
+ − 3486
break 2;
+ − 3487
}
+ − 3488
$j = sizeof($deps);
+ − 3489
}
+ − 3490
}
+ − 3491
//die('<pre>'.print_r($deps, true).'</pre>');
+ − 3492
foreach($deps as $d)
+ − 3493
{
+ − 3494
if ( !$this->get_permissions($d) )
+ − 3495
{
+ − 3496
return false;
+ − 3497
}
+ − 3498
}
+ − 3499
return true;
+ − 3500
}
+ − 3501
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
+ − 3502
/**
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3503
* 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
+ − 3504
* @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
+ − 3505
* @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
+ − 3506
* @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
+ − 3507
*/
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3508
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3509
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
+ − 3510
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3511
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
+ − 3512
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3513
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
+ − 3514
{
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
diff
changeset
+ − 3515
if ( $is_everyone && !@$this->acl_defaults_used[$i] )
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
+ − 3516
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
+ − 3517
// 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
+ − 3518
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
+ − 3519
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3520
//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
+ − 3521
// 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
+ − 3522
$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
+ − 3523
$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
+ − 3524
}
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3525
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
+ − 3526
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3527
//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
+ − 3528
// 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
+ − 3529
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
+ − 3530
{
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3531
//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
+ − 3532
$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
+ − 3533
}
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3534
//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
+ − 3535
}
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3536
}
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3537
}
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3538
}
bda11e521e8a
Fixed a few presentation bugs in installer, made installer more "legally binding", and fixed global permissions inheritance in $session->fetch_page_acl()
Dan
diff
changeset
+ − 3539
1
+ − 3540
}
+ − 3541
466
+ − 3542
/**
+ − 3543
* Cron task - clears out the database of Diffie-Hellman keys
+ − 3544
*/
+ − 3545
+ − 3546
function cron_clean_login_cache()
+ − 3547
{
+ − 3548
global $db, $session, $paths, $template, $plugins; // Common objects
+ − 3549
+ − 3550
if ( !$db->sql_query('DELETE FROM ' . table_prefix . 'diffiehellman;') )
+ − 3551
$db->_die();
+ − 3552
+ − 3553
setConfig('login_key_cache', '');
+ − 3554
}
+ − 3555
+ − 3556
register_cron_task('cron_clean_login_cache', 72);
+ − 3557
1
+ − 3558
?>