@@ -26,13 +26,13 @@ |
||
| 26 | 26 | namespace OCA\User_LDAP; |
| 27 | 27 | |
| 28 | 28 | abstract class BackendUtility { |
| 29 | - protected $access; |
|
| 29 | + protected $access; |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * constructor, make sure the subclasses call this one! |
|
| 33 | - * @param Access $access an instance of Access for LDAP interaction |
|
| 34 | - */ |
|
| 35 | - public function __construct(Access $access) { |
|
| 36 | - $this->access = $access; |
|
| 37 | - } |
|
| 31 | + /** |
|
| 32 | + * constructor, make sure the subclasses call this one! |
|
| 33 | + * @param Access $access an instance of Access for LDAP interaction |
|
| 34 | + */ |
|
| 35 | + public function __construct(Access $access) { |
|
| 36 | + $this->access = $access; |
|
| 37 | + } |
|
| 38 | 38 | } |
@@ -38,12 +38,12 @@ |
||
| 38 | 38 | |
| 39 | 39 | $newConfig = new \OCA\User_LDAP\Configuration($nk, false); |
| 40 | 40 | if (isset($_POST['copyConfig'])) { |
| 41 | - $originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']); |
|
| 42 | - $newConfig->setConfiguration($originalConfig->getConfiguration()); |
|
| 41 | + $originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']); |
|
| 42 | + $newConfig->setConfiguration($originalConfig->getConfiguration()); |
|
| 43 | 43 | } else { |
| 44 | - $configuration = new \OCA\User_LDAP\Configuration($nk, false); |
|
| 45 | - $newConfig->setConfiguration($configuration->getDefaults()); |
|
| 46 | - $resultData['defaults'] = $configuration->getDefaults(); |
|
| 44 | + $configuration = new \OCA\User_LDAP\Configuration($nk, false); |
|
| 45 | + $newConfig->setConfiguration($configuration->getDefaults()); |
|
| 46 | + $resultData['defaults'] = $configuration->getDefaults(); |
|
| 47 | 47 | } |
| 48 | 48 | $newConfig->saveConfiguration(); |
| 49 | 49 | |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | $serverConnections = $helper->getServerConfigurationPrefixes(); |
| 34 | 34 | sort($serverConnections); |
| 35 | 35 | $lk = array_pop($serverConnections); |
| 36 | -$ln = (int)str_replace('s', '', $lk); |
|
| 36 | +$ln = (int) str_replace('s', '', $lk); |
|
| 37 | 37 | $nk = 's'.str_pad($ln + 1, 2, '0', STR_PAD_LEFT); |
| 38 | 38 | |
| 39 | 39 | $resultData = ['configPrefix' => $nk]; |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | * @return bool |
| 168 | 168 | */ |
| 169 | 169 | public function userHasFiles($uid) { |
| 170 | - return $this->files->file_exists($uid . '/files'); |
|
| 170 | + return $this->files->file_exists($uid.'/files'); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | /** |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | if (count($parts) > 1) { |
| 184 | 184 | $owner = $parts[1]; |
| 185 | 185 | if ($this->userManager->userExists($owner) === false) { |
| 186 | - throw new \BadMethodCallException('Unknown user: ' . |
|
| 186 | + throw new \BadMethodCallException('Unknown user: '. |
|
| 187 | 187 | 'method expects path to a user folder relative to the data folder'); |
| 188 | 188 | } |
| 189 | 189 | } |
@@ -36,164 +36,164 @@ |
||
| 36 | 36 | use OCP\PreConditionNotMetException; |
| 37 | 37 | |
| 38 | 38 | class Util { |
| 39 | - /** |
|
| 40 | - * @var View |
|
| 41 | - */ |
|
| 42 | - private $files; |
|
| 43 | - /** |
|
| 44 | - * @var Crypt |
|
| 45 | - */ |
|
| 46 | - private $crypt; |
|
| 47 | - /** |
|
| 48 | - * @var ILogger |
|
| 49 | - */ |
|
| 50 | - private $logger; |
|
| 51 | - /** |
|
| 52 | - * @var bool|IUser |
|
| 53 | - */ |
|
| 54 | - private $user; |
|
| 55 | - /** |
|
| 56 | - * @var IConfig |
|
| 57 | - */ |
|
| 58 | - private $config; |
|
| 59 | - /** |
|
| 60 | - * @var IUserManager |
|
| 61 | - */ |
|
| 62 | - private $userManager; |
|
| 39 | + /** |
|
| 40 | + * @var View |
|
| 41 | + */ |
|
| 42 | + private $files; |
|
| 43 | + /** |
|
| 44 | + * @var Crypt |
|
| 45 | + */ |
|
| 46 | + private $crypt; |
|
| 47 | + /** |
|
| 48 | + * @var ILogger |
|
| 49 | + */ |
|
| 50 | + private $logger; |
|
| 51 | + /** |
|
| 52 | + * @var bool|IUser |
|
| 53 | + */ |
|
| 54 | + private $user; |
|
| 55 | + /** |
|
| 56 | + * @var IConfig |
|
| 57 | + */ |
|
| 58 | + private $config; |
|
| 59 | + /** |
|
| 60 | + * @var IUserManager |
|
| 61 | + */ |
|
| 62 | + private $userManager; |
|
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * Util constructor. |
|
| 66 | - * |
|
| 67 | - * @param View $files |
|
| 68 | - * @param Crypt $crypt |
|
| 69 | - * @param ILogger $logger |
|
| 70 | - * @param IUserSession $userSession |
|
| 71 | - * @param IConfig $config |
|
| 72 | - * @param IUserManager $userManager |
|
| 73 | - */ |
|
| 74 | - public function __construct(View $files, |
|
| 75 | - Crypt $crypt, |
|
| 76 | - ILogger $logger, |
|
| 77 | - IUserSession $userSession, |
|
| 78 | - IConfig $config, |
|
| 79 | - IUserManager $userManager |
|
| 80 | - ) { |
|
| 81 | - $this->files = $files; |
|
| 82 | - $this->crypt = $crypt; |
|
| 83 | - $this->logger = $logger; |
|
| 84 | - $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser() : false; |
|
| 85 | - $this->config = $config; |
|
| 86 | - $this->userManager = $userManager; |
|
| 87 | - } |
|
| 64 | + /** |
|
| 65 | + * Util constructor. |
|
| 66 | + * |
|
| 67 | + * @param View $files |
|
| 68 | + * @param Crypt $crypt |
|
| 69 | + * @param ILogger $logger |
|
| 70 | + * @param IUserSession $userSession |
|
| 71 | + * @param IConfig $config |
|
| 72 | + * @param IUserManager $userManager |
|
| 73 | + */ |
|
| 74 | + public function __construct(View $files, |
|
| 75 | + Crypt $crypt, |
|
| 76 | + ILogger $logger, |
|
| 77 | + IUserSession $userSession, |
|
| 78 | + IConfig $config, |
|
| 79 | + IUserManager $userManager |
|
| 80 | + ) { |
|
| 81 | + $this->files = $files; |
|
| 82 | + $this->crypt = $crypt; |
|
| 83 | + $this->logger = $logger; |
|
| 84 | + $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser() : false; |
|
| 85 | + $this->config = $config; |
|
| 86 | + $this->userManager = $userManager; |
|
| 87 | + } |
|
| 88 | 88 | |
| 89 | - /** |
|
| 90 | - * check if recovery key is enabled for user |
|
| 91 | - * |
|
| 92 | - * @param string $uid |
|
| 93 | - * @return bool |
|
| 94 | - */ |
|
| 95 | - public function isRecoveryEnabledForUser($uid) { |
|
| 96 | - $recoveryMode = $this->config->getUserValue($uid, |
|
| 97 | - 'encryption', |
|
| 98 | - 'recoveryEnabled', |
|
| 99 | - '0'); |
|
| 89 | + /** |
|
| 90 | + * check if recovery key is enabled for user |
|
| 91 | + * |
|
| 92 | + * @param string $uid |
|
| 93 | + * @return bool |
|
| 94 | + */ |
|
| 95 | + public function isRecoveryEnabledForUser($uid) { |
|
| 96 | + $recoveryMode = $this->config->getUserValue($uid, |
|
| 97 | + 'encryption', |
|
| 98 | + 'recoveryEnabled', |
|
| 99 | + '0'); |
|
| 100 | 100 | |
| 101 | - return ($recoveryMode === '1'); |
|
| 102 | - } |
|
| 101 | + return ($recoveryMode === '1'); |
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - /** |
|
| 105 | - * check if the home storage should be encrypted |
|
| 106 | - * |
|
| 107 | - * @return bool |
|
| 108 | - */ |
|
| 109 | - public function shouldEncryptHomeStorage() { |
|
| 110 | - $encryptHomeStorage = $this->config->getAppValue( |
|
| 111 | - 'encryption', |
|
| 112 | - 'encryptHomeStorage', |
|
| 113 | - '1' |
|
| 114 | - ); |
|
| 104 | + /** |
|
| 105 | + * check if the home storage should be encrypted |
|
| 106 | + * |
|
| 107 | + * @return bool |
|
| 108 | + */ |
|
| 109 | + public function shouldEncryptHomeStorage() { |
|
| 110 | + $encryptHomeStorage = $this->config->getAppValue( |
|
| 111 | + 'encryption', |
|
| 112 | + 'encryptHomeStorage', |
|
| 113 | + '1' |
|
| 114 | + ); |
|
| 115 | 115 | |
| 116 | - return ($encryptHomeStorage === '1'); |
|
| 117 | - } |
|
| 116 | + return ($encryptHomeStorage === '1'); |
|
| 117 | + } |
|
| 118 | 118 | |
| 119 | - /** |
|
| 120 | - * set the home storage encryption on/off |
|
| 121 | - * |
|
| 122 | - * @param bool $encryptHomeStorage |
|
| 123 | - */ |
|
| 124 | - public function setEncryptHomeStorage($encryptHomeStorage) { |
|
| 125 | - $value = $encryptHomeStorage ? '1' : '0'; |
|
| 126 | - $this->config->setAppValue( |
|
| 127 | - 'encryption', |
|
| 128 | - 'encryptHomeStorage', |
|
| 129 | - $value |
|
| 130 | - ); |
|
| 131 | - } |
|
| 119 | + /** |
|
| 120 | + * set the home storage encryption on/off |
|
| 121 | + * |
|
| 122 | + * @param bool $encryptHomeStorage |
|
| 123 | + */ |
|
| 124 | + public function setEncryptHomeStorage($encryptHomeStorage) { |
|
| 125 | + $value = $encryptHomeStorage ? '1' : '0'; |
|
| 126 | + $this->config->setAppValue( |
|
| 127 | + 'encryption', |
|
| 128 | + 'encryptHomeStorage', |
|
| 129 | + $value |
|
| 130 | + ); |
|
| 131 | + } |
|
| 132 | 132 | |
| 133 | - /** |
|
| 134 | - * check if master key is enabled |
|
| 135 | - * |
|
| 136 | - * @return bool |
|
| 137 | - */ |
|
| 138 | - public function isMasterKeyEnabled() { |
|
| 139 | - $userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '1'); |
|
| 140 | - return ($userMasterKey === '1'); |
|
| 141 | - } |
|
| 133 | + /** |
|
| 134 | + * check if master key is enabled |
|
| 135 | + * |
|
| 136 | + * @return bool |
|
| 137 | + */ |
|
| 138 | + public function isMasterKeyEnabled() { |
|
| 139 | + $userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '1'); |
|
| 140 | + return ($userMasterKey === '1'); |
|
| 141 | + } |
|
| 142 | 142 | |
| 143 | - /** |
|
| 144 | - * @param $enabled |
|
| 145 | - * @return bool |
|
| 146 | - */ |
|
| 147 | - public function setRecoveryForUser($enabled) { |
|
| 148 | - $value = $enabled ? '1' : '0'; |
|
| 143 | + /** |
|
| 144 | + * @param $enabled |
|
| 145 | + * @return bool |
|
| 146 | + */ |
|
| 147 | + public function setRecoveryForUser($enabled) { |
|
| 148 | + $value = $enabled ? '1' : '0'; |
|
| 149 | 149 | |
| 150 | - try { |
|
| 151 | - $this->config->setUserValue($this->user->getUID(), |
|
| 152 | - 'encryption', |
|
| 153 | - 'recoveryEnabled', |
|
| 154 | - $value); |
|
| 155 | - return true; |
|
| 156 | - } catch (PreConditionNotMetException $e) { |
|
| 157 | - return false; |
|
| 158 | - } |
|
| 159 | - } |
|
| 150 | + try { |
|
| 151 | + $this->config->setUserValue($this->user->getUID(), |
|
| 152 | + 'encryption', |
|
| 153 | + 'recoveryEnabled', |
|
| 154 | + $value); |
|
| 155 | + return true; |
|
| 156 | + } catch (PreConditionNotMetException $e) { |
|
| 157 | + return false; |
|
| 158 | + } |
|
| 159 | + } |
|
| 160 | 160 | |
| 161 | - /** |
|
| 162 | - * @param string $uid |
|
| 163 | - * @return bool |
|
| 164 | - */ |
|
| 165 | - public function userHasFiles($uid) { |
|
| 166 | - return $this->files->file_exists($uid . '/files'); |
|
| 167 | - } |
|
| 161 | + /** |
|
| 162 | + * @param string $uid |
|
| 163 | + * @return bool |
|
| 164 | + */ |
|
| 165 | + public function userHasFiles($uid) { |
|
| 166 | + return $this->files->file_exists($uid . '/files'); |
|
| 167 | + } |
|
| 168 | 168 | |
| 169 | - /** |
|
| 170 | - * get owner from give path, path relative to data/ expected |
|
| 171 | - * |
|
| 172 | - * @param string $path relative to data/ |
|
| 173 | - * @return string |
|
| 174 | - * @throws \BadMethodCallException |
|
| 175 | - */ |
|
| 176 | - public function getOwner($path) { |
|
| 177 | - $owner = ''; |
|
| 178 | - $parts = explode('/', $path, 3); |
|
| 179 | - if (count($parts) > 1) { |
|
| 180 | - $owner = $parts[1]; |
|
| 181 | - if ($this->userManager->userExists($owner) === false) { |
|
| 182 | - throw new \BadMethodCallException('Unknown user: ' . |
|
| 183 | - 'method expects path to a user folder relative to the data folder'); |
|
| 184 | - } |
|
| 185 | - } |
|
| 169 | + /** |
|
| 170 | + * get owner from give path, path relative to data/ expected |
|
| 171 | + * |
|
| 172 | + * @param string $path relative to data/ |
|
| 173 | + * @return string |
|
| 174 | + * @throws \BadMethodCallException |
|
| 175 | + */ |
|
| 176 | + public function getOwner($path) { |
|
| 177 | + $owner = ''; |
|
| 178 | + $parts = explode('/', $path, 3); |
|
| 179 | + if (count($parts) > 1) { |
|
| 180 | + $owner = $parts[1]; |
|
| 181 | + if ($this->userManager->userExists($owner) === false) { |
|
| 182 | + throw new \BadMethodCallException('Unknown user: ' . |
|
| 183 | + 'method expects path to a user folder relative to the data folder'); |
|
| 184 | + } |
|
| 185 | + } |
|
| 186 | 186 | |
| 187 | - return $owner; |
|
| 188 | - } |
|
| 187 | + return $owner; |
|
| 188 | + } |
|
| 189 | 189 | |
| 190 | - /** |
|
| 191 | - * get storage of path |
|
| 192 | - * |
|
| 193 | - * @param string $path |
|
| 194 | - * @return \OC\Files\Storage\Storage|null |
|
| 195 | - */ |
|
| 196 | - public function getStorage($path) { |
|
| 197 | - return $this->files->getMount($path)->getStorage(); |
|
| 198 | - } |
|
| 190 | + /** |
|
| 191 | + * get storage of path |
|
| 192 | + * |
|
| 193 | + * @param string $path |
|
| 194 | + * @return \OC\Files\Storage\Storage|null |
|
| 195 | + */ |
|
| 196 | + public function getStorage($path) { |
|
| 197 | + return $this->files->getMount($path)->getStorage(); |
|
| 198 | + } |
|
| 199 | 199 | } |
@@ -34,126 +34,126 @@ |
||
| 34 | 34 | |
| 35 | 35 | class DecryptAll { |
| 36 | 36 | |
| 37 | - /** @var Util */ |
|
| 38 | - protected $util; |
|
| 39 | - |
|
| 40 | - /** @var QuestionHelper */ |
|
| 41 | - protected $questionHelper; |
|
| 42 | - |
|
| 43 | - /** @var Crypt */ |
|
| 44 | - protected $crypt; |
|
| 45 | - |
|
| 46 | - /** @var KeyManager */ |
|
| 47 | - protected $keyManager; |
|
| 48 | - |
|
| 49 | - /** @var Session */ |
|
| 50 | - protected $session; |
|
| 51 | - |
|
| 52 | - /** |
|
| 53 | - * @param Util $util |
|
| 54 | - * @param KeyManager $keyManager |
|
| 55 | - * @param Crypt $crypt |
|
| 56 | - * @param Session $session |
|
| 57 | - * @param QuestionHelper $questionHelper |
|
| 58 | - */ |
|
| 59 | - public function __construct( |
|
| 60 | - Util $util, |
|
| 61 | - KeyManager $keyManager, |
|
| 62 | - Crypt $crypt, |
|
| 63 | - Session $session, |
|
| 64 | - QuestionHelper $questionHelper |
|
| 65 | - ) { |
|
| 66 | - $this->util = $util; |
|
| 67 | - $this->keyManager = $keyManager; |
|
| 68 | - $this->crypt = $crypt; |
|
| 69 | - $this->session = $session; |
|
| 70 | - $this->questionHelper = $questionHelper; |
|
| 71 | - } |
|
| 72 | - |
|
| 73 | - /** |
|
| 74 | - * prepare encryption module to decrypt all files |
|
| 75 | - * |
|
| 76 | - * @param InputInterface $input |
|
| 77 | - * @param OutputInterface $output |
|
| 78 | - * @param $user |
|
| 79 | - * @return bool |
|
| 80 | - */ |
|
| 81 | - public function prepare(InputInterface $input, OutputInterface $output, $user) { |
|
| 82 | - $question = new Question('Please enter the recovery key password: '); |
|
| 83 | - |
|
| 84 | - if ($this->util->isMasterKeyEnabled()) { |
|
| 85 | - $output->writeln('Use master key to decrypt all files'); |
|
| 86 | - $user = $this->keyManager->getMasterKeyId(); |
|
| 87 | - $password = $this->keyManager->getMasterKeyPassword(); |
|
| 88 | - } else { |
|
| 89 | - $recoveryKeyId = $this->keyManager->getRecoveryKeyId(); |
|
| 90 | - if (!empty($user)) { |
|
| 91 | - $output->writeln('You can only decrypt the users files if you know'); |
|
| 92 | - $output->writeln('the users password or if he activated the recovery key.'); |
|
| 93 | - $output->writeln(''); |
|
| 94 | - $questionUseLoginPassword = new ConfirmationQuestion( |
|
| 95 | - 'Do you want to use the users login password to decrypt all files? (y/n) ', |
|
| 96 | - false |
|
| 97 | - ); |
|
| 98 | - $useLoginPassword = $this->questionHelper->ask($input, $output, $questionUseLoginPassword); |
|
| 99 | - if ($useLoginPassword) { |
|
| 100 | - $question = new Question('Please enter the user\'s login password: '); |
|
| 101 | - } elseif ($this->util->isRecoveryEnabledForUser($user) === false) { |
|
| 102 | - $output->writeln('No recovery key available for user ' . $user); |
|
| 103 | - return false; |
|
| 104 | - } else { |
|
| 105 | - $user = $recoveryKeyId; |
|
| 106 | - } |
|
| 107 | - } else { |
|
| 108 | - $output->writeln('You can only decrypt the files of all users if the'); |
|
| 109 | - $output->writeln('recovery key is enabled by the admin and activated by the users.'); |
|
| 110 | - $output->writeln(''); |
|
| 111 | - $user = $recoveryKeyId; |
|
| 112 | - } |
|
| 113 | - |
|
| 114 | - $question->setHidden(true); |
|
| 115 | - $question->setHiddenFallback(false); |
|
| 116 | - $password = $this->questionHelper->ask($input, $output, $question); |
|
| 117 | - } |
|
| 118 | - |
|
| 119 | - $privateKey = $this->getPrivateKey($user, $password); |
|
| 120 | - if ($privateKey !== false) { |
|
| 121 | - $this->updateSession($user, $privateKey); |
|
| 122 | - return true; |
|
| 123 | - } else { |
|
| 124 | - $output->writeln('Could not decrypt private key, maybe you entered the wrong password?'); |
|
| 125 | - } |
|
| 126 | - |
|
| 127 | - |
|
| 128 | - return false; |
|
| 129 | - } |
|
| 130 | - |
|
| 131 | - /** |
|
| 132 | - * get the private key which will be used to decrypt all files |
|
| 133 | - * |
|
| 134 | - * @param string $user |
|
| 135 | - * @param string $password |
|
| 136 | - * @return bool|string |
|
| 137 | - * @throws \OCA\Encryption\Exceptions\PrivateKeyMissingException |
|
| 138 | - */ |
|
| 139 | - protected function getPrivateKey($user, $password) { |
|
| 140 | - $recoveryKeyId = $this->keyManager->getRecoveryKeyId(); |
|
| 141 | - $masterKeyId = $this->keyManager->getMasterKeyId(); |
|
| 142 | - if ($user === $recoveryKeyId) { |
|
| 143 | - $recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId); |
|
| 144 | - $privateKey = $this->crypt->decryptPrivateKey($recoveryKey, $password); |
|
| 145 | - } elseif ($user === $masterKeyId) { |
|
| 146 | - $masterKey = $this->keyManager->getSystemPrivateKey($masterKeyId); |
|
| 147 | - $privateKey = $this->crypt->decryptPrivateKey($masterKey, $password, $masterKeyId); |
|
| 148 | - } else { |
|
| 149 | - $userKey = $this->keyManager->getPrivateKey($user); |
|
| 150 | - $privateKey = $this->crypt->decryptPrivateKey($userKey, $password, $user); |
|
| 151 | - } |
|
| 152 | - |
|
| 153 | - return $privateKey; |
|
| 154 | - } |
|
| 155 | - |
|
| 156 | - protected function updateSession($user, $privateKey) { |
|
| 157 | - $this->session->prepareDecryptAll($user, $privateKey); |
|
| 158 | - } |
|
| 37 | + /** @var Util */ |
|
| 38 | + protected $util; |
|
| 39 | + |
|
| 40 | + /** @var QuestionHelper */ |
|
| 41 | + protected $questionHelper; |
|
| 42 | + |
|
| 43 | + /** @var Crypt */ |
|
| 44 | + protected $crypt; |
|
| 45 | + |
|
| 46 | + /** @var KeyManager */ |
|
| 47 | + protected $keyManager; |
|
| 48 | + |
|
| 49 | + /** @var Session */ |
|
| 50 | + protected $session; |
|
| 51 | + |
|
| 52 | + /** |
|
| 53 | + * @param Util $util |
|
| 54 | + * @param KeyManager $keyManager |
|
| 55 | + * @param Crypt $crypt |
|
| 56 | + * @param Session $session |
|
| 57 | + * @param QuestionHelper $questionHelper |
|
| 58 | + */ |
|
| 59 | + public function __construct( |
|
| 60 | + Util $util, |
|
| 61 | + KeyManager $keyManager, |
|
| 62 | + Crypt $crypt, |
|
| 63 | + Session $session, |
|
| 64 | + QuestionHelper $questionHelper |
|
| 65 | + ) { |
|
| 66 | + $this->util = $util; |
|
| 67 | + $this->keyManager = $keyManager; |
|
| 68 | + $this->crypt = $crypt; |
|
| 69 | + $this->session = $session; |
|
| 70 | + $this->questionHelper = $questionHelper; |
|
| 71 | + } |
|
| 72 | + |
|
| 73 | + /** |
|
| 74 | + * prepare encryption module to decrypt all files |
|
| 75 | + * |
|
| 76 | + * @param InputInterface $input |
|
| 77 | + * @param OutputInterface $output |
|
| 78 | + * @param $user |
|
| 79 | + * @return bool |
|
| 80 | + */ |
|
| 81 | + public function prepare(InputInterface $input, OutputInterface $output, $user) { |
|
| 82 | + $question = new Question('Please enter the recovery key password: '); |
|
| 83 | + |
|
| 84 | + if ($this->util->isMasterKeyEnabled()) { |
|
| 85 | + $output->writeln('Use master key to decrypt all files'); |
|
| 86 | + $user = $this->keyManager->getMasterKeyId(); |
|
| 87 | + $password = $this->keyManager->getMasterKeyPassword(); |
|
| 88 | + } else { |
|
| 89 | + $recoveryKeyId = $this->keyManager->getRecoveryKeyId(); |
|
| 90 | + if (!empty($user)) { |
|
| 91 | + $output->writeln('You can only decrypt the users files if you know'); |
|
| 92 | + $output->writeln('the users password or if he activated the recovery key.'); |
|
| 93 | + $output->writeln(''); |
|
| 94 | + $questionUseLoginPassword = new ConfirmationQuestion( |
|
| 95 | + 'Do you want to use the users login password to decrypt all files? (y/n) ', |
|
| 96 | + false |
|
| 97 | + ); |
|
| 98 | + $useLoginPassword = $this->questionHelper->ask($input, $output, $questionUseLoginPassword); |
|
| 99 | + if ($useLoginPassword) { |
|
| 100 | + $question = new Question('Please enter the user\'s login password: '); |
|
| 101 | + } elseif ($this->util->isRecoveryEnabledForUser($user) === false) { |
|
| 102 | + $output->writeln('No recovery key available for user ' . $user); |
|
| 103 | + return false; |
|
| 104 | + } else { |
|
| 105 | + $user = $recoveryKeyId; |
|
| 106 | + } |
|
| 107 | + } else { |
|
| 108 | + $output->writeln('You can only decrypt the files of all users if the'); |
|
| 109 | + $output->writeln('recovery key is enabled by the admin and activated by the users.'); |
|
| 110 | + $output->writeln(''); |
|
| 111 | + $user = $recoveryKeyId; |
|
| 112 | + } |
|
| 113 | + |
|
| 114 | + $question->setHidden(true); |
|
| 115 | + $question->setHiddenFallback(false); |
|
| 116 | + $password = $this->questionHelper->ask($input, $output, $question); |
|
| 117 | + } |
|
| 118 | + |
|
| 119 | + $privateKey = $this->getPrivateKey($user, $password); |
|
| 120 | + if ($privateKey !== false) { |
|
| 121 | + $this->updateSession($user, $privateKey); |
|
| 122 | + return true; |
|
| 123 | + } else { |
|
| 124 | + $output->writeln('Could not decrypt private key, maybe you entered the wrong password?'); |
|
| 125 | + } |
|
| 126 | + |
|
| 127 | + |
|
| 128 | + return false; |
|
| 129 | + } |
|
| 130 | + |
|
| 131 | + /** |
|
| 132 | + * get the private key which will be used to decrypt all files |
|
| 133 | + * |
|
| 134 | + * @param string $user |
|
| 135 | + * @param string $password |
|
| 136 | + * @return bool|string |
|
| 137 | + * @throws \OCA\Encryption\Exceptions\PrivateKeyMissingException |
|
| 138 | + */ |
|
| 139 | + protected function getPrivateKey($user, $password) { |
|
| 140 | + $recoveryKeyId = $this->keyManager->getRecoveryKeyId(); |
|
| 141 | + $masterKeyId = $this->keyManager->getMasterKeyId(); |
|
| 142 | + if ($user === $recoveryKeyId) { |
|
| 143 | + $recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId); |
|
| 144 | + $privateKey = $this->crypt->decryptPrivateKey($recoveryKey, $password); |
|
| 145 | + } elseif ($user === $masterKeyId) { |
|
| 146 | + $masterKey = $this->keyManager->getSystemPrivateKey($masterKeyId); |
|
| 147 | + $privateKey = $this->crypt->decryptPrivateKey($masterKey, $password, $masterKeyId); |
|
| 148 | + } else { |
|
| 149 | + $userKey = $this->keyManager->getPrivateKey($user); |
|
| 150 | + $privateKey = $this->crypt->decryptPrivateKey($userKey, $password, $user); |
|
| 151 | + } |
|
| 152 | + |
|
| 153 | + return $privateKey; |
|
| 154 | + } |
|
| 155 | + |
|
| 156 | + protected function updateSession($user, $privateKey) { |
|
| 157 | + $this->session->prepareDecryptAll($user, $privateKey); |
|
| 158 | + } |
|
| 159 | 159 | } |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | if ($useLoginPassword) { |
| 100 | 100 | $question = new Question('Please enter the user\'s login password: '); |
| 101 | 101 | } elseif ($this->util->isRecoveryEnabledForUser($user) === false) { |
| 102 | - $output->writeln('No recovery key available for user ' . $user); |
|
| 102 | + $output->writeln('No recovery key available for user '.$user); |
|
| 103 | 103 | return false; |
| 104 | 104 | } else { |
| 105 | 105 | $user = $recoveryKeyId; |
@@ -28,13 +28,13 @@ |
||
| 28 | 28 | |
| 29 | 29 | class PrivateKeyMissingException extends GenericEncryptionException { |
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * @param string $userId |
|
| 33 | - */ |
|
| 34 | - public function __construct($userId) { |
|
| 35 | - if (empty($userId)) { |
|
| 36 | - $userId = "<no-user-id-given>"; |
|
| 37 | - } |
|
| 38 | - parent::__construct("Private Key missing for user: $userId"); |
|
| 39 | - } |
|
| 31 | + /** |
|
| 32 | + * @param string $userId |
|
| 33 | + */ |
|
| 34 | + public function __construct($userId) { |
|
| 35 | + if (empty($userId)) { |
|
| 36 | + $userId = "<no-user-id-given>"; |
|
| 37 | + } |
|
| 38 | + parent::__construct("Private Key missing for user: $userId"); |
|
| 39 | + } |
|
| 40 | 40 | } |
@@ -25,13 +25,13 @@ |
||
| 25 | 25 | |
| 26 | 26 | class PublicKeyMissingException extends GenericEncryptionException { |
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * @param string $userId |
|
| 30 | - */ |
|
| 31 | - public function __construct($userId) { |
|
| 32 | - if (empty($userId)) { |
|
| 33 | - $userId = "<no-user-id-given>"; |
|
| 34 | - } |
|
| 35 | - parent::__construct("Public Key missing for user: $userId"); |
|
| 36 | - } |
|
| 28 | + /** |
|
| 29 | + * @param string $userId |
|
| 30 | + */ |
|
| 31 | + public function __construct($userId) { |
|
| 32 | + if (empty($userId)) { |
|
| 33 | + $userId = "<no-user-id-given>"; |
|
| 34 | + } |
|
| 35 | + parent::__construct("Public Key missing for user: $userId"); |
|
| 36 | + } |
|
| 37 | 37 | } |
@@ -32,63 +32,63 @@ |
||
| 32 | 32 | |
| 33 | 33 | class Personal implements ISettings { |
| 34 | 34 | |
| 35 | - /** @var IConfig */ |
|
| 36 | - private $config; |
|
| 37 | - /** @var Session */ |
|
| 38 | - private $session; |
|
| 39 | - /** @var Util */ |
|
| 40 | - private $util; |
|
| 41 | - /** @var IUserSession */ |
|
| 42 | - private $userSession; |
|
| 35 | + /** @var IConfig */ |
|
| 36 | + private $config; |
|
| 37 | + /** @var Session */ |
|
| 38 | + private $session; |
|
| 39 | + /** @var Util */ |
|
| 40 | + private $util; |
|
| 41 | + /** @var IUserSession */ |
|
| 42 | + private $userSession; |
|
| 43 | 43 | |
| 44 | - public function __construct(IConfig $config, Session $session, Util $util, IUserSession $userSession) { |
|
| 45 | - $this->config = $config; |
|
| 46 | - $this->session = $session; |
|
| 47 | - $this->util = $util; |
|
| 48 | - $this->userSession = $userSession; |
|
| 49 | - } |
|
| 44 | + public function __construct(IConfig $config, Session $session, Util $util, IUserSession $userSession) { |
|
| 45 | + $this->config = $config; |
|
| 46 | + $this->session = $session; |
|
| 47 | + $this->util = $util; |
|
| 48 | + $this->userSession = $userSession; |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * @return TemplateResponse returns the instance with all parameters set, ready to be rendered |
|
| 53 | - * @since 9.1 |
|
| 54 | - */ |
|
| 55 | - public function getForm() { |
|
| 56 | - $recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled'); |
|
| 57 | - $privateKeySet = $this->session->isPrivateKeySet(); |
|
| 51 | + /** |
|
| 52 | + * @return TemplateResponse returns the instance with all parameters set, ready to be rendered |
|
| 53 | + * @since 9.1 |
|
| 54 | + */ |
|
| 55 | + public function getForm() { |
|
| 56 | + $recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled'); |
|
| 57 | + $privateKeySet = $this->session->isPrivateKeySet(); |
|
| 58 | 58 | |
| 59 | - if (!$recoveryAdminEnabled && $privateKeySet) { |
|
| 60 | - return new TemplateResponse('settings', 'settings/empty', [], ''); |
|
| 61 | - } |
|
| 59 | + if (!$recoveryAdminEnabled && $privateKeySet) { |
|
| 60 | + return new TemplateResponse('settings', 'settings/empty', [], ''); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - $userId = $this->userSession->getUser()->getUID(); |
|
| 64 | - $recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId); |
|
| 63 | + $userId = $this->userSession->getUser()->getUID(); |
|
| 64 | + $recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId); |
|
| 65 | 65 | |
| 66 | - $parameters = [ |
|
| 67 | - 'recoveryEnabled' => $recoveryAdminEnabled, |
|
| 68 | - 'recoveryEnabledForUser' => $recoveryEnabledForUser, |
|
| 69 | - 'privateKeySet' => $privateKeySet, |
|
| 70 | - 'initialized' => $this->session->getStatus(), |
|
| 71 | - ]; |
|
| 72 | - return new TemplateResponse('encryption', 'settings-personal', $parameters, ''); |
|
| 73 | - } |
|
| 66 | + $parameters = [ |
|
| 67 | + 'recoveryEnabled' => $recoveryAdminEnabled, |
|
| 68 | + 'recoveryEnabledForUser' => $recoveryEnabledForUser, |
|
| 69 | + 'privateKeySet' => $privateKeySet, |
|
| 70 | + 'initialized' => $this->session->getStatus(), |
|
| 71 | + ]; |
|
| 72 | + return new TemplateResponse('encryption', 'settings-personal', $parameters, ''); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - /** |
|
| 76 | - * @return string the section ID, e.g. 'sharing' |
|
| 77 | - * @since 9.1 |
|
| 78 | - */ |
|
| 79 | - public function getSection() { |
|
| 80 | - return 'security'; |
|
| 81 | - } |
|
| 75 | + /** |
|
| 76 | + * @return string the section ID, e.g. 'sharing' |
|
| 77 | + * @since 9.1 |
|
| 78 | + */ |
|
| 79 | + public function getSection() { |
|
| 80 | + return 'security'; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - /** |
|
| 84 | - * @return int whether the form should be rather on the top or bottom of |
|
| 85 | - * the admin section. The forms are arranged in ascending order of the |
|
| 86 | - * priority values. It is required to return a value between 0 and 100. |
|
| 87 | - * |
|
| 88 | - * E.g.: 70 |
|
| 89 | - * @since 9.1 |
|
| 90 | - */ |
|
| 91 | - public function getPriority() { |
|
| 92 | - return 80; |
|
| 93 | - } |
|
| 83 | + /** |
|
| 84 | + * @return int whether the form should be rather on the top or bottom of |
|
| 85 | + * the admin section. The forms are arranged in ascending order of the |
|
| 86 | + * priority values. It is required to return a value between 0 and 100. |
|
| 87 | + * |
|
| 88 | + * E.g.: 70 |
|
| 89 | + * @since 9.1 |
|
| 90 | + */ |
|
| 91 | + public function getPriority() { |
|
| 92 | + return 80; |
|
| 93 | + } |
|
| 94 | 94 | } |
@@ -23,10 +23,10 @@ |
||
| 23 | 23 | namespace OCA\Encryption\Hooks\Contracts; |
| 24 | 24 | |
| 25 | 25 | interface IHook { |
| 26 | - /** |
|
| 27 | - * Connects Hooks |
|
| 28 | - * |
|
| 29 | - * @return null |
|
| 30 | - */ |
|
| 31 | - public function addHooks(); |
|
| 26 | + /** |
|
| 27 | + * Connects Hooks |
|
| 28 | + * |
|
| 29 | + * @return null |
|
| 30 | + */ |
|
| 31 | + public function addHooks(); |
|
| 32 | 32 | } |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | ?> |
| 7 | 7 | |
| 8 | 8 | -- |
| 9 | -<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?> |
|
| 9 | +<?php p($theme->getName().' - '.$theme->getSlogan()); ?> |
|
| 10 | 10 | <?php print_unescaped("\n".$theme->getBaseUrl()); |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | |
| 5 | 5 | print_unescaped($l->t("Hey there,\n\nThe administration enabled server-side-encryption. Your files were encrypted using the password \"%s\".\n\nPlease login to the web interface, go to the section \"Basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"Old log-in password\" field and your current login-password.\n\n", [$_['password']])); |
| 6 | 6 | if (isset($_['expiration'])) { |
| 7 | - print_unescaped($l->t("The share will expire on %s.", [$_['expiration']])); |
|
| 8 | - print_unescaped("\n\n"); |
|
| 7 | + print_unescaped($l->t("The share will expire on %s.", [$_['expiration']])); |
|
| 8 | + print_unescaped("\n\n"); |
|
| 9 | 9 | } |
| 10 | 10 | // TRANSLATORS term at the end of a mail |
| 11 | 11 | p($l->t("Cheers!")); |