diff options
author | Bjoern Schiessle <schiessle@owncloud.com> | 2016-03-02 13:58:06 +0100 |
---|---|---|
committer | Bjoern Schiessle <schiessle@owncloud.com> | 2016-03-18 11:06:14 +0100 |
commit | 5e267589d40400223e5dce692568ab2933be14f7 (patch) | |
tree | 018f66a48dacf80ab512c3d1898359f420b173b6 /apps/encryption/lib/users/setup.php | |
parent | a6c921267e00d0fb5021e8bdbd4d202931d7a58a (diff) | |
download | nextcloud-server-5e267589d40400223e5dce692568ab2933be14f7.tar.gz nextcloud-server-5e267589d40400223e5dce692568ab2933be14f7.zip |
only create and update user specific key if no master key is enabled
Diffstat (limited to 'apps/encryption/lib/users/setup.php')
-rw-r--r-- | apps/encryption/lib/users/setup.php | 22 |
1 files changed, 8 insertions, 14 deletions
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; } } |