Vergleich admin/index.php - 1.8.8 - 1.8.26

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 22Zeile 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 104Zeile 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 111Zeile 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 119Zeile 123
		if(!$user['uid'])
{
$error = $lang->error_invalid_uid;

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

		}

		}

	}

	}





	// Do we have the token? If so let's process it
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'");

	// Do we have the token? If so let's process it
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)


// If we're good to go
if($db->fetch_field($query, "num") > 0)

Zeile 145Zeile 151
}
elseif($mybb->input['do'] == "login")
{

}
elseif($mybb->input['do'] == "login")
{

 
	$plugins->run_hooks("admin_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');

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

		// Session found: redirect to index
if($admin_session)
{

Zeile 162Zeile 170
	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']))


	// Determine login method
$login_lang_string = $lang->error_invalid_username_password;
switch($mybb->settings['username_method'])

	{

	{

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


















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

$plugins->run_hooks("admin_login_incorrect_pin");


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


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

Zeile 181Zeile 207
			if($loginattempts['loginlockoutexpiry'] == 0)
{
$db->update_query("adminoptions", array("loginlockoutexpiry" => TIME_NOW+((int)$mybb->settings['loginattemptstimeout']*60)), "uid='".(int)$login_user['uid']."'");

			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 211Zeile 237
		}
else
{

		}
else
{

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

			$default_page->show_login($login_lang_string, "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']

Zeile 228Zeile 254
	if($mybb->user['uid'])
{
if(login_attempt_check_acp($mybb->user['uid']) == true)

	if($mybb->user['uid'])
{
if(login_attempt_check_acp($mybb->user['uid']) == true)

		{
log_admin_action(array(

		{
log_admin_action(array(

					'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'],

Zeile 237Zeile 263
			);

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





		$sid = md5(random_str(50));

$useragent = $_SERVER['HTTP_USER_AGENT'];
if(my_strlen($useragent) > 200)

		$sid = md5(random_str(50));

$useragent = $_SERVER['HTTP_USER_AGENT'];
if(my_strlen($useragent) > 200)

		{

		{

			$useragent = my_substr($useragent, 0, 200);
}


			$useragent = my_substr($useragent, 0, 200);
}


Zeile 271Zeile 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 293Zeile 321
				// So what do we do? We know that parameters are devided by ampersands
// That means we must get to work!
$parameters = explode('&', $qstring);

				// So what do we do? We know that parameters are devided by ampersands
// That means we must get to work!
$parameters = explode('&', $qstring);





				// Remove our first member if it's for the module
if(substr($parameters[0], 0, 8) == '?module=')
{
unset($parameters[0]);

				// Remove our first member if it's for the module
if(substr($parameters[0], 0, 8) == '?module=')
{
unset($parameters[0]);

				}

				}


foreach($parameters as $key => $param)
{


foreach($parameters as $key => $param)
{

Zeile 306Zeile 334

$query_string .= '&'.htmlspecialchars_uni($params[0])."=".htmlspecialchars_uni($params[1]);
}


$query_string .= '&'.htmlspecialchars_uni($params[0])."=".htmlspecialchars_uni($params[1]);
}

			}


			}


			admin_redirect("index.php".$query_string);
}
}
else
{
$login_user = get_user_by_username($mybb->input['username'], array('fields' => array('email', 'username')));

			admin_redirect("index.php".$query_string);
}
}
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 330Zeile 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 414Zeile 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;

						{
$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

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

					$hex = unpack("H*hex", my_inet_pton($ip_address));

					$expanded_ip = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex['hex']), 0, -1);

					$expanded_ip = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex['hex']), 0, -1);

					$hex_admin = unpack("H*hex", $admin_session['ip']);         

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

					$expanded_admin_ip = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex_admin['hex']), 0, -1);

$exploded_ip = explode(":", $expanded_ip);

Zeile 442Zeile 474
					for($i = 0; $i < ADMIN_IPV6_SEGMENTS; ++$i)
{
if($exploded_ip[$i] == $exploded_admin_ip[$i])

					for($i = 0; $i < ADMIN_IPV6_SEGMENTS; ++$i)
{
if($exploded_ip[$i] == $exploded_admin_ip[$i])

						{

						{

							++$matches;
}
if($matches == ADMIN_IPV6_SEGMENTS)

							++$matches;
}
if($matches == ADMIN_IPV6_SEGMENTS)

Zeile 466Zeile 498

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 503Zeile 537
	$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"))


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

	{

	{

		$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['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'];


		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 562Zeile 600
	}
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");
}
else

		$page->show_login($login_lang_string, "error");
}
else

Zeile 589Zeile 611
			exit;
}
$page->show_login($login_message, "error");

			exit;
}
$page->show_login($login_message, "error");

	}

	}

}

// Time to check for Two-Factor Authentication

}

// Time to check for Two-Factor Authentication

Zeile 625Zeile 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 788Zeile 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;