mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support for multiple login cookie tokens

This commit is contained in:
Bart Visscher 2012-09-04 18:07:38 +02:00 committed by Michael Göhler
parent 4af5b016cc
commit 1012d317e3
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/base.php
View File

@ -449,6 +449,7 @@ class OC{
OC_App::loadApps(); OC_App::loadApps();
OC_User::setupBackends(); OC_User::setupBackends();
if(isset($_GET["logout"]) and ($_GET["logout"])) { if(isset($_GET["logout"]) and ($_GET["logout"])) {
OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
OC_User::logout(); OC_User::logout();
header("Location: ".OC::$WEBROOT.'/'); header("Location: ".OC::$WEBROOT.'/');
}else{ }else{
@ -523,15 +524,17 @@ class OC{
OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG); OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG);
} }
// confirm credentials in cookie // confirm credentials in cookie
if(isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username']) && if(isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username'])) {
OC_Preferences::getValue($_COOKIE['oc_username'], "login", "token") === $_COOKIE['oc_token']) $tokens = OC_Preferences::getKeys($_COOKIE['oc_username'], 'login_token');
{ $tokens[] = OC_Preferences::getValue($_COOKIE['oc_username'], 'login', 'token');
OC_User::setUserId($_COOKIE['oc_username']); if (in_array($_COOKIE['oc_token'], $tokens, true)) {
OC_Util::redirectToDefaultPage(); OC_User::setUserId($_COOKIE['oc_username']);
} OC_Util::redirectToDefaultPage();
else { // doesn't return
OC_User::unsetMagicInCookie(); }
OC_Preferences::deleteKey($_POST['user'], 'login_token', $_COOKIE['oc_token']);
} }
OC_User::unsetMagicInCookie();
return true; return true;
} }
@ -551,7 +554,7 @@ class OC{
OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG); OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
} }
$token = md5($_POST["user"].time().$_POST['password']); $token = md5($_POST["user"].time().$_POST['password']);
OC_Preferences::setValue($_POST['user'], 'login', 'token', $token); OC_Preferences::setValue($_POST['user'], 'login_token', $token, time());
OC_User::setMagicInCookie($_POST["user"], $token); OC_User::setMagicInCookie($_POST["user"], $token);
} }
else { else {