Vergleich admin/index.php - 1.8.7 - 1.8.24

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 11Zeile 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";


Zeile 21Zeile 22
send_page_headers();

header('X-Frame-Options: SAMEORIGIN');

 
send_page_headers();

header('X-Frame-Options: SAMEORIGIN');

 
header('Referrer-Policy: no-referrer');


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 103Zeile 105
{
	$user = array();
	$error = '';

 
{
	$user = array();
	$error = '';

 

	$plugins->run_hooks("admin_unlock_start");


	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' => '*'));

Zeile 110Zeile 115
		if(!$user['uid'])
		{
			$error = $lang->error_invalid_username;

 
		if(!$user['uid'])
		{
			$error = $lang->error_invalid_username;

		}

		}

	}
	else if($mybb->input['uid'])
	{

	}
	else if($mybb->input['uid'])
	{

Zeile 125Zeile 130
	if($mybb->input['token'] && $user['uid'])
	{
		$query = $db->simple_select("awaitingactivation", "COUNT(aid) AS num", "uid='".(int)$user['uid']."' AND code='".$db->escape_string($mybb->input['token'])."' AND type='l'");

 
	if($mybb->input['token'] && $user['uid'])
	{
		$query = $db->simple_select("awaitingactivation", "COUNT(aid) AS num", "uid='".(int)$user['uid']."' AND code='".$db->escape_string($mybb->input['token'])."' AND type='l'");

 

		$plugins->run_hooks("admin_unlock_end");


		// If we're good to go
		if($db->fetch_field($query, "num") > 0)
		{
			$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']."'");

 

		// If we're good to go
		if($db->fetch_field($query, "num") > 0)
		{
			$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");

 
			admin_redirect("index.php");

		}

		}

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

 
	$plugins->run_hooks("admin_login");


	// We have an adminsid cookie?
	if(isset($mybb->cookies['adminsid']))
	{

	// We have an adminsid cookie?
	if(isset($mybb->cookies['adminsid']))
	{

Zeile 160Zeile 169

	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']))
	{
		$login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));

 

	// Validate PIN first
	if(!empty($config['secret_pin']) && (empty($mybb->input['pin']) || $mybb->input['pin'] != $config['secret_pin']))
	{
		$login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));

 

		$plugins->run_hooks("admin_login_incorrect_pin");


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


		}

		$loginattempts = login_attempt_check_acp($login_user['uid'], true);


		// Have we attempted too many times?
		if($loginattempts['loginattempts'] > 0)
		{

		// Have we attempted too many times?
		if($loginattempts['loginattempts'] > 0)
		{

Zeile 210Zeile 237
		}
		else
		{

 
		}
		else
		{

			$default_page->show_login($lang->error_invalid_secret_pin, "error");

			$default_page->show_login($login_lang_string, "error");

		}
	}


		}
	}


Zeile 220Zeile 247
	));

	if($loginhandler->validate_login() == true)

 
	));

	if($loginhandler->validate_login() == true)

	{

	{

		$mybb->user = get_user($loginhandler->login_data['uid']);
	}


		$mybb->user = get_user($loginhandler->login_data['uid']);
	}


Zeile 234Zeile 261
					'username' => $mybb->user['username'],
				)
			);

 
					'username' => $mybb->user['username'],
				)
			);





			$default_page->show_lockedout();
		}

 
			$default_page->show_lockedout();
		}

 

		$plugins->run_hooks("admin_login_success");


		$db->delete_query("adminsessions", "uid='{$mybb->user['uid']}'");



		$db->delete_query("adminsessions", "uid='{$mybb->user['uid']}'");


Zeile 270Zeile 299
			$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']}'");
		}


		my_setcookie("adminsid", $sid, '', true);

		my_setcookie("adminsid", $sid, '', true, "lax");

		my_setcookie('acploginattempts', 0);
		$post_verify = false;


		my_setcookie('acploginattempts', 0);
		$post_verify = false;


Zeile 313Zeile 342
	else
	{
		$login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));

 
	else
	{
		$login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));

 

		$plugins->run_hooks("admin_login_fail");


		if($login_user['uid'] > 0)

 

		if($login_user['uid'] > 0)

		{

		{

			$db->update_query("adminoptions", array("loginattempts" => "loginattempts+1"), "uid='".(int)$login_user['uid']."'", '', true);
		}


			$db->update_query("adminoptions", array("loginattempts" => "loginattempts+1"), "uid='".(int)$login_user['uid']."'", '', true);
		}


Zeile 329Zeile 360
			{
				$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']."'");
			}

 

			$plugins->run_hooks("admin_login_lockout");


			// 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 386Zeile 419
			$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 400Zeile 433
					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 413Zeile 446
							++$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 428Zeile 493
				}
			}
		}

 
				}
			}
		}

	}
}


	}
}


if($mybb->input['action'] == "logout" && $mybb->user)
{

 
if($mybb->input['action'] == "logout" && $mybb->user)
{

 
	$plugins->run_hooks("admin_logout");


	if(verify_post_check($mybb->input['my_post_key']))
	{
		$db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");

	if(verify_post_check($mybb->input['my_post_key']))
	{
		$db->delete_query("adminsessions", "sid='".$db->escape_string($mybb->cookies['adminsid'])."'");

Zeile 457Zeile 524
{
	$uid = 0;
	if(isset($mybb->user['uid']))

 
{
	$uid = 0;
	if(isset($mybb->user['uid']))

	{

	{

		$uid = (int)$mybb->user['uid'];
	}
	$db->delete_query("adminsessions", "uid = '{$uid}'");

		$uid = (int)$mybb->user['uid'];
	}
	$db->delete_query("adminsessions", "uid = '{$uid}'");

Zeile 469Zeile 536
{
	$query = $db->simple_select("adminoptions", "*", "uid='".$mybb->user['uid']."'");
	$admin_options = $db->fetch_array($query);

 
{
	$query = $db->simple_select("adminoptions", "*", "uid='".$mybb->user['uid']."'");
	$admin_options = $db->fetch_array($query);


	if(!empty($admin_options['cplanguage']) && file_exists(MYBB_ROOT."inc/languages/".$admin_options['cplanguage']."/admin/home_dashboard.lang.php"))
	{
		$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"))


	// Only update language / theme once fully authenticated
	if(empty($admin_options['authsecret']) || $admin_session['authenticated'] == 1)








	{

 
	{

		$cp_style = $admin_options['cpstyle'];












		if(!empty($admin_options['cplanguage']) && file_exists(MYBB_ROOT."inc/languages/".$admin_options['cplanguage']."/admin/home_dashboard.lang.php"))
		{
			$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"))
		{
			$cp_style = $admin_options['cpstyle'];
		}

	}

	// Update the session information in the DB

	}

	// Update the session information in the DB

Zeile 522Zeile 593

// Do not have a valid Admin user, throw back to login page.
if(!isset($mybb->user['uid']) || $logged_out == true)

 

// Do not have a valid Admin user, throw back to login page.
if(!isset($mybb->user['uid']) || $logged_out == true)

{

{

	if($logged_out == true)

 
	if($logged_out == true)

	{

	{

		$page->show_login($lang->success_logged_out);
	}
	elseif($fail_check == 1)

 
		$page->show_login($lang->success_logged_out);
	}
	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");
	}
	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)

 
		$page->show_login($login_lang_string, "error");
	}
	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;
		}
		$page->show_login($login_message, "error");
	}
}

 
			echo json_encode(array("errors" => array("login")));
			exit;
		}
		$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")

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

Zeile 571Zeile 626
		$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']}'");

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

		if(count($ncodes) == 0)
		{
			flash_message($lang->my2fa_no_codes, "error");

Zeile 592Zeile 647
		$admin_session['authenticated'] = 1;
		$db->update_query("adminoptions", array("loginattempts" => 0, "loginlockoutexpiry" => 0), "uid='{$mybb->user['uid']}'");
		my_setcookie('acploginattempts', 0);

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

		admin_redirect("index.php");


	}
	else
	{

	}
	else
	{

Zeile 755Zeile 809
	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(!verify_post_check($mybb->input['my_post_key'], true))

		{
			$mybb->request_method = "get";
			$page->show_post_verify_error = true;

		{
			$mybb->request_method = "get";
			$page->show_post_verify_error = true;