nextcloud / server

lib/private/Files/Search/SearchBinaryOperator.php

Indentation +26 added lines, -26 removed lines

@@ -25,33 +25,33 @@
 use OCP\Files\Search\ISearchOperator;
 
 class SearchBinaryOperator implements ISearchBinaryOperator {
-	/** @var string */
-	private $type;
-	/** @var ISearchOperator[] */
-	private $arguments;
+    /** @var string */
+    private $type;
+    /** @var ISearchOperator[] */
+    private $arguments;
 
-	/**
-	 * SearchBinaryOperator constructor.
-	 *
-	 * @param string $type
-	 * @param ISearchOperator[] $arguments
-	 */
-	public function __construct($type, array $arguments) {
-		$this->type = $type;
-		$this->arguments = $arguments;
-	}
+    /**
+     * SearchBinaryOperator constructor.
+     *
+     * @param string $type
+     * @param ISearchOperator[] $arguments
+     */
+    public function __construct($type, array $arguments) {
+        $this->type = $type;
+        $this->arguments = $arguments;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getType() {
-		return $this->type;
-	}
+    /**
+     * @return string
+     */
+    public function getType() {
+        return $this->type;
+    }
 
-	/**
-	 * @return ISearchOperator[]
-	 */
-	public function getArguments() {
-		return $this->arguments;
-	}
+    /**
+     * @return ISearchOperator[]
+     */
+    public function getArguments() {
+        return $this->arguments;
+    }
 }

lib/private/OCS/Provider.php

Indentation +81 added lines, -81 removed lines

@@ -24,92 +24,92 @@
 namespace OC\OCS;
 
 class Provider extends \OCP\AppFramework\Controller {
-	/** @var \OCP\App\IAppManager */
-	private $appManager;
+    /** @var \OCP\App\IAppManager */
+    private $appManager;
 
-	/**
-	 * @param string $appName
-	 * @param \OCP\IRequest $request
-	 * @param \OCP\App\IAppManager $appManager
-	 */
-	public function __construct($appName,
-								\OCP\IRequest $request,
-								\OCP\App\IAppManager $appManager) {
-		parent::__construct($appName, $request);
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param string $appName
+     * @param \OCP\IRequest $request
+     * @param \OCP\App\IAppManager $appManager
+     */
+    public function __construct($appName,
+                                \OCP\IRequest $request,
+                                \OCP\App\IAppManager $appManager) {
+        parent::__construct($appName, $request);
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * @return \OCP\AppFramework\Http\JSONResponse
-	 */
-	public function buildProviderList() {
-		$services = [
-			'PRIVATE_DATA' => [
-				'version' => 1,
-				'endpoints' => [
-					'store' => '/ocs/v2.php/privatedata/setattribute',
-					'read' => '/ocs/v2.php/privatedata/getattribute',
-					'delete' => '/ocs/v2.php/privatedata/deleteattribute',
-				],
-			],
-		];
+    /**
+     * @return \OCP\AppFramework\Http\JSONResponse
+     */
+    public function buildProviderList() {
+        $services = [
+            'PRIVATE_DATA' => [
+                'version' => 1,
+                'endpoints' => [
+                    'store' => '/ocs/v2.php/privatedata/setattribute',
+                    'read' => '/ocs/v2.php/privatedata/getattribute',
+                    'delete' => '/ocs/v2.php/privatedata/deleteattribute',
+                ],
+            ],
+        ];
 
-		if($this->appManager->isEnabledForUser('files_sharing')) {
-			$services['SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
-				],
-			];
-			$services['FEDERATED_SHARING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'share' => '/ocs/v2.php/cloud/shares',
-					'webdav' => '/public.php/webdav/',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('files_sharing')) {
+            $services['SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
+                ],
+            ];
+            $services['FEDERATED_SHARING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'share' => '/ocs/v2.php/cloud/shares',
+                    'webdav' => '/public.php/webdav/',
+                ],
+            ];
+        }
 
-		if ($this->appManager->isEnabledForUser('federation')) {
-			if (isset($services['FEDERATED_SHARING'])) {
-				$services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
-				$services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
-				$services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
-			} else {
-				$services['FEDERATED_SHARING'] = [
-					'version' => 1,
-					'endpoints' => [
-						'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
-						'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
-						'carddav-user' => 'system'
-					],
-				];
-			}
-		}
+        if ($this->appManager->isEnabledForUser('federation')) {
+            if (isset($services['FEDERATED_SHARING'])) {
+                $services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret';
+                $services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system';
+                $services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system';
+            } else {
+                $services['FEDERATED_SHARING'] = [
+                    'version' => 1,
+                    'endpoints' => [
+                        'shared-secret' => '/ocs/v2.php/cloud/shared-secret',
+                        'system-address-book' => '/remote.php/dav/addressbooks/system/system/system',
+                        'carddav-user' => 'system'
+                    ],
+                ];
+            }
+        }
 
-		if($this->appManager->isEnabledForUser('activity')) {
-			$services['ACTIVITY'] = [
-				'version' => 1,
-				'endpoints' => [
-					'list' => '/ocs/v2.php/cloud/activity',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('activity')) {
+            $services['ACTIVITY'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'list' => '/ocs/v2.php/cloud/activity',
+                ],
+            ];
+        }
 
-		if($this->appManager->isEnabledForUser('provisioning_api')) {
-			$services['PROVISIONING'] = [
-				'version' => 1,
-				'endpoints' => [
-					'user' => '/ocs/v2.php/cloud/users',
-					'groups' => '/ocs/v2.php/cloud/groups',
-					'apps' => '/ocs/v2.php/cloud/apps',
-				],
-			];
-		}
+        if($this->appManager->isEnabledForUser('provisioning_api')) {
+            $services['PROVISIONING'] = [
+                'version' => 1,
+                'endpoints' => [
+                    'user' => '/ocs/v2.php/cloud/users',
+                    'groups' => '/ocs/v2.php/cloud/groups',
+                    'apps' => '/ocs/v2.php/cloud/apps',
+                ],
+            ];
+        }
 
-		return new \OCP\AppFramework\Http\JSONResponse([
-			'version' => 2,
-			'services' => $services,
-		]);
-	}
+        return new \OCP\AppFramework\Http\JSONResponse([
+            'version' => 2,
+            'services' => $services,
+        ]);
+    }
 }

apps/federatedfilesharing/appinfo/routes.php

Indentation +14 added lines, -14 removed lines

@@ -23,18 +23,18 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
-		['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
-	],
-	'ocs' => [
-		['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
-	],
+    'routes' => [
+        ['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
+        ['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
+    ],
+    'ocs' => [
+        ['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
+    ],
 ];

apps/dav/appinfo/v2/remote.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 // no php execution timeout for webdav
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 

lib/private/Encryption/Keys/Storage.php

Indentation +340 added lines, -340 removed lines

@@ -32,345 +32,345 @@
 
 class Storage implements IStorage {
 
-	// hidden file which indicate that the folder is a valid key storage
-	const KEY_STORAGE_MARKER = '.oc_key_storage';
-
-	/** @var View */
-	private $view;
-
-	/** @var Util */
-	private $util;
-
-	// base dir where all the file related keys are stored
-	/** @var string */
-	private $keys_base_dir;
-
-	// root of the key storage default is empty which means that we use the data folder
-	/** @var string */
-	private $root_dir;
-
-	/** @var string */
-	private $encryption_base_dir;
-
-	/** @var string */
-	private $backup_base_dir;
-
-	/** @var array */
-	private $keyCache = [];
-
-	/**
-	 * @param View $view
-	 * @param Util $util
-	 */
-	public function __construct(View $view, Util $util) {
-		$this->view = $view;
-		$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->root_dir = $this->util->getKeyStorageRoot();
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getUserKey($uid, $keyId, $encryptionModuleId) {
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
-		return $this->getKey($path);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getFileKey($path, $keyId, $encryptionModuleId) {
-		$realFile = $this->util->stripPartialFileExtension($path);
-		$keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile);
-		$key = $this->getKey($keyDir . $keyId);
-
-		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);
-		}
-
-		return $key;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSystemUserKey($keyId, $encryptionModuleId) {
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
-		return $this->getKey($path);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setUserKey($uid, $keyId, $key, $encryptionModuleId) {
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
-		return $this->setKey($path, $key);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setFileKey($path, $keyId, $key, $encryptionModuleId) {
-		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-		return $this->setKey($keyDir . $keyId, $key);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSystemUserKey($keyId, $key, $encryptionModuleId) {
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
-		return $this->setKey($path, $key);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteUserKey($uid, $keyId, $encryptionModuleId) {
-		try {
-			$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
-			return !$this->view->file_exists($path) || $this->view->unlink($path);
-		} catch (NoUserException $e) {
-			// this exception can come from initMountPoints() from setupUserMounts()
-			// for a deleted user.
-			//
-			// It means, that:
-			// - we are not running in alternative storage mode because we don't call
-			// initMountPoints() in that mode
-			// - the keys were in the user's home but since the user was deleted, the
-			// user's home is gone and so are the keys
-			//
-			// So there is nothing to do, just ignore.
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteFileKey($path, $keyId, $encryptionModuleId) {
-		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
-		return !$this->view->file_exists($keyDir . $keyId) || $this->view->unlink($keyDir . $keyId);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteAllFileKeys($path) {
-		$keyDir = $this->getFileKeyDir('', $path);
-		return !$this->view->file_exists($keyDir) || $this->view->deleteAll($keyDir);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteSystemUserKey($keyId, $encryptionModuleId) {
-		$path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
-		return !$this->view->file_exists($path) || $this->view->unlink($path);
-	}
-
-	/**
-	 * construct path to users key
-	 *
-	 * @param string $encryptionModuleId
-	 * @param string $keyId
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function constructUserKeyPath($encryptionModuleId, $keyId, $uid) {
-
-		if ($uid === null) {
-			$path = $this->root_dir . '/' . $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
-		} else {
-			$path = $this->root_dir . '/' . $uid . $this->encryption_base_dir . '/'
-				. $encryptionModuleId . '/' . $uid . '.' . $keyId;
-		}
-
-		return \OC\Files\Filesystem::normalizePath($path);
-	}
-
-	/**
-	 * read key from hard disk
-	 *
-	 * @param string $path to key
-	 * @return string
-	 */
-	private function getKey($path) {
-
-		$key = '';
-
-		if ($this->view->file_exists($path)) {
-			if (isset($this->keyCache[$path])) {
-				$key =  $this->keyCache[$path];
-			} else {
-				$key = $this->view->file_get_contents($path);
-				$this->keyCache[$path] = $key;
-			}
-		}
-
-		return $key;
-	}
-
-	/**
-	 * write key to disk
-	 *
-	 *
-	 * @param string $path path to key directory
-	 * @param string $key key
-	 * @return bool
-	 */
-	private function setKey($path, $key) {
-		$this->keySetPreparation(dirname($path));
-
-		$result = $this->view->file_put_contents($path, $key);
-
-		if (is_int($result) && $result > 0) {
-			$this->keyCache[$path] = $key;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * get path to key folder for a given file
-	 *
-	 * @param string $encryptionModuleId
-	 * @param string $path path to the file, relative to data/
-	 * @return string
-	 */
-	private function getFileKeyDir($encryptionModuleId, $path) {
-
-		list($owner, $filename) = $this->util->getUidAndFilename($path);
-
-		// 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 . '/';
-		} else {
-			$keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
-		}
-
-		return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
-	}
-
-	/**
-	 * move keys if a file was renamed
-	 *
-	 * @param string $source
-	 * @param string $target
-	 * @return boolean
-	 */
-	public function renameKeys($source, $target) {
-
-		$sourcePath = $this->getPathToKeys($source);
-		$targetPath = $this->getPathToKeys($target);
-
-		if ($this->view->file_exists($sourcePath)) {
-			$this->keySetPreparation(dirname($targetPath));
-			$this->view->rename($sourcePath, $targetPath);
-
-			return true;
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * copy keys if a file was renamed
-	 *
-	 * @param string $source
-	 * @param string $target
-	 * @return boolean
-	 */
-	public function copyKeys($source, $target) {
-
-		$sourcePath = $this->getPathToKeys($source);
-		$targetPath = $this->getPathToKeys($target);
-
-		if ($this->view->file_exists($sourcePath)) {
-			$this->keySetPreparation(dirname($targetPath));
-			$this->view->copy($sourcePath, $targetPath);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * backup keys of a given encryption module
-	 *
-	 * @param string $encryptionModuleId
-	 * @param string $purpose
-	 * @param string $uid
-	 * @return bool
-	 * @since 12.0.0
-	 */
-	public function backupUserKeys($encryptionModuleId, $purpose, $uid) {
-		$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();
-		$this->view->mkdir($backupDir);
-
-		return $this->view->copy($source, $backupDir);
-	}
-
-	/**
-	 * get the current timestamp
-	 *
-	 * @return int
-	 */
-	protected function getTimestamp() {
-		return time();
-	}
-
-	/**
-	 * get system wide path and detect mount points
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	protected function getPathToKeys($path) {
-		list($owner, $relativePath) = $this->util->getUidAndFilename($path);
-		$systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
-
-		if ($systemWideMountPoint) {
-			$systemPath = $this->root_dir . '/' . $this->keys_base_dir . $relativePath . '/';
-		} else {
-			$systemPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $relativePath . '/';
-		}
-
-		return  Filesystem::normalizePath($systemPath, false);
-	}
-
-	/**
-	 * Make preparations to filesystem for saving a key file
-	 *
-	 * @param string $path relative to the views root
-	 */
-	protected function keySetPreparation($path) {
-		// If the file resides within a subdirectory, create it
-		if (!$this->view->file_exists($path)) {
-			$sub_dirs = explode('/', ltrim($path, '/'));
-			$dir = '';
-			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
-				if (!$this->view->is_dir($dir)) {
-					$this->view->mkdir($dir);
-				}
-			}
-		}
-	}
+    // hidden file which indicate that the folder is a valid key storage
+    const KEY_STORAGE_MARKER = '.oc_key_storage';
+
+    /** @var View */
+    private $view;
+
+    /** @var Util */
+    private $util;
+
+    // base dir where all the file related keys are stored
+    /** @var string */
+    private $keys_base_dir;
+
+    // root of the key storage default is empty which means that we use the data folder
+    /** @var string */
+    private $root_dir;
+
+    /** @var string */
+    private $encryption_base_dir;
+
+    /** @var string */
+    private $backup_base_dir;
+
+    /** @var array */
+    private $keyCache = [];
+
+    /**
+     * @param View $view
+     * @param Util $util
+     */
+    public function __construct(View $view, Util $util) {
+        $this->view = $view;
+        $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->root_dir = $this->util->getKeyStorageRoot();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getUserKey($uid, $keyId, $encryptionModuleId) {
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
+        return $this->getKey($path);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFileKey($path, $keyId, $encryptionModuleId) {
+        $realFile = $this->util->stripPartialFileExtension($path);
+        $keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile);
+        $key = $this->getKey($keyDir . $keyId);
+
+        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);
+        }
+
+        return $key;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSystemUserKey($keyId, $encryptionModuleId) {
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
+        return $this->getKey($path);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setUserKey($uid, $keyId, $key, $encryptionModuleId) {
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
+        return $this->setKey($path, $key);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setFileKey($path, $keyId, $key, $encryptionModuleId) {
+        $keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
+        return $this->setKey($keyDir . $keyId, $key);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSystemUserKey($keyId, $key, $encryptionModuleId) {
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
+        return $this->setKey($path, $key);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteUserKey($uid, $keyId, $encryptionModuleId) {
+        try {
+            $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, $uid);
+            return !$this->view->file_exists($path) || $this->view->unlink($path);
+        } catch (NoUserException $e) {
+            // this exception can come from initMountPoints() from setupUserMounts()
+            // for a deleted user.
+            //
+            // It means, that:
+            // - we are not running in alternative storage mode because we don't call
+            // initMountPoints() in that mode
+            // - the keys were in the user's home but since the user was deleted, the
+            // user's home is gone and so are the keys
+            //
+            // So there is nothing to do, just ignore.
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteFileKey($path, $keyId, $encryptionModuleId) {
+        $keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
+        return !$this->view->file_exists($keyDir . $keyId) || $this->view->unlink($keyDir . $keyId);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteAllFileKeys($path) {
+        $keyDir = $this->getFileKeyDir('', $path);
+        return !$this->view->file_exists($keyDir) || $this->view->deleteAll($keyDir);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteSystemUserKey($keyId, $encryptionModuleId) {
+        $path = $this->constructUserKeyPath($encryptionModuleId, $keyId, null);
+        return !$this->view->file_exists($path) || $this->view->unlink($path);
+    }
+
+    /**
+     * construct path to users key
+     *
+     * @param string $encryptionModuleId
+     * @param string $keyId
+     * @param string $uid
+     * @return string
+     */
+    protected function constructUserKeyPath($encryptionModuleId, $keyId, $uid) {
+
+        if ($uid === null) {
+            $path = $this->root_dir . '/' . $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
+        } else {
+            $path = $this->root_dir . '/' . $uid . $this->encryption_base_dir . '/'
+                . $encryptionModuleId . '/' . $uid . '.' . $keyId;
+        }
+
+        return \OC\Files\Filesystem::normalizePath($path);
+    }
+
+    /**
+     * read key from hard disk
+     *
+     * @param string $path to key
+     * @return string
+     */
+    private function getKey($path) {
+
+        $key = '';
+
+        if ($this->view->file_exists($path)) {
+            if (isset($this->keyCache[$path])) {
+                $key =  $this->keyCache[$path];
+            } else {
+                $key = $this->view->file_get_contents($path);
+                $this->keyCache[$path] = $key;
+            }
+        }
+
+        return $key;
+    }
+
+    /**
+     * write key to disk
+     *
+     *
+     * @param string $path path to key directory
+     * @param string $key key
+     * @return bool
+     */
+    private function setKey($path, $key) {
+        $this->keySetPreparation(dirname($path));
+
+        $result = $this->view->file_put_contents($path, $key);
+
+        if (is_int($result) && $result > 0) {
+            $this->keyCache[$path] = $key;
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * get path to key folder for a given file
+     *
+     * @param string $encryptionModuleId
+     * @param string $path path to the file, relative to data/
+     * @return string
+     */
+    private function getFileKeyDir($encryptionModuleId, $path) {
+
+        list($owner, $filename) = $this->util->getUidAndFilename($path);
+
+        // 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 . '/';
+        } else {
+            $keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
+        }
+
+        return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
+    }
+
+    /**
+     * move keys if a file was renamed
+     *
+     * @param string $source
+     * @param string $target
+     * @return boolean
+     */
+    public function renameKeys($source, $target) {
+
+        $sourcePath = $this->getPathToKeys($source);
+        $targetPath = $this->getPathToKeys($target);
+
+        if ($this->view->file_exists($sourcePath)) {
+            $this->keySetPreparation(dirname($targetPath));
+            $this->view->rename($sourcePath, $targetPath);
+
+            return true;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * copy keys if a file was renamed
+     *
+     * @param string $source
+     * @param string $target
+     * @return boolean
+     */
+    public function copyKeys($source, $target) {
+
+        $sourcePath = $this->getPathToKeys($source);
+        $targetPath = $this->getPathToKeys($target);
+
+        if ($this->view->file_exists($sourcePath)) {
+            $this->keySetPreparation(dirname($targetPath));
+            $this->view->copy($sourcePath, $targetPath);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * backup keys of a given encryption module
+     *
+     * @param string $encryptionModuleId
+     * @param string $purpose
+     * @param string $uid
+     * @return bool
+     * @since 12.0.0
+     */
+    public function backupUserKeys($encryptionModuleId, $purpose, $uid) {
+        $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();
+        $this->view->mkdir($backupDir);
+
+        return $this->view->copy($source, $backupDir);
+    }
+
+    /**
+     * get the current timestamp
+     *
+     * @return int
+     */
+    protected function getTimestamp() {
+        return time();
+    }
+
+    /**
+     * get system wide path and detect mount points
+     *
+     * @param string $path
+     * @return string
+     */
+    protected function getPathToKeys($path) {
+        list($owner, $relativePath) = $this->util->getUidAndFilename($path);
+        $systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
+
+        if ($systemWideMountPoint) {
+            $systemPath = $this->root_dir . '/' . $this->keys_base_dir . $relativePath . '/';
+        } else {
+            $systemPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $relativePath . '/';
+        }
+
+        return  Filesystem::normalizePath($systemPath, false);
+    }
+
+    /**
+     * Make preparations to filesystem for saving a key file
+     *
+     * @param string $path relative to the views root
+     */
+    protected function keySetPreparation($path) {
+        // If the file resides within a subdirectory, create it
+        if (!$this->view->file_exists($path)) {
+            $sub_dirs = explode('/', ltrim($path, '/'));
+            $dir = '';
+            foreach ($sub_dirs as $sub_dir) {
+                $dir .= '/' . $sub_dir;
+                if (!$this->view->is_dir($dir)) {
+                    $this->view->mkdir($dir);
+                }
+            }
+        }
+    }
 
 }

apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php

Indentation +25 added lines, -25 removed lines

@@ -39,33 +39,33 @@
  * @package OCA\DAV\Connector\Sabre
  */
 class DummyGetResponsePlugin extends \Sabre\DAV\ServerPlugin {
-	/** @var \Sabre\DAV\Server */
-	protected $server;
+    /** @var \Sabre\DAV\Server */
+    protected $server;
 
-	/**
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('method:GET', [$this, 'httpGet'], 200);
-	}
+    /**
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('method:GET', [$this, 'httpGet'], 200);
+    }
 
-	/**
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return false
-	 */
-	function httpGet(RequestInterface $request, ResponseInterface $response) {
-		$string = 'This is the WebDAV interface. It can only be accessed by ' .
-			'WebDAV clients such as the Nextcloud desktop sync client.';
-		$stream = fopen('php://memory','r+');
-		fwrite($stream, $string);
-		rewind($stream);
+    /**
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return false
+     */
+    function httpGet(RequestInterface $request, ResponseInterface $response) {
+        $string = 'This is the WebDAV interface. It can only be accessed by ' .
+            'WebDAV clients such as the Nextcloud desktop sync client.';
+        $stream = fopen('php://memory','r+');
+        fwrite($stream, $string);
+        rewind($stream);
 
-		$response->setStatus(200);
-		$response->setBody($stream);
+        $response->setStatus(200);
+        $response->setBody($stream);
 
-		return false;
-	}
+        return false;
+    }
 }

lib/private/Migration/ConsoleOutput.php

Indentation +46 added lines, -46 removed lines

@@ -37,57 +37,57 @@
  */
 class ConsoleOutput implements IOutput {
 
-	/** @var OutputInterface */
-	private $output;
+    /** @var OutputInterface */
+    private $output;
 
-	/** @var ProgressBar */
-	private $progressBar;
+    /** @var ProgressBar */
+    private $progressBar;
 
-	public function __construct(OutputInterface $output) {
-		$this->output = $output;
-	}
+    public function __construct(OutputInterface $output) {
+        $this->output = $output;
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function info($message) {
-		$this->output->writeln("<info>$message</info>");
-	}
+    /**
+     * @param string $message
+     */
+    public function info($message) {
+        $this->output->writeln("<info>$message</info>");
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		$this->output->writeln("<comment>$message</comment>");
-	}
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        $this->output->writeln("<comment>$message</comment>");
+    }
 
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		if (!is_null($this->progressBar)) {
-			$this->progressBar->finish();
-		}
-		$this->progressBar = new ProgressBar($this->output);
-		$this->progressBar->start($max);
-	}
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        if (!is_null($this->progressBar)) {
+            $this->progressBar->finish();
+        }
+        $this->progressBar = new ProgressBar($this->output);
+        $this->progressBar->start($max);
+    }
 
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		if (!is_null($this->progressBar)) {
-			$this->progressBar = new ProgressBar($this->output);
-			$this->progressBar->start();
-		}
-		$this->progressBar->advance($step);
-	}
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        if (!is_null($this->progressBar)) {
+            $this->progressBar = new ProgressBar($this->output);
+            $this->progressBar->start();
+        }
+        $this->progressBar->advance($step);
+    }
 
-	public function finishProgress() {
-		if (is_null($this->progressBar)) {
-			return;
-		}
-		$this->progressBar->finish();
-	}
+    public function finishProgress() {
+        if (is_null($this->progressBar)) {
+            return;
+        }
+        $this->progressBar->finish();
+    }
 }

core/Command/User/ResetPassword.php

Indentation +94 added lines, -94 removed lines

@@ -39,98 +39,98 @@
 
 class ResetPassword extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('user:resetpassword')
-			->setDescription('Resets the password of the named user')
-			->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'Username to reset password'
-			)
-			->addOption(
-				'password-from-env',
-				null,
-				InputOption::VALUE_NONE,
-				'read password from environment variable OC_PASS'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$username = $input->getArgument('user');
-
-		/** @var $user \OCP\IUser */
-		$user = $this->userManager->get($username);
-		if (is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return 1;
-		}
-
-		if ($input->getOption('password-from-env')) {
-			$password = getenv('OC_PASS');
-			if (!$password) {
-				$output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
-				return 1;
-			}
-		} elseif ($input->isInteractive()) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-
-			if (\OCP\App::isEnabled('encryption')) {
-				$output->writeln(
-					'<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
-				);
-
-				$question = new ConfirmationQuestion('Do you want to continue?');
-				if (!$helper->ask($input, $output, $question)) {
-					return 1;
-				}
-			}
-
-			$question = new Question('Enter a new password: ');
-			$question->setHidden(true);
-			$password = $helper->ask($input, $output, $question);
-
-			if ($password === null) {
-				$output->writeln("<error>Password cannot be empty!</error>");
-				return 1;
-			}
-
-			$question = new Question('Confirm the new password: ');
-			$question->setHidden(true);
-			$confirm = $helper->ask($input, $output, $question);
-
-			if ($password !== $confirm) {
-				$output->writeln("<error>Passwords did not match!</error>");
-				return 1;
-			}
-		} else {
-			$output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>");
-			return 1;
-		}
-
-
-		try {
-			$success = $user->setPassword($password);
-		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
-			return 1;
-		}
-
-		if ($success) {
-			$output->writeln("<info>Successfully reset password for " . $username . "</info>");
-		} else {
-			$output->writeln("<error>Error while resetting password!</error>");
-			return 1;
-		}
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('user:resetpassword')
+            ->setDescription('Resets the password of the named user')
+            ->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'Username to reset password'
+            )
+            ->addOption(
+                'password-from-env',
+                null,
+                InputOption::VALUE_NONE,
+                'read password from environment variable OC_PASS'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $username = $input->getArgument('user');
+
+        /** @var $user \OCP\IUser */
+        $user = $this->userManager->get($username);
+        if (is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return 1;
+        }
+
+        if ($input->getOption('password-from-env')) {
+            $password = getenv('OC_PASS');
+            if (!$password) {
+                $output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
+                return 1;
+            }
+        } elseif ($input->isInteractive()) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+
+            if (\OCP\App::isEnabled('encryption')) {
+                $output->writeln(
+                    '<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
+                );
+
+                $question = new ConfirmationQuestion('Do you want to continue?');
+                if (!$helper->ask($input, $output, $question)) {
+                    return 1;
+                }
+            }
+
+            $question = new Question('Enter a new password: ');
+            $question->setHidden(true);
+            $password = $helper->ask($input, $output, $question);
+
+            if ($password === null) {
+                $output->writeln("<error>Password cannot be empty!</error>");
+                return 1;
+            }
+
+            $question = new Question('Confirm the new password: ');
+            $question->setHidden(true);
+            $confirm = $helper->ask($input, $output, $question);
+
+            if ($password !== $confirm) {
+                $output->writeln("<error>Passwords did not match!</error>");
+                return 1;
+            }
+        } else {
+            $output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>");
+            return 1;
+        }
+
+
+        try {
+            $success = $user->setPassword($password);
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            return 1;
+        }
+
+        if ($success) {
+            $output->writeln("<info>Successfully reset password for " . $username . "</info>");
+        } else {
+            $output->writeln("<error>Error while resetting password!</error>");
+            return 1;
+        }
+    }
 }

lib/public/Contacts/ContactsMenu/IEntry.php

Indentation +28 added lines, -28 removed lines

@@ -31,36 +31,36 @@
  */
 interface IEntry extends JsonSerializable {
 
-	/**
-	 * @since 12.0
-	 * @return string
-	 */
-	public function getFullName();
+    /**
+     * @since 12.0
+     * @return string
+     */
+    public function getFullName();
 
-	/**
-	 * @since 12.0
-	 * @return string[]
-	 */
-	public function getEMailAddresses();
+    /**
+     * @since 12.0
+     * @return string[]
+     */
+    public function getEMailAddresses();
 
-	/**
-	 * @since 12.0
-	 * @return string|null image URI
-	 */
-	public function getAvatar();
+    /**
+     * @since 12.0
+     * @return string|null image URI
+     */
+    public function getAvatar();
 
-	/**
-	 * @since 12.0
-	 * @param IAction $action an action to show in the contacts menu
-	 */
-	public function addAction(IAction $action);
+    /**
+     * @since 12.0
+     * @param IAction $action an action to show in the contacts menu
+     */
+    public function addAction(IAction $action);
 
-	/**
-	 * Get an arbitrary property from the contact
-	 *
-	 * @since 12.0
-	 * @param string $key
-	 * @return mixed the value of the property or null
-	 */
-	public function getProperty($key);
+    /**
+     * Get an arbitrary property from the contact
+     *
+     * @since 12.0
+     * @param string $key
+     * @return mixed the value of the property or null
+     */
+    public function getProperty($key);
 }