strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'main/master'

Browse source
This commit is contained in:
Thomas 2012-03-19 22:33:06 +00:00
commit 64a2b00cdc
3 changed files with 66 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1285' );
define ( 'FRIENDICA_VERSION', '2.3.1286' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1132 );

31
include/auth.php
View file

@ -24,7 +24,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
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());
@ -77,7 +77,7 @@ else {
$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
@ -99,30 +99,9 @@ else {
$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(z_root());
// 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());
// NOTREACHED
}
}
if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {

111
mod/openid.php
View file

@ -13,72 +13,81 @@ function openid_content(&$a) {
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;
if($photosq)
$args .= '&photo=' . $photosq;
elseif($photo)
$args .= '&photo=' . $photo;
$args .= '&openid_url=' . notags(trim($_SESSION['openid']));
if($a->config['register_policy'] != REGISTER_CLOSED)
goaway($a->get_baseurl() . '/register' . $args);
else
goaway(z_root());
// NOTREACHED
}
$authid = normalise_openid($_REQUEST['openid_identity']);
if(! strlen($authid))
goaway(z_root());
if(! strlen($authid)) {
logger( t('OpenID protocol error. No ID returned.') . EOL);
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 `verified` = 1 LIMIT 1",
FROM `user` WHERE `openid` = '%s' AND `blocked` = 0
AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
dbesc($authid)
);
if(! count($r)) {
notice( t('Login failed.') . EOL );
if($r && count($r)) {
// successful OpenID login
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());
}
unset($_SESSION['openid']);
}
require_once('include/security.php');
authenticate_success($r[0],true,true);
// Successful OpenID login - but we can't match it to an existing account.
// New registration?
// just in case there was no return url set
// and we fell through
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());
}
goaway(z_root());
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;
$args .= '&openid_url=' . notags(trim($authid));
goaway($a->get_baseurl() . '/register' . $args);
// NOTREACHED
}
}
notice( t('Login failed.') . EOL);