Add password verification for public shares

Author: DeepDiver1975

apps/dav/lib/DAV/PublicAuth.php

@@ -29,13 +29,9 @@ class PublicAuth implements BackendInterface {
 	/** @var string[] */
 	private $publicURLs;
 
-	/**
-	 * @param string[] $publicURLs
-	 */
 	public function __construct() {
 		$this->publicURLs = [
 			'public-calendars',
-			'public-files',
 			'principals/system/public'
 		];
 	}

apps/dav/lib/Files/PublicFiles/PublicSharingAuth.php

@@ -0,0 +1,116 @@
+<?php
+/**
+ * @author Thomas Müller <[email protected]>
+ *
+ * @copyright Copyright (c) 2017, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+namespace OCA\DAV\Files\PublicFiles;
+
+use OCP\Share\IManager;
+use OCP\Share\IShare;
+use Sabre\DAV\Auth\Backend\AbstractBasic;
+use Sabre\DAV\Server;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
+
+class PublicSharingAuth extends AbstractBasic {
+
+	/** @var Server */
+	private $server;
+	/** @var IShare */
+	private $share;
+	/** @var IManager */
+	private $shareManager;
+
+	/**
+	 * PublicSharingAuth constructor.
+	 *
+	 * @param Server $server
+	 */
+	public function __construct(Server $server, IManager $manager) {
+		$this->server = $server;
+		$this->shareManager = $manager;
+		$this->principalPrefix = 'principals/system/';
+		$this->setRealm('owncloud/share');
+	}
+
+	/**
+	 * When this method is called, the backend must check if authentication was
+	 * successful.
+	 *
+	 * The returned value must be one of the following
+	 *
+	 * [true, "principals/username"]
+	 * [false, "reason for failure"]
+	 *
+	 * If authentication was successful, it's expected that the authentication
+	 * backend returns a so-called principal url.
+	 *
+	 * Examples of a principal url:
+	 *
+	 * principals/admin
+	 * principals/user1
+	 * principals/users/joe
+	 * principals/uid/123457
+	 *
+	 * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+	 * return a string such as:
+	 *
+	 * principals/users/[username]
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return array
+	 */
+	function check(RequestInterface $request, ResponseInterface $response) {
+
+		$node = $this->server->tree->getNodeForPath($request->getPath());
+		if (!$node instanceof ShareNode && !$node instanceof SharedFile && !$node instanceof SharedFolder) {
+			return [true, "principals/system/public"];
+		}
+		$this->share = $node->getShare();
+		$password = $this->share->getPassword();
+		if ($password === null) {
+			return [true, "principals/system/public"];
+		}
+
+		return parent::check($request, $response);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	function challenge(RequestInterface $request, ResponseInterface $response) {
+	}
+
+	/**
+	 * 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
+	 */
+	protected function validateUserPass($username, $password) {
+		if ($username !== 'public') {
+			return false;
+		}
+		return $this->shareManager->checkPassword($this->share, $password);
+	}
+}

apps/dav/lib/Files/PublicFiles/RootCollection.php

@@ -65,7 +65,6 @@ function getChild($name) {
 		try {
 			$share = $this->shareManager->getShareByToken($name);
 			$password = $share->getPassword();
-			// TODO: check password
 			return new ShareNode($share);
 		} catch (ShareNotFound $ex) {
 			throw new NotFound();

apps/dav/lib/Files/PublicFiles/ShareNode.php

@@ -52,4 +52,8 @@ function getChildren() {
 	function getName() {
 		return $this->share->getToken();
 	}
+
+	function getShare() {
+		return $this->share;
+	}
 }

apps/dav/lib/Files/PublicFiles/SharedFile.php

@@ -101,4 +101,9 @@ function getACL() {
 			]
 		];
 	}
+
+	function getShare() {
+		return $this->share;
+	}
+
 }

apps/dav/lib/Files/PublicFiles/SharedFolder.php

@@ -125,4 +125,8 @@ function getACL() {
 		return $acl;
 	}
 
+	function getShare() {
+		return $this->share;
+	}
+
 }

apps/dav/lib/Server.php

@@ -50,6 +50,7 @@
 use OCA\DAV\DAV\PublicAuth;
 use OCA\DAV\Files\BrowserErrorPagePlugin;
 use OCA\DAV\Files\PreviewPlugin;
+use OCA\DAV\Files\PublicFiles\PublicSharingAuth;
 use OCA\DAV\SystemTag\SystemTagPlugin;
 use OCA\DAV\Upload\ChunkingPlugin;
 use OCP\IRequest;
@@ -101,6 +102,7 @@ public function __construct(IRequest $request, $baseUri) {
 		$this->server->addPlugin(new BlockLegacyClientPlugin($config));
 		$this->server->addPlugin(new CorsPlugin(\OC::$server->getUserSession()));
 		$authPlugin = new Plugin();
+		$authPlugin->addBackend(new PublicSharingAuth($this->server, \OC::$server->getShareManager()));
 		$authPlugin->addBackend(new PublicAuth());
 		$this->server->addPlugin($authPlugin);