X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=a02c18d1dbf0f64aa045e418e9155cd91af3773d;hb=e848e376b89a6aaf35054c178c1662d4a23035fa;hp=2ca9c3efb29e7937b326b40ee8e5d2665693cd57;hpb=63610c7b73fcaf862adbf880d4968dd2b1678d9b;p=friendica.git
diff --git a/include/auth.php b/include/auth.php
index 2ca9c3efb2..a02c18d1db 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -1,32 +1,51 @@
uid)) {
- $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
- FROM `user` WHERE `uid` = %d AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified` LIMIT 1",
- intval($data->uid)
+
+ $user = dba::select('user',
+ [],
+ [
+ 'uid' => $data->uid,
+ 'blocked' => false,
+ 'account_expired' => false,
+ 'account_removed' => false,
+ 'verified' => true,
+ ],
+ ['limit' => 1]
);
- if ($r) {
- if ($data->hash != cookie_hash($r[0])) {
- logger("Hash for user ".$data->uid." doesn't fit.");
+ if (DBM::is_result($user)) {
+ if ($data->hash != cookie_hash($user)) {
+ logger("Hash for user " . $data->uid . " doesn't fit.");
nuke_session();
- goaway(z_root());
+ goaway(System::baseUrl());
}
// Renew the cookie
- new_cookie(604800, $r[0]);
+ // Expires after 7 days by default,
+ // can be set via system.auth_cookie_lifetime
+ $authcookiedays = Config::get('system', 'auth_cookie_lifetime', 7);
+ new_cookie($authcookiedays * 24 * 60 * 60, $user);
// Do the authentification if not done by now
- if (!isset($_SESSION) OR !isset($_SESSION['authenticated'])) {
- authenticate_success($r[0]);
+ if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
+ authenticate_success($user);
- if (get_config('system','paranoia'))
+ if (Config::get('system', 'paranoia')) {
$_SESSION['addr'] = $data->ip;
+ }
}
}
}
@@ -35,108 +54,106 @@ if (isset($_COOKIE["Friendica"])) {
// login/logout
-if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params') || ($_POST['auth-params'] !== 'login'))) {
-
- if ((x($_POST,'auth-params') && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
-
+if (isset($_SESSION) && x($_SESSION, 'authenticated') && (!x($_POST, 'auth-params') || ($_POST['auth-params'] !== 'login'))) {
+ if ((x($_POST, 'auth-params') && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
// process logout request
call_hooks("logging_out");
nuke_session();
- info(t('Logged out.').EOL);
- goaway(z_root());
+ info(t('Logged out.') . EOL);
+ goaway(System::baseUrl());
}
- 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",
intval($_SESSION['visitor_id'])
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$a->contact = $r[0];
}
}
- if (x($_SESSION,'uid')) {
-
+ if (x($_SESSION, 'uid')) {
// already logged in user returning
-
- $check = get_config('system','paranoia');
+ $check = Config::get('system', 'paranoia');
// extra paranoia - if the IP changed, log them out
if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
- logger('Session address changed. Paranoid setting in effect, blocking session. '.
- $_SESSION['addr'].' != '.$_SERVER['REMOTE_ADDR']);
+ logger('Session address changed. Paranoid setting in effect, blocking session. ' .
+ $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
nuke_session();
- goaway(z_root());
+ goaway(System::baseUrl());
}
- $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
- FROM `user` WHERE `uid` = %d AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified` LIMIT 1",
- intval($_SESSION['uid'])
+ $user = dba::select('user',
+ [],
+ [
+ 'uid' => $_SESSION['uid'],
+ 'blocked' => false,
+ 'account_expired' => false,
+ 'account_removed' => false,
+ 'verified' => true,
+ ],
+ ['limit' => 1]
);
-
- if (!dbm::is_result($r)) {
+ if (!DBM::is_result($user)) {
nuke_session();
- goaway(z_root());
+ goaway(System::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"
$login_refresh = false;
if (!x($_SESSION['last_login_date'])) {
- $_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
+ $_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) {
+ $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
$login_refresh = true;
}
- authenticate_success($r[0], false, false, $login_refresh);
+ authenticate_success($user, false, false, $login_refresh);
}
} else {
-
session_unset();
+ if (
+ !(x($_POST, 'password') && strlen($_POST['password']))
+ && (
+ x($_POST, 'openid_url') && strlen($_POST['openid_url'])
+ || x($_POST, 'username') && strlen($_POST['username'])
+ )
+ ) {
+ $noid = Config::get('system', 'no_openid');
- if (x($_POST,'password') && strlen($_POST['password']))
- $encrypted = hash('whirlpool',trim($_POST['password']));
- else {
- if ((x($_POST,'openid_url')) && strlen($_POST['openid_url']) ||
- (x($_POST,'username')) && strlen($_POST['username'])) {
-
- $noid = get_config('system','no_openid');
-
- $openid_url = trim((strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']));
+ $openid_url = trim(strlen($_POST['openid_url']) ? $_POST['openid_url'] : $_POST['username']);
- // validate_url alters the calling parameter
+ // validate_url alters the calling parameter
- $temp_string = $openid_url;
+ $temp_string = $openid_url;
- // if it's an email address or doesn't resolve to a URL, fail.
-
- if ($noid || strpos($temp_string,'@') || !validate_url($temp_string)) {
- $a = get_app();
- notice(t('Login failed.').EOL);
- goaway(z_root());
- // NOTREACHED
- }
+ // if it's an email address or doesn't resolve to a URL, fail.
- // Otherwise it's probably an openid.
-
- try {
- require_once('library/openid.php');
- $openid = new LightOpenID;
- $openid->identity = $openid_url;
- $_SESSION['openid'] = $openid_url;
- $a = get_app();
- $openid->returnUrl = $a->get_baseurl(true).'/openid';
- goaway($openid->authUrl());
- } 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.').'
'.t('The error message was:').' '.$e->getMessage());
- }
+ if ($noid || strpos($temp_string, '@') || !validate_url($temp_string)) {
+ $a = get_app();
+ notice(t('Login failed.') . EOL);
+ goaway(System::baseUrl());
// NOTREACHED
}
- }
- if (x($_POST,'auth-params') && $_POST['auth-params'] === 'login') {
+ // 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 = System::baseUrl(true) . '/openid';
+ goaway($openid->authUrl());
+ } 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.') . '
' . t('The error message was:') . ' ' . $e->getMessage());
+ }
+ // NOTREACHED
+ }
+ if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') {
$record = null;
$addon_auth = array(
@@ -153,44 +170,30 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
* and later plugins should not interfere with an earlier one that succeeded.
*
*/
-
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'];
- else {
-
- // process normal login request
-
- $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
- FROM `user` WHERE (`email` = '%s' OR `nickname` = '%s')
- AND `password` = '%s' AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified` LIMIT 1",
- dbesc(trim($_POST['username'])),
- dbesc(trim($_POST['username'])),
- dbesc($encrypted)
- );
- if (dbm::is_result($r))
- $record = $r[0];
+ } else {
+ $user_id = User::authenticate(trim($_POST['username']), trim($_POST['password']));
+ if ($user_id) {
+ $record = dba::select('user', [], ['uid' => $user_id], ['limit' => 1]);
+ }
}
if (!$record || !count($record)) {
- logger('authenticate: failed login attempt: '.notags(trim($_POST['username'])).' from IP '.$_SERVER['REMOTE_ADDR']);
- notice(t('Login failed.').EOL);
- goaway(z_root());
+ logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
+ notice(t('Login failed.') . EOL);
+ goaway(System::baseUrl());
}
- // If the user specified to remember the authentication, then set a cookie
- // that expires after one week (the default is when the browser is closed).
- // The cookie will be renewed automatically.
- // The week ensures that sessions will expire after some inactivity.
- if ($_POST['remember'])
- new_cookie(604800, $r[0]);
- else
+ if (!$_POST['remember']) {
new_cookie(0); // 0 means delete on browser exit
+ }
// if we haven't failed up this point, log them in.
-
- $_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
+ $_SESSION['remember'] = $_POST['remember'];
+ $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
authenticate_success($record, true, true);
}
}
@@ -198,45 +201,9 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
/**
* @brief Kills the "Friendica" cookie and all session data
*/
-function nuke_session() {
-
+function nuke_session()
+{
new_cookie(-3600); // make sure cookie is deleted on browser close, as a security measure
session_unset();
session_destroy();
}
-
-/**
- * @brief Calculate the hash that is needed for the "Friendica" cookie
- *
- * @param array $user Record from "user" table
- *
- * @return string Hashed data
- */
-function cookie_hash($user) {
- return(hash("sha256", get_config("system", "site_prvkey").
- $user["uprvkey"].
- $user["password"]));
-}
-
-/**
- * @brief Set the "Friendica" cookie
- *
- * @param int $time
- * @param array $user Record from "user" table
- */
-function new_cookie($time, $user = array()) {
-
- if ($time != 0)
- $time = $time + time();
-
- if ($user)
- $value = json_encode(array("uid" => $user["uid"],
- "hash" => cookie_hash($user),
- "ip" => $_SERVER['REMOTE_ADDR']));
- else
- $value = "";
-
- setcookie("Friendica", $value, $time, "/", "",
- (get_config('system', 'ssl_policy') == SSL_POLICY_FULL), true);
-
-}