Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 11:10:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

smooth a few rough edges of openid

Browse source
This commit is contained in:
Friendika 2010-11-18 15:06:33 -08:00
parent abc6199c17
commit 0c7ae3aeee
5 changed files with 61 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

63
include/auth.php
View file

@ -70,27 +70,54 @@ else {
if((x($_POST,'password')) && strlen($_POST['password']))
$encrypted = hash('whirlpool',trim($_POST['password']));
else {
if((x($_POST,'login-name')) && strlen($_POST['login-name'])) {
$openid_url = trim($_POST['login-name']);
$r = q("SELECT `uid` FROM `user` WHERE `openid` = '%s' LIMIT 1",
dbesc($openid_url)
);
if(count($r)) {
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';
goaway($openid->authUrl());
// NOTREACHED
}
else {
if((x($_POST,'openid_url')) && strlen($_POST['openid_url'])) {
$openid_url = trim($_POST['openid_url']);
// validate_url alters the calling parameter
$temp_string = $openid_url;
// if it's an email address or doesn't resolve to a URL, fail.
if((strpos($temp_string,'@')) || (! validate_url($temp_string))) {
$a = get_app();
notice( t('Login failed.') . EOL);
goaway($a->get_baseurl());
// NOTREACHED
}
// Otherwise it's probably an openid.
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');
goaway($openid->authUrl());
// NOTREACHED
}
}
}
if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
@ -99,8 +126,8 @@ else {
$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['login-name'])),
dbesc(trim($_POST['login-name'])),
dbesc(trim($_POST['openid_url'])),
dbesc(trim($_POST['openid_url'])),
dbesc($encrypted));
if(($r === false) || (! count($r))) {
notice( t('Login failed.') . EOL );