nextcloud / server

apps/dav/lib/Connector/PublicAuth.php

Spacing +2 added lines, -2 removed lines

@@ -100,13 +100,13 @@
 				if ($this->shareManager->checkPassword($share, $password)) {
 					return true;
 				} else if ($this->session->exists('public_link_authenticated')
-					&& $this->session->get('public_link_authenticated') === (string)$share->getId()) {
+					&& $this->session->get('public_link_authenticated') === (string) $share->getId()) {
 					return true;
 				} else {
 					if (in_array('XMLHttpRequest', explode(',', $this->request->getHeader('X-Requested-With')))) {
 						// do not re-authenticate over ajax, use dummy auth name to prevent browser popup
 						http_response_code(401);
-						header('WWW-Authenticate','DummyBasic realm="' . $this->realm . '"');
+						header('WWW-Authenticate', 'DummyBasic realm="'.$this->realm.'"');
 						throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
 					}
 					return false;

Indentation +75 added lines, -75 removed lines

@@ -42,89 +42,89 @@
  */
 class PublicAuth extends AbstractBasic {
 
-	/** @var \OCP\Share\IShare */
-	private $share;
+    /** @var \OCP\Share\IShare */
+    private $share;
 
-	/** @var IManager */
-	private $shareManager;
+    /** @var IManager */
+    private $shareManager;
 
-	/** @var ISession */
-	private $session;
+    /** @var ISession */
+    private $session;
 
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/**
-	 * @param IRequest $request
-	 * @param IManager $shareManager
-	 * @param ISession $session
-	 */
-	public function __construct(IRequest $request,
-								IManager $shareManager,
-								ISession $session) {
-		$this->request = $request;
-		$this->shareManager = $shareManager;
-		$this->session = $session;
+    /**
+     * @param IRequest $request
+     * @param IManager $shareManager
+     * @param ISession $session
+     */
+    public function __construct(IRequest $request,
+                                IManager $shareManager,
+                                ISession $session) {
+        $this->request = $request;
+        $this->shareManager = $shareManager;
+        $this->session = $session;
 
-		// setup realm
-		$defaults = new \OCP\Defaults();
-		$this->realm = $defaults->getName();
-	}
+        // setup realm
+        $defaults = new \OCP\Defaults();
+        $this->realm = $defaults->getName();
+    }
 
-	/**
-	 * Validates a username and password
-	 *
-	 * This method should return true or false depending on if login
-	 * succeeded.
-	 *
-	 * @param string $username
-	 * @param string $password
-	 *
-	 * @return bool
-	 * @throws \Sabre\DAV\Exception\NotAuthenticated
-	 */
-	protected function validateUserPass($username, $password) {
-		try {
-			$share = $this->shareManager->getShareByToken($username);
-		} catch (ShareNotFound $e) {
-			return false;
-		}
+    /**
+     * Validates a username and password
+     *
+     * This method should return true or false depending on if login
+     * succeeded.
+     *
+     * @param string $username
+     * @param string $password
+     *
+     * @return bool
+     * @throws \Sabre\DAV\Exception\NotAuthenticated
+     */
+    protected function validateUserPass($username, $password) {
+        try {
+            $share = $this->shareManager->getShareByToken($username);
+        } catch (ShareNotFound $e) {
+            return false;
+        }
 
-		$this->share = $share;
+        $this->share = $share;
 
-		\OC_User::setIncognitoMode(true);
+        \OC_User::setIncognitoMode(true);
 
-		// check if the share is password protected
-		if ($share->getPassword() !== null) {
-			if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
-				if ($this->shareManager->checkPassword($share, $password)) {
-					return true;
-				} else if ($this->session->exists('public_link_authenticated')
-					&& $this->session->get('public_link_authenticated') === (string)$share->getId()) {
-					return true;
-				} else {
-					if (in_array('XMLHttpRequest', explode(',', $this->request->getHeader('X-Requested-With')))) {
-						// do not re-authenticate over ajax, use dummy auth name to prevent browser popup
-						http_response_code(401);
-						header('WWW-Authenticate','DummyBasic realm="' . $this->realm . '"');
-						throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
-					}
-					return false;
-				}
-			} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE) {
-				return true;
-			} else {
-				return false;
-			}
-		} else {
-			return true;
-		}
-	}
+        // check if the share is password protected
+        if ($share->getPassword() !== null) {
+            if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+                if ($this->shareManager->checkPassword($share, $password)) {
+                    return true;
+                } else if ($this->session->exists('public_link_authenticated')
+                    && $this->session->get('public_link_authenticated') === (string)$share->getId()) {
+                    return true;
+                } else {
+                    if (in_array('XMLHttpRequest', explode(',', $this->request->getHeader('X-Requested-With')))) {
+                        // do not re-authenticate over ajax, use dummy auth name to prevent browser popup
+                        http_response_code(401);
+                        header('WWW-Authenticate','DummyBasic realm="' . $this->realm . '"');
+                        throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
+                    }
+                    return false;
+                }
+            } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE) {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return true;
+        }
+    }
 
-	/**
-	 * @return \OCP\Share\IShare
-	 */
-	public function getShare() {
-		return $this->share;
-	}
+    /**
+     * @return \OCP\Share\IShare
+     */
+    public function getShare() {
+        return $this->share;
+    }
 }

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

Spacing +5 added lines, -5 removed lines

@@ -102,11 +102,11 @@
 	 * @param array $conditions
 	 */
 	public function validateTokens(RequestInterface $request, &$conditions) {
-		foreach($conditions as &$fileCondition) {
-			if(isset($fileCondition['tokens'])) {
-				foreach($fileCondition['tokens'] as &$token) {
-					if(isset($token['token'])) {
-						if(substr($token['token'], 0, 16) === 'opaquelocktoken:') {
+		foreach ($conditions as &$fileCondition) {
+			if (isset($fileCondition['tokens'])) {
+				foreach ($fileCondition['tokens'] as &$token) {
+					if (isset($token['token'])) {
+						if (substr($token['token'], 0, 16) === 'opaquelocktoken:') {
 							$token['validToken'] = true;
 						}
 					}

Indentation +99 added lines, -99 removed lines

@@ -45,114 +45,114 @@
  * @package OCA\DAV\Connector\Sabre
  */
 class FakeLockerPlugin extends ServerPlugin {
-	/** @var \Sabre\DAV\Server */
-	private $server;
+    /** @var \Sabre\DAV\Server */
+    private $server;
 
-	/** {@inheritDoc} */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1);
-		$this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1);
-		$server->on('propFind', [$this, 'propFind']);
-		$server->on('validateTokens', [$this, 'validateTokens']);
-	}
+    /** {@inheritDoc} */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1);
+        $this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1);
+        $server->on('propFind', [$this, 'propFind']);
+        $server->on('validateTokens', [$this, 'validateTokens']);
+    }
 
-	/**
-	 * Indicate that we support LOCK and UNLOCK
-	 *
-	 * @param string $path
-	 * @return string[]
-	 */
-	public function getHTTPMethods($path) {
-		return [
-			'LOCK',
-			'UNLOCK',
-		];
-	}
+    /**
+     * Indicate that we support LOCK and UNLOCK
+     *
+     * @param string $path
+     * @return string[]
+     */
+    public function getHTTPMethods($path) {
+        return [
+            'LOCK',
+            'UNLOCK',
+        ];
+    }
 
-	/**
-	 * Indicate that we support locking
-	 *
-	 * @return integer[]
-	 */
-	function getFeatures() {
-		return [2];
-	}
+    /**
+     * Indicate that we support locking
+     *
+     * @return integer[]
+     */
+    function getFeatures() {
+        return [2];
+    }
 
-	/**
-	 * Return some dummy response for PROPFIND requests with regard to locking
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFind(PropFind $propFind, INode $node) {
-		$propFind->handle('{DAV:}supportedlock', function() {
-			return new SupportedLock(true);
-		});
-		$propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) {
-			return new LockDiscovery([]);
-		});
-	}
+    /**
+     * Return some dummy response for PROPFIND requests with regard to locking
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFind(PropFind $propFind, INode $node) {
+        $propFind->handle('{DAV:}supportedlock', function() {
+            return new SupportedLock(true);
+        });
+        $propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) {
+            return new LockDiscovery([]);
+        });
+    }
 
-	/**
-	 * Mark a locking token always as valid
-	 *
-	 * @param RequestInterface $request
-	 * @param array $conditions
-	 */
-	public function validateTokens(RequestInterface $request, &$conditions) {
-		foreach($conditions as &$fileCondition) {
-			if(isset($fileCondition['tokens'])) {
-				foreach($fileCondition['tokens'] as &$token) {
-					if(isset($token['token'])) {
-						if(substr($token['token'], 0, 16) === 'opaquelocktoken:') {
-							$token['validToken'] = true;
-						}
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Mark a locking token always as valid
+     *
+     * @param RequestInterface $request
+     * @param array $conditions
+     */
+    public function validateTokens(RequestInterface $request, &$conditions) {
+        foreach($conditions as &$fileCondition) {
+            if(isset($fileCondition['tokens'])) {
+                foreach($fileCondition['tokens'] as &$token) {
+                    if(isset($token['token'])) {
+                        if(substr($token['token'], 0, 16) === 'opaquelocktoken:') {
+                            $token['validToken'] = true;
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Fakes a successful LOCK
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function fakeLockProvider(RequestInterface $request,
-									 ResponseInterface $response) {
+    /**
+     * Fakes a successful LOCK
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function fakeLockProvider(RequestInterface $request,
+                                        ResponseInterface $response) {
 
-		$lockInfo = new LockInfo();
-		$lockInfo->token = md5($request->getPath());
-		$lockInfo->uri = $request->getPath();
-		$lockInfo->depth = \Sabre\DAV\Server::DEPTH_INFINITY;
-		$lockInfo->timeout = 1800;
+        $lockInfo = new LockInfo();
+        $lockInfo->token = md5($request->getPath());
+        $lockInfo->uri = $request->getPath();
+        $lockInfo->depth = \Sabre\DAV\Server::DEPTH_INFINITY;
+        $lockInfo->timeout = 1800;
 
-		$body = $this->server->xml->write('{DAV:}prop', [
-				'{DAV:}lockdiscovery' =>
-						new LockDiscovery([$lockInfo])
-		]);
+        $body = $this->server->xml->write('{DAV:}prop', [
+                '{DAV:}lockdiscovery' =>
+                        new LockDiscovery([$lockInfo])
+        ]);
 
-		$response->setStatus(200);
-		$response->setBody($body);
+        $response->setStatus(200);
+        $response->setBody($body);
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Fakes a successful LOCK
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function fakeUnlockProvider(RequestInterface $request,
-									 ResponseInterface $response) {
-		$response->setStatus(204);
-		$response->setHeader('Content-Length', '0');
-		return false;
-	}
+    /**
+     * Fakes a successful LOCK
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function fakeUnlockProvider(RequestInterface $request,
+                                        ResponseInterface $response) {
+        $response->setStatus(204);
+        $response->setHeader('Content-Length', '0');
+        return false;
+    }
 }

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

Indentation +358 added lines, -358 removed lines

@@ -41,362 +41,362 @@
 
 class FilesReportPlugin extends ServerPlugin {
 
-	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const REPORT_NAME            = '{http://owncloud.org/ns}filter-files';
-	const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag';
-
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @var Tree
-	 */
-	private $tree;
-
-	/**
-	 * @var View
-	 */
-	private $fileView;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var ISystemTagObjectMapper
-	 */
-	private $tagMapper;
-
-	/**
-	 * Manager for private tags
-	 *
-	 * @var ITagManager
-	 */
-	private $fileTagger;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * @var IGroupManager
-	 */
-	private $groupManager;
-
-	/**
-	 * @var Folder
-	 */
-	private $userFolder;
-
-	/**
-	 * @param Tree $tree
-	 * @param View $view
-	 * @param ISystemTagManager $tagManager
-	 * @param ISystemTagObjectMapper $tagMapper
-	 * @param ITagManager $fileTagger manager for private tags
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param Folder $userFolder
-	 */
-	public function __construct(Tree $tree,
-								View $view,
-								ISystemTagManager $tagManager,
-								ISystemTagObjectMapper $tagMapper,
-								ITagManager $fileTagger,
-								IUserSession $userSession,
-								IGroupManager $groupManager,
-								Folder $userFolder
-	) {
-		$this->tree = $tree;
-		$this->fileView = $view;
-		$this->tagManager = $tagManager;
-		$this->tagMapper = $tagMapper;
-		$this->fileTagger = $fileTagger;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->userFolder = $userFolder;
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-
-		$server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-
-		$this->server = $server;
-		$this->server->on('report', array($this, 'onReport'));
-	}
-
-	/**
-	 * Returns a list of reports this plugin supports.
-	 *
-	 * This will be used in the {DAV:}supported-report-set property.
-	 *
-	 * @param string $uri
-	 * @return array
-	 */
-	public function getSupportedReportSet($uri) {
-		return [self::REPORT_NAME];
-	}
-
-	/**
-	 * REPORT operations to look for files
-	 *
-	 * @param string $reportName
-	 * @param $report
-	 * @param string $uri
-	 * @return bool
-	 * @throws BadRequest
-	 * @throws PreconditionFailed
-	 * @internal param $ [] $report
-	 */
-	public function onReport($reportName, $report, $uri) {
-		$reportTargetNode = $this->server->tree->getNodeForPath($uri);
-		if (!$reportTargetNode instanceof Directory || $reportName !== self::REPORT_NAME) {
-			return;
-		}
-
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
-		$requestedProps = [];
-		$filterRules = [];
-
-		// parse report properties and gather filter info
-		foreach ($report as $reportProps) {
-			$name = $reportProps['name'];
-			if ($name === $ns . 'filter-rules') {
-				$filterRules = $reportProps['value'];
-			} else if ($name === '{DAV:}prop') {
-				// propfind properties
-				foreach ($reportProps['value'] as $propVal) {
-					$requestedProps[] = $propVal['name'];
-				}
-			}
-		}
-
-		if (empty($filterRules)) {
-			// an empty filter would return all existing files which would be slow
-			throw new BadRequest('Missing filter-rule block in request');
-		}
-
-		// gather all file ids matching filter
-		try {
-			$resultFileIds = $this->processFilterRules($filterRules);
-		} catch (TagNotFoundException $e) {
-			throw new PreconditionFailed('Cannot filter by non-existing tag', 0, $e);
-		}
-
-		// find sabre nodes by file id, restricted to the root node path
-		$results = $this->findNodesByFileIds($reportTargetNode, $resultFileIds);
-
-		$filesUri = $this->getFilesBaseUri($uri, $reportTargetNode->getPath());
-		$responses = $this->prepareResponses($filesUri, $requestedProps, $results);
-
-		$xml = $this->server->xml->write(
-			'{DAV:}multistatus',
-			new MultiStatus($responses)
-		);
-
-		$this->server->httpResponse->setStatus(207);
-		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-		$this->server->httpResponse->setBody($xml);
-
-		return false;
-	}
-
-	/**
-	 * Returns the base uri of the files root by removing
-	 * the subpath from the URI
-	 *
-	 * @param string $uri URI from this request
-	 * @param string $subPath subpath to remove from the URI
-	 *
-	 * @return string files base uri
-	 */
-	private function getFilesBaseUri($uri, $subPath) {
-		$uri = trim($uri, '/');
-		$subPath = trim($subPath, '/');
-		if (empty($subPath)) {
-			$filesUri = $uri;
-		} else {
-			$filesUri = substr($uri, 0, strlen($uri) - strlen($subPath));
-		}
-		$filesUri = trim($filesUri, '/');
-		if (empty($filesUri)) {
-			return '';
-		}
-		return '/' . $filesUri;
-	}
-
-	/**
-	 * Find file ids matching the given filter rules
-	 *
-	 * @param array $filterRules
-	 * @return array array of unique file id results
-	 *
-	 * @throws TagNotFoundException whenever a tag was not found
-	 */
-	protected function processFilterRules($filterRules) {
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
-		$resultFileIds = null;
-		$systemTagIds = [];
-		$favoriteFilter = null;
-		foreach ($filterRules as $filterRule) {
-			if ($filterRule['name'] === $ns . 'systemtag') {
-				$systemTagIds[] = $filterRule['value'];
-			}
-			if ($filterRule['name'] === $ns . 'favorite') {
-				$favoriteFilter = true;
-			}
-		}
-
-		if ($favoriteFilter !== null) {
-			$resultFileIds = $this->fileTagger->load('files')->getFavorites();
-			if (empty($resultFileIds)) {
-				return [];
-			}
-		}
-
-		if (!empty($systemTagIds)) {
-			$fileIds = $this->getSystemTagFileIds($systemTagIds);
-			if (empty($resultFileIds)) {
-				$resultFileIds = $fileIds;
-			} else {
-				$resultFileIds = array_intersect($fileIds, $resultFileIds);
-			}
-		}
-
-		return $resultFileIds;
-	}
-
-	private function getSystemTagFileIds($systemTagIds) {
-		$resultFileIds = null;
-
-		// check user permissions, if applicable
-		if (!$this->isAdmin()) {
-			// check visibility/permission
-			$tags = $this->tagManager->getTagsByIds($systemTagIds);
-			$unknownTagIds = [];
-			foreach ($tags as $tag) {
-				if (!$tag->isUserVisible()) {
-					$unknownTagIds[] = $tag->getId();
-				}
-			}
-
-			if (!empty($unknownTagIds)) {
-				throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
-			}
-		}
-
-		// fetch all file ids and intersect them
-		foreach ($systemTagIds as $systemTagId) {
-			$fileIds = $this->tagMapper->getObjectIdsForTags($systemTagId, 'files');
-
-			if (empty($fileIds)) {
-				// This tag has no files, nothing can ever show up
-				return [];
-			}
-
-			// first run ?
-			if ($resultFileIds === null) {
-				$resultFileIds = $fileIds;
-			} else {
-				$resultFileIds = array_intersect($resultFileIds, $fileIds);
-			}
-
-			if (empty($resultFileIds)) {
-				// Empty intersection, nothing can show up anymore
-				return [];
-			}
-		}
-		return $resultFileIds;
-	}
-
-	/**
-	 * Prepare propfind response for the given nodes
-	 *
-	 * @param string $filesUri $filesUri URI leading to root of the files URI,
-	 * with a leading slash but no trailing slash
-	 * @param string[] $requestedProps requested properties
-	 * @param Node[] nodes nodes for which to fetch and prepare responses
-	 * @return Response[]
-	 */
-	public function prepareResponses($filesUri, $requestedProps, $nodes) {
-		$responses = [];
-		foreach ($nodes as $node) {
-			$propFind = new PropFind($filesUri . $node->getPath(), $requestedProps);
-
-			$this->server->getPropertiesByNode($propFind, $node);
-			// copied from Sabre Server's getPropertiesForPath
-			$result = $propFind->getResultForMultiStatus();
-			$result['href'] = $propFind->getPath();
-
-			$resourceType = $this->server->getResourceTypeForNode($node);
-			if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
-				$result['href'] .= '/';
-			}
-
-			$responses[] = new Response(
-				rtrim($this->server->getBaseUri(), '/') . $filesUri . $node->getPath(),
-				$result,
-				200
-			);
-		}
-		return $responses;
-	}
-
-	/**
-	 * Find Sabre nodes by file ids
-	 *
-	 * @param Node $rootNode root node for search
-	 * @param array $fileIds file ids
-	 * @return Node[] array of Sabre nodes
-	 */
-	public function findNodesByFileIds($rootNode, $fileIds) {
-		$folder = $this->userFolder;
-		if (trim($rootNode->getPath(), '/') !== '') {
-			$folder = $folder->get($rootNode->getPath());
-		}
-
-		$results = [];
-		foreach ($fileIds as $fileId) {
-			$entry = $folder->getById($fileId);
-			if ($entry) {
-				$entry = current($entry);
-				if ($entry instanceof \OCP\Files\File) {
-					$results[] = new File($this->fileView, $entry);
-				} else if ($entry instanceof \OCP\Files\Folder) {
-					$results[] = new Directory($this->fileView, $entry);
-				}
-			}
-		}
-
-		return $results;
-	}
-
-	/**
-	 * Returns whether the currently logged in user is an administrator
-	 */
-	private function isAdmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
+    // namespace
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const REPORT_NAME            = '{http://owncloud.org/ns}filter-files';
+    const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag';
+
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
+
+    /**
+     * @var Tree
+     */
+    private $tree;
+
+    /**
+     * @var View
+     */
+    private $fileView;
+
+    /**
+     * @var ISystemTagManager
+     */
+    private $tagManager;
+
+    /**
+     * @var ISystemTagObjectMapper
+     */
+    private $tagMapper;
+
+    /**
+     * Manager for private tags
+     *
+     * @var ITagManager
+     */
+    private $fileTagger;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var IGroupManager
+     */
+    private $groupManager;
+
+    /**
+     * @var Folder
+     */
+    private $userFolder;
+
+    /**
+     * @param Tree $tree
+     * @param View $view
+     * @param ISystemTagManager $tagManager
+     * @param ISystemTagObjectMapper $tagMapper
+     * @param ITagManager $fileTagger manager for private tags
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param Folder $userFolder
+     */
+    public function __construct(Tree $tree,
+                                View $view,
+                                ISystemTagManager $tagManager,
+                                ISystemTagObjectMapper $tagMapper,
+                                ITagManager $fileTagger,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager,
+                                Folder $userFolder
+    ) {
+        $this->tree = $tree;
+        $this->fileView = $view;
+        $this->tagManager = $tagManager;
+        $this->tagMapper = $tagMapper;
+        $this->fileTagger = $fileTagger;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->userFolder = $userFolder;
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+
+        $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+
+        $this->server = $server;
+        $this->server->on('report', array($this, 'onReport'));
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+        return [self::REPORT_NAME];
+    }
+
+    /**
+     * REPORT operations to look for files
+     *
+     * @param string $reportName
+     * @param $report
+     * @param string $uri
+     * @return bool
+     * @throws BadRequest
+     * @throws PreconditionFailed
+     * @internal param $ [] $report
+     */
+    public function onReport($reportName, $report, $uri) {
+        $reportTargetNode = $this->server->tree->getNodeForPath($uri);
+        if (!$reportTargetNode instanceof Directory || $reportName !== self::REPORT_NAME) {
+            return;
+        }
+
+        $ns = '{' . $this::NS_OWNCLOUD . '}';
+        $requestedProps = [];
+        $filterRules = [];
+
+        // parse report properties and gather filter info
+        foreach ($report as $reportProps) {
+            $name = $reportProps['name'];
+            if ($name === $ns . 'filter-rules') {
+                $filterRules = $reportProps['value'];
+            } else if ($name === '{DAV:}prop') {
+                // propfind properties
+                foreach ($reportProps['value'] as $propVal) {
+                    $requestedProps[] = $propVal['name'];
+                }
+            }
+        }
+
+        if (empty($filterRules)) {
+            // an empty filter would return all existing files which would be slow
+            throw new BadRequest('Missing filter-rule block in request');
+        }
+
+        // gather all file ids matching filter
+        try {
+            $resultFileIds = $this->processFilterRules($filterRules);
+        } catch (TagNotFoundException $e) {
+            throw new PreconditionFailed('Cannot filter by non-existing tag', 0, $e);
+        }
+
+        // find sabre nodes by file id, restricted to the root node path
+        $results = $this->findNodesByFileIds($reportTargetNode, $resultFileIds);
+
+        $filesUri = $this->getFilesBaseUri($uri, $reportTargetNode->getPath());
+        $responses = $this->prepareResponses($filesUri, $requestedProps, $results);
+
+        $xml = $this->server->xml->write(
+            '{DAV:}multistatus',
+            new MultiStatus($responses)
+        );
+
+        $this->server->httpResponse->setStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+        $this->server->httpResponse->setBody($xml);
+
+        return false;
+    }
+
+    /**
+     * Returns the base uri of the files root by removing
+     * the subpath from the URI
+     *
+     * @param string $uri URI from this request
+     * @param string $subPath subpath to remove from the URI
+     *
+     * @return string files base uri
+     */
+    private function getFilesBaseUri($uri, $subPath) {
+        $uri = trim($uri, '/');
+        $subPath = trim($subPath, '/');
+        if (empty($subPath)) {
+            $filesUri = $uri;
+        } else {
+            $filesUri = substr($uri, 0, strlen($uri) - strlen($subPath));
+        }
+        $filesUri = trim($filesUri, '/');
+        if (empty($filesUri)) {
+            return '';
+        }
+        return '/' . $filesUri;
+    }
+
+    /**
+     * Find file ids matching the given filter rules
+     *
+     * @param array $filterRules
+     * @return array array of unique file id results
+     *
+     * @throws TagNotFoundException whenever a tag was not found
+     */
+    protected function processFilterRules($filterRules) {
+        $ns = '{' . $this::NS_OWNCLOUD . '}';
+        $resultFileIds = null;
+        $systemTagIds = [];
+        $favoriteFilter = null;
+        foreach ($filterRules as $filterRule) {
+            if ($filterRule['name'] === $ns . 'systemtag') {
+                $systemTagIds[] = $filterRule['value'];
+            }
+            if ($filterRule['name'] === $ns . 'favorite') {
+                $favoriteFilter = true;
+            }
+        }
+
+        if ($favoriteFilter !== null) {
+            $resultFileIds = $this->fileTagger->load('files')->getFavorites();
+            if (empty($resultFileIds)) {
+                return [];
+            }
+        }
+
+        if (!empty($systemTagIds)) {
+            $fileIds = $this->getSystemTagFileIds($systemTagIds);
+            if (empty($resultFileIds)) {
+                $resultFileIds = $fileIds;
+            } else {
+                $resultFileIds = array_intersect($fileIds, $resultFileIds);
+            }
+        }
+
+        return $resultFileIds;
+    }
+
+    private function getSystemTagFileIds($systemTagIds) {
+        $resultFileIds = null;
+
+        // check user permissions, if applicable
+        if (!$this->isAdmin()) {
+            // check visibility/permission
+            $tags = $this->tagManager->getTagsByIds($systemTagIds);
+            $unknownTagIds = [];
+            foreach ($tags as $tag) {
+                if (!$tag->isUserVisible()) {
+                    $unknownTagIds[] = $tag->getId();
+                }
+            }
+
+            if (!empty($unknownTagIds)) {
+                throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
+            }
+        }
+
+        // fetch all file ids and intersect them
+        foreach ($systemTagIds as $systemTagId) {
+            $fileIds = $this->tagMapper->getObjectIdsForTags($systemTagId, 'files');
+
+            if (empty($fileIds)) {
+                // This tag has no files, nothing can ever show up
+                return [];
+            }
+
+            // first run ?
+            if ($resultFileIds === null) {
+                $resultFileIds = $fileIds;
+            } else {
+                $resultFileIds = array_intersect($resultFileIds, $fileIds);
+            }
+
+            if (empty($resultFileIds)) {
+                // Empty intersection, nothing can show up anymore
+                return [];
+            }
+        }
+        return $resultFileIds;
+    }
+
+    /**
+     * Prepare propfind response for the given nodes
+     *
+     * @param string $filesUri $filesUri URI leading to root of the files URI,
+     * with a leading slash but no trailing slash
+     * @param string[] $requestedProps requested properties
+     * @param Node[] nodes nodes for which to fetch and prepare responses
+     * @return Response[]
+     */
+    public function prepareResponses($filesUri, $requestedProps, $nodes) {
+        $responses = [];
+        foreach ($nodes as $node) {
+            $propFind = new PropFind($filesUri . $node->getPath(), $requestedProps);
+
+            $this->server->getPropertiesByNode($propFind, $node);
+            // copied from Sabre Server's getPropertiesForPath
+            $result = $propFind->getResultForMultiStatus();
+            $result['href'] = $propFind->getPath();
+
+            $resourceType = $this->server->getResourceTypeForNode($node);
+            if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
+                $result['href'] .= '/';
+            }
+
+            $responses[] = new Response(
+                rtrim($this->server->getBaseUri(), '/') . $filesUri . $node->getPath(),
+                $result,
+                200
+            );
+        }
+        return $responses;
+    }
+
+    /**
+     * Find Sabre nodes by file ids
+     *
+     * @param Node $rootNode root node for search
+     * @param array $fileIds file ids
+     * @return Node[] array of Sabre nodes
+     */
+    public function findNodesByFileIds($rootNode, $fileIds) {
+        $folder = $this->userFolder;
+        if (trim($rootNode->getPath(), '/') !== '') {
+            $folder = $folder->get($rootNode->getPath());
+        }
+
+        $results = [];
+        foreach ($fileIds as $fileId) {
+            $entry = $folder->getById($fileId);
+            if ($entry) {
+                $entry = current($entry);
+                if ($entry instanceof \OCP\Files\File) {
+                    $results[] = new File($this->fileView, $entry);
+                } else if ($entry instanceof \OCP\Files\Folder) {
+                    $results[] = new Directory($this->fileView, $entry);
+                }
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Returns whether the currently logged in user is an administrator
+     */
+    private function isAdmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+        return false;
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -172,14 +172,14 @@ 
 			return;
 		}
 
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
+		$ns = '{'.$this::NS_OWNCLOUD.'}';
 		$requestedProps = [];
 		$filterRules = [];
 
 		// parse report properties and gather filter info
 		foreach ($report as $reportProps) {
 			$name = $reportProps['name'];
-			if ($name === $ns . 'filter-rules') {
+			if ($name === $ns.'filter-rules') {
 				$filterRules = $reportProps['value'];
 			} else if ($name === '{DAV:}prop') {
 				// propfind properties
@@ -240,7 +240,7 @@ 
 		if (empty($filesUri)) {
 			return '';
 		}
-		return '/' . $filesUri;
+		return '/'.$filesUri;
 	}
 
 	/**
@@ -252,15 +252,15 @@ 
 	 * @throws TagNotFoundException whenever a tag was not found
 	 */
 	protected function processFilterRules($filterRules) {
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
+		$ns = '{'.$this::NS_OWNCLOUD.'}';
 		$resultFileIds = null;
 		$systemTagIds = [];
 		$favoriteFilter = null;
 		foreach ($filterRules as $filterRule) {
-			if ($filterRule['name'] === $ns . 'systemtag') {
+			if ($filterRule['name'] === $ns.'systemtag') {
 				$systemTagIds[] = $filterRule['value'];
 			}
-			if ($filterRule['name'] === $ns . 'favorite') {
+			if ($filterRule['name'] === $ns.'favorite') {
 				$favoriteFilter = true;
 			}
 		}
@@ -299,7 +299,7 @@ 
 			}
 
 			if (!empty($unknownTagIds)) {
-				throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
+				throw new TagNotFoundException('Tag with ids '.implode(', ', $unknownTagIds).' not found');
 			}
 		}
 
@@ -339,7 +339,7 @@ 
 	public function prepareResponses($filesUri, $requestedProps, $nodes) {
 		$responses = [];
 		foreach ($nodes as $node) {
-			$propFind = new PropFind($filesUri . $node->getPath(), $requestedProps);
+			$propFind = new PropFind($filesUri.$node->getPath(), $requestedProps);
 
 			$this->server->getPropertiesByNode($propFind, $node);
 			// copied from Sabre Server's getPropertiesForPath
@@ -352,7 +352,7 @@ 
 			}
 
 			$responses[] = new Response(
-				rtrim($this->server->getBaseUri(), '/') . $filesUri . $node->getPath(),
+				rtrim($this->server->getBaseUri(), '/').$filesUri.$node->getPath(),
 				$result,
 				200
 			);

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

Indentation +43 added lines, -43 removed lines

@@ -33,50 +33,50 @@
  */
 class CopyEtagHeaderPlugin extends \Sabre\DAV\ServerPlugin {
 
-	/** @var \Sabre\DAV\Server */
-	private $server;
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
+    /** @var \Sabre\DAV\Server */
+    private $server;
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
 
-		$server->on('afterMethod', [$this, 'afterMethod']);
-		$server->on('afterMove', [$this, 'afterMove']);
-	}
+        $server->on('afterMethod', [$this, 'afterMethod']);
+        $server->on('afterMove', [$this, 'afterMove']);
+    }
 
-	/**
-	 * After method, copy the "Etag" header to "OC-Etag" header.
-	 *
-	 * @param RequestInterface $request request
-	 * @param ResponseInterface $response response
-	 */
-	public function afterMethod(RequestInterface $request, ResponseInterface $response) {
-		$eTag = $response->getHeader('Etag');
-		if (!empty($eTag)) {
-			$response->setHeader('OC-ETag', $eTag);
-		}
-	}
+    /**
+     * After method, copy the "Etag" header to "OC-Etag" header.
+     *
+     * @param RequestInterface $request request
+     * @param ResponseInterface $response response
+     */
+    public function afterMethod(RequestInterface $request, ResponseInterface $response) {
+        $eTag = $response->getHeader('Etag');
+        if (!empty($eTag)) {
+            $response->setHeader('OC-ETag', $eTag);
+        }
+    }
 
-	/**
-	 * Called after a node is moved.
-	 *
-	 * This allows the backend to move all the associated properties.
-	 *
-	 * @param string $source
-	 * @param string $destination
-	 * @return void
-	 */
-	function afterMove($source, $destination) {
-		$node = $this->server->tree->getNodeForPath($destination);
-		if ($node instanceof File) {
-			$eTag = $node->getETag();
-			$this->server->httpResponse->setHeader('OC-ETag', $eTag);
-			$this->server->httpResponse->setHeader('ETag', $eTag);
-		}
-	}
+    /**
+     * Called after a node is moved.
+     *
+     * This allows the backend to move all the associated properties.
+     *
+     * @param string $source
+     * @param string $destination
+     * @return void
+     */
+    function afterMove($source, $destination) {
+        $node = $this->server->tree->getNodeForPath($destination);
+        if ($node instanceof File) {
+            $eTag = $node->getETag();
+            $this->server->httpResponse->setHeader('OC-ETag', $eTag);
+            $this->server->httpResponse->setHeader('ETag', $eTag);
+        }
+    }
 }

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

Indentation +33 added lines, -33 removed lines

@@ -32,41 +32,41 @@
  * checksum name.
  */
 class ChecksumList implements XmlSerializable {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/** @var string[] of TYPE:CHECKSUM */
-	private $checksums;
+    /** @var string[] of TYPE:CHECKSUM */
+    private $checksums;
 
-	/**
-	 * @param string $checksum
-	 */
-	public function __construct($checksum) {
-		$this->checksums = explode(',', $checksum);
-	}
+    /**
+     * @param string $checksum
+     */
+    public function __construct($checksum) {
+        $this->checksums = explode(',', $checksum);
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	function xmlSerialize(Writer $writer) {
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    function xmlSerialize(Writer $writer) {
 
-		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
-		}
-	}
+        foreach ($this->checksums as $checksum) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 	function xmlSerialize(Writer $writer) {
 
 		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}checksum', $checksum);
 		}
 	}
 }

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

Indentation +48 added lines, -48 removed lines

@@ -34,58 +34,58 @@
  */
 class AppEnabledPlugin extends ServerPlugin {
 
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * @var string
-	 */
-	private $app;
+    /**
+     * @var string
+     */
+    private $app;
 
-	/**
-	 * @var \OCP\App\IAppManager
-	 */
-	private $appManager;
+    /**
+     * @var \OCP\App\IAppManager
+     */
+    private $appManager;
 
-	/**
-	 * @param string $app
-	 * @param \OCP\App\IAppManager $appManager
-	 */
-	public function __construct($app, IAppManager $appManager) {
-		$this->app = $app;
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param string $app
+     * @param \OCP\App\IAppManager $appManager
+     */
+    public function __construct($app, IAppManager $appManager) {
+        $this->app = $app;
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
 
-		$this->server = $server;
-		$this->server->on('beforeMethod', array($this, 'checkAppEnabled'), 30);
-	}
+        $this->server = $server;
+        $this->server->on('beforeMethod', array($this, 'checkAppEnabled'), 30);
+    }
 
-	/**
-	 * This method is called before any HTTP after auth and checks if the user has access to the app
-	 *
-	 * @throws \Sabre\DAV\Exception\Forbidden
-	 * @return bool
-	 */
-	public function checkAppEnabled() {
-		if (!$this->appManager->isEnabledForUser($this->app)) {
-			throw new Forbidden();
-		}
-	}
+    /**
+     * This method is called before any HTTP after auth and checks if the user has access to the app
+     *
+     * @throws \Sabre\DAV\Exception\Forbidden
+     * @return bool
+     */
+    public function checkAppEnabled() {
+        if (!$this->appManager->isEnabledForUser($this->app)) {
+            throw new Forbidden();
+        }
+    }
 }

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

Indentation +38 added lines, -38 removed lines

@@ -35,47 +35,47 @@
  * @package OCA\DAV\Connector\Sabre
  */
 class BlockLegacyClientPlugin extends ServerPlugin {
-	/** @var \Sabre\DAV\Server */
-	protected $server;
-	/** @var IConfig */
-	protected $config;
+    /** @var \Sabre\DAV\Server */
+    protected $server;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('beforeMethod', [$this, 'beforeHandler'], 200);
-	}
+    /**
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('beforeMethod', [$this, 'beforeHandler'], 200);
+    }
 
-	/**
-	 * Detects all unsupported clients and throws a \Sabre\DAV\Exception\Forbidden
-	 * exception which will result in a 403 to them.
-	 * @param RequestInterface $request
-	 * @throws \Sabre\DAV\Exception\Forbidden If the client version is not supported
-	 */
-	public function beforeHandler(RequestInterface $request) {
-		$userAgent = $request->getHeader('User-Agent');
-		if($userAgent === null) {
-			return;
-		}
+    /**
+     * Detects all unsupported clients and throws a \Sabre\DAV\Exception\Forbidden
+     * exception which will result in a 403 to them.
+     * @param RequestInterface $request
+     * @throws \Sabre\DAV\Exception\Forbidden If the client version is not supported
+     */
+    public function beforeHandler(RequestInterface $request) {
+        $userAgent = $request->getHeader('User-Agent');
+        if($userAgent === null) {
+            return;
+        }
 
-		$minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.0.0');
+        $minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.0.0');
 
-		// Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
-		// "mirall/%1" for older releases
-		preg_match("/(?:mirall\\/)([\d.]+)/i", $userAgent, $versionMatches);
-		if(isset($versionMatches[1]) &&
-			version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1) {
-			throw new \Sabre\DAV\Exception\Forbidden('Unsupported client version.');
-		}
-	}
+        // Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
+        // "mirall/%1" for older releases
+        preg_match("/(?:mirall\\/)([\d.]+)/i", $userAgent, $versionMatches);
+        if(isset($versionMatches[1]) &&
+            version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1) {
+            throw new \Sabre\DAV\Exception\Forbidden('Unsupported client version.');
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 	 */
 	public function beforeHandler(RequestInterface $request) {
 		$userAgent = $request->getHeader('User-Agent');
-		if($userAgent === null) {
+		if ($userAgent === null) {
 			return;
 		}
 
@@ -73,7 +73,7 @@ 
 		// Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
 		// "mirall/%1" for older releases
 		preg_match("/(?:mirall\\/)([\d.]+)/i", $userAgent, $versionMatches);
-		if(isset($versionMatches[1]) &&
+		if (isset($versionMatches[1]) &&
 			version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1) {
 			throw new \Sabre\DAV\Exception\Forbidden('Unsupported client version.');
 		}

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

Spacing +4 added lines, -4 removed lines

@@ -99,13 +99,13 @@ 
 	 * @return mixed|string
 	 */
 	public function getCommentsLink(Node $node) {
-		$href =  $this->server->getBaseUri();
+		$href = $this->server->getBaseUri();
 		$entryPoint = strpos($href, '/remote.php/');
-		if($entryPoint === false) {
+		if ($entryPoint === false) {
 			// in case we end up somewhere else, unexpectedly.
 			return null;
 		}
-		$commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
+		$commentsPart = 'dav/comments/files/'.rawurldecode($node->getId());
 		$href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
 		return $href;
 	}
@@ -119,7 +119,7 @@ 
 	 */
 	public function getUnreadCount(Node $node) {
 		$user = $this->userSession->getUser();
-		if(is_null($user)) {
+		if (is_null($user)) {
 			return null;
 		}
 

Indentation +127 added lines, -127 removed lines

@@ -29,132 +29,132 @@
 
 class CommentPropertiesPlugin extends ServerPlugin {
 
-	const PROPERTY_NAME_HREF   = '{http://owncloud.org/ns}comments-href';
-	const PROPERTY_NAME_COUNT  = '{http://owncloud.org/ns}comments-count';
-	const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}comments-unread';
-
-	/** @var  \Sabre\DAV\Server */
-	protected $server;
-
-	/** @var ICommentsManager */
-	private $commentsManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	private $cachedUnreadCount = [];
-
-	private $cachedFolders = [];
-
-	public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
-		$this->commentsManager = $commentsManager;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('propFind', array($this, 'handleGetProperties'));
-	}
-
-	/**
-	 * Adds tags and favorites properties to the response,
-	 * if requested.
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 * @return void
-	 */
-	public function handleGetProperties(
-		PropFind $propFind,
-		\Sabre\DAV\INode $node
-	) {
-		if (!($node instanceof File) && !($node instanceof Directory)) {
-			return;
-		}
-
-		// need prefetch ?
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Directory
-			&& $propFind->getDepth() !== 0
-			&& !is_null($propFind->getStatus(self::PROPERTY_NAME_UNREAD))
-		) {
-			$unreadCounts = $this->commentsManager->getNumberOfUnreadCommentsForFolder($node->getId(), $this->userSession->getUser());
-			$this->cachedFolders[] = $node->getPath();
-			foreach ($unreadCounts as $id => $count) {
-				$this->cachedUnreadCount[$id] = $count;
-			}
-		}
-
-		$propFind->handle(self::PROPERTY_NAME_COUNT, function() use ($node) {
-			return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()));
-		});
-
-		$propFind->handle(self::PROPERTY_NAME_HREF, function() use ($node) {
-			return $this->getCommentsLink($node);
-		});
-
-		$propFind->handle(self::PROPERTY_NAME_UNREAD, function() use ($node) {
-			if (isset($this->cachedUnreadCount[$node->getId()])) {
-				return $this->cachedUnreadCount[$node->getId()];
-			} else {
-				list($parentPath,) = \Sabre\Uri\split($node->getPath());
-				if ($parentPath === '') {
-					$parentPath = '/';
-				}
-				// if we already cached the folder this file is in we know there are no shares for this file
-				if (array_search($parentPath, $this->cachedFolders) === false) {
-					return $this->getUnreadCount($node);
-				} else {
-					return 0;
-				}
-			}
-		});
-	}
-
-	/**
-	 * returns a reference to the comments node
-	 *
-	 * @param Node $node
-	 * @return mixed|string
-	 */
-	public function getCommentsLink(Node $node) {
-		$href =  $this->server->getBaseUri();
-		$entryPoint = strpos($href, '/remote.php/');
-		if($entryPoint === false) {
-			// in case we end up somewhere else, unexpectedly.
-			return null;
-		}
-		$commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
-		$href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
-		return $href;
-	}
-
-	/**
-	 * returns the number of unread comments for the currently logged in user
-	 * on the given file or directory node
-	 *
-	 * @param Node $node
-	 * @return Int|null
-	 */
-	public function getUnreadCount(Node $node) {
-		$user = $this->userSession->getUser();
-		if(is_null($user)) {
-			return null;
-		}
-
-		$lastRead = $this->commentsManager->getReadMark('files', strval($node->getId()), $user);
-
-		return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()), $lastRead);
-	}
+    const PROPERTY_NAME_HREF   = '{http://owncloud.org/ns}comments-href';
+    const PROPERTY_NAME_COUNT  = '{http://owncloud.org/ns}comments-count';
+    const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}comments-unread';
+
+    /** @var  \Sabre\DAV\Server */
+    protected $server;
+
+    /** @var ICommentsManager */
+    private $commentsManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    private $cachedUnreadCount = [];
+
+    private $cachedFolders = [];
+
+    public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
+        $this->commentsManager = $commentsManager;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('propFind', array($this, 'handleGetProperties'));
+    }
+
+    /**
+     * Adds tags and favorites properties to the response,
+     * if requested.
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     * @return void
+     */
+    public function handleGetProperties(
+        PropFind $propFind,
+        \Sabre\DAV\INode $node
+    ) {
+        if (!($node instanceof File) && !($node instanceof Directory)) {
+            return;
+        }
+
+        // need prefetch ?
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Directory
+            && $propFind->getDepth() !== 0
+            && !is_null($propFind->getStatus(self::PROPERTY_NAME_UNREAD))
+        ) {
+            $unreadCounts = $this->commentsManager->getNumberOfUnreadCommentsForFolder($node->getId(), $this->userSession->getUser());
+            $this->cachedFolders[] = $node->getPath();
+            foreach ($unreadCounts as $id => $count) {
+                $this->cachedUnreadCount[$id] = $count;
+            }
+        }
+
+        $propFind->handle(self::PROPERTY_NAME_COUNT, function() use ($node) {
+            return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()));
+        });
+
+        $propFind->handle(self::PROPERTY_NAME_HREF, function() use ($node) {
+            return $this->getCommentsLink($node);
+        });
+
+        $propFind->handle(self::PROPERTY_NAME_UNREAD, function() use ($node) {
+            if (isset($this->cachedUnreadCount[$node->getId()])) {
+                return $this->cachedUnreadCount[$node->getId()];
+            } else {
+                list($parentPath,) = \Sabre\Uri\split($node->getPath());
+                if ($parentPath === '') {
+                    $parentPath = '/';
+                }
+                // if we already cached the folder this file is in we know there are no shares for this file
+                if (array_search($parentPath, $this->cachedFolders) === false) {
+                    return $this->getUnreadCount($node);
+                } else {
+                    return 0;
+                }
+            }
+        });
+    }
+
+    /**
+     * returns a reference to the comments node
+     *
+     * @param Node $node
+     * @return mixed|string
+     */
+    public function getCommentsLink(Node $node) {
+        $href =  $this->server->getBaseUri();
+        $entryPoint = strpos($href, '/remote.php/');
+        if($entryPoint === false) {
+            // in case we end up somewhere else, unexpectedly.
+            return null;
+        }
+        $commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
+        $href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
+        return $href;
+    }
+
+    /**
+     * returns the number of unread comments for the currently logged in user
+     * on the given file or directory node
+     *
+     * @param Node $node
+     * @return Int|null
+     */
+    public function getUnreadCount(Node $node) {
+        $user = $this->userSession->getUser();
+        if(is_null($user)) {
+            return null;
+        }
+
+        $lastRead = $this->commentsManager->getReadMark('files', strval($node->getId()), $user);
+
+        return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()), $lastRead);
+    }
 
 }

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

Indentation +46 added lines, -46 removed lines

@@ -34,53 +34,53 @@
 use Sabre\HTTP\RequestInterface;
 
 class LockPlugin extends ServerPlugin {
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('beforeMethod', [$this, 'getLock'], 50);
-		$this->server->on('afterMethod', [$this, 'releaseLock'], 50);
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('beforeMethod', [$this, 'getLock'], 50);
+        $this->server->on('afterMethod', [$this, 'releaseLock'], 50);
+    }
 
-	public function getLock(RequestInterface $request) {
-		// we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
-		// so instead we limit ourselves to the PUT method manually
-		if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			return;
-		}
-		try {
-			$node = $this->server->tree->getNodeForPath($request->getPath());
-		} catch (NotFound $e) {
-			return;
-		}
-		if ($node instanceof Node) {
-			try {
-				$node->acquireLock(ILockingProvider::LOCK_SHARED);
-			} catch (LockedException $e) {
-				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-			}
-		}
-	}
+    public function getLock(RequestInterface $request) {
+        // we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
+        // so instead we limit ourselves to the PUT method manually
+        if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            return;
+        }
+        try {
+            $node = $this->server->tree->getNodeForPath($request->getPath());
+        } catch (NotFound $e) {
+            return;
+        }
+        if ($node instanceof Node) {
+            try {
+                $node->acquireLock(ILockingProvider::LOCK_SHARED);
+            } catch (LockedException $e) {
+                throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+            }
+        }
+    }
 
-	public function releaseLock(RequestInterface $request) {
-		if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			return;
-		}
-		try {
-			$node = $this->server->tree->getNodeForPath($request->getPath());
-		} catch (NotFound $e) {
-			return;
-		}
-		if ($node instanceof Node) {
-			$node->releaseLock(ILockingProvider::LOCK_SHARED);
-		}
-	}
+    public function releaseLock(RequestInterface $request) {
+        if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            return;
+        }
+        try {
+            $node = $this->server->tree->getNodeForPath($request->getPath());
+        } catch (NotFound $e) {
+            return;
+        }
+        if ($node instanceof Node) {
+            $node->releaseLock(ILockingProvider::LOCK_SHARED);
+        }
+    }
 }