Merge pull request #3610 from owncloud/encryption_recovery_for_ldap

recover encryption keys if ownCloud can't change the log-in password

2 files changed, 26 insertions, 10 deletions

diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index cb66c57c743..30877810550 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -28,17 +28,29 @@ if(is_null($userstatus)) {
 	exit();
 }
 
-$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
 $recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
-$recoveryEnabledForUser = $util->recoveryEnabledForUser();
 
-if ($recoveryAdminEnabled && $recoveryEnabledForUser && $recoveryPassword == '') {
+
+$validRecoveryPassword = false;
+$recoveryPasswordSupported = false;
+
+if ($recoveryAdminEnabled) {
+	$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
+	$validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
+	$recoveryPasswordSupported = $util->recoveryEnabledForUser();
+}
+
+if ($recoveryPasswordSupported && $recoveryPassword == '') {
 	OC_JSON::error(array("data" => array( "message" => "Please provide a admin recovery password, otherwise all user data will be lost" )));
-}elseif ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) {
+} elseif ( $recoveryPasswordSupported && ! $validRecoveryPassword) {
 	OC_JSON::error(array("data" => array( "message" => "Wrong admin recovery password. Please check the password and try again." )));
-}elseif(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) {
-	OC_JSON::success(array("data" => array( "username" => $username )));
-}
-else{
-	OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
+} 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" )));
+	} else {
+		OC_JSON::success(array("data" => array( "username" => $username )));
+	}
 }
diff --git a/settings/templates/users.php b/settings/templates/users.php
index a6df85983dd..b0637814f5d 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -31,7 +31,11 @@ $_['subadmingroups'] = array_flip($items);
 	</form>
 	<?php if((bool)$_['recoveryAdminEnabled']): ?>
 	<div class="recoveryPassword">
-	<input id="recoveryPassword" type="password" placeholder="<?php p($l->t('Admin Recovery Password'))?>" />
+	<input id="recoveryPassword"
+		   type="password"
+		   placeholder="<?php p($l->t('Admin Recovery Password'))?>"
+		   title="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"
+		   alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
 	</div>
 	<?php endif; ?>
 	<div class="quota">