Vergleich admin/index.php - 1.8.0 - 1.8.5

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 15Zeile 15
define("ADMIN_IP_SEGMENTS", 0);

require_once dirname(dirname(__FILE__))."/inc/init.php";

define("ADMIN_IP_SEGMENTS", 0);

require_once dirname(dirname(__FILE__))."/inc/init.php";

 

$shutdown_queries = $shutdown_functions = array();


send_page_headers();


send_page_headers();





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));

require_once MYBB_ADMIN_DIR."inc/class_page.php";

define('COPY_YEAR', my_date('Y', TIME_NOW));

require_once MYBB_ADMIN_DIR."inc/class_page.php";

Zeile 32Zeile 34
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(!file_exists(MYBB_ROOT."inc/languages/".$mybb->settings['cplanguage']."/admin/home_dashboard.lang.php"))
{
$mybb->settings['cplanguage'] = "english";


if(!isset($cp_language))
{
if(!file_exists(MYBB_ROOT."inc/languages/".$mybb->settings['cplanguage']."/admin/home_dashboard.lang.php"))
{
$mybb->settings['cplanguage'] = "english";

	}

	}

	$lang->set_language($mybb->settings['cplanguage'], "admin");
}


	$lang->set_language($mybb->settings['cplanguage'], "admin");
}


Zeile 59Zeile 65
{
$mybb->trigger_generic_error("install_directory");
}

{
$mybb->trigger_generic_error("install_directory");
}





$ip_address = get_ip();
unset($user);


$ip_address = get_ip();
unset($user);


Zeile 73Zeile 79
	else
{
$cp_style = "default";

	else
{
$cp_style = "default";

	}

	}

}

$default_page = new DefaultPage;

}

$default_page = new DefaultPage;

Zeile 107Zeile 113
	{
$user = get_user($mybb->input['uid']);
if(!$user['uid'])

	{
$user = get_user($mybb->input['uid']);
if(!$user['uid'])

		{

		{

			$error = $lang->error_invalid_uid;
}
}

			$error = $lang->error_invalid_uid;
}
}

Zeile 128Zeile 134
		else
{
$error = $lang->error_invalid_token;

		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");





	// 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(

	}

$loginhandler->set_data(array(

Zeile 149Zeile 216
		'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 186Zeile 253
			"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']."'");
my_setcookie("adminsid", $sid);










// 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('acploginattempts', 0);
$post_verify = false;


Zeile 306Zeile 381

// Fetch the user from the admin session
$mybb->user = get_user($admin_session['uid']);


// Fetch the user from the admin session
$mybb->user = get_user($admin_session['uid']);





			// Login key has changed - force logout
if(!$mybb->user['uid'] || $mybb->user['loginkey'] != $admin_session['loginkey'])
{

			// Login key has changed - force logout
if(!$mybb->user['uid'] || $mybb->user['loginkey'] != $admin_session['loginkey'])
{

Zeile 478Zeile 553
		}
$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");