Merge pull request #22791 from owncloud/enc_master_key_improvements

Enc master key improvements

2 files changed, 17 insertions, 17 deletions

diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php
index 0accfb7900a..5cce760fa59 100644
--- a/apps/encryption/lib/keymanager.php
+++ b/apps/encryption/lib/keymanager.php
@@ -174,6 +174,11 @@ class KeyManager {
 	 * check if a key pair for the master key exists, if not we create one
 	 */
 	public function validateMasterKey() {
+
+		if ($this->util->isMasterKeyEnabled() === false) {
+			return;
+		}
+
 		$masterKey = $this->getPublicMasterKey();
 		if (empty($masterKey)) {
 			$keyPair = $this->crypt->createKeyPair();
@@ -334,7 +339,7 @@ class KeyManager {
 	/**
 	 * Decrypt private key and store it
 	 *
-	 * @param string $uid userid
+	 * @param string $uid user id
 	 * @param string $passPhrase users password
 	 * @return boolean
 	 */
@@ -342,7 +347,6 @@ class KeyManager {
 
 		$this->session->setStatus(Session::INIT_EXECUTED);
 
-
 		try {
 			if($this->util->isMasterKeyEnabled()) {
 				$uid = $this->getMasterKeyId();
@@ -554,9 +558,11 @@ class KeyManager {
 	}
 
 	/**
+	 * creat a backup of the users private and public key and then  delete it
+	 *
 	 * @param string $uid
 	 */
-	public function replaceUserKeys($uid) {
+	public function deleteUserKeys($uid) {
 		$this->backupAllKeys('password_reset');
 		$this->deletePublicKey($uid);
 		$this->deletePrivateKey($uid);
diff --git a/apps/encryption/lib/users/setup.php b/apps/encryption/lib/users/setup.php
index 0b5fb351aca..e59340c4ce2 100644
--- a/apps/encryption/lib/users/setup.php
+++ b/apps/encryption/lib/users/setup.php
@@ -66,29 +66,23 @@ class Setup {
  	}
 
 	/**
-	 * @param string $uid userid
+	 * @param string $uid user id
 	 * @param string $password user password
 	 * @return bool
 	 */
 	public function setupUser($uid, $password) {
-		return $this->setupServerSide($uid, $password);
+		if (!$this->keyManager->userHasKeys($uid)) {
+			return $this->keyManager->storeKeyPair($uid, $password,
+				$this->crypt->createKeyPair());
+		}
+		return true;
 	}
 
 	/**
-	 * check if user has a key pair, if not we create one
-	 *
-	 * @param string $uid userid
-	 * @param string $password user password
-	 * @return bool
+	 * make sure that all system keys exists
 	 */
-	public function setupServerSide($uid, $password) {
+	public function setupSystem() {
 		$this->keyManager->validateShareKey();
 		$this->keyManager->validateMasterKey();
-		// Check if user already has keys
-		if (!$this->keyManager->userHasKeys($uid)) {
-			return $this->keyManager->storeKeyPair($uid, $password,
-				$this->crypt->createKeyPair());
-		}
-		return true;
 	}
 }