X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FLogin.php;h=3f9d6998c782fcdaa3aac6e87661bff9159dc653;hb=cfa68c52b9117616fa95a4639ad74e7d220d193d;hp=e080663d7f0429199ecab7a5ac882124a0410798;hpb=2e420a15f8f3e469f9ea3fd298b1283d9806698e;p=friendica.git
diff --git a/src/Module/Login.php b/src/Module/Login.php
index e080663d7f..3f9d6998c7 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -4,17 +4,18 @@
*/
namespace Friendica\Module;
+use Exception;
use Friendica\BaseModule;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
-use dba;
+use LightOpenID;
require_once 'boot.php';
-require_once 'include/datetime.php';
require_once 'include/security.php';
require_once 'include/text.php';
@@ -41,7 +42,7 @@ class Login extends BaseModule
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(), intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
}
public static function post()
@@ -49,88 +50,117 @@ class Login extends BaseModule
session_unset();
// OpenId Login
if (
- !x($_POST, 'password')
+ empty($_POST['password'])
&& (
- x($_POST, 'openid_url')
- || x($_POST, 'username')
+ !empty($_POST['openid_url'])
+ || !empty($_POST['username'])
)
) {
- $noid = Config::get('system', 'no_openid');
+ $openid_url = trim(defaults($_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 ($noid || strpos($openid_url, '@') || !Network::isUrlValid($openid_url)) {
- notice(L10n::t('Login failed.') . EOL);
- goaway(self::getApp()->get_baseurl());
- // NOTREACHED
- }
-
- // Otherwise it's probably an openid.
- try {
- require_once 'library/openid.php';
- $openid = new \LightOpenID;
- $openid->identity = $openid_url;
- $_SESSION['openid'] = $openid_url;
- $_SESSION['remember'] = $_POST['remember'];
- $openid->returnUrl = self::getApp()->get_baseurl(true) . '/openid';
- goaway($openid->authUrl());
- } catch (Exception $e) {
- notice(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '
' . L10n::t('The error message was:') . ' ' . $e->getMessage());
- }
- // NOTREACHED
+ self::openIdAuthentication($openid_url, !empty($_POST['remember']));
}
if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') {
- $record = null;
+ self::passwordAuthentication(
+ trim($_POST['username']),
+ trim($_POST['password']),
+ !empty($_POST['remember'])
+ );
+ }
+ }
- $addon_auth = [
- 'username' => trim($_POST['username']),
- 'password' => trim($_POST['password']),
- 'authenticated' => 0,
- 'user_record' => null
- ];
+ /**
+ * Attempts to authenticate using OpenId
+ *
+ * @param string $openid_url OpenID URL string
+ * @param bool $remember Whether to set the session remember flag
+ */
+ private static function openIdAuthentication($openid_url, $remember)
+ {
+ $noid = Config::get('system', 'no_openid');
- /*
- * An addon indicates successful login by setting 'authenticated' to non-zero value and returning a user record
- * Addons should never set 'authenticated' except to indicate success - as hooks may be chained
- * and later addons should not interfere with an earlier one that succeeded.
- */
- Addon::callHooks('authenticate', $addon_auth);
+ // if it's an email address or doesn't resolve to a URL, fail.
+ if ($noid || strpos($openid_url, '@') || !Network::isUrlValid($openid_url)) {
+ notice(L10n::t('Login failed.') . EOL);
+ goaway(self::getApp()->get_baseurl());
+ // NOTREACHED
+ }
- if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) {
- $record = $addon_auth['user_record'];
- } else {
- $user_id = User::authenticate(trim($_POST['username']), trim($_POST['password']));
- if ($user_id) {
- $record = dba::selectFirst('user', [], ['uid' => $user_id]);
- }
- }
+ // Otherwise it's probably an openid.
+ try {
+ $a = get_app();
+ $openid = new LightOpenID($a->get_hostname());
+ $openid->identity = $openid_url;
+ $_SESSION['openid'] = $openid_url;
+ $_SESSION['remember'] = $remember;
+ $openid->returnUrl = self::getApp()->get_baseurl(true) . '/openid';
+ goaway($openid->authUrl());
+ } catch (Exception $e) {
+ notice(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '
' . L10n::t('The error message was:') . ' ' . $e->getMessage());
+ }
+ }
- if (!$record || !count($record)) {
- logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
- notice(L10n::t('Login failed.') . EOL);
- goaway(self::getApp()->get_baseurl());
- }
+ /**
+ * Attempts to authenticate using login/password
+ *
+ * @param string $username User name
+ * @param string $password Clear password
+ * @param bool $remember Whether to set the session remember flag
+ */
+ private static function passwordAuthentication($username, $password, $remember)
+ {
+ $record = null;
+
+ $addon_auth = [
+ 'username' => $username,
+ 'password' => $password,
+ 'authenticated' => 0,
+ 'user_record' => null
+ ];
+
+ /*
+ * An addon indicates successful login by setting 'authenticated' to non-zero value and returning a user record
+ * Addons should never set 'authenticated' except to indicate success - as hooks may be chained
+ * and later addons should not interfere with an earlier one that succeeded.
+ */
+ Addon::callHooks('authenticate', $addon_auth);
+
+ try {
+ if ($addon_auth['authenticated']) {
+ $record = $addon_auth['user_record'];
- if (!$_POST['remember']) {
- new_cookie(0); // 0 means delete on browser exit
+ if (empty($record)) {
+ throw new Exception(L10n::t('Login failed.'));
+ }
+ } else {
+ $record = DBA::selectFirst('user', [],
+ ['uid' => User::getIdFromPasswordAuthentication($username, $password)]
+ );
}
+ } catch (Exception $e) {
+ logger('authenticate: failed login attempt: ' . notags($username) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
+ notice($e->getMessage() . EOL);
+ goaway(self::getApp()->get_baseurl() . '/login');
+ }
- // if we haven't failed up this point, log them in.
- $_SESSION['remember'] = $_POST['remember'];
- $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
- authenticate_success($record, true, true);
+ if (!$remember) {
+ new_cookie(0); // 0 means delete on browser exit
+ }
- if (x($_SESSION, 'return_url')) {
- $return_url = $_SESSION['return_url'];
- unset($_SESSION['return_url']);
- } else {
- $return_url = '';
- }
+ // if we haven't failed up this point, log them in.
+ $_SESSION['remember'] = $remember;
+ $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
+ authenticate_success($record, true, true);
- goaway($return_url);
+ if (x($_SESSION, 'return_url')) {
+ $return_url = $_SESSION['return_url'];
+ unset($_SESSION['return_url']);
+ } else {
+ $return_url = '';
}
+
+ goaway($return_url);
}
/**
@@ -145,7 +175,7 @@ class Login extends BaseModule
$data = json_decode($_COOKIE["Friendica"]);
if (isset($data->uid)) {
- $user = dba::selectFirst('user', [],
+ $user = DBA::selectFirst('user', [],
[
'uid' => $data->uid,
'blocked' => false,
@@ -154,7 +184,7 @@ class Login extends BaseModule
'verified' => true,
]
);
- if (DBM::is_result($user)) {
+ if (DBA::isResult($user)) {
if ($data->hash != cookie_hash($user)) {
logger("Hash for user " . $data->uid . " doesn't fit.");
nuke_session();
@@ -184,7 +214,7 @@ class Login extends BaseModule
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($_SESSION['visitor_id'])
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
self::getApp()->contact = $r[0];
}
}
@@ -200,7 +230,7 @@ class Login extends BaseModule
goaway(self::getApp()->get_baseurl());
}
- $user = dba::selectFirst('user', [],
+ $user = DBA::selectFirst('user', [],
[
'uid' => $_SESSION['uid'],
'blocked' => false,
@@ -209,7 +239,7 @@ class Login extends BaseModule
'verified' => true,
]
);
- if (!DBM::is_result($user)) {
+ if (!DBA::isResult($user)) {
nuke_session();
goaway(self::getApp()->get_baseurl());
}
@@ -217,11 +247,11 @@ class Login extends BaseModule
// 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"
$login_refresh = false;
- if (!x($_SESSION['last_login_date'])) {
- $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
+ if (empty($_SESSION['last_login_date'])) {
+ $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
}
- if (strcmp(datetime_convert('UTC', 'UTC', 'now - 12 hours'), $_SESSION['last_login_date']) > 0) {
- $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
+ if (strcmp(DateTimeFormat::utc('now - 12 hours'), $_SESSION['last_login_date']) > 0) {
+ $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
$login_refresh = true;
}
authenticate_success($user, false, false, $login_refresh);
@@ -235,7 +265,7 @@ class Login extends BaseModule
* @param string $return_url The url relative to the base the user should be sent
* back to after login completes
* @param bool $register If $register == true provide a registration link.
- * This will most always depend on the value of $a->config['register_policy'].
+ * This will most always depend on the value of config.register_policy.
* @param array $hiddens optional
*
* @return string Returns the complete html for inserting into the page