{
parent::handle($args);
- $disabled = common_config('logincommand','disabled');
- $disabled = isset($disabled) && $disabled;
-
if (common_is_real_login()) {
$this->clientError(_('Already logged in.'));
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->checkLogin();
- } else if (!$disabled && isset($args['user_id']) && isset($args['token'])){
- $this->checkLogin($args['user_id'],$args['token']);
} else {
common_ensure_session();
$this->showForm();
function checkLogin($user_id=null, $token=null)
{
- if(isset($token) && isset($user_id)){
- //Token based login (from the LoginCommand)
- $login_token = Login_token::staticGet('user_id',$user_id);
- if($login_token && $login_token->token == $token){
- if($login_token->modified > time()+2*60){
- //token has expired
- //delete the token as it is useless
- $login_token->delete();
- $this->showForm(_('Invalid or expired token.'));
- return;
- }else{
- //delete the token so it cannot be reused
- $login_token->delete();
- //it's a valid token - let them log in
- $user = User::staticGet('id', $user_id);
- //$user = User::staticGet('nickname', "candrews");
- }
- }else{
- $this->showForm(_('Invalid or expired token.'));
- return;
- }
- }else{
- // Regular form submission login
-
- // XXX: login throttle
-
- // CSRF protection - token set in NoticeForm
- $token = $this->trimmed('token');
- if (!$token || $token != common_session_token()) {
- $this->clientError(_('There was a problem with your session token. '.
- 'Try again, please.'));
- return;
- }
-
- $nickname = $this->trimmed('nickname');
- $password = $this->arg('password');
-
- $user = common_check_user($nickname, $password);
+ // XXX: login throttle
+
+ // CSRF protection - token set in NoticeForm
+ $token = $this->trimmed('token');
+ if (!$token || $token != common_session_token()) {
+ $this->clientError(_('There was a problem with your session token. '.
+ 'Try again, please.'));
+ return;
}
+ $nickname = $this->trimmed('nickname');
+ $password = $this->arg('password');
+
+ $user = common_check_user($nickname, $password);
+
if (!$user) {
$this->showForm(_('Incorrect username or password.'));
return;
$url = common_get_returnto();
+ if (common_config('ssl', 'sometimes') && // mixed environment
+ common_config('site', 'server') != common_config('site', 'sslserver')) {
+ $this->redirectFromSSL($user, $url, $this->boolean('rememberme'));
+ return;
+ }
+
if ($url) {
// We don't have to return to it again
common_set_returnto(null);
function showContent()
{
$this->elementStart('form', array('method' => 'post',
- 'id' => 'form_login',
- 'class' => 'form_settings',
- 'action' => common_local_url('login')));
+ 'id' => 'form_login',
+ 'class' => 'form_settings',
+ 'action' => common_local_url('login')));
$this->elementStart('fieldset');
$this->element('legend', null, _('Login to site'));
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->checkbox('rememberme', _('Remember me'), false,
_('Automatically login in the future; ' .
- 'not for shared computers!'));
+ 'not for shared computers!'));
$this->elementEnd('li');
$this->elementEnd('ul');
$this->submit('submit', _('Login'));
$nav = new LoginGroupNav($this);
$nav->show();
}
+
+ function redirectFromSSL($user, $returnto, $rememberme)
+ {
+ try {
+ $login_token = Login_token::makeNew($user);
+ } catch (Exception $e) {
+ $this->serverError($e->getMessage());
+ return;
+ }
+
+ $params = array();
+
+ if (!empty($returnto)) {
+ $params['returnto'] = $returnto;
+ }
+
+ if (!empty($rememberme)) {
+ $params['rememberme'] = $rememberme;
+ }
+
+ $target = common_local_url('otp',
+ array('user_id' => $login_token->user_id,
+ 'token' => $login_token->token),
+ $params);
+
+ common_redirect($target, 303);
+ }
}
--- /dev/null
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Allow one-time password login
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Login
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * Allow one-time password login
+ *
+ * This action will automatically log in the user identified by the user_id
+ * parameter. A login_token record must be constructed beforehand, typically
+ * by code where the user is already authenticated.
+ *
+ * @category Login
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link http://status.net/
+ */
+
+class OtpAction extends Action
+{
+ var $user;
+ var $token;
+ var $rememberme;
+ var $returnto;
+ var $lt;
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+
+ if (common_is_real_login()) {
+ $this->clientError(_('Already logged in.'));
+ return false;
+ }
+
+ $id = $this->trimmed('user_id');
+
+ if (empty($id)) {
+ $this->clientError(_('No user ID specified.'));
+ return false;
+ }
+
+ $this->user = User::staticGet('id', $id);
+
+ if (empty($this->user)) {
+ $this->clientError(_('No such user.'));
+ return false;
+ }
+
+ $this->token = $this->trimmed('token');
+
+ if (empty($this->token)) {
+ $this->clientError(_('No login token specified.'));
+ return false;
+ }
+
+ $this->lt = Login_token::staticGet('user_id', $id);
+
+ if (empty($this->lt)) {
+ $this->clientError(_('No login token requested.'));
+ return false;
+ }
+
+ if ($this->lt->token != $this->token) {
+ $this->clientError(_('Invalid login token specified.'));
+ return false;
+ }
+
+ if ($this->lt->modified > time() + Login_token::TIMEOUT) {
+ //token has expired
+ //delete the token as it is useless
+ $this->lt->delete();
+ $this->lt = null;
+ $this->clientError(_('Login token expired.'));
+ return false;
+ }
+
+ $this->rememberme = $this->boolean('rememberme');
+ $this->returnto = $this->trimmed('returnto');
+
+ return true;
+ }
+
+ function handle($args)
+ {
+ parent::handle($args);
+
+ // success!
+ if (!common_set_user($this->user)) {
+ $this->serverError(_('Error setting user. You are probably not authorized.'));
+ return;
+ }
+
+ // We're now logged in; disable the lt
+
+ $this->lt->delete();
+ $this->lt = null;
+
+ if ($this->rememberme) {
+ common_rememberme($this->user);
+ }
+
+ if (!empty($this->returnto)) {
+ $url = $this->returnto;
+ // We don't have to return to it again
+ common_set_returnto(null);
+ } else {
+ $url = common_local_url('all',
+ array('nickname' =>
+ $this->user->nickname));
+ }
+
+ common_redirect($url, 303);
+ }
+}
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
+ const TIMEOUT = 120; // seconds after which to timeout the token
+
/*
DB_DataObject calculates the sequence key(s) by taking the first key returned by the keys() function.
In this case, the keys() function returns user_id as the first key. user_id is not a sequence, but
{
return array(false,false);
}
+
+ function makeNew($user)
+ {
+ $login_token = Login_token::staticGet('user_id', $user->id);
+
+ if (!empty($login_token)) {
+ $login_token->delete();
+ }
+
+ $login_token = new Login_token();
+
+ $login_token->user_id = $user->id;
+ $login_token->token = common_good_rand(16);
+ $login_token->created = common_sql_now();
+
+ $result = $login_token->insert();
+
+ if (!$result) {
+ common_log_db_error($login_token, 'INSERT', __FILE__);
+ throw new Exception(sprintf(_('Could not create login token for %s'),
+ $user->nickname));
+ }
+
+ return $login_token;
+ }
}
$channel->error($this->user, _('Login command is disabled'));
return;
}
- $login_token = Login_token::staticGet('user_id',$this->user->id);
- if($login_token){
- $login_token->delete();
- }
- $login_token = new Login_token();
- $login_token->user_id = $this->user->id;
- $login_token->token = common_good_rand(16);
- $login_token->created = common_sql_now();
- $result = $login_token->insert();
- if (!$result) {
- common_log_db_error($login_token, 'INSERT', __FILE__);
- $channel->error($this->user, sprintf(_('Could not create login token for %s'),
- $this->user->nickname));
- return;
+
+ try {
+ $login_token = Login_token::makeNew($this->user);
+ } catch (Exception $e) {
+ $channel->error($this->user, $e->getMessage());
}
+
$channel->output($this->user,
sprintf(_('This link is useable only once, and is good for only 2 minutes: %s'),
- common_local_url('login',
- array('user_id'=>$login_token->user_id, 'token'=>$login_token->token))));
+ common_local_url('otp',
+ array('user_id' => $login_token->user_id, 'token' => $login_token->token))));
}
}
$m->connect('doc/:title', array('action' => 'doc'));
- $m->connect('main/login?user_id=:user_id&token=:token', array('action'=>'login'), array('user_id'=> '[0-9]+', 'token'=>'.+'));
+ $m->connect('main/otp/:user_id/:token',
+ array('action' => 'otp'),
+ array('user_id' => '[0-9]+',
+ 'token' => '.+'));
// main stuff is repetitive
projects / quix0rs-gnu-social.git / commitdiff