bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bugfix: getApp() in sessionAuth()

Browse source
This commit is contained in:
rabuzarus 2018-01-10 22:21:22 +01:00
parent d23c1c0da7
commit 186b6330b9
1 changed files with 307 additions and 306 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

613
src/Module/Login.php
View file

@ -1,306 +1,307 @@
<?php <?php
namespace Friendica\Module; namespace Friendica\Module;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\User; use Friendica\Model\User;
use dba; use dba;
require_once 'boot.php'; require_once 'boot.php';
require_once 'include/datetime.php'; require_once 'include/datetime.php';
require_once 'include/pgettext.php'; require_once 'include/pgettext.php';
require_once 'include/security.php'; require_once 'include/security.php';
require_once 'include/text.php'; require_once 'include/text.php';
/** /**
* Login module * Login module
* *
* @author Hypolite Petovan mrpetovan@gmail.com * @author Hypolite Petovan mrpetovan@gmail.com
*/ */
class Login extends BaseModule class Login extends BaseModule
{ {
public static function content() public static function content()
{ {
$a = self::getApp(); $a = self::getApp();
if (x($_SESSION, 'theme')) { if (x($_SESSION, 'theme')) {
unset($_SESSION['theme']); unset($_SESSION['theme']);
} }
if (x($_SESSION, 'mobile-theme')) { if (x($_SESSION, 'mobile-theme')) {
unset($_SESSION['mobile-theme']); unset($_SESSION['mobile-theme']);
} }
if (local_user()) { if (local_user()) {
goaway(self::getApp()->get_baseurl()); goaway(self::getApp()->get_baseurl());
} }
return self::form(self::getApp()->get_baseurl(), $a->config['register_policy'] != REGISTER_CLOSED); return self::form(self::getApp()->get_baseurl(), $a->config['register_policy'] != REGISTER_CLOSED);
} }
public static function post() public static function post()
{ {
session_unset(); session_unset();
// OpenId Login // OpenId Login
if ( if (
!x($_POST, 'password') !x($_POST, 'password')
&& ( && (
x($_POST, 'openid_url') x($_POST, 'openid_url')
|| x($_POST, 'username') || x($_POST, 'username')
) )
) { ) {
$noid = Config::get('system', 'no_openid'); $noid = Config::get('system', 'no_openid');
$openid_url = trim($_POST['openid_url'] ? : $_POST['username']); $openid_url = trim($_POST['openid_url'] ? : $_POST['username']);
// if it's an email address or doesn't resolve to a URL, fail. // if it's an email address or doesn't resolve to a URL, fail.
if ($noid || strpos($openid_url, '@') || !validate_url($openid_url)) { if ($noid || strpos($openid_url, '@') || !validate_url($openid_url)) {
notice(t('Login failed.') . EOL); notice(t('Login failed.') . EOL);
goaway(self::getApp()->get_baseurl()); goaway(self::getApp()->get_baseurl());
// NOTREACHED // NOTREACHED
} }
// Otherwise it's probably an openid. // Otherwise it's probably an openid.
try { try {
require_once 'library/openid.php'; require_once 'library/openid.php';
$openid = new LightOpenID; $openid = new LightOpenID;
$openid->identity = $openid_url; $openid->identity = $openid_url;
$_SESSION['openid'] = $openid_url; $_SESSION['openid'] = $openid_url;
$_SESSION['remember'] = $_POST['remember']; $_SESSION['remember'] = $_POST['remember'];
$openid->returnUrl = self::getApp()->get_baseurl(true) . '/openid'; $openid->returnUrl = self::getApp()->get_baseurl(true) . '/openid';
goaway($openid->authUrl()); goaway($openid->authUrl());
} catch (Exception $e) { } catch (Exception $e) {
notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '<br /><br >' . t('The error message was:') . ' ' . $e->getMessage()); notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '<br /><br >' . t('The error message was:') . ' ' . $e->getMessage());
} }
// NOTREACHED // NOTREACHED
} }
if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') { if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') {
$record = null; $record = null;
$addon_auth = array( $addon_auth = array(
'username' => trim($_POST['username']), 'username' => trim($_POST['username']),
'password' => trim($_POST['password']), 'password' => trim($_POST['password']),
'authenticated' => 0, 'authenticated' => 0,
'user_record' => null 'user_record' => null
); );
/* /*
* A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record * A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record
* Plugins should never set 'authenticated' except to indicate success - as hooks may be chained * Plugins should never set 'authenticated' except to indicate success - as hooks may be chained
* and later plugins should not interfere with an earlier one that succeeded. * and later plugins should not interfere with an earlier one that succeeded.
*/ */
call_hooks('authenticate', $addon_auth); call_hooks('authenticate', $addon_auth);
if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) { if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) {
$record = $addon_auth['user_record']; $record = $addon_auth['user_record'];
} else { } else {
$user_id = User::authenticate(trim($_POST['username']), trim($_POST['password'])); $user_id = User::authenticate(trim($_POST['username']), trim($_POST['password']));
if ($user_id) { if ($user_id) {
$record = dba::selectFirst('user', [], ['uid' => $user_id]); $record = dba::selectFirst('user', [], ['uid' => $user_id]);
} }
} }
if (!$record || !count($record)) { if (!$record || !count($record)) {
logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']); logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
notice(t('Login failed.') . EOL); notice(t('Login failed.') . EOL);
goaway(self::getApp()->get_baseurl()); goaway(self::getApp()->get_baseurl());
} }
if (!$_POST['remember']) { if (!$_POST['remember']) {
new_cookie(0); // 0 means delete on browser exit new_cookie(0); // 0 means delete on browser exit
} }
// if we haven't failed up this point, log them in. // if we haven't failed up this point, log them in.
$_SESSION['remember'] = $_POST['remember']; $_SESSION['remember'] = $_POST['remember'];
$_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC'); $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
authenticate_success($record, true, true); authenticate_success($record, true, true);
if (x($_SESSION, 'return_url')) { if (x($_SESSION, 'return_url')) {
$return_url = $_SESSION['return_url']; $return_url = $_SESSION['return_url'];
unset($_SESSION['return_url']); unset($_SESSION['return_url']);
} else { } else {
$return_url = ''; $return_url = '';
} }
goaway($return_url); goaway($return_url);
} }
} }
/** /**
* @brief Tries to auth the user from the cookie or session * @brief Tries to auth the user from the cookie or session
* *
* @todo Should be moved to Friendica\Core\Session when it's created * @todo Should be moved to Friendica\Core\Session when it's created
*/ */
public static function sessionAuth() public static function sessionAuth()
{ {
// When the "Friendica" cookie is set, take the value to authenticate and renew the cookie. // When the "Friendica" cookie is set, take the value to authenticate and renew the cookie.
if (isset($_COOKIE["Friendica"])) { if (isset($_COOKIE["Friendica"])) {
$data = json_decode($_COOKIE["Friendica"]); $data = json_decode($_COOKIE["Friendica"]);
if (isset($data->uid)) { if (isset($data->uid)) {
$user = dba::selectFirst('user', [], $user = dba::selectFirst('user', [],
[ [
'uid' => $data->uid, 'uid' => $data->uid,
'blocked' => false, 'blocked' => false,
'account_expired' => false, 'account_expired' => false,
'account_removed' => false, 'account_removed' => false,
'verified' => true, 'verified' => true,
] ]
); );
if (DBM::is_result($user)) { if (DBM::is_result($user)) {
if ($data->hash != cookie_hash($user)) { if ($data->hash != cookie_hash($user)) {
logger("Hash for user " . $data->uid . " doesn't fit."); logger("Hash for user " . $data->uid . " doesn't fit.");
nuke_session(); nuke_session();
goaway(self::getApp()->get_baseurl()); goaway(self::getApp()->get_baseurl());
} }
// Renew the cookie // Renew the cookie
// Expires after 7 days by default, // Expires after 7 days by default,
// can be set via system.auth_cookie_lifetime // can be set via system.auth_cookie_lifetime
$authcookiedays = Config::get('system', 'auth_cookie_lifetime', 7); $authcookiedays = Config::get('system', 'auth_cookie_lifetime', 7);
new_cookie($authcookiedays * 24 * 60 * 60, $user); new_cookie($authcookiedays * 24 * 60 * 60, $user);
// Do the authentification if not done by now // Do the authentification if not done by now
if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) { if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
authenticate_success($user); authenticate_success($user);
if (Config::get('system', 'paranoia')) { if (Config::get('system', 'paranoia')) {
$_SESSION['addr'] = $data->ip; $_SESSION['addr'] = $data->ip;
} }
} }
} }
} }
} }
if (isset($_SESSION) && x($_SESSION, 'authenticated')) { if (isset($_SESSION) && x($_SESSION, 'authenticated')) {
if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) { if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($_SESSION['visitor_id']) intval($_SESSION['visitor_id'])
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$a->contact = $r[0]; $a = self::getApp();
} $a->contact = $r[0];
} }
}
if (x($_SESSION, 'uid')) {
// already logged in user returning if (x($_SESSION, 'uid')) {
$check = Config::get('system', 'paranoia'); // already logged in user returning
// extra paranoia - if the IP changed, log them out $check = Config::get('system', 'paranoia');
if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) { // extra paranoia - if the IP changed, log them out
logger('Session address changed. Paranoid setting in effect, blocking session. ' . if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
$_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']); logger('Session address changed. Paranoid setting in effect, blocking session. ' .
nuke_session(); $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
goaway(self::getApp()->get_baseurl()); nuke_session();
} goaway(self::getApp()->get_baseurl());
}
$user = dba::selectFirst('user', [],
[ $user = dba::selectFirst('user', [],
'uid' => $_SESSION['uid'], [
'blocked' => false, 'uid' => $_SESSION['uid'],
'account_expired' => false, 'blocked' => false,
'account_removed' => false, 'account_expired' => false,
'verified' => true, 'account_removed' => false,
] 'verified' => true,
); ]
if (!DBM::is_result($user)) { );
nuke_session(); if (!DBM::is_result($user)) {
goaway(self::getApp()->get_baseurl()); nuke_session();
} goaway(self::getApp()->get_baseurl());
}
// Make sure to refresh the last login time for the user if the user
// stays logged in for a long time, e.g. with "Remember Me" // Make sure to refresh the last login time for the user if the user
$login_refresh = false; // stays logged in for a long time, e.g. with "Remember Me"
if (!x($_SESSION['last_login_date'])) { $login_refresh = false;
$_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC'); if (!x($_SESSION['last_login_date'])) {
} $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
if (strcmp(datetime_convert('UTC', 'UTC', 'now - 12 hours'), $_SESSION['last_login_date']) > 0) { }
$_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC'); if (strcmp(datetime_convert('UTC', 'UTC', 'now - 12 hours'), $_SESSION['last_login_date']) > 0) {
$login_refresh = true; $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
} $login_refresh = true;
authenticate_success($user, false, false, $login_refresh); }
} authenticate_success($user, false, false, $login_refresh);
} }
} }
}
/**
* @brief Wrapper for adding a login box. /**
* * @brief Wrapper for adding a login box.
* @param string $return_url The url relative to the base the user should be sent *
* back to after login completes * @param string $return_url The url relative to the base the user should be sent
* @param bool $register If $register == true provide a registration link. * back to after login completes
* This will most always depend on the value of $a->config['register_policy']. * @param bool $register If $register == true provide a registration link.
* @param array $hiddens optional * This will most always depend on the value of $a->config['register_policy'].
* * @param array $hiddens optional
* @return string Returns the complete html for inserting into the page *
* * @return string Returns the complete html for inserting into the page
* @hooks 'login_hook' string $o *
*/ * @hooks 'login_hook' string $o
public static function form($return_url = null, $register = false, $hiddens = []) */
{ public static function form($return_url = null, $register = false, $hiddens = [])
$a = self::getApp(); {
$o = ''; $a = self::getApp();
$reg = false; $o = '';
if ($register) { $reg = false;
$reg = array( if ($register) {
'title' => t('Create a New Account'), $reg = array(
'desc' => t('Register') 'title' => t('Create a New Account'),
); 'desc' => t('Register')
} );
}
$noid = Config::get('system', 'no_openid');
$noid = Config::get('system', 'no_openid');
if (is_null($return_url)) {
$return_url = $a->query_string; if (is_null($return_url)) {
} $return_url = $a->query_string;
}
if (local_user()) {
$tpl = get_markup_template('logout.tpl'); if (local_user()) {
} else { $tpl = get_markup_template('logout.tpl');
$a->page['htmlhead'] .= replace_macros( } else {
get_markup_template('login_head.tpl'), $a->page['htmlhead'] .= replace_macros(
[ get_markup_template('login_head.tpl'),
'$baseurl' => $a->get_baseurl(true) [
] '$baseurl' => $a->get_baseurl(true)
); ]
);
$tpl = get_markup_template('login.tpl');
$_SESSION['return_url'] = $return_url; $tpl = get_markup_template('login.tpl');
} $_SESSION['return_url'] = $return_url;
}
$o .= replace_macros(
$tpl, $o .= replace_macros(
[ $tpl,
'$dest_url' => self::getApp()->get_baseurl(true) . '/login', [
'$logout' => t('Logout'), '$dest_url' => self::getApp()->get_baseurl(true) . '/login',
'$login' => t('Login'), '$logout' => t('Logout'),
'$login' => t('Login'),
'$lname' => array('username', t('Nickname or Email: ') , '', ''),
'$lpassword' => array('password', t('Password: '), '', ''), '$lname' => array('username', t('Nickname or Email: ') , '', ''),
'$lremember' => array('remember', t('Remember me'), 0, ''), '$lpassword' => array('password', t('Password: '), '', ''),
'$lremember' => array('remember', t('Remember me'), 0, ''),
'$openid' => !$noid,
'$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''), '$openid' => !$noid,
'$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
'$hiddens' => $hiddens,
'$hiddens' => $hiddens,
'$register' => $reg,
'$register' => $reg,
'$lostpass' => t('Forgot your password?'),
'$lostlink' => t('Password Reset'), '$lostpass' => t('Forgot your password?'),
'$lostlink' => t('Password Reset'),
'$tostitle' => t('Website Terms of Service'),
'$toslink' => t('terms of service'), '$tostitle' => t('Website Terms of Service'),
'$toslink' => t('terms of service'),
'$privacytitle' => t('Website Privacy Policy'),
'$privacylink' => t('privacy policy'), '$privacytitle' => t('Website Privacy Policy'),
] '$privacylink' => t('privacy policy'),
); ]
);
call_hooks('login_hook', $o);
call_hooks('login_hook', $o);
return $o;
} return $o;
} }
}