summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/login.php74
-rw-r--r--actions/otp.php145
-rw-r--r--actions/register.php1
3 files changed, 173 insertions, 47 deletions
diff --git a/actions/login.php b/actions/login.php
index c775fa692..8ea3c800b 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -76,15 +76,10 @@ class LoginAction extends Action
{
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();
@@ -103,46 +98,30 @@ class LoginAction extends Action
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()) {
+ $st = common_session_token();
+ if (empty($token)) {
+ common_log(LOG_WARNING, 'No token provided by client.');
+ } else if (empty($st)) {
+ common_log(LOG_WARNING, 'No session token stored.');
+ } else {
+ common_log(LOG_WARNING, 'Token = ' . $token . ' and session token = ' . $st);
+ }
+
+ $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;
@@ -165,6 +144,7 @@ class LoginAction extends Action
if ($url) {
// We don't have to return to it again
common_set_returnto(null);
+ $url = common_inject_session($url);
} else {
$url = common_local_url('all',
array('nickname' =>
@@ -240,9 +220,9 @@ class LoginAction extends Action
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');
@@ -255,7 +235,7 @@ class LoginAction extends Action
$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'));
diff --git a/actions/otp.php b/actions/otp.php
new file mode 100644
index 000000000..acf84aee8
--- /dev/null
+++ b/actions/otp.php
@@ -0,0 +1,145 @@
+<?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);
+ }
+}
diff --git a/actions/register.php b/actions/register.php
index 96015c219..698137346 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -259,6 +259,7 @@ class RegisterAction extends Action
// Re-init language env in case it changed (not yet, but soon)
common_init_language();
+
$this->showSuccess();
} else {
$this->showForm(_('Invalid username or password.'));
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-30 15:45:44 +0000