Zeile 11 | Zeile 11 |
---|
define("IN_MYBB", 1); define("IN_ADMINCP", 1);
|
define("IN_MYBB", 1); define("IN_ADMINCP", 1);
|
// Here you can change how much of an Admin CP IP address must match in a previous session for the user is validated (defaults to 3 which matches a.b.c)
| // Here you can change how much of an Admin CP IP address must match in a previous session for the user is validated (e.g. 3 means a.b.c need to match)
|
define("ADMIN_IP_SEGMENTS", 0);
|
define("ADMIN_IP_SEGMENTS", 0);
|
| define("ADMIN_IPV6_SEGMENTS", 0);
|
require_once dirname(dirname(__FILE__))."/inc/init.php";
|
require_once dirname(dirname(__FILE__))."/inc/init.php";
|
| $shutdown_queries = $shutdown_functions = array();
|
send_page_headers();
|
send_page_headers();
|
| header('X-Frame-Options: SAMEORIGIN');
|
if(!isset($config['admin_dir']) || !file_exists(MYBB_ROOT.$config['admin_dir']."/inc/class_page.php"))
|
if(!isset($config['admin_dir']) || !file_exists(MYBB_ROOT.$config['admin_dir']."/inc/class_page.php"))
|
{ $config['admin_dir'] = "admin"; }
define('MYBB_ADMIN_DIR', MYBB_ROOT.$config['admin_dir'].'/');
| { $config['admin_dir'] = basename(dirname(__FILE__)); }
define('MYBB_ADMIN_DIR', MYBB_ROOT.$config['admin_dir'].'/');
|
define('COPY_YEAR', my_date('Y', TIME_NOW));
| define('COPY_YEAR', my_date('Y', TIME_NOW));
|
Zeile 32 | Zeile 37 |
---|
require_once MYBB_ADMIN_DIR."inc/class_table.php"; require_once MYBB_ADMIN_DIR."inc/functions.php"; require_once MYBB_ROOT."inc/functions_user.php";
|
require_once MYBB_ADMIN_DIR."inc/class_table.php"; require_once MYBB_ADMIN_DIR."inc/functions.php"; require_once MYBB_ROOT."inc/functions_user.php";
|
| // Set cookie path to our admin dir temporarily, i.e. so that it affects the ACP only $loc = get_current_location('', '', true); $mybb->settings['cookiepath'] = substr($loc, 0, strrpos($loc, "/{$config['admin_dir']}/"))."/{$config['admin_dir']}/";
|
if(!isset($cp_language)) {
| if(!isset($cp_language)) {
|
Zeile 44 | Zeile 53 |
---|
// Load global language phrases $lang->load("global");
|
// Load global language phrases $lang->load("global");
|
| $lang->load("messages", true);
|
if(function_exists('mb_internal_encoding') && !empty($lang->settings['charset'])) { @mb_internal_encoding($lang->settings['charset']);
|
if(function_exists('mb_internal_encoding') && !empty($lang->settings['charset'])) { @mb_internal_encoding($lang->settings['charset']);
|
}
header("Content-type: text/html; charset={$lang->settings['charset']}");
| }
header("Content-type: text/html; charset={$lang->settings['charset']}");
|
$time = TIME_NOW; $errors = null;
| $time = TIME_NOW; $errors = null;
|
Zeile 69 | Zeile 79 |
---|
if(!empty($mybb->settings['cpstyle']) && file_exists(MYBB_ADMIN_DIR."/styles/".$mybb->settings['cpstyle']."/main.css")) { $cp_style = $mybb->settings['cpstyle'];
|
if(!empty($mybb->settings['cpstyle']) && file_exists(MYBB_ADMIN_DIR."/styles/".$mybb->settings['cpstyle']."/main.css")) { $cp_style = $mybb->settings['cpstyle'];
|
} else {
| } else {
|
$cp_style = "default";
|
$cp_style = "default";
|
} }
| } }
|
$default_page = new DefaultPage;
$logged_out = false;
| $default_page = new DefaultPage;
$logged_out = false;
|
Zeile 95 | Zeile 105 |
---|
$user = array(); $error = ''; if($mybb->input['username'])
|
$user = array(); $error = ''; if($mybb->input['username'])
|
{
| {
|
$user = get_user_by_username($mybb->input['username'], array('fields' => '*'));
if(!$user['uid']) { $error = $lang->error_invalid_username;
|
$user = get_user_by_username($mybb->input['username'], array('fields' => '*'));
if(!$user['uid']) { $error = $lang->error_invalid_username;
|
} }
| } }
|
else if($mybb->input['uid']) { $user = get_user($mybb->input['uid']);
| else if($mybb->input['uid']) { $user = get_user($mybb->input['uid']);
|
Zeile 122 | Zeile 132 |
---|
{ $db->delete_query("awaitingactivation", "uid='".(int)$user['uid']."' AND code='".$db->escape_string($mybb->input['token'])."' AND type='l'"); $db->update_query("adminoptions", array('loginlockoutexpiry' => 0, 'loginattempts' => 0), "uid='".(int)$user['uid']."'");
|
{ $db->delete_query("awaitingactivation", "uid='".(int)$user['uid']."' AND code='".$db->escape_string($mybb->input['token'])."' AND type='l'"); $db->update_query("adminoptions", array('loginlockoutexpiry' => 0, 'loginattempts' => 0), "uid='".(int)$user['uid']."'");
|
admin_redirect("index.php"); } else { $error = $lang->error_invalid_token;
| admin_redirect("index.php");
|
}
|
}
|
}
| else { $error = $lang->error_invalid_token; } }
|
$default_page->show_lockout_unlock($error, 'error'); } elseif($mybb->input['do'] == "login") {
|
$default_page->show_lockout_unlock($error, 'error'); } elseif($mybb->input['do'] == "login") {
|
| // We have an adminsid cookie? if(isset($mybb->cookies['adminsid'])) { // Check admin session $query = $db->simple_select("adminsessions", "sid", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'"); $admin_session = $db->fetch_field($query, 'sid');
// Session found: redirect to index if($admin_session) { admin_redirect("index.php"); } }
|
require_once MYBB_ROOT."inc/datahandlers/login.php"; $loginhandler = new LoginDataHandler("get");
|
require_once MYBB_ROOT."inc/datahandlers/login.php"; $loginhandler = new LoginDataHandler("get");
|
| // Determine login method $login_lang_string = $lang->error_invalid_username_password; switch($mybb->settings['username_method']) { case 0: // Username only $login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username); break; case 1: // Email only $login_lang_string = $lang->sprintf($login_lang_string, $lang->login_email); break; case 2: // Username and email default: $login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username_and_password); break; }
|
// Validate PIN first if(!empty($config['secret_pin']) && (empty($mybb->input['pin']) || $mybb->input['pin'] != $config['secret_pin'])) {
|
// Validate PIN first if(!empty($config['secret_pin']) && (empty($mybb->input['pin']) || $mybb->input['pin'] != $config['secret_pin'])) {
|
$default_page->show_login($lang->error_invalid_secret_pin, "error");
| $login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));
if($login_user['uid'] > 0) { $db->update_query("adminoptions", array("loginattempts" => "loginattempts+1"), "uid='".(int)$login_user['uid']."'", '', true); }
$loginattempts = login_attempt_check_acp($login_user['uid'], true);
// Have we attempted too many times? if($loginattempts['loginattempts'] > 0) { // Have we set an expiry yet? if($loginattempts['loginlockoutexpiry'] == 0) { $db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='".(int)$login_user['uid']."'"); }
// Did we hit lockout for the first time? Send the unlock email to the administrator if($loginattempts['loginattempts'] == $mybb->settings['maxloginattempts']) { $db->delete_query("awaitingactivation", "uid='".(int)$login_user['uid']."' AND type='l'"); $lockout_array = array( "uid" => $login_user['uid'], "dateline" => TIME_NOW, "code" => random_str(), "type" => "l" ); $db->insert_query("awaitingactivation", $lockout_array);
$subject = $lang->sprintf($lang->locked_out_subject, $mybb->settings['bbname']); $message = $lang->sprintf($lang->locked_out_message, htmlspecialchars_uni($mybb->input['username']), $mybb->settings['bbname'], $mybb->settings['maxloginattempts'], $mybb->settings['bburl'], $mybb->config['admin_dir'], $lockout_array['code'], $lockout_array['uid']); my_mail($login_user['email'], $subject, $message); }
log_admin_action(array( 'type' => 'admin_locked_out', 'uid' => (int)$login_user['uid'], 'username' => $login_user['username'], ) );
$default_page->show_lockedout(); } else { $default_page->show_login($login_lang_string, "error"); }
|
}
$loginhandler->set_data(array(
| }
$loginhandler->set_data(array(
|
Zeile 149 | Zeile 236 |
---|
'password' => $mybb->input['password'] ));
|
'password' => $mybb->input['password'] ));
|
if($loginhandler->verify_username() !== false && $loginhandler->verify_password() !== false)
| if($loginhandler->validate_login() == true)
|
{ $mybb->user = get_user($loginhandler->login_data['uid']); }
| { $mybb->user = get_user($loginhandler->login_data['uid']); }
|
Zeile 170 | Zeile 257 |
---|
$db->delete_query("adminsessions", "uid='{$mybb->user['uid']}'");
|
$db->delete_query("adminsessions", "uid='{$mybb->user['uid']}'");
|
$sid = md5(uniqid(microtime(true), true));
| $sid = md5(random_str(50));
|
$useragent = $_SERVER['HTTP_USER_AGENT'];
|
$useragent = $_SERVER['HTTP_USER_AGENT'];
|
if(my_strlen($useragent) > 100)
| if(my_strlen($useragent) > 200)
|
{
|
{
|
$useragent = my_substr($useragent, 0, 100);
| $useragent = my_substr($useragent, 0, 200);
|
}
// Create a new admin session for this user
| }
// Create a new admin session for this user
|
Zeile 186 | Zeile 273 |
---|
"ip" => $db->escape_binary(my_inet_pton(get_ip())), "dateline" => TIME_NOW, "lastactive" => TIME_NOW,
|
"ip" => $db->escape_binary(my_inet_pton(get_ip())), "dateline" => TIME_NOW, "lastactive" => TIME_NOW,
|
"data" => serialize(array()),
| "data" => my_serialize(array()),
|
"useragent" => $db->escape_string($useragent), ); $db->insert_query("adminsessions", $admin_session); $admin_session['data'] = array();
|
"useragent" => $db->escape_string($useragent), ); $db->insert_query("adminsessions", $admin_session); $admin_session['data'] = array();
|
$db->update_query("adminoptions", array("loginattempts" => 0, "loginlockoutexpiry" => 0), "uid='".(int)$mybb->user['uid']."'");
| // Only reset the loginattempts when we're really logged in and the user doesn't need to enter a 2fa code $query = $db->simple_select("adminoptions", "authsecret", "uid='{$mybb->user['uid']}'"); $admin_options = $db->fetch_array($query); if(empty($admin_options['authsecret'])) { $db->update_query("adminoptions", array("loginattempts" => 0, "loginlockoutexpiry" => 0), "uid='{$mybb->user['uid']}'"); }
|
my_setcookie("adminsid", $sid, '', true); my_setcookie('acploginattempts', 0); $post_verify = false;
| my_setcookie("adminsid", $sid, '', true); my_setcookie('acploginattempts', 0); $post_verify = false;
|
Zeile 219 | Zeile 314 |
---|
if(substr($parameters[0], 0, 8) == '?module=') { unset($parameters[0]);
|
if(substr($parameters[0], 0, 8) == '?module=') { unset($parameters[0]);
|
}
| }
|
foreach($parameters as $key => $param) {
| foreach($parameters as $key => $param) {
|
Zeile 239 | Zeile 334 |
---|
if($login_user['uid'] > 0) { $db->update_query("adminoptions", array("loginattempts" => "loginattempts+1"), "uid='".(int)$login_user['uid']."'", '', true);
|
if($login_user['uid'] > 0) { $db->update_query("adminoptions", array("loginattempts" => "loginattempts+1"), "uid='".(int)$login_user['uid']."'", '', true);
|
}
$loginattempts = login_attempt_check_acp($login_user['uid'], true);
// Have we attempted too many times?
| }
$loginattempts = login_attempt_check_acp($login_user['uid'], true);
// Have we attempted too many times?
|
if($loginattempts['loginattempts'] > 0) { // Have we set an expiry yet? if($loginattempts['loginlockoutexpiry'] == 0) { $db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='".(int)$login_user['uid']."'");
|
if($loginattempts['loginattempts'] > 0) { // Have we set an expiry yet? if($loginattempts['loginlockoutexpiry'] == 0) { $db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='".(int)$login_user['uid']."'");
|
}
| }
|
// Did we hit lockout for the first time? Send the unlock email to the administrator if($loginattempts['loginattempts'] == $mybb->settings['maxloginattempts'])
| // Did we hit lockout for the first time? Send the unlock email to the administrator if($loginattempts['loginattempts'] == $mybb->settings['maxloginattempts'])
|
Zeile 278 | Zeile 373 |
---|
$default_page->show_lockedout(); }
|
$default_page->show_lockedout(); }
|
|
|
$fail_check = 1; } }
| $fail_check = 1; } }
|
Zeile 297 | Zeile 392 |
---|
// No matching admin session found - show message on login screen if(!$admin_session['sid'])
|
// No matching admin session found - show message on login screen if(!$admin_session['sid'])
|
{ $login_message = $lang->error_invalid_admin_session;
| { $login_message = $lang->error_invalid_admin_session;
|
} else {
| } else {
|
Zeile 308 | Zeile 403 |
---|
$mybb->user = get_user($admin_session['uid']);
// Login key has changed - force logout
|
$mybb->user = get_user($admin_session['uid']);
// Login key has changed - force logout
|
if(!$mybb->user['uid'] || $mybb->user['loginkey'] != $admin_session['loginkey'])
| if(!$mybb->user['uid'] || $mybb->user['loginkey'] !== $admin_session['loginkey'])
|
{ unset($mybb->user); }
| { unset($mybb->user); }
|
Zeile 320 | Zeile 415 |
---|
$login_message = $lang->error_admin_session_expired; $db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'"); unset($mybb->user);
|
$login_message = $lang->error_admin_session_expired; $db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'"); unset($mybb->user);
|
}
| }
|
// If IP matching is set - check IP address against the session IP
|
// If IP matching is set - check IP address against the session IP
|
else if(ADMIN_IP_SEGMENTS > 0) {
| else if(ADMIN_IP_SEGMENTS > 0 && strpos($ip_address, ':') === false) {
|
$exploded_ip = explode(".", $ip_address);
|
$exploded_ip = explode(".", $ip_address);
|
$exploded_admin_ip = explode(".", $admin_session['ip']); $matches = 0; $valid_ip = false;
| $exploded_admin_ip = explode(".", my_inet_ntop($admin_session['ip'])); $matches = 0; $valid_ip = false;
|
for($i = 0; $i < ADMIN_IP_SEGMENTS; ++$i) { if($exploded_ip[$i] == $exploded_admin_ip[$i]) { ++$matches; }
|
for($i = 0; $i < ADMIN_IP_SEGMENTS; ++$i) { if($exploded_ip[$i] == $exploded_admin_ip[$i]) { ++$matches; }
|
if($matches == ADMIN_IP_SEGMENTS)
| if($matches == ADMIN_IP_SEGMENTS) { $valid_ip = true; break; } }
// IP doesn't match properly - show message on logon screen if(!$valid_ip) { $login_message = $lang->error_invalid_ip; unset($mybb->user); } } else if(ADMIN_IPV6_SEGMENTS > 0 && strpos($ip_address, ':') !== false) { // Expand IPv6 addresses $hex = unpack("H*hex", my_inet_pton($ip_address)); $expanded_ip = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex['hex']), 0, -1); $hex_admin = unpack("H*hex", $admin_session['ip']); $expanded_admin_ip = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex_admin['hex']), 0, -1);
$exploded_ip = explode(":", $expanded_ip); $exploded_admin_ip = explode(":", $expanded_admin_ip); $matches = 0; $valid_ip = false; for($i = 0; $i < ADMIN_IPV6_SEGMENTS; ++$i) { if($exploded_ip[$i] == $exploded_admin_ip[$i]) { ++$matches; } if($matches == ADMIN_IPV6_SEGMENTS)
|
{ $valid_ip = true; break;
| { $valid_ip = true; break;
|
Zeile 356 | Zeile 483 |
---|
if($mybb->input['action'] == "logout" && $mybb->user) { if(verify_post_check($mybb->input['my_post_key']))
|
if($mybb->input['action'] == "logout" && $mybb->user) { if(verify_post_check($mybb->input['my_post_key']))
|
{
| {
|
$db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'"); my_unsetcookie('adminsid'); $logged_out = true;
| $db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'"); my_unsetcookie('adminsid'); $logged_out = true;
|
Zeile 397 | Zeile 524 |
---|
$cp_language = $admin_options['cplanguage']; $lang->set_language($cp_language, "admin"); $lang->load("global"); // Reload global language vars
|
$cp_language = $admin_options['cplanguage']; $lang->set_language($cp_language, "admin"); $lang->load("global"); // Reload global language vars
|
| $lang->load("messages", true);
|
}
if(!empty($admin_options['cpstyle']) && file_exists(MYBB_ADMIN_DIR."/styles/{$admin_options['cpstyle']}/main.css"))
| }
if(!empty($admin_options['cpstyle']) && file_exists(MYBB_ADMIN_DIR."/styles/{$admin_options['cpstyle']}/main.css"))
|
Zeile 450 | Zeile 578 |
---|
} elseif($fail_check == 1) {
|
} elseif($fail_check == 1) {
|
$login_lang_string = $lang->error_invalid_username_password;
switch($mybb->settings['username_method']) { case 0: // Username only $login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username); break; case 1: // Email only $login_lang_string = $lang->sprintf($login_lang_string, $lang->login_email); break; case 2: // Username and email default: $login_lang_string = $lang->sprintf($login_lang_string, $lang->login_username_and_password); break; }
| |
$page->show_login($login_lang_string, "error");
|
$page->show_login($login_lang_string, "error");
|
} else {
| } else {
|
// If we have this error while retreiving it from an AJAX request, then send back a nice error if(isset($mybb->input['ajax']) && $mybb->input['ajax'] == 1) { echo json_encode(array("errors" => array("login"))); exit;
|
// If we have this error while retreiving it from an AJAX request, then send back a nice error if(isset($mybb->input['ajax']) && $mybb->input['ajax'] == 1) { echo json_encode(array("errors" => array("login"))); exit;
|
}
| }
|
$page->show_login($login_message, "error"); }
|
$page->show_login($login_message, "error"); }
|
| }
// Time to check for Two-Factor Authentication // First: are we trying to verify a code? if($mybb->input['do'] == "do_2fa" && $mybb->request_method == "post") { // Test whether it's a recovery code $recovery = false; $codes = my_unserialize($admin_options['recovery_codes']); if(!empty($codes) && in_array($mybb->get_input('code'), $codes)) { $recovery = true; $ncodes = array_diff($codes, array($mybb->input['code'])); // Removes our current code from the codes array $db->update_query("adminoptions", array("recovery_codes" => $db->escape_string(my_serialize($ncodes))), "uid='{$mybb->user['uid']}'");
if(count($ncodes) == 0) { flash_message($lang->my2fa_no_codes, "error"); } }
// Validate the code require_once MYBB_ROOT."inc/3rdparty/2fa/GoogleAuthenticator.php"; $auth = new PHPGangsta_GoogleAuthenticator;
$test = $auth->verifyCode($admin_options['authsecret'], $mybb->get_input('code'));
// Either the code was okay or it was a recovery code if($test === true || $recovery === true) { // Correct code -> session authenticated $db->update_query("adminsessions", array("authenticated" => 1), "sid='".$db->escape_string($mybb->cookies['adminsid'])."'"); $admin_session['authenticated'] = 1; $db->update_query("adminoptions", array("loginattempts" => 0, "loginlockoutexpiry" => 0), "uid='{$mybb->user['uid']}'"); my_setcookie('acploginattempts', 0); // post would result in an authorization code mismatch error $mybb->request_method = "get"; } else { // Wrong code -> close session (aka logout) $db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'"); my_unsetcookie('adminsid');
// Now test whether we need to lock this guy completly $db->update_query("adminoptions", array("loginattempts" => "loginattempts+1"), "uid='{$mybb->user['uid']}'", '', true);
$loginattempts = login_attempt_check_acp($mybb->user['uid'], true);
// Have we attempted too many times? if($loginattempts['loginattempts'] > 0) { // Have we set an expiry yet? if($loginattempts['loginlockoutexpiry'] == 0) { $db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='{$mybb->user['uid']}'"); }
// Did we hit lockout for the first time? Send the unlock email to the administrator if($loginattempts['loginattempts'] == $mybb->settings['maxloginattempts']) { $db->delete_query("awaitingactivation", "uid='{$mybb->user['uid']}' AND type='l'"); $lockout_array = array( "uid" => $mybb->user['uid'], "dateline" => TIME_NOW, "code" => random_str(), "type" => "l" ); $db->insert_query("awaitingactivation", $lockout_array);
$subject = $lang->sprintf($lang->locked_out_subject, $mybb->settings['bbname']); $message = $lang->sprintf($lang->locked_out_message, htmlspecialchars_uni($mybb->user['username']), $mybb->settings['bbname'], $mybb->settings['maxloginattempts'], $mybb->settings['bburl'], $mybb->config['admin_dir'], $lockout_array['code'], $lockout_array['uid']); my_mail($mybb->user['email'], $subject, $message); }
log_admin_action(array( 'type' => 'admin_locked_out', 'uid' => $mybb->user['uid'], 'username' => $mybb->user['username'], ) );
$page->show_lockedout(); }
// Still here? Show a custom login page $page->show_login($lang->my2fa_failed, "error"); } }
// Show our 2FA page if(!empty($admin_options['authsecret']) && $admin_session['authenticated'] != 1) { $page->show_2fa();
|
}
$page->add_breadcrumb_item($lang->home, "index.php");
| }
$page->add_breadcrumb_item($lang->home, "index.php");
|
Zeile 582 | Zeile 788 |
---|
if($post_verify == true) { // If the post key does not match we switch the action to GET and set a message to show the user
|
if($post_verify == true) { // If the post key does not match we switch the action to GET and set a message to show the user
|
if(!isset($mybb->input['my_post_key']) || $mybb->post_code != $mybb->input['my_post_key'])
| if(!isset($mybb->input['my_post_key']) || $mybb->post_code !== $mybb->input['my_post_key'])
|
{ $mybb->request_method = "get"; $page->show_post_verify_error = true;
| { $mybb->request_method = "get"; $page->show_post_verify_error = true;
|