From: Björn Schießle <schiessle@owncloud.com>
Date: Mon, 10 Jun 2013 10:12:07 +0000 (+0200)
Subject: Merge branch 'master' into files_encryption_check_private_key
X-Git-Tag: v6.0.0alpha2~641^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=13017ce9e114d84ba9b4ced240e5648447fdfe45;p=nextcloud-server.git

Merge branch 'master' into files_encryption_check_private_key

Conflicts:
	settings/ajax/changepassword.php
---

13017ce9e114d84ba9b4ced240e5648447fdfe45
diff --cc settings/ajax/changepassword.php
index e8adb8c959f,30877810550..d409904ebc7
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@@ -23,28 -23,34 +23,42 @@@ if (OC_User::getUser() === $username &
  	$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');
- 	$recoveryEnabledForUser = $util->recoveryEnabledForUser();
 +
- 	if ($recoveryAdminEnabled && $recoveryEnabledForUser && $recoveryPassword === '') {
++	$validRecoveryPassword = false;
++	$recoveryPasswordSupported = false;
++	if ($recoveryAdminEnabled) {
++		$validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
++		$recoveryEnabledForUser = $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 ( $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
++	if ($recoveryEnabledForUser && $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 ($recoveryEnabledForUser && ! $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 { // 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::error(array('data' => array('message' => 'Unable to change password')));
+ 		OC_JSON::success(array("data" => array( "username" => $username )));
+ 	}
++
 +	}
- } else {
++} 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::error(array('data' => array('message' => 'Unable to change password')));
 +	}
- }
+ }