Merge pull request #2190 from annando/1512-getload

[friendica.git] / mod / openid.php

diff --git a/mod/openid.php b/mod/openid.php
index df074b299fb0bd003df978b269e89355857345a8..5d5539f00eb4e696429903179c1ae1b8022136d7 100644 (file)
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -10,68 +10,84 @@ function openid_content(&$a) {
        if($noid)
                goaway(z_root());
 
+       logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
+
        if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
+
                $openid = new LightOpenID;
 
                if($openid->validate()) {
 
-                       if(x($_SESSION,'register')) {
-                               unset($_SESSION['register']);
-                               $args = '';
-                               $attr = $openid->getAttributes();
-                               if(is_array($attr) && count($attr)) {
-                                       foreach($attr as $k => $v) {
-                                               if($k === 'namePerson/friendly')
-                                                       $nick = notags(trim($v));
-                                               if($k === 'namePerson/first')
-                                                       $first = notags(trim($v));
-                                               if($k === 'namePerson')
-                                                       $args .= '&username=' . notags(trim($v));
-                                               if($k === 'contact/email')
-                                                       $args .= '&email=' . notags(trim($v));
-                                               if($k === 'media/image/aspect11')
-                                                       $photosq = bin2hex(trim($v));
-                                               if($k === 'media/image/default')
-                                                       $photo = bin2hex(trim($v));
-                                       }
-                               }
-                               if($nick)
-                                       $args .= '&nickname=' . $nick;
-                               elseif($first)
-                                       $args .= '&nickname=' . $first;
+                       $authid = normalise_openid($_REQUEST['openid_identity']);
 
-                               if($photosq)
-                                       $args .= '&photo=' . $photosq;
-                               elseif($photo)
-                                       $args .= '&photo=' . $photo;
+                       if(! strlen($authid)) {
+                               logger( t('OpenID protocol error. No ID returned.') . EOL);
+                               goaway(z_root());
+                       }
 
-                               $args .= '&openid_url=' . notags(trim($_SESSION['openid']));
-                               if($a->config['register_policy'] != REGISTER_CLOSED)
-                                       goaway($a->get_baseurl() . '/register' . $args);
-                               else
-                                       goaway(z_root());
+                       $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
+                               FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 
+                               AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
+                               dbesc($authid)
+                       );
 
-                               // NOTREACHED
-                       } 
+                       if($r && count($r)) {
 
+                               // successful OpenID login
 
-                       $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
-                               FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
-                               dbesc($_SESSION['openid'])
-                       );
-                       if(! count($r)) {
-                               notice( t('Login failed.') . EOL );
+                               unset($_SESSION['openid']);
+
+                               require_once('include/security.php');
+                               authenticate_success($r[0],true,true);
+
+                               // just in case there was no return url set 
+                               // and we fell through
+
+                               goaway(z_root());
+                       }
+
+                       // Successful OpenID login - but we can't match it to an existing account.
+                       // New registration?
+
+                       if($a->config['register_policy'] == REGISTER_CLOSED) {
+                               notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
                                goaway(z_root());
-                       }
-                       unset($_SESSION['openid']);
+                       }
+
+                       unset($_SESSION['register']);
+                       $args = '';
+                       $attr = $openid->getAttributes();
+                       if(is_array($attr) && count($attr)) {
+                               foreach($attr as $k => $v) {
+                                       if($k === 'namePerson/friendly')
+                                               $nick = notags(trim($v));
+                                       if($k === 'namePerson/first')
+                                               $first = notags(trim($v));
+                                       if($k === 'namePerson')
+                                               $args .= '&username=' . notags(trim($v));
+                                       if($k === 'contact/email')
+                                               $args .= '&email=' . notags(trim($v));
+                                       if($k === 'media/image/aspect11')
+                                               $photosq = bin2hex(trim($v));
+                                       if($k === 'media/image/default')
+                                               $photo = bin2hex(trim($v));
+                               }
+                       }
+                       if($nick)
+                               $args .= '&nickname=' . $nick;
+                       elseif($first)
+                               $args .= '&nickname=' . $first;
+
+                       if($photosq)
+                               $args .= '&photo=' . $photosq;
+                       elseif($photo)
+                               $args .= '&photo=' . $photo;
 
-                       require_once('include/security.php');
-                       authenticate_success($r[0],true,true);
+                       $args .= '&openid_url=' . notags(trim($authid));
 
-                       // just in case there was no return url set 
-                       // and we fell through
+                       goaway($a->get_baseurl() . '/register' . $args);
 
-                       goaway(z_root());
+                       // NOTREACHED
                }
        }
        notice( t('Login failed.') . EOL);