nextcloud / server

lib/private/Encryption/DecryptAll.php

Spacing +8 added lines, -8 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	public function decryptAll(InputInterface $input, OutputInterface $output, string $user = ''): bool {
 		if ($user !== '' && $this->userManager->userExists($user) === false) {
-			$output->writeln('User "' . $user . '" does not exist. Please check the username and try again');
+			$output->writeln('User "'.$user.'" does not exist. Please check the username and try again');
 			return false;
 		}
 
@@ -58,9 +58,9 @@ 
 			$output->writeln('Files for following users couldn\'t be decrypted, ');
 			$output->writeln('maybe the user is not set up in a way that supports this operation: ');
 			foreach ($this->failed as $uid => $paths) {
-				$output->writeln('    ' . $uid);
+				$output->writeln('    '.$uid);
 				foreach ($paths as $path) {
-					$output->writeln('        ' . $path);
+					$output->writeln('        '.$path);
 				}
 			}
 			$output->writeln('');
@@ -79,10 +79,10 @@ 
 			/** @var IEncryptionModule $module */
 			$module = call_user_func($moduleDesc['callback']);
 			$output->writeln('');
-			$output->writeln('Prepare "' . $module->getDisplayName() . '"');
+			$output->writeln('Prepare "'.$module->getDisplayName().'"');
 			$output->writeln('');
 			if ($module->prepareDecryptAll($input, $output, $user) === false) {
-				$output->writeln('Module "' . $moduleDesc['displayName'] . '" does not support the functionality to decrypt all files again or the initialization of the module failed!');
+				$output->writeln('Module "'.$moduleDesc['displayName'].'" does not support the functionality to decrypt all files again or the initialization of the module failed!');
 				return false;
 			}
 		}
@@ -152,7 +152,7 @@ 
 	protected function decryptUsersFiles(string $uid, ProgressBar $progress, string $userCount): void {
 		$this->setupUserFS($uid);
 		$directories = [];
-		$directories[] = '/' . $uid . '/files';
+		$directories[] = '/'.$uid.'/files';
 
 		while ($root = array_pop($directories)) {
 			$content = $this->rootView->getDirectoryContent($root);
@@ -161,7 +161,7 @@ 
 				if ($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) {
 					continue;
 				}
-				$path = $root . '/' . $file['name'];
+				$path = $root.'/'.$file['name'];
 				if ($this->rootView->is_dir($path)) {
 					$directories[] = $path;
 					continue;
@@ -201,7 +201,7 @@ 
 		}
 
 		$source = $path;
-		$target = $path . '.decrypted.' . $this->getTimestamp();
+		$target = $path.'.decrypted.'.$this->getTimestamp();
 
 		try {
 			$this->rootView->copy($source, $target);

lib/private/Encryption/Update.php

Spacing +11 added lines, -11 removed lines

@@ -33,14 +33,14 @@ 
 	/**
 	 * hook after file was shared
 	 */
-	public function postShared(OCPFile|Folder $node): void {
+	public function postShared(OCPFile | Folder $node): void {
 		$this->update($node);
 	}
 
 	/**
 	 * hook after file was unshared
 	 */
-	public function postUnshared(OCPFile|Folder $node): void {
+	public function postUnshared(OCPFile | Folder $node): void {
 		$this->update($node);
 	}
 
@@ -48,7 +48,7 @@ 
 	 * inform encryption module that a file was restored from the trash bin,
 	 * e.g. to update the encryption keys
 	 */
-	public function postRestore(OCPFile|Folder $node): void {
+	public function postRestore(OCPFile | Folder $node): void {
 		$this->update($node);
 	}
 
@@ -56,7 +56,7 @@ 
 	 * inform encryption module that a file was renamed,
 	 * e.g. to update the encryption keys
 	 */
-	public function postRename(OCPFile|Folder $source, OCPFile|Folder $target): void {
+	public function postRename(OCPFile | Folder $source, OCPFile | Folder $target): void {
 		if (dirname($source->getPath()) !== dirname($target->getPath())) {
 			$this->update($target);
 		}
@@ -67,18 +67,18 @@ 
 	 *
 	 * @throws \InvalidArgumentException
 	 */
-	protected function getOwnerPath(OCPFile|Folder $node): string {
+	protected function getOwnerPath(OCPFile | Folder $node): string {
 		$owner = $node->getOwner()?->getUID();
 		if ($owner === null) {
-			throw new InvalidArgumentException('No owner found for ' . $node->getId());
+			throw new InvalidArgumentException('No owner found for '.$node->getId());
 		}
-		$view = new View('/' . $owner . '/files');
+		$view = new View('/'.$owner.'/files');
 		try {
 			$path = $view->getPath($node->getId());
 		} catch (NotFoundException $e) {
-			throw new InvalidArgumentException('No file found for ' . $node->getId(), previous:$e);
+			throw new InvalidArgumentException('No file found for '.$node->getId(), previous:$e);
 		}
-		return '/' . $owner . '/files/' . $path;
+		return '/'.$owner.'/files/'.$path;
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 * @param string $path relative to data/
 	 * @throws Exceptions\ModuleDoesNotExistsException
 	 */
-	public function update(OCPFile|Folder $node): void {
+	public function update(OCPFile | Folder $node): void {
 		$encryptionModule = $this->encryptionManager->getEncryptionModule();
 
 		// if the encryption module doesn't encrypt the files on a per-user basis
@@ -110,7 +110,7 @@ 
 				$encryptionModule->update($file, '', $usersSharing);
 			} catch (GenericEncryptionException $e) {
 				// If the update of an individual file fails e.g. due to a corrupt key we should continue the operation and just log the failure
-				$this->logger->error('Failed to update encryption module for ' . $file, [ 'exception' => $e ]);
+				$this->logger->error('Failed to update encryption module for '.$file, ['exception' => $e]);
 			}
 		}
 	}

apps/encryption/lib/KeyManager.php

Spacing +22 added lines, -22 removed lines

@@ -42,7 +42,7 @@ 
 		$this->recoveryKeyId = $this->config->getAppValue('encryption',
 			'recoveryKeyId');
 		if (empty($this->recoveryKeyId)) {
-			$this->recoveryKeyId = 'recoveryKey_' . substr(md5((string)time()), 0, 8);
+			$this->recoveryKeyId = 'recoveryKey_'.substr(md5((string) time()), 0, 8);
 			$this->config->setAppValue('encryption',
 				'recoveryKeyId',
 				$this->recoveryKeyId);
@@ -51,14 +51,14 @@ 
 		$this->publicShareKeyId = $this->config->getAppValue('encryption',
 			'publicShareKeyId');
 		if (empty($this->publicShareKeyId)) {
-			$this->publicShareKeyId = 'pubShare_' . substr(md5((string)time()), 0, 8);
+			$this->publicShareKeyId = 'pubShare_'.substr(md5((string) time()), 0, 8);
 			$this->config->setAppValue('encryption', 'publicShareKeyId', $this->publicShareKeyId);
 		}
 
 		$this->masterKeyId = $this->config->getAppValue('encryption',
 			'masterKeyId');
 		if (empty($this->masterKeyId)) {
-			$this->masterKeyId = 'master_' . substr(md5((string)time()), 0, 8);
+			$this->masterKeyId = 'master_'.substr(md5((string) time()), 0, 8);
 			$this->config->setAppValue('encryption', 'masterKeyId', $this->masterKeyId);
 		}
 
@@ -77,13 +77,13 @@ 
 
 				// Save public key
 				$this->keyStorage->setSystemUserKey(
-					$this->publicShareKeyId . '.' . $this->publicKeyId, $keyPair['publicKey'],
+					$this->publicShareKeyId.'.'.$this->publicKeyId, $keyPair['publicKey'],
 					Encryption::ID);
 
 				// Encrypt private key empty passphrase
 				$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], '');
 				$header = $this->crypt->generateHeader();
-				$this->setSystemPrivateKey($this->publicShareKeyId, $header . $encryptedKey);
+				$this->setSystemPrivateKey($this->publicShareKeyId, $header.$encryptedKey);
 			} catch (\Throwable $e) {
 				$this->lockingProvider->releaseLock('encryption-generateSharedKey', ILockingProvider::LOCK_EXCLUSIVE);
 				throw $e;
@@ -113,13 +113,13 @@ 
 
 				// Save public key
 				$this->keyStorage->setSystemUserKey(
-					$this->masterKeyId . '.' . $this->publicKeyId, $keyPair['publicKey'],
+					$this->masterKeyId.'.'.$this->publicKeyId, $keyPair['publicKey'],
 					Encryption::ID);
 
 				// Encrypt private key with system password
 				$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $this->getMasterKeyPassword(), $this->masterKeyId);
 				$header = $this->crypt->generateHeader();
-				$this->setSystemPrivateKey($this->masterKeyId, $header . $encryptedKey);
+				$this->setSystemPrivateKey($this->masterKeyId, $header.$encryptedKey);
 			} catch (\Throwable $e) {
 				$this->lockingProvider->releaseLock('encryption-generateMasterKey', ILockingProvider::LOCK_EXCLUSIVE);
 				throw $e;
@@ -161,7 +161,7 @@ 
 	 * @return string
 	 */
 	public function getRecoveryKey() {
-		return $this->keyStorage->getSystemUserKey($this->recoveryKeyId . '.' . $this->publicKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($this->recoveryKeyId.'.'.$this->publicKeyId, Encryption::ID);
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	 * @return bool
 	 */
 	public function checkRecoveryPassword($password) {
-		$recoveryKey = $this->keyStorage->getSystemUserKey($this->recoveryKeyId . '.' . $this->privateKeyId, Encryption::ID);
+		$recoveryKey = $this->keyStorage->getSystemUserKey($this->recoveryKeyId.'.'.$this->privateKeyId, Encryption::ID);
 		$decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $password);
 
 		if ($decryptedRecoveryKey) {
@@ -202,7 +202,7 @@ 
 		$header = $this->crypt->generateHeader();
 
 		if ($encryptedKey) {
-			$this->setPrivateKey($uid, $header . $encryptedKey);
+			$this->setPrivateKey($uid, $header.$encryptedKey);
 			return true;
 		}
 		return false;
@@ -216,7 +216,7 @@ 
 	public function setRecoveryKey($password, $keyPair) {
 		// Save Public Key
 		$this->keyStorage->setSystemUserKey($this->getRecoveryKeyId()
-			. '.' . $this->publicKeyId,
+			. '.'.$this->publicKeyId,
 			$keyPair['publicKey'],
 			Encryption::ID);
 
@@ -224,7 +224,7 @@ 
 		$header = $this->crypt->generateHeader();
 
 		if ($encryptedKey) {
-			$this->setSystemPrivateKey($this->getRecoveryKeyId(), $header . $encryptedKey);
+			$this->setSystemPrivateKey($this->getRecoveryKeyId(), $header.$encryptedKey);
 			return true;
 		}
 		return false;
@@ -284,7 +284,7 @@ 
 	 * @return boolean
 	 */
 	public function setShareKey($path, $uid, $key) {
-		$keyId = $uid . '.' . $this->shareKeyId;
+		$keyId = $uid.'.'.$this->shareKeyId;
 		return $this->keyStorage->setFileKey($path, $keyId, $key, Encryption::ID);
 	}
 
@@ -315,7 +315,7 @@ 
 			return false;
 		} catch (\Exception $e) {
 			$this->logger->warning(
-				'Could not decrypt the private key from user "' . $uid . '"" during login. Assume password change on the user back-end.',
+				'Could not decrypt the private key from user "'.$uid.'"" during login. Assume password change on the user back-end.',
 				[
 					'app' => 'encryption',
 					'exception' => $e,
@@ -378,7 +378,7 @@ 
 			// use public share key for public links
 			$uid = $this->getPublicShareKeyId();
 			$shareKey = $this->getShareKey($path, $uid);
-			$privateKey = $this->keyStorage->getSystemUserKey($this->publicShareKeyId . '.' . $this->privateKeyId, Encryption::ID);
+			$privateKey = $this->keyStorage->getSystemUserKey($this->publicShareKeyId.'.'.$this->privateKeyId, Encryption::ID);
 			$privateKey = $this->crypt->decryptPrivateKey($privateKey);
 		} else {
 			$uid = $this->keyUid;
@@ -456,7 +456,7 @@ 
 	public function deleteShareKey($path, $keyId) {
 		return $this->keyStorage->deleteFileKey(
 			$path,
-			$keyId . '.' . $this->shareKeyId,
+			$keyId.'.'.$this->shareKeyId,
 			Encryption::ID);
 	}
 
@@ -467,7 +467,7 @@ 
 	 * @return mixed
 	 */
 	public function getShareKey($path, $uid) {
-		$keyId = $uid . '.' . $this->shareKeyId;
+		$keyId = $uid.'.'.$this->shareKeyId;
 		return $this->keyStorage->getFileKey($path, $keyId, Encryption::ID);
 	}
 
@@ -529,7 +529,7 @@ 
 	 * @return string
 	 */
 	public function getPublicShareKey() {
-		return $this->keyStorage->getSystemUserKey($this->publicShareKeyId . '.' . $this->publicKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($this->publicShareKeyId.'.'.$this->publicKeyId, Encryption::ID);
 	}
 
 	/**
@@ -602,7 +602,7 @@ 
 	 * @return string returns openssl key
 	 */
 	public function getSystemPrivateKey($keyId) {
-		return $this->keyStorage->getSystemUserKey($keyId . '.' . $this->privateKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($keyId.'.'.$this->privateKeyId, Encryption::ID);
 	}
 
 	/**
@@ -612,7 +612,7 @@ 
 	 */
 	public function setSystemPrivateKey($keyId, $key) {
 		return $this->keyStorage->setSystemUserKey(
-			$keyId . '.' . $this->privateKeyId,
+			$keyId.'.'.$this->privateKeyId,
 			$key,
 			Encryption::ID);
 	}
@@ -673,7 +673,7 @@ 
 	 * @return string
 	 */
 	public function getPublicMasterKey() {
-		return $this->keyStorage->getSystemUserKey($this->masterKeyId . '.' . $this->publicKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($this->masterKeyId.'.'.$this->publicKeyId, Encryption::ID);
 	}
 
 	/**
@@ -682,6 +682,6 @@ 
 	 * @return string
 	 */
 	public function getPrivateMasterKey() {
-		return $this->keyStorage->getSystemUserKey($this->masterKeyId . '.' . $this->privateKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($this->masterKeyId.'.'.$this->privateKeyId, Encryption::ID);
 	}
 }

apps/encryption/lib/Crypto/DecryptAll.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 				if ($useLoginPassword) {
 					$question = new Question('Please enter the user\'s login password: ');
 				} elseif ($this->util->isRecoveryEnabledForUser($user) === false) {
-					$output->writeln('No recovery key available for user ' . $user);
+					$output->writeln('No recovery key available for user '.$user);
 					return false;
 				} else {
 					$user = $recoveryKeyId;
@@ -88,7 +88,7 @@ 
 	 *
 	 * @throws PrivateKeyMissingException
 	 */
-	protected function getPrivateKey(string $user, string $password): string|false {
+	protected function getPrivateKey(string $user, string $password): string | false {
 		$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
 		$masterKeyId = $this->keyManager->getMasterKeyId();
 		if ($user === $recoveryKeyId) {

apps/encryption/lib/Crypto/EncryptAll.php

Spacing +7 added lines, -7 removed lines

@@ -68,7 +68,7 @@ 
 		$this->input = $input;
 		$this->output = $output;
 
-		$headline = 'Encrypt all files with the ' . Encryption::DISPLAY_NAME;
+		$headline = 'Encrypt all files with the '.Encryption::DISPLAY_NAME;
 		$this->output->writeln("\n");
 		$this->output->writeln($headline);
 		$this->output->writeln(str_pad('', strlen($headline), '='));
@@ -124,7 +124,7 @@ 
 				$users = $backend->getUsers('', $limit, $offset);
 				foreach ($users as $user) {
 					if ($this->keyManager->userHasKeys($user) === false) {
-						$progress->setMessage('Create key-pair for ' . $user);
+						$progress->setMessage('Create key-pair for '.$user);
 						$progress->advance();
 						$this->setupUserFS($user);
 						$password = $this->generateOneTimePassword($user);
@@ -192,12 +192,12 @@ 
 	protected function encryptUsersFiles(string $uid, ProgressBar $progress, string $userCount): void {
 		$this->setupUserFS($uid);
 		$directories = [];
-		$directories[] = '/' . $uid . '/files';
+		$directories[] = '/'.$uid.'/files';
 
 		while ($root = array_pop($directories)) {
 			$content = $this->rootView->getDirectoryContent($root);
 			foreach ($content as $file) {
-				$path = $root . '/' . $file->getName();
+				$path = $root.'/'.$file->getName();
 				if ($file->isShared()) {
 					$progress->setMessage("Skip shared file/folder $path");
 					$progress->advance();
@@ -214,7 +214,7 @@ 
 							$progress->advance();
 						}
 					} catch (\Exception $e) {
-						$progress->setMessage("Failed to encrypt path $path: " . $e->getMessage());
+						$progress->setMessage("Failed to encrypt path $path: ".$e->getMessage());
 						$progress->advance();
 						$this->logger->error(
 							'Failed to encrypt path {path}',
@@ -237,7 +237,7 @@ 
 		}
 
 		$source = $path;
-		$target = $path . '.encrypted.' . time();
+		$target = $path.'.encrypted.'.time();
 
 		try {
 			$copySuccess = $this->rootView->copy($source, $target);
@@ -246,7 +246,7 @@ 
 				if ($this->rootView->file_exists($target)) {
 					$this->rootView->unlink($target);
 				}
-				throw new \Exception('Copy failed for ' . $source);
+				throw new \Exception('Copy failed for '.$source);
 			}
 			$this->rootView->rename($target, $source);
 		} catch (DecryptionFailedException $e) {

apps/encryption/lib/Crypto/Crypt.php

Spacing +28 added lines, -28 removed lines

@@ -93,7 +93,7 @@ 
 				['app' => 'encryption']);
 
 			if (openssl_error_string()) {
-				$this->logger->error('Encryption library openssl_pkey_new() fails: ' . openssl_error_string(),
+				$this->logger->error('Encryption library openssl_pkey_new() fails: '.openssl_error_string(),
 					['app' => 'encryption']);
 			}
 		} elseif (openssl_pkey_export($res,
@@ -108,10 +108,10 @@ 
 				'privateKey' => $privateKey
 			];
 		}
-		$this->logger->error('Encryption library couldn\'t export users private key, please check your servers OpenSSL configuration.' . $this->user,
+		$this->logger->error('Encryption library couldn\'t export users private key, please check your servers OpenSSL configuration.'.$this->user,
 			['app' => 'encryption']);
 		if (openssl_error_string()) {
-			$this->logger->error('Encryption Library:' . openssl_error_string(),
+			$this->logger->error('Encryption Library:'.openssl_error_string(),
 				['app' => 'encryption']);
 		}
 
@@ -140,7 +140,7 @@ 
 	/**
 	 * @throws EncryptionFailedException
 	 */
-	public function symmetricEncryptFileContent(string $plainContent, string $passPhrase, int $version, string $position): string|false {
+	public function symmetricEncryptFileContent(string $plainContent, string $passPhrase, int $version, string $position): string | false {
 		if (!$plainContent) {
 			$this->logger->error('Encryption Library, symmetrical encryption failed no content given',
 				['app' => 'encryption']);
@@ -155,7 +155,7 @@ 
 			$this->getCipher());
 
 		// Create a signature based on the key as well as the current version
-		$sig = $this->createSignature($encryptedContent, $passPhrase . '_' . $version . '_' . $position);
+		$sig = $this->createSignature($encryptedContent, $passPhrase.'_'.$version.'_'.$position);
 
 		// combine content to encrypt the IV identifier and actual IV
 		$catFile = $this->concatIV($encryptedContent, $iv);
@@ -172,18 +172,18 @@ 
 	 */
 	public function generateHeader($keyFormat = self::DEFAULT_KEY_FORMAT) {
 		if (in_array($keyFormat, self::SUPPORTED_KEY_FORMATS, true) === false) {
-			throw new \InvalidArgumentException('key format "' . $keyFormat . '" is not supported');
+			throw new \InvalidArgumentException('key format "'.$keyFormat.'" is not supported');
 		}
 
 		$header = self::HEADER_START
-			. ':cipher:' . $this->getCipher()
-			. ':keyFormat:' . $keyFormat;
+			. ':cipher:'.$this->getCipher()
+			. ':keyFormat:'.$keyFormat;
 
 		if ($this->useLegacyBase64Encoding !== true) {
-			$header .= ':encoding:' . self::BINARY_ENCODING_FORMAT;
+			$header .= ':encoding:'.self::BINARY_ENCODING_FORMAT;
 		}
 
-		$header .= ':' . self::HEADER_END;
+		$header .= ':'.self::HEADER_END;
 
 		return $header;
 	}
@@ -201,7 +201,7 @@ 
 
 		if (!$encryptedContent) {
 			$error = 'Encryption (symmetric) of content failed';
-			$this->logger->error($error . openssl_error_string(),
+			$this->logger->error($error.openssl_error_string(),
 				['app' => 'encryption']);
 			throw new EncryptionFailedException($error);
 		}
@@ -280,11 +280,11 @@ 
 	}
 
 	private function concatIV(string $encryptedContent, string $iv): string {
-		return $encryptedContent . '00iv00' . $iv;
+		return $encryptedContent.'00iv00'.$iv;
 	}
 
 	private function concatSig(string $encryptedContent, string $signature): string {
-		return $encryptedContent . '00sig00' . $signature;
+		return $encryptedContent.'00sig00'.$signature;
 	}
 
 	/**
@@ -293,7 +293,7 @@ 
 	 * encrypted content and is not used in any crypto primitive.
 	 */
 	private function addPadding(string $data): string {
-		return $data . 'xxx';
+		return $data.'xxx';
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 	protected function generatePasswordHash(string $password, string $cipher, string $uid = '', int $iterations = 600000): string {
 		$instanceId = $this->config->getSystemValue('instanceid');
 		$instanceSecret = $this->config->getSystemValue('secret');
-		$salt = hash('sha256', $uid . $instanceId . $instanceSecret, true);
+		$salt = hash('sha256', $uid.$instanceId.$instanceSecret, true);
 		$keySize = $this->getKeySize($cipher);
 
 		return hash_pbkdf2(
@@ -343,7 +343,7 @@ 
 	 * @param string $password
 	 * @param string $uid for regular users, empty for system keys
 	 */
-	public function decryptPrivateKey($privateKey, $password = '', $uid = '') : string|false {
+	public function decryptPrivateKey($privateKey, $password = '', $uid = '') : string | false {
 		$header = $this->parseHeader($privateKey);
 
 		if (isset($header['cipher'])) {
@@ -427,10 +427,10 @@ 
 		if ($catFile['signature'] !== false) {
 			try {
 				// First try the new format
-				$this->checkSignature($catFile['encrypted'], $passPhrase . '_' . $version . '_' . $position, $catFile['signature']);
+				$this->checkSignature($catFile['encrypted'], $passPhrase.'_'.$version.'_'.$position, $catFile['signature']);
 			} catch (GenericEncryptionException $e) {
 				// For compatibility with old files check the version without _
-				$this->checkSignature($catFile['encrypted'], $passPhrase . $version . $position, $catFile['signature']);
+				$this->checkSignature($catFile['encrypted'], $passPhrase.$version.$position, $catFile['signature']);
 			}
 		}
 
@@ -465,7 +465,7 @@ 
 	 * create signature
 	 */
 	private function createSignature(string $data, string $passPhrase): string {
-		$passPhrase = hash('sha512', $passPhrase . 'a', true);
+		$passPhrase = hash('sha512', $passPhrase.'a', true);
 		return hash_hmac('sha256', $data, $passPhrase);
 	}
 
@@ -473,7 +473,7 @@ 
 	/**
 	 * @param bool $hasSignature did the block contain a signature, in this case we use a different padding
 	 */
-	private function removePadding(string $padded, bool $hasSignature = false): string|false {
+	private function removePadding(string $padded, bool $hasSignature = false): string | false {
 		if ($hasSignature === false && substr($padded, -2) === 'xx') {
 			return substr($padded, 0, -2);
 		} elseif ($hasSignature === true && substr($padded, -3) === 'xxx') {
@@ -548,7 +548,7 @@ 
 		if ($plainContent) {
 			return $plainContent;
 		} else {
-			throw new DecryptionFailedException('Encryption library: Decryption (symmetric) of content failed: ' . openssl_error_string());
+			throw new DecryptionFailedException('Encryption library: Decryption (symmetric) of content failed: '.openssl_error_string());
 		}
 	}
 
@@ -609,7 +609,7 @@ 
 		if (openssl_private_decrypt($shareKey, $intermediate, $privateKey, OPENSSL_PKCS1_OAEP_PADDING)) {
 			return $intermediate;
 		} else {
-			throw new MultiKeyDecryptException('multikeydecrypt with share key failed:' . openssl_error_string());
+			throw new MultiKeyDecryptException('multikeydecrypt with share key failed:'.openssl_error_string());
 		}
 	}
 
@@ -626,7 +626,7 @@ 
 		if ($this->opensslOpen($encKeyFile, $plainContent, $shareKey, $privateKey, 'RC4')) {
 			return $plainContent;
 		} else {
-			throw new MultiKeyDecryptException('multikeydecrypt with share key failed:' . openssl_error_string());
+			throw new MultiKeyDecryptException('multikeydecrypt with share key failed:'.openssl_error_string());
 		}
 	}
 
@@ -669,7 +669,7 @@ 
 				return $mappedShareKeys;
 			}
 		}
-		throw new MultiKeyEncryptException('multikeyencryption failed ' . openssl_error_string());
+		throw new MultiKeyEncryptException('multikeyencryption failed '.openssl_error_string());
 	}
 
 	/**
@@ -705,7 +705,7 @@ 
 				'data' => $sealed
 			];
 		} else {
-			throw new MultiKeyEncryptException('multikeyencryption failed ' . openssl_error_string());
+			throw new MultiKeyEncryptException('multikeyencryption failed '.openssl_error_string());
 		}
 	}
 
@@ -759,7 +759,7 @@ 
 				$result = (strlen($output) === strlen($data));
 			}
 		} else {
-			throw new DecryptionFailedException('Unsupported cipher ' . $cipher_algo);
+			throw new DecryptionFailedException('Unsupported cipher '.$cipher_algo);
 		}
 
 		return $result;
@@ -771,7 +771,7 @@ 
 	 * @deprecated 27.0.0 use multiKeyEncrypt
 	 * @throws EncryptionFailedException
 	 */
-	private function opensslSeal(string $data, string &$sealed_data, array &$encrypted_keys, array $public_key, string $cipher_algo): int|false {
+	private function opensslSeal(string $data, string &$sealed_data, array &$encrypted_keys, array $public_key, string $cipher_algo): int | false {
 		$result = false;
 
 		// check if RC4 is used
@@ -806,7 +806,7 @@ 
 				}
 			}
 		} else {
-			throw new EncryptionFailedException('Unsupported cipher ' . $cipher_algo);
+			throw new EncryptionFailedException('Unsupported cipher '.$cipher_algo);
 		}
 
 		return $result;

apps/encryption/lib/Command/DropLegacyFileKey.php

Spacing +13 added lines, -13 removed lines

@@ -48,9 +48,9 @@ 
 			do {
 				$users = $backend->getUsers('', $limit, $offset);
 				foreach ($users as $user) {
-					$output->writeln('Scanning all files for ' . $user);
+					$output->writeln('Scanning all files for '.$user);
 					$this->setupUserFS($user);
-					$result = $result && $this->scanFolder($output, '/' . $user);
+					$result = $result && $this->scanFolder($output, '/'.$user);
 				}
 				$offset += $limit;
 			} while (count($users) >= $limit);
@@ -68,7 +68,7 @@ 
 		$clean = true;
 
 		foreach ($this->rootView->getDirectoryContent($folder) as $item) {
-			$path = $folder . '/' . $item['name'];
+			$path = $folder.'/'.$item['name'];
 			if ($this->rootView->is_dir($path)) {
 				if ($this->scanFolder($output, $path) === false) {
 					$clean = false;
@@ -82,21 +82,21 @@ 
 				$stats = $this->rootView->stat($path);
 				if (!isset($stats['hasHeader']) || $stats['hasHeader'] === false) {
 					$clean = false;
-					$output->writeln('<error>' . $path . ' does not have a proper header</error>');
+					$output->writeln('<error>'.$path.' does not have a proper header</error>');
 				} else {
 					try {
 						$legacyFileKey = $this->keyManager->getFileKey($path, true);
 						if ($legacyFileKey === '') {
-							$output->writeln('Got an empty legacy filekey for ' . $path . ', continuing', OutputInterface::VERBOSITY_VERBOSE);
+							$output->writeln('Got an empty legacy filekey for '.$path.', continuing', OutputInterface::VERBOSITY_VERBOSE);
 							continue;
 						}
 					} catch (GenericEncryptionException $e) {
-						$output->writeln('Got a decryption error for legacy filekey for ' . $path . ', continuing', OutputInterface::VERBOSITY_VERBOSE);
+						$output->writeln('Got a decryption error for legacy filekey for '.$path.', continuing', OutputInterface::VERBOSITY_VERBOSE);
 						continue;
 					}
 					/* If that did not throw and filekey is not empty, a legacy filekey is used */
 					$clean = false;
-					$output->writeln($path . ' is using a legacy filekey, migrating');
+					$output->writeln($path.' is using a legacy filekey, migrating');
 					$this->migrateSinglefile($path, $item, $output);
 				}
 			}
@@ -107,29 +107,29 @@ 
 
 	private function migrateSinglefile(string $path, FileInfo $fileInfo, OutputInterface $output): void {
 		$source = $path;
-		$target = $path . '.reencrypted.' . time();
+		$target = $path.'.reencrypted.'.time();
 
 		try {
 			$this->rootView->copy($source, $target);
 			$copyResource = $this->rootView->fopen($target, 'r');
 			$sourceResource = $this->rootView->fopen($source, 'w');
 			if ($copyResource === false || $sourceResource === false) {
-				throw new DecryptionFailedException('Failed to open ' . $source . ' or ' . $target);
+				throw new DecryptionFailedException('Failed to open '.$source.' or '.$target);
 			}
 			if (stream_copy_to_stream($copyResource, $sourceResource) === false) {
-				$output->writeln('<error>Failed to copy ' . $target . ' data into ' . $source . '</error>');
+				$output->writeln('<error>Failed to copy '.$target.' data into '.$source.'</error>');
 				$output->writeln('<error>Leaving both files in there to avoid data loss</error>');
 				return;
 			}
 			$this->rootView->touch($source, $fileInfo->getMTime());
 			$this->rootView->unlink($target);
-			$output->writeln('<info>Migrated ' . $source . '</info>', OutputInterface::VERBOSITY_VERBOSE);
+			$output->writeln('<info>Migrated '.$source.'</info>', OutputInterface::VERBOSITY_VERBOSE);
 		} catch (DecryptionFailedException $e) {
 			if ($this->rootView->file_exists($target)) {
 				$this->rootView->unlink($target);
 			}
-			$output->writeln('<error>Failed to migrate ' . $path . '</error>');
-			$output->writeln('<error>' . $e . '</error>', OutputInterface::VERBOSITY_VERBOSE);
+			$output->writeln('<error>Failed to migrate '.$path.'</error>');
+			$output->writeln('<error>'.$e.'</error>', OutputInterface::VERBOSITY_VERBOSE);
 		} finally {
 			if (is_resource($copyResource)) {
 				fclose($copyResource);

apps/encryption/lib/Recovery.php

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
 		$encryptedRecoveryKey = $this->crypt->encryptPrivateKey($decryptedRecoveryKey, $newPassword);
 		$header = $this->crypt->generateHeader();
 		if ($encryptedRecoveryKey !== false) {
-			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header . $encryptedRecoveryKey);
+			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header.$encryptedRecoveryKey);
 			return true;
 		}
 		return false;
@@ -138,9 +138,9 @@ 
 				$value);
 
 			if ($value === '1') {
-				$this->addRecoveryKeys('/' . $this->user->getUID() . '/files/');
+				$this->addRecoveryKeys('/'.$this->user->getUID().'/files/');
 			} else {
-				$this->removeRecoveryKeys('/' . $this->user->getUID() . '/files/');
+				$this->removeRecoveryKeys('/'.$this->user->getUID().'/files/');
 			}
 
 			return true;
@@ -157,7 +157,7 @@ 
 		foreach ($dirContent as $item) {
 			$filePath = $item->getPath();
 			if ($item['type'] === 'dir') {
-				$this->addRecoveryKeys($filePath . '/');
+				$this->addRecoveryKeys($filePath.'/');
 			} else {
 				$fileKey = $this->keyManager->getFileKey($filePath, null);
 				if (!empty($fileKey)) {
@@ -187,7 +187,7 @@ 
 		foreach ($dirContent as $item) {
 			$filePath = $item->getPath();
 			if ($item['type'] === 'dir') {
-				$this->removeRecoveryKeys($filePath . '/');
+				$this->removeRecoveryKeys($filePath.'/');
 			} else {
 				$this->keyManager->deleteShareKey($filePath, $this->keyManager->getRecoveryKeyId());
 			}
@@ -202,7 +202,7 @@ 
 
 		$privateKey = $this->crypt->decryptPrivateKey($encryptedKey, $recoveryPassword);
 		if ($privateKey !== false) {
-			$this->recoverAllFiles('/' . $user . '/files/', $privateKey, $user);
+			$this->recoverAllFiles('/'.$user.'/files/', $privateKey, $user);
 		}
 	}
 
@@ -216,7 +216,7 @@ 
 			// Get relative path from encryption/keyfiles
 			$filePath = $item->getPath();
 			if ($this->view->is_dir($filePath)) {
-				$this->recoverAllFiles($filePath . '/', $privateKey, $uid);
+				$this->recoverAllFiles($filePath.'/', $privateKey, $uid);
 			} else {
 				$this->recoverFile($filePath, $privateKey, $uid);
 			}

tests/lib/Encryption/DecryptAllTest.php

Spacing +10 added lines, -10 removed lines

@@ -154,7 +154,7 @@ 
 			->with($this->inputInterface, $this->outputInterface, $user)
 			->willReturn($success);
 
-		$callback = function () use ($dummyEncryptionModule) {
+		$callback = function() use ($dummyEncryptionModule) {
 			return $dummyEncryptionModule;
 		};
 		$moduleDescription = [
@@ -199,7 +199,7 @@ 
 			];
 			$instance->expects($this->exactly(2))
 				->method('decryptUsersFiles')
-				->willReturnCallback(function ($user) use (&$calls): void {
+				->willReturnCallback(function($user) use (&$calls): void {
 					$expected = array_shift($calls);
 					$this->assertEquals($expected, $user);
 				});
@@ -265,7 +265,7 @@ 
 
 		$this->view->expects($this->any())->method('is_dir')
 			->willReturnCallback(
-				function ($path) {
+				function($path) {
 					if ($path === '/user1/files/foo') {
 						return true;
 					}
@@ -279,7 +279,7 @@ 
 		];
 		$instance->expects($this->exactly(2))
 			->method('decryptFile')
-			->willReturnCallback(function ($path) use (&$calls): bool {
+			->willReturnCallback(function($path) use (&$calls): bool {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, $path);
 				return true;
@@ -327,10 +327,10 @@ 
 
 			$this->view->expects($this->once())
 				->method('copy')
-				->with($path, $path . '.decrypted.42');
+				->with($path, $path.'.decrypted.42');
 			$this->view->expects($this->once())
 				->method('rename')
-				->with($path . '.decrypted.42', $path);
+				->with($path.'.decrypted.42', $path);
 		} else {
 			$instance->expects($this->never())->method('getTimestamp');
 			$this->view->expects($this->never())->method('copy');
@@ -367,19 +367,19 @@ 
 
 		$this->view->expects($this->once())
 			->method('copy')
-			->with($path, $path . '.decrypted.42')
-			->willReturnCallback(function (): void {
+			->with($path, $path.'.decrypted.42')
+			->willReturnCallback(function(): void {
 				throw new DecryptionFailedException();
 			});
 
 		$this->view->expects($this->never())->method('rename');
 		$this->view->expects($this->once())
 			->method('file_exists')
-			->with($path . '.decrypted.42')
+			->with($path.'.decrypted.42')
 			->willReturn(true);
 		$this->view->expects($this->once())
 			->method('unlink')
-			->with($path . '.decrypted.42');
+			->with($path.'.decrypted.42');
 
 		$this->assertFalse(
 			$this->invokePrivate($instance, 'decryptFile', [$path])