nextcloud / server

lib/private/Encryption/Keys/Storage.php

Spacing +19 added lines, -19 removed lines

@@ -80,8 +80,8 @@ 
 		$this->util = $util;
 
 		$this->encryption_base_dir = '/files_encryption';
-		$this->keys_base_dir = $this->encryption_base_dir .'/keys';
-		$this->backup_base_dir = $this->encryption_base_dir .'/backup';
+		$this->keys_base_dir = $this->encryption_base_dir.'/keys';
+		$this->backup_base_dir = $this->encryption_base_dir.'/backup';
 		$this->root_dir = $this->util->getKeyStorageRoot();
 		$this->crypto = $crypto;
 		$this->config = $config;
@@ -101,14 +101,14 @@ 
 	public function getFileKey($path, $keyId, $encryptionModuleId) {
 		$realFile = $this->util->stripPartialFileExtension($path);
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile);
-		$key = $this->getKey($keyDir . $keyId)['key'];
+		$key = $this->getKey($keyDir.$keyId)['key'];
 
 		if ($key === '' && $realFile !== $path) {
 			// Check if the part file has keys and use them, if no normal keys
 			// exist. This is required to fix copyBetweenStorage() when we
 			// rename a .part file over storage borders.
 			$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-			$key = $this->getKey($keyDir . $keyId)['key'];
+			$key = $this->getKey($keyDir.$keyId)['key'];
 		}
 
 		return base64_decode($key);
@@ -138,7 +138,7 @@ 
 	 */
 	public function setFileKey($path, $keyId, $key, $encryptionModuleId) {
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-		return $this->setKey($keyDir . $keyId, [
+		return $this->setKey($keyDir.$keyId, [
 			'key' => base64_encode($key),
 		]);
 	}
@@ -180,7 +180,7 @@ 
 	 */
 	public function deleteFileKey($path, $keyId, $encryptionModuleId) {
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-		return !$this->view->file_exists($keyDir . $keyId) || $this->view->unlink($keyDir . $keyId);
+		return !$this->view->file_exists($keyDir.$keyId) || $this->view->unlink($keyDir.$keyId);
 	}
 
 	/**
@@ -209,10 +209,10 @@ 
 	 */
 	protected function constructUserKeyPath($encryptionModuleId, $keyId, $uid) {
 		if ($uid === null) {
-			$path = $this->root_dir . '/' . $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
+			$path = $this->root_dir.'/'.$this->encryption_base_dir.'/'.$encryptionModuleId.'/'.$keyId;
 		} else {
-			$path = $this->root_dir . '/' . $uid . $this->encryption_base_dir . '/'
-				. $encryptionModuleId . '/' . $uid . '.' . $keyId;
+			$path = $this->root_dir.'/'.$uid.$this->encryption_base_dir.'/'
+				. $encryptionModuleId.'/'.$uid.'.'.$keyId;
 		}
 
 		return \OC\Files\Filesystem::normalizePath($path);
@@ -269,7 +269,7 @@ 
 
 		if ($this->view->file_exists($path)) {
 			if (isset($this->keyCache[$path])) {
-				$key =  $this->keyCache[$path];
+				$key = $this->keyCache[$path];
 			} else {
 				$data = $this->view->file_get_contents($path);
 
@@ -369,12 +369,12 @@ 
 
 		// in case of system wide mount points the keys are stored directly in the data directory
 		if ($this->util->isSystemWideMountPoint($filename, $owner)) {
-			$keyPath = $this->root_dir . '/' . $this->keys_base_dir . $filename . '/';
+			$keyPath = $this->root_dir.'/'.$this->keys_base_dir.$filename.'/';
 		} else {
-			$keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
+			$keyPath = $this->root_dir.'/'.$owner.$this->keys_base_dir.$filename.'/';
 		}
 
-		return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
+		return Filesystem::normalizePath($keyPath.$encryptionModuleId.'/', false);
 	}
 
 	/**
@@ -429,13 +429,13 @@ 
 	 * @since 12.0.0
 	 */
 	public function backupUserKeys($encryptionModuleId, $purpose, $uid) {
-		$source = $uid . $this->encryption_base_dir . '/' . $encryptionModuleId;
-		$backupDir = $uid . $this->backup_base_dir;
+		$source = $uid.$this->encryption_base_dir.'/'.$encryptionModuleId;
+		$backupDir = $uid.$this->backup_base_dir;
 		if (!$this->view->file_exists($backupDir)) {
 			$this->view->mkdir($backupDir);
 		}
 
-		$backupDir = $backupDir . '/' . $purpose . '.' . $encryptionModuleId . '.' . $this->getTimestamp();
+		$backupDir = $backupDir.'/'.$purpose.'.'.$encryptionModuleId.'.'.$this->getTimestamp();
 		$this->view->mkdir($backupDir);
 
 		return $this->view->copy($source, $backupDir);
@@ -461,9 +461,9 @@ 
 		$systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
 
 		if ($systemWideMountPoint) {
-			$systemPath = $this->root_dir . '/' . $this->keys_base_dir . $relativePath . '/';
+			$systemPath = $this->root_dir.'/'.$this->keys_base_dir.$relativePath.'/';
 		} else {
-			$systemPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $relativePath . '/';
+			$systemPath = $this->root_dir.'/'.$owner.$this->keys_base_dir.$relativePath.'/';
 		}
 
 		return  Filesystem::normalizePath($systemPath, false);
@@ -480,7 +480,7 @@ 
 			$sub_dirs = explode('/', ltrim($path, '/'));
 			$dir = '';
 			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
+				$dir .= '/'.$sub_dir;
 				if (!$this->view->is_dir($dir)) {
 					$this->view->mkdir($dir);
 				}

core/Command/Encryption/MigrateKeyStorage.php

Spacing +9 added lines, -9 removed lines

@@ -108,11 +108,11 @@ 
 	 * @param string $root
 	 */
 	protected function updateSystemKeys($root) {
-		if (!$this->rootView->is_dir($root . '/files_encryption')) {
+		if (!$this->rootView->is_dir($root.'/files_encryption')) {
 			return;
 		}
 
-		$this->traverseKeys($root . '/files_encryption', null);
+		$this->traverseKeys($root.'/files_encryption', null);
 	}
 
 	private function traverseKeys(string $folder, ?string $uid) {
@@ -122,7 +122,7 @@ 
 			if ($node['mimetype'] === 'httpd/unix-directory') {
 				//ignore
 			} else {
-				$endsWith = function ($haystack, $needle) {
+				$endsWith = function($haystack, $needle) {
 					$length = strlen($needle);
 					if ($length === 0) {
 						return true;
@@ -135,7 +135,7 @@ 
 					$endsWith($node['name'], '.privateKey') ||
 					$endsWith($node['name'], '.publicKey') ||
 					$endsWith($node['name'], '.shareKey')) {
-					$path = $folder . '/' . $node['name'];
+					$path = $folder.'/'.$node['name'];
 
 					$content = $this->rootView->file_get_contents($path);
 
@@ -163,9 +163,9 @@ 
 
 		foreach ($listing as $node) {
 			if ($node['mimetype'] === 'httpd/unix-directory') {
-				$this->traverseFileKeys($folder . '/' . $node['name']);
+				$this->traverseFileKeys($folder.'/'.$node['name']);
 			} else {
-				$endsWith = function ($haystack, $needle) {
+				$endsWith = function($haystack, $needle) {
 					$length = strlen($needle);
 					if ($length === 0) {
 						return true;
@@ -178,7 +178,7 @@ 
 					$endsWith($node['name'], '.privateKey') ||
 					$endsWith($node['name'], '.publicKey') ||
 					$endsWith($node['name'], '.shareKey')) {
-					$path = $folder . '/' . $node['name'];
+					$path = $folder.'/'.$node['name'];
 
 					$content = $this->rootView->file_get_contents($path);
 
@@ -247,12 +247,12 @@ 
 	 */
 	protected function updateUserKeys(string $root, string $user) {
 		if ($this->userManager->userExists($user)) {
-			$source = $root . '/' . $user . '/files_encryption/OC_DEFAULT_MODULE';
+			$source = $root.'/'.$user.'/files_encryption/OC_DEFAULT_MODULE';
 			if ($this->rootView->is_dir($source)) {
 				$this->traverseKeys($source, $user);
 			}
 
-			$source = $root . '/' . $user . '/files_encryption/keys';
+			$source = $root.'/'.$user.'/files_encryption/keys';
 			if ($this->rootView->is_dir($source)) {
 				$this->traverseFileKeys($source);
 			}