[stable10] Remove alternate keys storage during user delete

apps/encryption/lib/Hooks/UserHooks.php

@@ -198,7 +198,14 @@ public function postCreateUser($params) {
 	public function postDeleteUser($params) {
 
 		if (App::isEnabled('encryption')) {
-			$this->keyManager->deletePublicKey($params['uid']);
+			/**
+			 * Adding a safe condition to make sure the uid is not
+			 * empty or null.
+			 */
+			if (!is_null($params['uid']) && ($params['uid'] !== '')) {
+				$this->keyManager->deletePublicKey($params['uid']);
+				\OC::$server->getEncryptionKeyStorage()->deleteAltUserStorageKeys($params['uid']);
+			}
 		}
 	}
 

lib/private/Encryption/Keys/Storage.php

@@ -181,6 +181,27 @@ public function deleteSystemUserKey($keyId, $encryptionModuleId) {
 		return !$this->view->file_exists($path) || $this->view->unlink($path);
 	}
 
+	/**
+	 * @inheritdoc
+	 */
+
+	public function deleteAltUserStorageKeys($uid) {
+		if (\OC::$server->getEncryptionManager()->isEnabled()) {
+			/**
+			 * If the key storage is not the default
+			 * location, then we need to remove the keys
+			 * in the alternate key location
+			 */
+			$keyStorageRoot = $this->util->getKeyStorageRoot();
+			if ($keyStorageRoot !== '') {
+				$this->view->rmdir($keyStorageRoot . '/' . $uid);
+				return true;
+			}
+
+			return false;
+		}
+	}
+
 	/**
 	 * construct path to users key
 	 *

lib/public/Encryption/Keys/IStorage.php

@@ -169,4 +169,14 @@ public function renameKeys($source, $target);
 	 */
 	public function copyKeys($source, $target);
 
+	/**
+	 * delete user keys from alternate storage location when
+	 * a user is deleted
+	 *
+	 * @param $uid
+	 * @return boolean
+	 * @since 10.0.4
+	 */
+	public function deleteAltUserStorageKeys($uid);
+
 }