yohan/SemanticScuttle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first working openid login (very very rough, but works!)

Browse Source
This commit is contained in:
Christian Weiske 2012-01-22 01:19:55 +01:00
parent 0a5eed2dd3
commit 16c08eb3b6
3 changed files with 126 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/templates/default/login.tpl.php
View File

@ -17,6 +17,11 @@ if (!$userservice->isSessionStable()) {
<form action="<?php echo $formaction; ?>" method="post">
<div><input type="hidden" name="query" value="<?php echo $querystring; ?>" /></div>
<table>
<tr>
<th align="left"><label for="openid"><?php echo T_('OpenId'); ?></label></th>
<td><input type="text" id="openid" name="openid_identifier" size="20" /></td>
<td></td>
</tr>
<tr>
<th align="left"><label for="username"><?php echo T_('Username'); ?></label></th>
<td><input type="text" id="username" name="username" size="20" /></td>

95
src/SemanticScuttle/Service/User.php
View File

@ -538,6 +538,101 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
}
}
/**
* Try to authenticate and login a user with his OpenID
*
* @param string $identifier OpenID URL, may be null if $return is active
* @param boolean $return If the request is the answer from the provider
* @param boolean $remember If a long-time cookie shall be set
*
* @return boolean True if the user could be authenticated,
* false if not.
*/
public function loginOpenId($identifier, $return, $remember = false)
{
require_once 'OpenID.php';
require_once 'OpenID/RelyingParty.php';
require_once 'OpenID/Extension/SREG11.php';
$returnUrl = addProtocolToUrl(createURL('login', 'openidreturn'));
if ($identifier !== null) {
$identifier = OpenID::normalizeIdentifier($identifier);
}
$rp = new OpenID_RelyingParty(
$returnUrl/*returnTo*/,
addProtocolToUrl(ROOT)/* realm */,
$identifier
);
if ($return) {
//answer from ID provider
if (!count($_POST)) {
list(, $queryString) = explode('?', $_SERVER['REQUEST_URI']);
} else {
$queryString = file_get_contents('php://input');
}
try {
$request = new Net_URL2($returnUrl . '?' . $queryString);
$message = new OpenID_Message($queryString, OpenID_Message::FORMAT_HTTP);
$result = $rp->verify($request, $message);
if (!$result->success()) {
return false;
}
$identifier = $message->get('openid.claimed_id');
} catch (Exception $e) {
//FIXME: report error
return false;
}
//FIXME: join user table to be sure the user exists
$query = 'SELECT uId'
. ' FROM sc_users_openids'
. ' WHERE url = "' . $this->db->sql_escape($identifier) . '"';
if (!($dbresult = $this->db->sql_query($query))) {
message_die(
GENERAL_ERROR,
'Could not get user',
'', __LINE__, __FILE__, $query, $this->db
);
return false;
}
$row = $this->db->sql_fetchrow($dbresult);
$this->db->sql_freeresult($dbresult);
if (!$row) {
//OpenID not found in database. FIXME: Need to register
return false;
}
$this->setCurrentUserId($row['uId'], true);
//FIXME: update email and name
//FIXME: remember login setting
return true;
}
//send request to ID provider
try {
$authRequest = $rp->prepare();
//FIXME: when user exists already, use immediate mode first and
// fall back to normal when it fails
//FIXME: (?) when user exists already, don't request details
$sreg = new OpenID_Extension_SREG11(OpenID_Extension::REQUEST);
//$sreg->set('required', 'email');
$sreg->set('optional', 'email,nickname,fullname');
$authRequest->addExtension($sreg);
//$auth->setMode(OpenID::MODE_CHECKID_IMMEDIATE);
header('Location: ' . $authRequest->getAuthorizeURL());
exit();
} catch (Exception $e) {
//FIXME: throw user exception
var_dump($e);
return false;
}
}
/**
* Try to authenticate via the privateKey
*

34
www/login.php
View File

@ -35,20 +35,38 @@ isset($_POST['query']) ? define('POST_QUERY', $_POST['query']): define('POST_QUE
$keeppass = (POST_KEEPPASS=='yes')?true:false;
@list($url, $method) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
$login = false;
if (POST_SUBMITTED!='' && POST_USERNAME!='' && POST_PASSWORD!='') {
if ($method == 'openidreturn') {
$login = $userservice->loginOpenId(null, true);
if (!$login) {
$tplVars['error'] = T_('OpenID login error');
}
} else if (POST_SUBMITTED != ''
&& isset($_POST['openid_identifier']) && $_POST['openid_identifier'] != ''
) {
$login = $userservice->loginOpenId(
$_POST['openid_identifier'], false, POST_KEEPPASS
);
if (!$login) {
//may be an exception with the ID
$tplVars['error'] = T_('OpenID login error');
}
} else if (POST_SUBMITTED!='' && POST_USERNAME!='' && POST_PASSWORD!='') {
$posteduser = trim(utf8_strtolower(POST_USERNAME));
$login = $userservice->login($posteduser, POST_PASSWORD, $keeppass);
if ($login) {
if (POST_QUERY)
header('Location: '. createURL('bookmarks', $posteduser .'?'. POST_QUERY));
else
header('Location: '. createURL('bookmarks', $posteduser));
} else {
if (!$login) {
$tplVars['error'] = T_('The details you have entered are incorrect. Please try again.');
}
}
if (!$login) {
if ($login) {
if (POST_QUERY)
header('Location: '. createURL('bookmarks', $posteduser .'?'. POST_QUERY));
else
header('Location: '. createURL('bookmarks', $posteduser));
} else {
if ($userservice->isLoggedOn()) {
$cUser = $userservice->getCurrentObjectUser();
header('Location: '. createURL('bookmarks', strtolower($cUser->getUsername())));