@@ -29,21 +29,21 @@ |
||
| 29 | 29 | * Listen to hooks and update the mount cache as needed |
| 30 | 30 | */ |
| 31 | 31 | class UserMountCacheListener { |
| 32 | - /** |
|
| 33 | - * @var IUserMountCache |
|
| 34 | - */ |
|
| 35 | - private $userMountCache; |
|
| 32 | + /** |
|
| 33 | + * @var IUserMountCache |
|
| 34 | + */ |
|
| 35 | + private $userMountCache; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * UserMountCacheListener constructor. |
|
| 39 | - * |
|
| 40 | - * @param IUserMountCache $userMountCache |
|
| 41 | - */ |
|
| 42 | - public function __construct(IUserMountCache $userMountCache) { |
|
| 43 | - $this->userMountCache = $userMountCache; |
|
| 44 | - } |
|
| 37 | + /** |
|
| 38 | + * UserMountCacheListener constructor. |
|
| 39 | + * |
|
| 40 | + * @param IUserMountCache $userMountCache |
|
| 41 | + */ |
|
| 42 | + public function __construct(IUserMountCache $userMountCache) { |
|
| 43 | + $this->userMountCache = $userMountCache; |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - public function listen(Manager $manager) { |
|
| 47 | - $manager->listen('\OC\User', 'postDelete', [$this->userMountCache, 'removeUserMounts']); |
|
| 48 | - } |
|
| 46 | + public function listen(Manager $manager) { |
|
| 47 | + $manager->listen('\OC\User', 'postDelete', [$this->userMountCache, 'removeUserMounts']); |
|
| 48 | + } |
|
| 49 | 49 | } |
@@ -29,80 +29,80 @@ |
||
| 29 | 29 | use OCP\Files\Storage\IStorageFactory; |
| 30 | 30 | |
| 31 | 31 | class StorageFactory implements IStorageFactory { |
| 32 | - /** |
|
| 33 | - * @var array[] [$name=>['priority'=>$priority, 'wrapper'=>$callable] $storageWrappers |
|
| 34 | - */ |
|
| 35 | - private $storageWrappers = []; |
|
| 32 | + /** |
|
| 33 | + * @var array[] [$name=>['priority'=>$priority, 'wrapper'=>$callable] $storageWrappers |
|
| 34 | + */ |
|
| 35 | + private $storageWrappers = []; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * allow modifier storage behaviour by adding wrappers around storages |
|
| 39 | - * |
|
| 40 | - * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage |
|
| 41 | - * |
|
| 42 | - * @param string $wrapperName name of the wrapper |
|
| 43 | - * @param callable $callback callback |
|
| 44 | - * @param int $priority wrappers with the lower priority are applied last (meaning they get called first) |
|
| 45 | - * @param \OCP\Files\Mount\IMountPoint[] $existingMounts existing mount points to apply the wrapper to |
|
| 46 | - * @return bool true if the wrapper was added, false if there was already a wrapper with this |
|
| 47 | - * name registered |
|
| 48 | - */ |
|
| 49 | - public function addStorageWrapper($wrapperName, $callback, $priority = 50, $existingMounts = []) { |
|
| 50 | - if (isset($this->storageWrappers[$wrapperName])) { |
|
| 51 | - return false; |
|
| 52 | - } |
|
| 37 | + /** |
|
| 38 | + * allow modifier storage behaviour by adding wrappers around storages |
|
| 39 | + * |
|
| 40 | + * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage |
|
| 41 | + * |
|
| 42 | + * @param string $wrapperName name of the wrapper |
|
| 43 | + * @param callable $callback callback |
|
| 44 | + * @param int $priority wrappers with the lower priority are applied last (meaning they get called first) |
|
| 45 | + * @param \OCP\Files\Mount\IMountPoint[] $existingMounts existing mount points to apply the wrapper to |
|
| 46 | + * @return bool true if the wrapper was added, false if there was already a wrapper with this |
|
| 47 | + * name registered |
|
| 48 | + */ |
|
| 49 | + public function addStorageWrapper($wrapperName, $callback, $priority = 50, $existingMounts = []) { |
|
| 50 | + if (isset($this->storageWrappers[$wrapperName])) { |
|
| 51 | + return false; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - // apply to existing mounts before registering it to prevent applying it double in MountPoint::createStorage |
|
| 55 | - foreach ($existingMounts as $mount) { |
|
| 56 | - $mount->wrapStorage($callback); |
|
| 57 | - } |
|
| 54 | + // apply to existing mounts before registering it to prevent applying it double in MountPoint::createStorage |
|
| 55 | + foreach ($existingMounts as $mount) { |
|
| 56 | + $mount->wrapStorage($callback); |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - $this->storageWrappers[$wrapperName] = ['wrapper' => $callback, 'priority' => $priority]; |
|
| 60 | - return true; |
|
| 61 | - } |
|
| 59 | + $this->storageWrappers[$wrapperName] = ['wrapper' => $callback, 'priority' => $priority]; |
|
| 60 | + return true; |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * Remove a storage wrapper by name. |
|
| 65 | - * Note: internal method only to be used for cleanup |
|
| 66 | - * |
|
| 67 | - * @param string $wrapperName name of the wrapper |
|
| 68 | - * @internal |
|
| 69 | - */ |
|
| 70 | - public function removeStorageWrapper($wrapperName) { |
|
| 71 | - unset($this->storageWrappers[$wrapperName]); |
|
| 72 | - } |
|
| 63 | + /** |
|
| 64 | + * Remove a storage wrapper by name. |
|
| 65 | + * Note: internal method only to be used for cleanup |
|
| 66 | + * |
|
| 67 | + * @param string $wrapperName name of the wrapper |
|
| 68 | + * @internal |
|
| 69 | + */ |
|
| 70 | + public function removeStorageWrapper($wrapperName) { |
|
| 71 | + unset($this->storageWrappers[$wrapperName]); |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * Create an instance of a storage and apply the registered storage wrappers |
|
| 76 | - * |
|
| 77 | - * @param \OCP\Files\Mount\IMountPoint $mountPoint |
|
| 78 | - * @param string $class |
|
| 79 | - * @param array $arguments |
|
| 80 | - * @return \OCP\Files\Storage |
|
| 81 | - */ |
|
| 82 | - public function getInstance(IMountPoint $mountPoint, $class, $arguments) { |
|
| 83 | - return $this->wrap($mountPoint, new $class($arguments)); |
|
| 84 | - } |
|
| 74 | + /** |
|
| 75 | + * Create an instance of a storage and apply the registered storage wrappers |
|
| 76 | + * |
|
| 77 | + * @param \OCP\Files\Mount\IMountPoint $mountPoint |
|
| 78 | + * @param string $class |
|
| 79 | + * @param array $arguments |
|
| 80 | + * @return \OCP\Files\Storage |
|
| 81 | + */ |
|
| 82 | + public function getInstance(IMountPoint $mountPoint, $class, $arguments) { |
|
| 83 | + return $this->wrap($mountPoint, new $class($arguments)); |
|
| 84 | + } |
|
| 85 | 85 | |
| 86 | - /** |
|
| 87 | - * @param \OCP\Files\Mount\IMountPoint $mountPoint |
|
| 88 | - * @param \OCP\Files\Storage $storage |
|
| 89 | - * @return \OCP\Files\Storage |
|
| 90 | - */ |
|
| 91 | - public function wrap(IMountPoint $mountPoint, $storage) { |
|
| 92 | - $wrappers = array_values($this->storageWrappers); |
|
| 93 | - usort($wrappers, function ($a, $b) { |
|
| 94 | - return $b['priority'] - $a['priority']; |
|
| 95 | - }); |
|
| 96 | - /** @var callable[] $wrappers */ |
|
| 97 | - $wrappers = array_map(function ($wrapper) { |
|
| 98 | - return $wrapper['wrapper']; |
|
| 99 | - }, $wrappers); |
|
| 100 | - foreach ($wrappers as $wrapper) { |
|
| 101 | - $storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint); |
|
| 102 | - if (!($storage instanceof \OCP\Files\Storage)) { |
|
| 103 | - throw new \Exception('Invalid result from storage wrapper'); |
|
| 104 | - } |
|
| 105 | - } |
|
| 106 | - return $storage; |
|
| 107 | - } |
|
| 86 | + /** |
|
| 87 | + * @param \OCP\Files\Mount\IMountPoint $mountPoint |
|
| 88 | + * @param \OCP\Files\Storage $storage |
|
| 89 | + * @return \OCP\Files\Storage |
|
| 90 | + */ |
|
| 91 | + public function wrap(IMountPoint $mountPoint, $storage) { |
|
| 92 | + $wrappers = array_values($this->storageWrappers); |
|
| 93 | + usort($wrappers, function ($a, $b) { |
|
| 94 | + return $b['priority'] - $a['priority']; |
|
| 95 | + }); |
|
| 96 | + /** @var callable[] $wrappers */ |
|
| 97 | + $wrappers = array_map(function ($wrapper) { |
|
| 98 | + return $wrapper['wrapper']; |
|
| 99 | + }, $wrappers); |
|
| 100 | + foreach ($wrappers as $wrapper) { |
|
| 101 | + $storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint); |
|
| 102 | + if (!($storage instanceof \OCP\Files\Storage)) { |
|
| 103 | + throw new \Exception('Invalid result from storage wrapper'); |
|
| 104 | + } |
|
| 105 | + } |
|
| 106 | + return $storage; |
|
| 107 | + } |
|
| 108 | 108 | } |
@@ -25,81 +25,81 @@ |
||
| 25 | 25 | namespace OC\Files\Storage\PolyFill; |
| 26 | 26 | |
| 27 | 27 | trait CopyDirectory { |
| 28 | - /** |
|
| 29 | - * Check if a path is a directory |
|
| 30 | - * |
|
| 31 | - * @param string $path |
|
| 32 | - * @return bool |
|
| 33 | - */ |
|
| 34 | - abstract public function is_dir($path); |
|
| 28 | + /** |
|
| 29 | + * Check if a path is a directory |
|
| 30 | + * |
|
| 31 | + * @param string $path |
|
| 32 | + * @return bool |
|
| 33 | + */ |
|
| 34 | + abstract public function is_dir($path); |
|
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * Check if a file or folder exists |
|
| 38 | - * |
|
| 39 | - * @param string $path |
|
| 40 | - * @return bool |
|
| 41 | - */ |
|
| 42 | - abstract public function file_exists($path); |
|
| 36 | + /** |
|
| 37 | + * Check if a file or folder exists |
|
| 38 | + * |
|
| 39 | + * @param string $path |
|
| 40 | + * @return bool |
|
| 41 | + */ |
|
| 42 | + abstract public function file_exists($path); |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * Delete a file or folder |
|
| 46 | - * |
|
| 47 | - * @param string $path |
|
| 48 | - * @return bool |
|
| 49 | - */ |
|
| 50 | - abstract public function unlink($path); |
|
| 44 | + /** |
|
| 45 | + * Delete a file or folder |
|
| 46 | + * |
|
| 47 | + * @param string $path |
|
| 48 | + * @return bool |
|
| 49 | + */ |
|
| 50 | + abstract public function unlink($path); |
|
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * Open a directory handle for a folder |
|
| 54 | - * |
|
| 55 | - * @param string $path |
|
| 56 | - * @return resource | bool |
|
| 57 | - */ |
|
| 58 | - abstract public function opendir($path); |
|
| 52 | + /** |
|
| 53 | + * Open a directory handle for a folder |
|
| 54 | + * |
|
| 55 | + * @param string $path |
|
| 56 | + * @return resource | bool |
|
| 57 | + */ |
|
| 58 | + abstract public function opendir($path); |
|
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * Create a new folder |
|
| 62 | - * |
|
| 63 | - * @param string $path |
|
| 64 | - * @return bool |
|
| 65 | - */ |
|
| 66 | - abstract public function mkdir($path); |
|
| 60 | + /** |
|
| 61 | + * Create a new folder |
|
| 62 | + * |
|
| 63 | + * @param string $path |
|
| 64 | + * @return bool |
|
| 65 | + */ |
|
| 66 | + abstract public function mkdir($path); |
|
| 67 | 67 | |
| 68 | - public function copy($source, $target) { |
|
| 69 | - if ($this->is_dir($source)) { |
|
| 70 | - if ($this->file_exists($target)) { |
|
| 71 | - $this->unlink($target); |
|
| 72 | - } |
|
| 73 | - $this->mkdir($target); |
|
| 74 | - return $this->copyRecursive($source, $target); |
|
| 75 | - } else { |
|
| 76 | - return parent::copy($source, $target); |
|
| 77 | - } |
|
| 78 | - } |
|
| 68 | + public function copy($source, $target) { |
|
| 69 | + if ($this->is_dir($source)) { |
|
| 70 | + if ($this->file_exists($target)) { |
|
| 71 | + $this->unlink($target); |
|
| 72 | + } |
|
| 73 | + $this->mkdir($target); |
|
| 74 | + return $this->copyRecursive($source, $target); |
|
| 75 | + } else { |
|
| 76 | + return parent::copy($source, $target); |
|
| 77 | + } |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - /** |
|
| 81 | - * For adapters that don't support copying folders natively |
|
| 82 | - * |
|
| 83 | - * @param $source |
|
| 84 | - * @param $target |
|
| 85 | - * @return bool |
|
| 86 | - */ |
|
| 87 | - protected function copyRecursive($source, $target) { |
|
| 88 | - $dh = $this->opendir($source); |
|
| 89 | - $result = true; |
|
| 90 | - while ($file = readdir($dh)) { |
|
| 91 | - if (!\OC\Files\Filesystem::isIgnoredDir($file)) { |
|
| 92 | - if ($this->is_dir($source . '/' . $file)) { |
|
| 93 | - $this->mkdir($target . '/' . $file); |
|
| 94 | - $result = $this->copyRecursive($source . '/' . $file, $target . '/' . $file); |
|
| 95 | - } else { |
|
| 96 | - $result = parent::copy($source . '/' . $file, $target . '/' . $file); |
|
| 97 | - } |
|
| 98 | - if (!$result) { |
|
| 99 | - break; |
|
| 100 | - } |
|
| 101 | - } |
|
| 102 | - } |
|
| 103 | - return $result; |
|
| 104 | - } |
|
| 80 | + /** |
|
| 81 | + * For adapters that don't support copying folders natively |
|
| 82 | + * |
|
| 83 | + * @param $source |
|
| 84 | + * @param $target |
|
| 85 | + * @return bool |
|
| 86 | + */ |
|
| 87 | + protected function copyRecursive($source, $target) { |
|
| 88 | + $dh = $this->opendir($source); |
|
| 89 | + $result = true; |
|
| 90 | + while ($file = readdir($dh)) { |
|
| 91 | + if (!\OC\Files\Filesystem::isIgnoredDir($file)) { |
|
| 92 | + if ($this->is_dir($source . '/' . $file)) { |
|
| 93 | + $this->mkdir($target . '/' . $file); |
|
| 94 | + $result = $this->copyRecursive($source . '/' . $file, $target . '/' . $file); |
|
| 95 | + } else { |
|
| 96 | + $result = parent::copy($source . '/' . $file, $target . '/' . $file); |
|
| 97 | + } |
|
| 98 | + if (!$result) { |
|
| 99 | + break; |
|
| 100 | + } |
|
| 101 | + } |
|
| 102 | + } |
|
| 103 | + return $result; |
|
| 104 | + } |
|
| 105 | 105 | } |
@@ -26,27 +26,27 @@ |
||
| 26 | 26 | use OCP\Files\Notify\IRenameChange; |
| 27 | 27 | |
| 28 | 28 | class RenameChange extends Change implements IRenameChange { |
| 29 | - /** @var string */ |
|
| 30 | - private $targetPath; |
|
| 29 | + /** @var string */ |
|
| 30 | + private $targetPath; |
|
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * Change constructor. |
|
| 34 | - * |
|
| 35 | - * @param int $type |
|
| 36 | - * @param string $path |
|
| 37 | - * @param string $targetPath |
|
| 38 | - */ |
|
| 39 | - public function __construct($type, $path, $targetPath) { |
|
| 40 | - parent::__construct($type, $path); |
|
| 41 | - $this->targetPath = $targetPath; |
|
| 42 | - } |
|
| 32 | + /** |
|
| 33 | + * Change constructor. |
|
| 34 | + * |
|
| 35 | + * @param int $type |
|
| 36 | + * @param string $path |
|
| 37 | + * @param string $targetPath |
|
| 38 | + */ |
|
| 39 | + public function __construct($type, $path, $targetPath) { |
|
| 40 | + parent::__construct($type, $path); |
|
| 41 | + $this->targetPath = $targetPath; |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * Get the new path of the renamed file relative to the storage root |
|
| 46 | - * |
|
| 47 | - * @return string |
|
| 48 | - */ |
|
| 49 | - public function getTargetPath() { |
|
| 50 | - return $this->targetPath; |
|
| 51 | - } |
|
| 44 | + /** |
|
| 45 | + * Get the new path of the renamed file relative to the storage root |
|
| 46 | + * |
|
| 47 | + * @return string |
|
| 48 | + */ |
|
| 49 | + public function getTargetPath() { |
|
| 50 | + return $this->targetPath; |
|
| 51 | + } |
|
| 52 | 52 | } |
@@ -26,40 +26,40 @@ |
||
| 26 | 26 | use OCP\Files\Notify\IChange; |
| 27 | 27 | |
| 28 | 28 | class Change implements IChange { |
| 29 | - /** @var int */ |
|
| 30 | - private $type; |
|
| 29 | + /** @var int */ |
|
| 30 | + private $type; |
|
| 31 | 31 | |
| 32 | - /** @var string */ |
|
| 33 | - private $path; |
|
| 32 | + /** @var string */ |
|
| 33 | + private $path; |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Change constructor. |
|
| 37 | - * |
|
| 38 | - * @param int $type |
|
| 39 | - * @param string $path |
|
| 40 | - */ |
|
| 41 | - public function __construct($type, $path) { |
|
| 42 | - $this->type = $type; |
|
| 43 | - $this->path = $path; |
|
| 44 | - } |
|
| 35 | + /** |
|
| 36 | + * Change constructor. |
|
| 37 | + * |
|
| 38 | + * @param int $type |
|
| 39 | + * @param string $path |
|
| 40 | + */ |
|
| 41 | + public function __construct($type, $path) { |
|
| 42 | + $this->type = $type; |
|
| 43 | + $this->path = $path; |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - /** |
|
| 47 | - * Get the type of the change |
|
| 48 | - * |
|
| 49 | - * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED |
|
| 50 | - */ |
|
| 51 | - public function getType() { |
|
| 52 | - return $this->type; |
|
| 53 | - } |
|
| 46 | + /** |
|
| 47 | + * Get the type of the change |
|
| 48 | + * |
|
| 49 | + * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED |
|
| 50 | + */ |
|
| 51 | + public function getType() { |
|
| 52 | + return $this->type; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * Get the path of the file that was changed relative to the root of the storage |
|
| 57 | - * |
|
| 58 | - * Note, for rename changes this path is the old path for the file |
|
| 59 | - * |
|
| 60 | - * @return mixed |
|
| 61 | - */ |
|
| 62 | - public function getPath() { |
|
| 63 | - return $this->path; |
|
| 64 | - } |
|
| 55 | + /** |
|
| 56 | + * Get the path of the file that was changed relative to the root of the storage |
|
| 57 | + * |
|
| 58 | + * Note, for rename changes this path is the old path for the file |
|
| 59 | + * |
|
| 60 | + * @return mixed |
|
| 61 | + */ |
|
| 62 | + public function getPath() { |
|
| 63 | + return $this->path; |
|
| 64 | + } |
|
| 65 | 65 | } |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | * @package OC\AppFramework\Middleware\Security\Exceptions |
| 32 | 32 | */ |
| 33 | 33 | class NotConfirmedException extends SecurityException { |
| 34 | - public function __construct() { |
|
| 35 | - parent::__construct('Password confirmation is required', Http::STATUS_FORBIDDEN); |
|
| 36 | - } |
|
| 34 | + public function __construct() { |
|
| 35 | + parent::__construct('Password confirmation is required', Http::STATUS_FORBIDDEN); |
|
| 36 | + } |
|
| 37 | 37 | } |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | * @package OC\AppFramework\Middleware\Security\Exceptions |
| 35 | 35 | */ |
| 36 | 36 | class CrossSiteRequestForgeryException extends SecurityException { |
| 37 | - public function __construct() { |
|
| 38 | - parent::__construct('CSRF check failed', Http::STATUS_PRECONDITION_FAILED); |
|
| 39 | - } |
|
| 37 | + public function __construct() { |
|
| 38 | + parent::__construct('CSRF check failed', Http::STATUS_PRECONDITION_FAILED); |
|
| 39 | + } |
|
| 40 | 40 | } |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | * @package OC\AppFramework\Middleware\Security\Exceptions |
| 35 | 35 | */ |
| 36 | 36 | class AppNotEnabledException extends SecurityException { |
| 37 | - public function __construct() { |
|
| 38 | - parent::__construct('App is not enabled', Http::STATUS_PRECONDITION_FAILED); |
|
| 39 | - } |
|
| 37 | + public function __construct() { |
|
| 38 | + parent::__construct('App is not enabled', Http::STATUS_PRECONDITION_FAILED); |
|
| 39 | + } |
|
| 40 | 40 | } |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | * @package OC\AppFramework\Middleware\Security\Exceptions |
| 35 | 35 | */ |
| 36 | 36 | class NotLoggedInException extends SecurityException { |
| 37 | - public function __construct() { |
|
| 38 | - parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED); |
|
| 39 | - } |
|
| 37 | + public function __construct() { |
|
| 38 | + parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED); |
|
| 39 | + } |
|
| 40 | 40 | } |