nextcloud / server

apps/files_sharing/lib/External/Scanner.php

Indentation +87 added lines, -87 removed lines

@@ -32,97 +32,97 @@
 use OCP\Files\StorageNotAvailableException;
 
 class Scanner extends \OC\Files\Cache\Scanner {
-	/** @var \OCA\Files_Sharing\External\Storage */
-	protected $storage;
+    /** @var \OCA\Files_Sharing\External\Storage */
+    protected $storage;
 
-	/** {@inheritDoc} */
-	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
-		if(!$this->storage->remoteIsOwnCloud()) {
-			return parent::scan($path, $recursive, $recursive, $lock);
-		}
+    /** {@inheritDoc} */
+    public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
+        if(!$this->storage->remoteIsOwnCloud()) {
+            return parent::scan($path, $recursive, $recursive, $lock);
+        }
 
-		$this->scanAll();
-	}
+        $this->scanAll();
+    }
 
-	/**
-	 * Scan a single file and store it in the cache.
-	 * If an exception happened while accessing the external storage,
-	 * the storage will be checked for availability and removed
-	 * if it is not available any more.
-	 *
-	 * @param string $file file to scan
-	 * @param int $reuseExisting
-	 * @param int $parentId
-	 * @param array | null $cacheData existing data in the cache for the file to be scanned
-	 * @param bool $lock set to false to disable getting an additional read lock during scanning
-	 * @return array an array of metadata of the scanned file
-	 */
-	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
-		try {
-			return parent::scanFile($file, $reuseExisting);
-		} catch (ForbiddenException $e) {
-			$this->storage->checkStorageAvailability();
-		} catch (NotFoundException $e) {
-			// if the storage isn't found, the call to
-			// checkStorageAvailable() will verify it and remove it
-			// if appropriate
-			$this->storage->checkStorageAvailability();
-		} catch (StorageInvalidException $e) {
-			$this->storage->checkStorageAvailability();
-		} catch (StorageNotAvailableException $e) {
-			$this->storage->checkStorageAvailability();
-		}
-	}
+    /**
+     * Scan a single file and store it in the cache.
+     * If an exception happened while accessing the external storage,
+     * the storage will be checked for availability and removed
+     * if it is not available any more.
+     *
+     * @param string $file file to scan
+     * @param int $reuseExisting
+     * @param int $parentId
+     * @param array | null $cacheData existing data in the cache for the file to be scanned
+     * @param bool $lock set to false to disable getting an additional read lock during scanning
+     * @return array an array of metadata of the scanned file
+     */
+    public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
+        try {
+            return parent::scanFile($file, $reuseExisting);
+        } catch (ForbiddenException $e) {
+            $this->storage->checkStorageAvailability();
+        } catch (NotFoundException $e) {
+            // if the storage isn't found, the call to
+            // checkStorageAvailable() will verify it and remove it
+            // if appropriate
+            $this->storage->checkStorageAvailability();
+        } catch (StorageInvalidException $e) {
+            $this->storage->checkStorageAvailability();
+        } catch (StorageNotAvailableException $e) {
+            $this->storage->checkStorageAvailability();
+        }
+    }
 
-	/**
-	 * Checks the remote share for changes.
-	 * If changes are available, scan them and update
-	 * the cache.
-	 * @throws NotFoundException
-	 * @throws StorageInvalidException
-	 * @throws \Exception
-	 */
-	public function scanAll() {
-		try {
-			$data = $this->storage->getShareInfo();
-		} catch (\Exception $e) {
-			$this->storage->checkStorageAvailability();
-			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '" ' .
-				$e->getMessage()
-			);
-		}
-		if ($data['status'] === 'success') {
-			$this->addResult($data['data'], '');
-		} else {
-			throw new \Exception(
-				'Error while scanning remote share: "' .
-				$this->storage->getRemote() . '"'
-			);
-		}
-	}
+    /**
+     * Checks the remote share for changes.
+     * If changes are available, scan them and update
+     * the cache.
+     * @throws NotFoundException
+     * @throws StorageInvalidException
+     * @throws \Exception
+     */
+    public function scanAll() {
+        try {
+            $data = $this->storage->getShareInfo();
+        } catch (\Exception $e) {
+            $this->storage->checkStorageAvailability();
+            throw new \Exception(
+                'Error while scanning remote share: "' .
+                $this->storage->getRemote() . '" ' .
+                $e->getMessage()
+            );
+        }
+        if ($data['status'] === 'success') {
+            $this->addResult($data['data'], '');
+        } else {
+            throw new \Exception(
+                'Error while scanning remote share: "' .
+                $this->storage->getRemote() . '"'
+            );
+        }
+    }
 
-	/**
-	 * @param array $data
-	 * @param string $path
-	 */
-	private function addResult($data, $path) {
-		$id = $this->cache->put($path, $data);
-		if (isset($data['children'])) {
-			$children = [];
-			foreach ($data['children'] as $child) {
-				$children[$child['name']] = true;
-				$this->addResult($child, ltrim($path . '/' . $child['name'], '/'));
-			}
+    /**
+     * @param array $data
+     * @param string $path
+     */
+    private function addResult($data, $path) {
+        $id = $this->cache->put($path, $data);
+        if (isset($data['children'])) {
+            $children = [];
+            foreach ($data['children'] as $child) {
+                $children[$child['name']] = true;
+                $this->addResult($child, ltrim($path . '/' . $child['name'], '/'));
+            }
 
-			$existingCache = $this->cache->getFolderContentsById($id);
-			foreach ($existingCache as $existingChild) {
-				// if an existing child is not in the new data, remove it
-				if (!isset($children[$existingChild['name']])) {
-					$this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/'));
-				}
-			}
-		}
-	}
+            $existingCache = $this->cache->getFolderContentsById($id);
+            foreach ($existingCache as $existingChild) {
+                // if an existing child is not in the new data, remove it
+                if (!isset($children[$existingChild['name']])) {
+                    $this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/'));
+                }
+            }
+        }
+    }
 }

apps/files_sharing/lib/External/Cache.php

Indentation +37 added lines, -37 removed lines

@@ -27,44 +27,44 @@
 use OCP\Federation\ICloudId;
 
 class Cache extends \OC\Files\Cache\Cache {
-	/** @var ICloudId */
-	private $cloudId;
-	private $remote;
-	private $remoteUser;
-	private $storage;
+    /** @var ICloudId */
+    private $cloudId;
+    private $remote;
+    private $remoteUser;
+    private $storage;
 
-	/**
-	 * @param \OCA\Files_Sharing\External\Storage $storage
-	 * @param ICloudId $cloudId
-	 */
-	public function __construct($storage, ICloudId $cloudId) {
-		$this->cloudId = $cloudId;
-		$this->storage = $storage;
-		list(, $remote) = explode('://', $cloudId->getRemote(), 2);
-		$this->remote = $remote;
-		$this->remoteUser = $cloudId->getUser();
-		parent::__construct($storage);
-	}
+    /**
+     * @param \OCA\Files_Sharing\External\Storage $storage
+     * @param ICloudId $cloudId
+     */
+    public function __construct($storage, ICloudId $cloudId) {
+        $this->cloudId = $cloudId;
+        $this->storage = $storage;
+        list(, $remote) = explode('://', $cloudId->getRemote(), 2);
+        $this->remote = $remote;
+        $this->remoteUser = $cloudId->getUser();
+        parent::__construct($storage);
+    }
 
-	public function get($file) {
-		$result = parent::get($file);
-		if (!$result) {
-			return false;
-		}
-		$result['displayname_owner'] = $this->cloudId->getDisplayId();
-		if (!$file || $file === '') {
-			$result['is_share_mount_point'] = true;
-			$mountPoint = rtrim($this->storage->getMountPoint());
-			$result['name'] = basename($mountPoint);
-		}
-		return $result;
-	}
+    public function get($file) {
+        $result = parent::get($file);
+        if (!$result) {
+            return false;
+        }
+        $result['displayname_owner'] = $this->cloudId->getDisplayId();
+        if (!$file || $file === '') {
+            $result['is_share_mount_point'] = true;
+            $mountPoint = rtrim($this->storage->getMountPoint());
+            $result['name'] = basename($mountPoint);
+        }
+        return $result;
+    }
 
-	public function getFolderContentsById($id) {
-		$results = parent::getFolderContentsById($id);
-		foreach ($results as &$file) {
-			$file['displayname_owner'] = $this->cloudId->getDisplayId();
-		}
-		return $results;
-	}
+    public function getFolderContentsById($id) {
+        $results = parent::getFolderContentsById($id);
+        foreach ($results as &$file) {
+            $file['displayname_owner'] = $this->cloudId->getDisplayId();
+        }
+        return $results;
+    }
 }

apps/files_sharing/lib/External/MountProvider.php

Indentation +45 added lines, -45 removed lines

@@ -29,59 +29,59 @@
 use OCP\IUser;
 
 class MountProvider implements IMountProvider {
-	const STORAGE = '\OCA\Files_Sharing\External\Storage';
+    const STORAGE = '\OCA\Files_Sharing\External\Storage';
 
-	/**
-	 * @var \OCP\IDBConnection
-	 */
-	private $connection;
+    /**
+     * @var \OCP\IDBConnection
+     */
+    private $connection;
 
-	/**
-	 * @var callable
-	 */
-	private $managerProvider;
+    /**
+     * @var callable
+     */
+    private $managerProvider;
 
-	/**
-	 * @var ICloudIdManager
-	 */
-	private $cloudIdManager;
+    /**
+     * @var ICloudIdManager
+     */
+    private $cloudIdManager;
 
-	/**
-	 * @param \OCP\IDBConnection $connection
-	 * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(IDBConnection $connection, callable $managerProvider, ICloudIdManager $cloudIdManager) {
-		$this->connection = $connection;
-		$this->managerProvider = $managerProvider;
-		$this->cloudIdManager = $cloudIdManager;
-	}
+    /**
+     * @param \OCP\IDBConnection $connection
+     * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(IDBConnection $connection, callable $managerProvider, ICloudIdManager $cloudIdManager) {
+        $this->connection = $connection;
+        $this->managerProvider = $managerProvider;
+        $this->cloudIdManager = $cloudIdManager;
+    }
 
-	public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
-		$managerProvider = $this->managerProvider;
-		$manager = $managerProvider();
-		$data['manager'] = $manager;
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
-		$data['mountpoint'] = $mountPoint;
-		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
-		$data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID());
-		$data['HttpClientService'] = \OC::$server->getHTTPClientService();
-		return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
-	}
+    public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
+        $managerProvider = $this->managerProvider;
+        $manager = $managerProvider();
+        $data['manager'] = $manager;
+        $mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
+        $data['mountpoint'] = $mountPoint;
+        $data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
+        $data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID());
+        $data['HttpClientService'] = \OC::$server->getHTTPClientService();
+        return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
+    }
 
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$query = $this->connection->prepare('
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $query = $this->connection->prepare('
 				SELECT `remote`, `share_token`, `password`, `mountpoint`, `owner`
 				FROM `*PREFIX*share_external`
 				WHERE `user` = ? AND `accepted` = ?
 			');
-		$query->execute([$user->getUID(), 1]);
-		$mounts = [];
-		while ($row = $query->fetch()) {
-			$row['manager'] = $this;
-			$row['token'] = $row['share_token'];
-			$mounts[] = $this->getMount($user, $row, $loader);
-		}
-		return $mounts;
-	}
+        $query->execute([$user->getUID(), 1]);
+        $mounts = [];
+        while ($row = $query->fetch()) {
+            $row['manager'] = $this;
+            $row['token'] = $row['share_token'];
+            $mounts[] = $this->getMount($user, $row, $loader);
+        }
+        return $mounts;
+    }
 }

apps/files_sharing/lib/External/Watcher.php

Indentation +8 added lines, -8 removed lines

@@ -23,12 +23,12 @@
 namespace OCA\Files_Sharing\External;
 
 class Watcher extends \OC\Files\Cache\Watcher {
-	/**
-	 * remove deleted files in $path from the cache
-	 *
-	 * @param string $path
-	 */
-	public function cleanFolder($path) {
-		// not needed, the scanner takes care of this
-	}
+    /**
+     * remove deleted files in $path from the cache
+     *
+     * @param string $path
+     */
+    public function cleanFolder($path) {
+        // not needed, the scanner takes care of this
+    }
 }

apps/files_sharing/lib/External/Mount.php

Indentation +35 added lines, -35 removed lines

@@ -29,43 +29,43 @@
 
 class Mount extends MountPoint implements MoveableMount {
 
-	/**
-	 * @var \OCA\Files_Sharing\External\Manager
-	 */
-	protected $manager;
+    /**
+     * @var \OCA\Files_Sharing\External\Manager
+     */
+    protected $manager;
 
-	/**
-	 * @param string|\OC\Files\Storage\Storage $storage
-	 * @param string $mountpoint
-	 * @param array $options
-	 * @param \OCA\Files_Sharing\External\Manager $manager
-	 * @param \OC\Files\Storage\StorageFactory $loader
-	 */
-	public function __construct($storage, $mountpoint, $options, $manager, $loader = null) {
-		parent::__construct($storage, $mountpoint, $options, $loader);
-		$this->manager = $manager;
-	}
+    /**
+     * @param string|\OC\Files\Storage\Storage $storage
+     * @param string $mountpoint
+     * @param array $options
+     * @param \OCA\Files_Sharing\External\Manager $manager
+     * @param \OC\Files\Storage\StorageFactory $loader
+     */
+    public function __construct($storage, $mountpoint, $options, $manager, $loader = null) {
+        parent::__construct($storage, $mountpoint, $options, $loader);
+        $this->manager = $manager;
+    }
 
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target) {
-		$result = $this->manager->setMountPoint($this->mountPoint, $target);
-		$this->setMountPoint($target);
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target) {
+        $result = $this->manager->setMountPoint($this->mountPoint, $target);
+        $this->setMountPoint($target);
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Remove the mount points
-	 *
-	 * @return mixed
-	 * @return bool
-	 */
-	public function removeMount() {
-		return $this->manager->removeShare($this->mountPoint);
-	}
+    /**
+     * Remove the mount points
+     *
+     * @return mixed
+     * @return bool
+     */
+    public function removeMount() {
+        return $this->manager->removeShare($this->mountPoint);
+    }
 }

apps/files_sharing/lib/Updater.php

Indentation +76 added lines, -76 removed lines

@@ -27,81 +27,81 @@
 
 class Updater {
 
-	/**
-	 * @param array $params
-	 */
-	static public function renameHook($params) {
-		self::renameChildren($params['oldpath'], $params['newpath']);
-		self::moveShareToShare($params['newpath']);
-	}
-
-	/**
-	 * Fix for https://github.com/owncloud/core/issues/20769
-	 *
-	 * The owner is allowed to move their files (if they are shared) into a receiving folder
-	 * In this case we need to update the parent of the moved share. Since they are
-	 * effectively handing over ownership of the file the rest of the code needs to know
-	 * they need to build up the reshare tree.
-	 *
-	 * @param string $path
-	 */
-	static private function moveShareToShare($path) {
-		$userFolder = \OC::$server->getUserFolder();
-
-		// If the user folder can't be constructed (e.g. link share) just return.
-		if ($userFolder === null) {
-			return;
-		}
-
-		$src = $userFolder->get($path);
-
-		$shareManager = \OC::$server->getShareManager();
-
-		$shares = $shareManager->getSharesBy($userFolder->getOwner()->getUID(), \OCP\Share::SHARE_TYPE_USER, $src, false, -1);
-		$shares = array_merge($shares, $shareManager->getSharesBy($userFolder->getOwner()->getUID(), \OCP\Share::SHARE_TYPE_GROUP, $src, false, -1));
-
-		// If the path we move is not a share we don't care
-		if (empty($shares)) {
-			return;
-		}
-
-		// Check if the destination is inside a share
-		$mountManager = \OC::$server->getMountManager();
-		$dstMount = $mountManager->find($src->getPath());
-		if (!($dstMount instanceof \OCA\Files_Sharing\SharedMount)) {
-			return;
-		}
-
-		$newOwner = $dstMount->getShare()->getShareOwner();
-
-		//Ownership is moved over
-		foreach ($shares as $share) {
-			/** @var \OCP\Share\IShare $share */
-			$share->setShareOwner($newOwner);
-			$shareManager->updateShare($share);
-		}
-	}
-
-	/**
-	 * rename mount point from the children if the parent was renamed
-	 *
-	 * @param string $oldPath old path relative to data/user/files
-	 * @param string $newPath new path relative to data/user/files
-	 */
-	static private function renameChildren($oldPath, $newPath) {
-
-		$absNewPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath);
-		$absOldPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath);
-
-		$mountManager = \OC\Files\Filesystem::getMountManager();
-		$mountedShares = $mountManager->findIn('/' . \OCP\User::getUser() . '/files/' . $oldPath);
-		foreach ($mountedShares as $mount) {
-			if ($mount->getStorage()->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
-				$mountPoint = $mount->getMountPoint();
-				$target = str_replace($absOldPath, $absNewPath, $mountPoint);
-				$mount->moveMount($target);
-			}
-		}
-	}
+    /**
+     * @param array $params
+     */
+    static public function renameHook($params) {
+        self::renameChildren($params['oldpath'], $params['newpath']);
+        self::moveShareToShare($params['newpath']);
+    }
+
+    /**
+     * Fix for https://github.com/owncloud/core/issues/20769
+     *
+     * The owner is allowed to move their files (if they are shared) into a receiving folder
+     * In this case we need to update the parent of the moved share. Since they are
+     * effectively handing over ownership of the file the rest of the code needs to know
+     * they need to build up the reshare tree.
+     *
+     * @param string $path
+     */
+    static private function moveShareToShare($path) {
+        $userFolder = \OC::$server->getUserFolder();
+
+        // If the user folder can't be constructed (e.g. link share) just return.
+        if ($userFolder === null) {
+            return;
+        }
+
+        $src = $userFolder->get($path);
+
+        $shareManager = \OC::$server->getShareManager();
+
+        $shares = $shareManager->getSharesBy($userFolder->getOwner()->getUID(), \OCP\Share::SHARE_TYPE_USER, $src, false, -1);
+        $shares = array_merge($shares, $shareManager->getSharesBy($userFolder->getOwner()->getUID(), \OCP\Share::SHARE_TYPE_GROUP, $src, false, -1));
+
+        // If the path we move is not a share we don't care
+        if (empty($shares)) {
+            return;
+        }
+
+        // Check if the destination is inside a share
+        $mountManager = \OC::$server->getMountManager();
+        $dstMount = $mountManager->find($src->getPath());
+        if (!($dstMount instanceof \OCA\Files_Sharing\SharedMount)) {
+            return;
+        }
+
+        $newOwner = $dstMount->getShare()->getShareOwner();
+
+        //Ownership is moved over
+        foreach ($shares as $share) {
+            /** @var \OCP\Share\IShare $share */
+            $share->setShareOwner($newOwner);
+            $shareManager->updateShare($share);
+        }
+    }
+
+    /**
+     * rename mount point from the children if the parent was renamed
+     *
+     * @param string $oldPath old path relative to data/user/files
+     * @param string $newPath new path relative to data/user/files
+     */
+    static private function renameChildren($oldPath, $newPath) {
+
+        $absNewPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath);
+        $absOldPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath);
+
+        $mountManager = \OC\Files\Filesystem::getMountManager();
+        $mountedShares = $mountManager->findIn('/' . \OCP\User::getUser() . '/files/' . $oldPath);
+        foreach ($mountedShares as $mount) {
+            if ($mount->getStorage()->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
+                $mountPoint = $mount->getMountPoint();
+                $target = str_replace($absOldPath, $absNewPath, $mountPoint);
+                $mount->moveMount($target);
+            }
+        }
+    }
 
 }

apps/files_sharing/lib/Helper.php

Indentation +237 added lines, -237 removed lines

@@ -36,242 +36,242 @@
 
 class Helper {
 
-	public static function registerHooks() {
-		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
-
-		\OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
-	}
-
-	/**
-	 * Sets up the filesystem and user for public sharing
-	 * @param string $token string share token
-	 * @param string $relativePath optional path relative to the share
-	 * @param string $password optional password
-	 * @return array
-	 */
-	public static function setupFromToken($token, $relativePath = null, $password = null) {
-		\OC_User::setIncognitoMode(true);
-
-		$shareManager = \OC::$server->getShareManager();
-
-		try {
-			$share = $shareManager->getShareByToken($token);
-		} catch (ShareNotFound $e) {
-			\OC_Response::setStatus(404);
-			\OCP\Util::writeLog('core-preview', 'Passed token parameter is not valid', \OCP\Util::DEBUG);
-			exit;
-		}
-
-		\OCP\JSON::checkUserExists($share->getShareOwner());
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($share->getShareOwner());
-
-
-		try {
-			$path = Filesystem::getPath($share->getNodeId());
-		} catch (NotFoundException $e) {
-			\OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG);
-			\OC_Response::setStatus(404);
-			\OCP\JSON::error(array('success' => false));
-			exit();
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK && $share->getPassword() !== null) {
-			if (!self::authenticate($share, $password)) {
-				\OC_Response::setStatus(403);
-				\OCP\JSON::error(array('success' => false));
-				exit();
-			}
-		}
-
-		$basePath = $path;
-
-		if ($relativePath !== null && Filesystem::isReadable($basePath . $relativePath)) {
-			$path .= Filesystem::normalizePath($relativePath);
-		}
-
-		return array(
-			'share' => $share,
-			'basePath' => $basePath,
-			'realPath' => $path
-		);
-	}
-
-	/**
-	 * Authenticate link item with the given password
-	 * or with the session if no password was given.
-	 * @param \OCP\Share\IShare $share
-	 * @param string $password optional password
-	 *
-	 * @return boolean true if authorized, false otherwise
-	 */
-	public static function authenticate($share, $password = null) {
-		$shareManager = \OC::$server->getShareManager();
-
-		if ($password !== null) {
-			if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-				if ($shareManager->checkPassword($share, $password)) {
-					\OC::$server->getSession()->set('public_link_authenticated', (string)$share->getId());
-					return true;
-				}
-			}
-		} else {
-			// not authenticated ?
-			if (\OC::$server->getSession()->exists('public_link_authenticated')
-				&& \OC::$server->getSession()->get('public_link_authenticated') !== (string)$share->getId()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static function getSharesFromItem($target) {
-		$result = array();
-		$owner = Filesystem::getOwner($target);
-		Filesystem::initMountPoints($owner);
-		$info = Filesystem::getFileInfo($target);
-		$ownerView = new View('/'.$owner.'/files');
-		if ( $owner != User::getUser() ) {
-			$path = $ownerView->getPath($info['fileid']);
-		} else {
-			$path = $target;
-		}
-
-
-		$ids = array();
-		while ($path !== dirname($path)) {
-			$info = $ownerView->getFileInfo($path);
-			if ($info instanceof \OC\Files\FileInfo) {
-				$ids[] = $info['fileid'];
-			} else {
-				\OCP\Util::writeLog('sharing', 'No fileinfo available for: ' . $path, \OCP\Util::WARN);
-			}
-			$path = dirname($path);
-		}
-
-		if (!empty($ids)) {
-
-			$idList = array_chunk($ids, 99, true);
-
-			foreach ($idList as $subList) {
-				$statement = "SELECT `share_with`, `share_type`, `file_target` FROM `*PREFIX*share` WHERE `file_source` IN (" . implode(',', $subList) . ") AND `share_type` IN (0, 1, 2)";
-				$query = \OCP\DB::prepare($statement);
-				$r = $query->execute();
-				$result = array_merge($result, $r->fetchAll());
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * get the UID of the owner of the file and the path to the file relative to
-	 * owners files folder
-	 *
-	 * @param $filename
-	 * @return array
-	 * @throws \OC\User\NoUserException
-	 */
-	public static function getUidAndFilename($filename) {
-		$uid = Filesystem::getOwner($filename);
-		$userManager = \OC::$server->getUserManager();
-		// if the user with the UID doesn't exists, e.g. because the UID points
-		// to a remote user with a federated cloud ID we use the current logged-in
-		// user. We need a valid local user to create the share
-		if (!$userManager->userExists($uid)) {
-			$uid = User::getUser();
-		}
-		Filesystem::initMountPoints($uid);
-		if ( $uid != User::getUser() ) {
-			$info = Filesystem::getFileInfo($filename);
-			$ownerView = new View('/'.$uid.'/files');
-			try {
-				$filename = $ownerView->getPath($info['fileid']);
-			} catch (NotFoundException $e) {
-				$filename = null;
-			}
-		}
-		return [$uid, $filename];
-	}
-
-	/**
-	 * Format a path to be relative to the /user/files/ directory
-	 * @param string $path the absolute path
-	 * @return string e.g. turns '/admin/files/test.txt' into 'test.txt'
-	 */
-	public static function stripUserFilesPath($path) {
-		$trimmed = ltrim($path, '/');
-		$split = explode('/', $trimmed);
-
-		// it is not a file relative to data/user/files
-		if (count($split) < 3 || $split[1] !== 'files') {
-			return false;
-		}
-
-		$sliced = array_slice($split, 2);
-		$relPath = implode('/', $sliced);
-
-		return $relPath;
-	}
-
-	/**
-	 * check if file name already exists and generate unique target
-	 *
-	 * @param string $path
-	 * @param array $excludeList
-	 * @param View $view
-	 * @return string $path
-	 */
-	public static function generateUniqueTarget($path, $excludeList, $view) {
-		$pathinfo = pathinfo($path);
-		$ext = (isset($pathinfo['extension'])) ? '.'.$pathinfo['extension'] : '';
-		$name = $pathinfo['filename'];
-		$dir = $pathinfo['dirname'];
-		$i = 2;
-		while ($view->file_exists($path) || in_array($path, $excludeList)) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
-			$i++;
-		}
-
-		return $path;
-	}
-
-	/**
-	 * get default share folder
-	 *
-	 * @param \OC\Files\View
-	 * @return string
-	 */
-	public static function getShareFolder($view = null) {
-		if ($view === null) {
-			$view = Filesystem::getView();
-		}
-		$shareFolder = \OC::$server->getConfig()->getSystemValue('share_folder', '/');
-		$shareFolder = Filesystem::normalizePath($shareFolder);
-
-		if (!$view->file_exists($shareFolder)) {
-			$dir = '';
-			$subdirs = explode('/', $shareFolder);
-			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
-				if (!$view->is_dir($dir)) {
-					$view->mkdir($dir);
-				}
-			}
-		}
-
-		return $shareFolder;
-
-	}
-
-	/**
-	 * set default share folder
-	 *
-	 * @param string $shareFolder
-	 */
-	public static function setShareFolder($shareFolder) {
-		\OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder);
-	}
+    public static function registerHooks() {
+        \OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
+        \OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
+
+        \OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
+    }
+
+    /**
+     * Sets up the filesystem and user for public sharing
+     * @param string $token string share token
+     * @param string $relativePath optional path relative to the share
+     * @param string $password optional password
+     * @return array
+     */
+    public static function setupFromToken($token, $relativePath = null, $password = null) {
+        \OC_User::setIncognitoMode(true);
+
+        $shareManager = \OC::$server->getShareManager();
+
+        try {
+            $share = $shareManager->getShareByToken($token);
+        } catch (ShareNotFound $e) {
+            \OC_Response::setStatus(404);
+            \OCP\Util::writeLog('core-preview', 'Passed token parameter is not valid', \OCP\Util::DEBUG);
+            exit;
+        }
+
+        \OCP\JSON::checkUserExists($share->getShareOwner());
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($share->getShareOwner());
+
+
+        try {
+            $path = Filesystem::getPath($share->getNodeId());
+        } catch (NotFoundException $e) {
+            \OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG);
+            \OC_Response::setStatus(404);
+            \OCP\JSON::error(array('success' => false));
+            exit();
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK && $share->getPassword() !== null) {
+            if (!self::authenticate($share, $password)) {
+                \OC_Response::setStatus(403);
+                \OCP\JSON::error(array('success' => false));
+                exit();
+            }
+        }
+
+        $basePath = $path;
+
+        if ($relativePath !== null && Filesystem::isReadable($basePath . $relativePath)) {
+            $path .= Filesystem::normalizePath($relativePath);
+        }
+
+        return array(
+            'share' => $share,
+            'basePath' => $basePath,
+            'realPath' => $path
+        );
+    }
+
+    /**
+     * Authenticate link item with the given password
+     * or with the session if no password was given.
+     * @param \OCP\Share\IShare $share
+     * @param string $password optional password
+     *
+     * @return boolean true if authorized, false otherwise
+     */
+    public static function authenticate($share, $password = null) {
+        $shareManager = \OC::$server->getShareManager();
+
+        if ($password !== null) {
+            if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+                if ($shareManager->checkPassword($share, $password)) {
+                    \OC::$server->getSession()->set('public_link_authenticated', (string)$share->getId());
+                    return true;
+                }
+            }
+        } else {
+            // not authenticated ?
+            if (\OC::$server->getSession()->exists('public_link_authenticated')
+                && \OC::$server->getSession()->get('public_link_authenticated') !== (string)$share->getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static function getSharesFromItem($target) {
+        $result = array();
+        $owner = Filesystem::getOwner($target);
+        Filesystem::initMountPoints($owner);
+        $info = Filesystem::getFileInfo($target);
+        $ownerView = new View('/'.$owner.'/files');
+        if ( $owner != User::getUser() ) {
+            $path = $ownerView->getPath($info['fileid']);
+        } else {
+            $path = $target;
+        }
+
+
+        $ids = array();
+        while ($path !== dirname($path)) {
+            $info = $ownerView->getFileInfo($path);
+            if ($info instanceof \OC\Files\FileInfo) {
+                $ids[] = $info['fileid'];
+            } else {
+                \OCP\Util::writeLog('sharing', 'No fileinfo available for: ' . $path, \OCP\Util::WARN);
+            }
+            $path = dirname($path);
+        }
+
+        if (!empty($ids)) {
+
+            $idList = array_chunk($ids, 99, true);
+
+            foreach ($idList as $subList) {
+                $statement = "SELECT `share_with`, `share_type`, `file_target` FROM `*PREFIX*share` WHERE `file_source` IN (" . implode(',', $subList) . ") AND `share_type` IN (0, 1, 2)";
+                $query = \OCP\DB::prepare($statement);
+                $r = $query->execute();
+                $result = array_merge($result, $r->fetchAll());
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * get the UID of the owner of the file and the path to the file relative to
+     * owners files folder
+     *
+     * @param $filename
+     * @return array
+     * @throws \OC\User\NoUserException
+     */
+    public static function getUidAndFilename($filename) {
+        $uid = Filesystem::getOwner($filename);
+        $userManager = \OC::$server->getUserManager();
+        // if the user with the UID doesn't exists, e.g. because the UID points
+        // to a remote user with a federated cloud ID we use the current logged-in
+        // user. We need a valid local user to create the share
+        if (!$userManager->userExists($uid)) {
+            $uid = User::getUser();
+        }
+        Filesystem::initMountPoints($uid);
+        if ( $uid != User::getUser() ) {
+            $info = Filesystem::getFileInfo($filename);
+            $ownerView = new View('/'.$uid.'/files');
+            try {
+                $filename = $ownerView->getPath($info['fileid']);
+            } catch (NotFoundException $e) {
+                $filename = null;
+            }
+        }
+        return [$uid, $filename];
+    }
+
+    /**
+     * Format a path to be relative to the /user/files/ directory
+     * @param string $path the absolute path
+     * @return string e.g. turns '/admin/files/test.txt' into 'test.txt'
+     */
+    public static function stripUserFilesPath($path) {
+        $trimmed = ltrim($path, '/');
+        $split = explode('/', $trimmed);
+
+        // it is not a file relative to data/user/files
+        if (count($split) < 3 || $split[1] !== 'files') {
+            return false;
+        }
+
+        $sliced = array_slice($split, 2);
+        $relPath = implode('/', $sliced);
+
+        return $relPath;
+    }
+
+    /**
+     * check if file name already exists and generate unique target
+     *
+     * @param string $path
+     * @param array $excludeList
+     * @param View $view
+     * @return string $path
+     */
+    public static function generateUniqueTarget($path, $excludeList, $view) {
+        $pathinfo = pathinfo($path);
+        $ext = (isset($pathinfo['extension'])) ? '.'.$pathinfo['extension'] : '';
+        $name = $pathinfo['filename'];
+        $dir = $pathinfo['dirname'];
+        $i = 2;
+        while ($view->file_exists($path) || in_array($path, $excludeList)) {
+            $path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
+            $i++;
+        }
+
+        return $path;
+    }
+
+    /**
+     * get default share folder
+     *
+     * @param \OC\Files\View
+     * @return string
+     */
+    public static function getShareFolder($view = null) {
+        if ($view === null) {
+            $view = Filesystem::getView();
+        }
+        $shareFolder = \OC::$server->getConfig()->getSystemValue('share_folder', '/');
+        $shareFolder = Filesystem::normalizePath($shareFolder);
+
+        if (!$view->file_exists($shareFolder)) {
+            $dir = '';
+            $subdirs = explode('/', $shareFolder);
+            foreach ($subdirs as $subdir) {
+                $dir = $dir . '/' . $subdir;
+                if (!$view->is_dir($dir)) {
+                    $view->mkdir($dir);
+                }
+            }
+        }
+
+        return $shareFolder;
+
+    }
+
+    /**
+     * set default share folder
+     *
+     * @param string $shareFolder
+     */
+    public static function setShareFolder($shareFolder) {
+        \OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder);
+    }
 
 }

apps/files_sharing/lib/DeleteOrphanedSharesJob.php

Indentation +27 added lines, -27 removed lines

@@ -31,36 +31,36 @@
  */
 class DeleteOrphanedSharesJob extends TimedJob {
 
-	/**
-	 * Default interval in minutes
-	 *
-	 * @var int $defaultIntervalMin
-	 **/
-	protected $defaultIntervalMin = 15;
+    /**
+     * Default interval in minutes
+     *
+     * @var int $defaultIntervalMin
+     **/
+    protected $defaultIntervalMin = 15;
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct(){
-		$this->interval = $this->defaultIntervalMin * 60;
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct(){
+        $this->interval = $this->defaultIntervalMin * 60;
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$connection = \OC::$server->getDatabaseConnection();
-		$logger = \OC::$server->getLogger();
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $connection = \OC::$server->getDatabaseConnection();
+        $logger = \OC::$server->getLogger();
 
-		$sql =
-			'DELETE FROM `*PREFIX*share` ' .
-			'WHERE `item_type` in (\'file\', \'folder\') ' .
-			'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
+        $sql =
+            'DELETE FROM `*PREFIX*share` ' .
+            'WHERE `item_type` in (\'file\', \'folder\') ' .
+            'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
 
-		$deletedEntries = $connection->executeUpdate($sql);
-		$logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
-	}
+        $deletedEntries = $connection->executeUpdate($sql);
+        $logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
+    }
 
 }

apps/files_sharing/lib/Middleware/OCSShareAPIMiddleware.php

Indentation +35 added lines, -35 removed lines

@@ -10,43 +10,43 @@
 use OCP\Share\IManager;
 
 class OCSShareAPIMiddleware extends Middleware {
-	/** @var IManager */
-	private $shareManager;
-	/** @var IL10N */
-	private $l;
+    /** @var IManager */
+    private $shareManager;
+    /** @var IL10N */
+    private $l;
 
-	public function __construct(IManager $shareManager,
-								IL10N $l) {
-		$this->shareManager = $shareManager;
-		$this->l = $l;
-	}
+    public function __construct(IManager $shareManager,
+                                IL10N $l) {
+        $this->shareManager = $shareManager;
+        $this->l = $l;
+    }
 
-	/**
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 *
-	 * @throws OCSNotFoundException
-	 */
-	public function beforeController($controller, $methodName) {
-		if ($controller instanceof ShareAPIController) {
-			if (!$this->shareManager->shareApiEnabled()) {
-				throw new OCSNotFoundException($this->l->t('Share API is disabled'));
-			}
-		}
-	}
+    /**
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     *
+     * @throws OCSNotFoundException
+     */
+    public function beforeController($controller, $methodName) {
+        if ($controller instanceof ShareAPIController) {
+            if (!$this->shareManager->shareApiEnabled()) {
+                throw new OCSNotFoundException($this->l->t('Share API is disabled'));
+            }
+        }
+    }
 
-	/**
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return Response
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		if ($controller instanceof ShareAPIController) {
-			/** @var ShareAPIController $controller */
-			$controller->cleanup();
-		}
+    /**
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return Response
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        if ($controller instanceof ShareAPIController) {
+            /** @var ShareAPIController $controller */
+            $controller->cleanup();
+        }
 
-		return $response;
-	}
+        return $response;
+    }
 }