wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update finishopenidlogin

Browse Source
This commit is contained in:
Evan Prodromou 2009-01-23 00:30:57 +01:00
parent 4fe5bd9cf1
commit cc5808cc28
1 changed files with 68 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
actions/finishopenidlogin.php
View File

@ -23,6 +23,9 @@ require_once(INSTALLDIR.'/lib/openid.php');
class FinishopenidloginAction extends Action class FinishopenidloginAction extends Action
{ {
var $error = null;
var $username = null;
var $message = null;
function handle($args) function handle($args)
{ {
@ -32,32 +35,32 @@ class FinishopenidloginAction extends Action
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') { } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$token = $this->trimmed('token'); $token = $this->trimmed('token');
if (!$token || $token != common_session_token()) { if (!$token || $token != common_session_token()) {
$this->show_form(_('There was a problem with your session token. Try again, please.')); $this->showForm(_('There was a problem with your session token. Try again, please.'));
return; return;
} }
if ($this->arg('create')) { if ($this->arg('create')) {
if (!$this->boolean('license')) { if (!$this->boolean('license')) {
$this->show_form(_('You can\'t register if you don\'t agree to the license.'), $this->showForm(_('You can\'t register if you don\'t agree to the license.'),
$this->trimmed('newname')); $this->trimmed('newname'));
return; return;
} }
$this->create_new_user(); $this->createNewUser();
} else if ($this->arg('connect')) { } else if ($this->arg('connect')) {
$this->connect_user(); $this->connectUser();
} else { } else {
common_debug(print_r($this->args, true), __FILE__); common_debug(print_r($this->args, true), __FILE__);
$this->show_form(_('Something weird happened.'), $this->showForm(_('Something weird happened.'),
$this->trimmed('newname')); $this->trimmed('newname'));
} }
} else { } else {
$this->try_login(); $this->tryLogin();
} }
} }
function show_top($error=null) function showPageNotice()
{ {
if ($error) { if ($this->error) {
$this->element('div', array('class' => 'error'), $error); $this->element('div', array('class' => 'error'), $this->error);
} else { } else {
global $config; global $config;
$this->element('div', 'instructions', $this->element('div', 'instructions',
@ -65,21 +68,36 @@ class FinishopenidloginAction extends Action
} }
} }
function show_form($error=null, $username=null) function title()
{ {
common_show_header(_('OpenID Account Setup'), null, $error, return _('OpenID Account Setup');
array($this, 'show_top')); }
function showForm($error=null, $username=null)
{
$this->error = $error;
$this->username = $username;
$this->showPage();
}
function showContent()
{
if ($this->message_text) {
$this->element('p', null, $this->message);
return;
}
$this->elementStart('form', array('method' => 'post', $this->elementStart('form', array('method' => 'post',
'id' => 'account_connect', 'id' => 'account_connect',
'action' => common_local_url('finishopenidlogin'))); 'action' => common_local_url('finishopenidlogin')));
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
$this->element('h2', null, $this->element('h2', null,
_('Create new account')); _('Create new account'));
$this->element('p', null, $this->element('p', null,
_('Create a new user with this nickname.')); _('Create a new user with this nickname.'));
$this->input('newname', _('New nickname'), $this->input('newname', _('New nickname'),
($username) ? $username : '', ($this->username) ? $this->username : '',
_('1-64 lowercase letters or numbers, no punctuation or spaces')); _('1-64 lowercase letters or numbers, no punctuation or spaces'));
$this->elementStart('p'); $this->elementStart('p');
$this->element('input', array('type' => 'checkbox', $this->element('input', array('type' => 'checkbox',
@ -87,7 +105,7 @@ class FinishopenidloginAction extends Action
'name' => 'license', 'name' => 'license',
'value' => 'true')); 'value' => 'true'));
$this->text(_('My text and files are available under ')); $this->text(_('My text and files are available under '));
$this->element('a', array(href => common_config('license', 'url')), $this->element('a', array('href' => common_config('license', 'url')),
common_config('license', 'title')); common_config('license', 'title'));
$this->text(_(' except this private data: password, email address, IM address, phone number.')); $this->text(_(' except this private data: password, email address, IM address, phone number.'));
$this->elementEnd('p'); $this->elementEnd('p');
@ -100,12 +118,10 @@ class FinishopenidloginAction extends Action
$this->password('password', _('Password')); $this->password('password', _('Password'));
$this->submit('connect', _('Connect')); $this->submit('connect', _('Connect'));
$this->elementEnd('form'); $this->elementEnd('form');
common_show_footer();
} }
function try_login() function tryLogin()
{ {
$consumer = oid_consumer(); $consumer = oid_consumer();
$response = $consumer->complete(common_local_url('finishopenidlogin')); $response = $consumer->complete(common_local_url('finishopenidlogin'));
@ -143,22 +159,21 @@ class FinishopenidloginAction extends Action
common_rememberme($user); common_rememberme($user);
} }
unset($_SESSION['openid_rememberme']); unset($_SESSION['openid_rememberme']);
$this->go_home($user->nickname); $this->goHome($user->nickname);
} else { } else {
$this->save_values($display, $canonical, $sreg); $this->saveValues($display, $canonical, $sreg);
$this->show_form(null, $this->best_new_nickname($display, $sreg)); $this->showForm(null, $this->bestNewNickname($display, $sreg));
} }
} }
} }
function message($msg) function message($msg)
{ {
common_show_header(_('OpenID Login')); $this->message_text = $msg;
$this->element('p', null, $msg); $this->showPage();
common_show_footer();
} }
function save_values($display, $canonical, $sreg) function saveValues($display, $canonical, $sreg)
{ {
common_ensure_session(); common_ensure_session();
$_SESSION['openid_display'] = $display; $_SESSION['openid_display'] = $display;
@ -166,16 +181,15 @@ class FinishopenidloginAction extends Action
$_SESSION['openid_sreg'] = $sreg; $_SESSION['openid_sreg'] = $sreg;
} }
function get_saved_values() function getSavedValues()
{ {
return array($_SESSION['openid_display'], return array($_SESSION['openid_display'],
$_SESSION['openid_canonical'], $_SESSION['openid_canonical'],
$_SESSION['openid_sreg']); $_SESSION['openid_sreg']);
} }
function create_new_user() function createNewUser()
{ {
# FIXME: save invite code before redirect, and check here # FIXME: save invite code before redirect, and check here
if (common_config('site', 'closed') || common_config('site', 'inviteonly')) { if (common_config('site', 'closed') || common_config('site', 'inviteonly')) {
@ -188,21 +202,21 @@ class FinishopenidloginAction extends Action
if (!Validate::string($nickname, array('min_length' => 1, if (!Validate::string($nickname, array('min_length' => 1,
'max_length' => 64, 'max_length' => 64,
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) { 'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
$this->show_form(_('Nickname must have only lowercase letters and numbers and no spaces.')); $this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.'));
return; return;
} }
if (!User::allowed_nickname($nickname)) { if (!User::allowed_nickname($nickname)) {
$this->show_form(_('Nickname not allowed.')); $this->showForm(_('Nickname not allowed.'));
return; return;
} }
if (User::staticGet('nickname', $nickname)) { if (User::staticGet('nickname', $nickname)) {
$this->show_form(_('Nickname already in use. Try another one.')); $this->showForm(_('Nickname already in use. Try another one.'));
return; return;
} }
list($display, $canonical, $sreg) = $this->get_saved_values(); list($display, $canonical, $sreg) = $this->getSavedValues();
if (!$display || !$canonical) { if (!$display || !$canonical) {
$this->serverError(_('Stored OpenID not found.')); $this->serverError(_('Stored OpenID not found.'));
@ -256,14 +270,13 @@ class FinishopenidloginAction extends Action
common_redirect(common_local_url('showstream', array('nickname' => $user->nickname))); common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)));
} }
function connect_user() function connectUser()
{ {
$nickname = $this->trimmed('nickname'); $nickname = $this->trimmed('nickname');
$password = $this->trimmed('password'); $password = $this->trimmed('password');
if (!common_check_user($nickname, $password)) { if (!common_check_user($nickname, $password)) {
$this->show_form(_('Invalid username or password.')); $this->showForm(_('Invalid username or password.'));
return; return;
} }
@ -271,7 +284,7 @@ class FinishopenidloginAction extends Action
$user = User::staticGet('nickname', $nickname); $user = User::staticGet('nickname', $nickname);
list($display, $canonical, $sreg) = $this->get_saved_values(); list($display, $canonical, $sreg) = $this->getSavedValues();
if (!$display || !$canonical) { if (!$display || !$canonical) {
$this->serverError(_('Stored OpenID not found.')); $this->serverError(_('Stored OpenID not found.'));
@ -293,10 +306,10 @@ class FinishopenidloginAction extends Action
common_rememberme($user); common_rememberme($user);
} }
unset($_SESSION['openid_rememberme']); unset($_SESSION['openid_rememberme']);
$this->go_home($user->nickname); $this->goHome($user->nickname);
} }
function go_home($nickname) function goHome($nickname)
{ {
$url = common_get_returnto(); $url = common_get_returnto();
if ($url) { if ($url) {
@ -310,14 +323,14 @@ class FinishopenidloginAction extends Action
common_redirect($url); common_redirect($url);
} }
function best_new_nickname($display, $sreg) function bestNewNickname($display, $sreg)
{ {
# Try the passed-in nickname # Try the passed-in nickname
if ($sreg['nickname']) { if ($sreg['nickname']) {
$nickname = $this->nicknamize($sreg['nickname']); $nickname = $this->nicknamize($sreg['nickname']);
if ($this->is_new_nickname($nickname)) { if ($this->isNewNickname($nickname)) {
return $nickname; return $nickname;
} }
} }
@ -326,16 +339,16 @@ class FinishopenidloginAction extends Action
if ($sreg['fullname']) { if ($sreg['fullname']) {
$fullname = $this->nicknamize($sreg['fullname']); $fullname = $this->nicknamize($sreg['fullname']);
if ($this->is_new_nickname($fullname)) { if ($this->isNewNickname($fullname)) {
return $fullname; return $fullname;
} }
} }
# Try the URL # Try the URL
$from_url = $this->openid_to_nickname($display); $from_url = $this->openidToNickname($display);
if ($from_url && $this->is_new_nickname($from_url)) { if ($from_url && $this->isNewNickname($from_url)) {
return $from_url; return $from_url;
} }
@ -344,14 +357,14 @@ class FinishopenidloginAction extends Action
return null; return null;
} }
function is_new_nickname($str) function isNewNickname($str)
{ {
if (!Validate::string($str, array('min_length' => 1, if (!Validate::string($str, array('min_length' => 1,
'max_length' => 64, 'max_length' => 64,
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) { 'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
return false; return false;
} }
if (!User::allowed_nickname($str)) { if (!User::allowed_nickname($str)) {
return false; return false;
} }
if (User::staticGet('nickname', $str)) { if (User::staticGet('nickname', $str)) {
@ -360,12 +373,12 @@ class FinishopenidloginAction extends Action
return true; return true;
} }
function openid_to_nickname($openid) function openidToNickname($openid)
{ {
if (Auth_Yadis_identifierScheme($openid) == 'XRI') { if (Auth_Yadis_identifierScheme($openid) == 'XRI') {
return $this->xri_to_nickname($openid); return $this->xriToNickname($openid);
} else { } else {
return $this->url_to_nickname($openid); return $this->urlToNickname($openid);
} }
} }
@ -374,7 +387,7 @@ class FinishopenidloginAction extends Action
# 2. One element in path, like http://profile.typekey.com/EvanProdromou/ # 2. One element in path, like http://profile.typekey.com/EvanProdromou/
# or http://getopenid.com/evanprodromou # or http://getopenid.com/evanprodromou
function url_to_nickname($openid) function urlToNickname($openid)
{ {
static $bad = array('query', 'user', 'password', 'port', 'fragment'); static $bad = array('query', 'user', 'password', 'port', 'fragment');
@ -421,9 +434,9 @@ class FinishopenidloginAction extends Action
return null; return null;
} }
function xri_to_nickname($xri) function xriToNickname($xri)
{ {
$base = $this->xri_base($xri); $base = $this->xriBase($xri);
if (!$base) { if (!$base) {
return null; return null;
@ -435,7 +448,7 @@ class FinishopenidloginAction extends Action
} }
} }
function xri_base($xri) function xriBase($xri)
{ {
if (substr($xri, 0, 6) == 'xri://') { if (substr($xri, 0, 6) == 'xri://') {
return substr($xri, 6); return substr($xri, 6);