| 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";
$shutdown_queries = $shutdown_functions = array();
send_page_headers();
|
require_once dirname(dirname(__FILE__))."/inc/init.php";
$shutdown_queries = $shutdown_functions = array();
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"))
{
|
| Zeile 50 | 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']))
{
|
if(function_exists('mb_internal_encoding') && !empty($lang->settings['charset']))
{
|
| Zeile 103 | Zeile 107 |
|---|
if($mybb->input['username'])
{
$user = get_user_by_username($mybb->input['username'], array('fields' => '*'));
|
if($mybb->input['username'])
{
$user = get_user_by_username($mybb->input['username'], array('fields' => '*'));
|
|
|
if(!$user['uid'])
{
$error = $lang->error_invalid_username;
| if(!$user['uid'])
{
$error = $lang->error_invalid_username;
|
| Zeile 161 | Zeile 165 |
|---|
// 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($lang->error_invalid_secret_pin, "error");
}
|
}
$loginhandler->set_data(array(
'username' => $mybb->input['username'],
'password' => $mybb->input['password']
));
|
}
$loginhandler->set_data(array(
'username' => $mybb->input['username'],
'password' => $mybb->input['password']
));
|
|
|
if($loginhandler->validate_login() == true)
{
$mybb->user = get_user($loginhandler->login_data['uid']);
| if($loginhandler->validate_login() == true)
{
$mybb->user = get_user($loginhandler->login_data['uid']);
|
| Zeile 182 | Zeile 233 |
|---|
'type' => 'admin_locked_out',
'uid' => (int)$mybb->user['uid'],
'username' => $mybb->user['username'],
|
'type' => 'admin_locked_out',
'uid' => (int)$mybb->user['uid'],
'username' => $mybb->user['username'],
|
)
);
$default_page->show_lockedout();
}
| )
);
$default_page->show_lockedout();
}
|
$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 213 | Zeile 264 |
|---|
$admin_session['data'] = array();
// Only reset the loginattempts when we're really logged in and the user doesn't need to enter a 2fa code
|
$admin_session['data'] = array();
// 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", "2fasecret", "uid='{$mybb->user['uid']}'");
| $query = $db->simple_select("adminoptions", "authsecret", "uid='{$mybb->user['uid']}'");
|
$admin_options = $db->fetch_array($query);
|
$admin_options = $db->fetch_array($query);
|
if(empty($admin_options['2fasecret']))
| if(empty($admin_options['authsecret']))
|
{
$db->update_query("adminoptions", array("loginattempts" => 0, "loginlockoutexpiry" => 0), "uid='{$mybb->user['uid']}'");
}
| {
$db->update_query("adminoptions", array("loginattempts" => 0, "loginlockoutexpiry" => 0), "uid='{$mybb->user['uid']}'");
}
|
| Zeile 276 | Zeile 327 |
|---|
{
// Have we set an expiry yet?
if($loginattempts['loginlockoutexpiry'] == 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']."'");
}
| $db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='".(int)$login_user['uid']."'");
}
|
| Zeile 336 | Zeile 387 |
|---|
$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 350 | Zeile 401 |
|---|
unset($mybb->user);
}
// If IP matching is set - check IP address against the session IP
|
unset($mybb->user);
}
// 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']);
| $exploded_admin_ip = explode(".", my_inet_ntop($admin_session['ip']));
|
$matches = 0;
$valid_ip = false;
for($i = 0; $i < ADMIN_IP_SEGMENTS; ++$i)
| $matches = 0;
$valid_ip = false;
for($i = 0; $i < ADMIN_IP_SEGMENTS; ++$i)
|
| Zeile 363 | Zeile 414 |
|---|
++$matches;
}
if($matches == ADMIN_IP_SEGMENTS)
|
++$matches;
}
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 425 | Zeile 508 |
|---|
$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 531 | Zeile 615 |
|---|
require_once MYBB_ROOT."inc/3rdparty/2fa/GoogleAuthenticator.php";
$auth = new PHPGangsta_GoogleAuthenticator;
|
require_once MYBB_ROOT."inc/3rdparty/2fa/GoogleAuthenticator.php";
$auth = new PHPGangsta_GoogleAuthenticator;
|
$test = $auth->verifyCode($admin_options['2fasecret'], $mybb->get_input('code'));
| $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)
|
// Either the code was okay or it was a recovery code
if($test === true || $recovery === true)
|
| Zeile 597 | Zeile 681 |
|---|
}
// Show our 2FA page
|
}
// Show our 2FA page
|
if(!empty($admin_options['2fasecret']) && $admin_session['authenticated'] != 1)
| if(!empty($admin_options['authsecret']) && $admin_session['authenticated'] != 1)
|
{
$page->show_2fa();
}
| {
$page->show_2fa();
}
|
| Zeile 704 | 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;
|