X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=cba6a67a7fd7ec5124b919540bc3b6bf118013cc;hb=f55e8e831c3becb0bf981d637179226550b9907c;hp=fe09ef1604c5b7e2096db828345807ddaba844da;hpb=f6ee615a79eaab03adc540704ab17b8a44a3d9e8;p=friendica.git
diff --git a/include/auth.php b/include/auth.php
index fe09ef1604..cba6a67a7f 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -1,6 +1,8 @@
module === 'logout')) {
// process logout request
-
+ call_hooks("logging_out");
nuke_session();
- notice( t('Logged out.') . EOL);
- goaway($a->get_baseurl());
+ info( t('Logged out.') . EOL);
+ goaway(z_root());
+ }
+
+ if(x($_SESSION,'visitor_id') && (! x($_SESSION,'uid'))) {
+ $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+ intval($_SESSION['visitor_id'])
+ );
+ if(count($r)) {
+ $a->contact = $r[0];
+ }
}
if(x($_SESSION,'uid')) {
@@ -35,38 +53,23 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
$check = get_config('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']);
nuke_session();
- goaway($a->get_baseurl());
+ goaway(z_root());
}
- $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+ $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
+ FROM `user` WHERE `uid` = %d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
intval($_SESSION['uid'])
);
if(! count($r)) {
nuke_session();
- goaway($a->get_baseurl());
+ goaway(z_root());
}
- // initialise user environment
-
- $a->user = $r[0];
- $_SESSION['theme'] = $a->user['theme'];
- $_SESSION['page_flags'] = $a->user['page-flags'];
- if(strlen($a->user['timezone']))
- date_default_timezone_set($a->user['timezone']);
-
- $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
-
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
- intval($_SESSION['uid']));
- if(count($r)) {
- $a->contact = $r[0];
- $a->cid = $r[0]['id'];
- $_SESSION['cid'] = $a->cid;
-
- }
- header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
+ authenticate_success($r[0]);
}
}
else {
@@ -78,11 +81,12 @@ else {
if((x($_POST,'password')) && strlen($_POST['password']))
$encrypted = hash('whirlpool',trim($_POST['password']));
else {
- if((x($_POST,'openid_url')) && strlen($_POST['openid_url'])) {
+ if((x($_POST,'openid_url')) && strlen($_POST['openid_url']) ||
+ (x($_POST,'username')) && strlen($_POST['username'])) {
$noid = get_config('system','no_openid');
- $openid_url = trim($_POST['openid_url']);
+ $openid_url = trim((strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) );
// validate_url alters the calling parameter
@@ -93,83 +97,75 @@ else {
if(($noid) || (strpos($temp_string,'@')) || (! validate_url($temp_string))) {
$a = get_app();
notice( t('Login failed.') . EOL);
- goaway($a->get_baseurl());
+ goaway(z_root());
// NOTREACHED
}
// 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() . '/openid';
-
- $r = q("SELECT `uid` FROM `user` WHERE `openid` = '%s' LIMIT 1",
- dbesc($openid_url)
- );
- if(count($r)) {
- // existing account
- goaway($openid->authUrl());
- // NOTREACHED
- }
- else {
- if($a->config['register_policy'] == REGISTER_CLOSED) {
- $a = get_app();
- notice( t('Login failed.') . EOL);
- goaway($a->get_baseurl());
- // NOTREACHED
- }
- // new account
- $_SESSION['register'] = 1;
- $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
- $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
- goaway($openid->authUrl());
- // NOTREACHED
- }
+ $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());
+ }
+ // NOTREACHED
}
}
+
if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
- // process login request
+ $record = null;
+
+ $addon_auth = array(
+ 'username' => trim($_POST['username']),
+ 'password' => trim($_POST['password']),
+ 'authenticated' => 0,
+ 'user_record' => null
+ );
+
+ /**
+ *
+ * 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
+ * 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']))) {
+ $record = $addon_auth['user_record'];
+ }
+ else {
+
+ // process normal login request
- $r = q("SELECT * FROM `user`
- WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
- dbesc(trim($_POST['openid_url'])),
- dbesc(trim($_POST['openid_url'])),
- dbesc($encrypted));
- if(($r === false) || (! count($r))) {
+ $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
+ FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
+ AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
+ dbesc(trim($_POST['username'])),
+ dbesc(trim($_POST['username'])),
+ dbesc($encrypted)
+ );
+ if(count($r))
+ $record = $r[0];
+ }
+
+ if((! $record) || (! count($record))) {
+ logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
notice( t('Login failed.') . EOL );
- goaway($a->get_baseurl());
+ goaway(z_root());
}
- $_SESSION['uid'] = $r[0]['uid'];
- $_SESSION['theme'] = $r[0]['theme'];
- $_SESSION['authenticated'] = 1;
- $_SESSION['page_flags'] = $r[0]['page-flags'];
- $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
- $_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
-
- notice( t("Welcome back ") . $r[0]['username'] . EOL);
- $a->user = $r[0];
- if(strlen($a->user['timezone']))
- date_default_timezone_set($a->user['timezone']);
-
- $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
- intval($_SESSION['uid']));
- if(count($r)) {
- $a->contact = $r[0];
- $a->cid = $r[0]['id'];
- $_SESSION['cid'] = $a->cid;
- }
- q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
- dbesc(datetime_convert()),
- intval($_SESSION['uid'])
- );
- header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
- if(($a->module !== 'home') && isset($_SESSION['return_url']))
- goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+ // if we haven't failed up this point, log them in.
+
+ authenticate_success($record, true, true);
}
}