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

Make enhanced auth time configurable

This commit is contained in:
Lukas Reschke 2012-10-16 01:02:03 +02:00
parent f4142bd2a8
commit 6f2e8788ca
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.sample.php
View File

@ -30,6 +30,9 @@ $CONFIG = array(
/* Force use of HTTPS connection (true = use HTTPS) */ /* Force use of HTTPS connection (true = use HTTPS) */
"forcessl" => false, "forcessl" => false,
/* Time in seconds how long an user is authenticated without entering his password again before performing sensitive actions like creating or deleting users etc...*/
"enhancedauthtime" => 15 * 60,
/* Theme to use for ownCloud */ /* Theme to use for ownCloud */
"theme" => "", "theme" => "",

3
lib/json.php
View File

@ -80,10 +80,9 @@ class OC_JSON{
} }
/** /**
* Check if the user verified the login with his password in the last 15 minutes * Check if the user verified the login with his password
*/ */
public static function verifyUser() { public static function verifyUser() {
// Check if the user verified his password in the last 15 minutes
if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) { if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
$l = OC_L10N::get('lib'); $l = OC_L10N::get('lib');
self::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));

3
lib/setup.php
View File

@ -391,6 +391,9 @@ class OC_Setup {
self::createHtaccess(); self::createHtaccess();
} }
// Set the admin auth time
OC_Config::setValue('enhancedauthtime', 15 * 60);
//and we are done //and we are done
OC_Config::setValue('installed', true); OC_Config::setValue('installed', true);
} }

7
lib/util.php
View File

@ -394,11 +394,11 @@ class OC_Util {
// Check password to set session // Check password to set session
if(isset($_POST['password'])) { if(isset($_POST['password'])) {
if (OC_User::login(OC_User::getUser(), $_POST["password"] ) === true) { if (OC_User::login(OC_User::getUser(), $_POST["password"] ) === true) {
$_SESSION['verifiedLogin']=time() + (15 * 60); $_SESSION['verifiedLogin']=time() + OC_Config::getValue('enhancedauthtime');
} }
} }
// Check if the user verified his password in the last 15 minutes // Check if the user verified his password
if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) { if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
OC_Template::printGuestPage("", "verify", array('username' => OC_User::getUser())); OC_Template::printGuestPage("", "verify", array('username' => OC_User::getUser()));
exit(); exit();
@ -406,11 +406,10 @@ class OC_Util {
} }
/** /**
* Check if the user verified the login with his password in the last 15 minutes * Check if the user verified the login with his password
* @return bool * @return bool
*/ */
public static function isUserVerified() { public static function isUserVerified() {
// Check if the user verified his password in the last 15 minutes
if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) { if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
return false; return false;
} }