diff options
author | Florin Peter <github@florin-peter.de> | 2013-06-03 21:06:20 +0400 |
---|---|---|
committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-13 15:39:54 +0400 |
commit | 5d7aa761bcb267ce933204fc6a450ef71f3fb294 (patch) | |
tree | 1225c09fabac22a4cfce21438f1a8ca5f6373b87 /settings | |
parent | 86a1a7ea5335989b626794de575d2a32c16c3e0c (diff) |
fix password change when files_encryption app is disabled
Conflicts:
settings/ajax/changepassword.php
Diffstat (limited to 'settings')
-rw-r--r-- | settings/ajax/changepassword.php | 67 |
1 files changed, 37 insertions, 30 deletions
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index 30877810550..5bdc589da34 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -7,50 +7,57 @@ OC_JSON::checkLoggedIn(); // Manually load apps to ensure hooks work correctly (workaround for issue 1503) OC_APP::loadApps(); -$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser(); -$password = isset($_POST["password"]) ? $_POST["password"] : null; -$oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:''; -$recoveryPassword=isset($_POST["recoveryPassword"])?$_POST["recoveryPassword"]:null; +$username = isset($_POST['username']) ? $_POST['username'] : OC_User::getUser(); +$password = isset($_POST['password']) ? $_POST['password'] : null; +$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : ''; +$recoveryPassword = isset($_POST['recoveryPassword']) ? $_POST['recoveryPassword'] : null; $userstatus = null; -if(OC_User::isAdminUser(OC_User::getUser())) { +if (OC_User::isAdminUser(OC_User::getUser())) { $userstatus = 'admin'; } -if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) { +if (OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) { $userstatus = 'subadmin'; } -if(OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPassword)) { +if (OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPassword)) { $userstatus = 'user'; } -if(is_null($userstatus)) { - OC_JSON::error( array( "data" => array( "message" => "Authentication error" ))); +if (is_null($userstatus)) { + OC_JSON::error(array('data' => array('message' => 'Authentication error'))); exit(); } -$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' ); - - -$validRecoveryPassword = false; -$recoveryPasswordSupported = false; - -if ($recoveryAdminEnabled) { +if (\OCP\App::isEnabled('files_encryption') && $userstatus !== 'user') { +//handle the recovery case $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username); - $validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword); - $recoveryPasswordSupported = $util->recoveryEnabledForUser(); -} + $recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'); -if ($recoveryPasswordSupported && $recoveryPassword == '') { - OC_JSON::error(array("data" => array( "message" => "Please provide a admin recovery password, otherwise all user data will be lost" ))); -} elseif ( $recoveryPasswordSupported && ! $validRecoveryPassword) { - OC_JSON::error(array("data" => array( "message" => "Wrong admin recovery password. Please check the password and try again." ))); -} else { // now we know that everything is file regarding the recovery password, let's try to change the password - $result = OC_User::setPassword($username, $password, $recoveryPassword); - if (!$result && $recoveryPasswordSupported) { - OC_JSON::error(array("data" => array( "message" => "Back-end doesn't support password change, but the users encryption key was successfully updated." ))); - } elseif (!$result && !$recoveryPasswordSupported) { - OC_JSON::error(array("data" => array( "message" => "Unable to change password" ))); + $validRecoveryPassword = false; + $recoveryPasswordSupported = false; + if ($recoveryAdminEnabled) { + $validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword); + $recoveryEnabledForUser = $util->recoveryEnabledForUser(); + } + + if ($recoveryEnabledForUser && $recoveryPassword === '') { + OC_JSON::error(array('data' => array('message' => 'Please provide a admin recovery password, otherwise all user data will be lost'))); + } elseif ($recoveryEnabledForUser && !$validRecoveryPassword) { + OC_JSON::error(array('data' => array('message' => 'Wrong admin recovery password. Please check the password and try again.'))); + } else { // now we know that everything is fine regarding the recovery password, let's try to change the password + $result = OC_User::setPassword($username, $password, $recoveryPassword); + if (!$result && $recoveryPasswordSupported) { + OC_JSON::error(array("data" => array("message" => "Back-end doesn't support password change, but the users encryption key was successfully updated."))); + } elseif (!$result && !$recoveryPasswordSupported) { + OC_JSON::error(array("data" => array("message" => "Unable to change password"))); + } else { + OC_JSON::success(array("data" => array("username" => $username))); + } + } +} else { // if user changes his own password or if encryption is disabled, proceed + if (!is_null($password) && OC_User::setPassword($username, $password)) { + OC_JSON::success(array('data' => array('username' => $username))); } else { - OC_JSON::success(array("data" => array( "username" => $username ))); + OC_JSON::error(array('data' => array('message' => 'Unable to change password'))); } } |