summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-11-20 11:12:17 +0000
committerZach Copley <zach@status.net>2009-11-20 11:12:17 +0000
commitc0283802f53bb5243bb3dacac3f0ced20f8c0ff0 (patch)
tree9713ac6f46e68828ed043cfec907f8a74d648e1b
parente640561ccdcd4f3472302341ed15503e1c9d8319 (diff)
parent224d82793c769c06d1e4f39c19cd5f2e9cf519b0 (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
-rw-r--r--actions/login.php9
-rw-r--r--classes/Login_token.php42
-rw-r--r--db/08to09.sql11
-rw-r--r--db/08to09_pg.sql12
-rw-r--r--db/statusnet.sql10
-rw-r--r--db/statusnet_pg.sql12
-rw-r--r--lib/command.php27
-rw-r--r--lib/commandinterpreter.php6
-rw-r--r--lib/router.php2
9 files changed, 9 insertions, 122 deletions
diff --git a/actions/login.php b/actions/login.php
index cee29fd09..cd1326813 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -79,8 +79,6 @@ class LoginAction extends Action
$this->clientError(_('Already logged in.'));
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->checkLogin();
- } else if (isset($args['user_id']) && isset($args['token'])){
- $this->checkLogin($args['user_id'],$args['token']);
} else {
common_ensure_session();
$this->showForm();
@@ -97,7 +95,7 @@ class LoginAction extends Action
* @return void
*/
- function checkLogin($user_id=null, $token=null)
+ function checkLogin()
{
if(isset($token) && isset($user_id)){
//Token based login (from the LoginCommand)
@@ -139,6 +137,11 @@ class LoginAction extends Action
$user = common_check_user($nickname, $password);
}
+ $nickname = common_canonical_nickname($this->trimmed('nickname'));
+ $password = $this->arg('password');
+
+ $user = common_check_user($nickname, $password);
+
if (!$user) {
$this->showForm(_('Incorrect username or password.'));
return;
diff --git a/classes/Login_token.php b/classes/Login_token.php
deleted file mode 100644
index bd6381f90..000000000
--- a/classes/Login_token.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Table Definition for group_alias
- *
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
- *
- * 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/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-
-class Login_token extends Memcached_DataObject
-{
- ###START_AUTOCODE
- /* the code below is auto generated do not remove the above tag */
-
- public $__table = 'login_token'; // table name
- public $user_id; // int(4) primary_key not_null
- public $token; // char(32) not_null
- public $created; // datetime() not_null
- public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
-
- /* Static get */
- function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Login_token',$k,$v); }
-
- /* the code above is auto generated do not remove the tag below */
- ###END_AUTOCODE
-}
diff --git a/db/08to09.sql b/db/08to09.sql
index 64640f4ce..8d463fab4 100644
--- a/db/08to09.sql
+++ b/db/08to09.sql
@@ -72,13 +72,4 @@ create table location_namespace (
created datetime not null comment 'date the record was created',
modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table login_token (
- user_id integer not null comment 'user owning this token' references user (id),
- token char(32) not null comment 'token useable for logging in',
- created datetime not null comment 'date this record was created',
- modified timestamp comment 'date this record was modified',
-
- constraint primary key (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; \ No newline at end of file
diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 7aaf3a7a0..de6a82209 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -39,15 +39,6 @@ create table profile_role (
);
-create table login_token (
- user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
- token char(32) not null /* comment 'token useable for logging in'*/,
- created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
- modified timestamp /* comment 'date this record was modified'*/,
-
- primary key (user_id)
-);
-
DROP index fave_user_id_idx;
CREATE index fave_user_id_idx on fave (user_id,modified);
@@ -58,5 +49,4 @@ DROP index subscription_subscribed_idx;
CREATE index subscription_subscribed_idx ON subscription (subscribed,created);
DROP index notice_profile_id_idx;
-CREATE index notice_profile_id_idx ON notice (profile_id,created,id);
-
+CREATE index notice_profile_id_idx ON notice (profile_id,created,id); \ No newline at end of file
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 18abcdfdb..f7b3b113b 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -575,13 +575,3 @@ create table location_namespace (
modified timestamp comment 'date this record was modified'
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table login_token (
- user_id integer not null comment 'user owning this token' references user (id),
- token char(32) not null comment 'token useable for logging in',
- created datetime not null comment 'date this record was created',
- modified timestamp comment 'date this record was modified',
-
- constraint primary key (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 927925753..27b189e28 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -568,14 +568,4 @@ create table profile_role (
primary key (profile_id, role)
-);
-
-create table login_token (
- user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
- token char(32) not null /* comment 'token useable for logging in'*/,
- created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
- modified timestamp /* comment 'date this record was modified'*/,
-
- primary key (user_id)
-);
-
+); \ No newline at end of file
diff --git a/lib/command.php b/lib/command.php
index 7e98156b6..bcc551c81 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -579,32 +579,6 @@ class OnCommand extends Command
}
}
-class LoginCommand extends Command
-{
- function execute($channel)
- {
- $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;
- }
- $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))));
- }
-}
-
class SubscriptionsCommand extends Command
{
function execute($channel)
@@ -692,7 +666,6 @@ class HelpCommand extends Command
"reply #<notice_id> - reply to notice with a given id\n".
"reply <nickname> - reply to the last notice from user\n".
"join <group> - join group\n".
- "login - Get a link to login to the web interface\n".
"drop <group> - leave group\n".
"stats - get your stats\n".
"stop - same as 'off'\n".
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index 665015afc..25f2e4b3e 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -41,12 +41,6 @@ class CommandInterpreter
return null;
}
return new HelpCommand($user);
- case 'login':
- if ($arg) {
- return null;
- } else {
- return new LoginCommand($user);
- }
case 'subscribers':
if ($arg) {
return null;
diff --git a/lib/router.php b/lib/router.php
index b22185126..beb98eb04 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -88,8 +88,6 @@ class Router
$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'=>'.+'));
-
// main stuff is repetitive
$main = array('login', 'logout', 'register', 'subscribe',