nextcloud / server

apps/dav/appinfo/v1/publicwebdav.php

Indentation +47 added lines, -47 removed lines

@@ -39,24 +39,24 @@ 
 
 // Backends
 $authBackend = new OCA\DAV\Connector\PublicAuth(
-	\OC::$server->getRequest(),
-	\OC::$server->getShareManager(),
-	\OC::$server->getSession(),
-	\OC::$server->getBruteForceThrottler()
+    \OC::$server->getRequest(),
+    \OC::$server->getShareManager(),
+    \OC::$server->getSession(),
+    \OC::$server->getBruteForceThrottler()
 );
 $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 
 $serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory(
-	\OC::$server->getConfig(),
-	\OC::$server->getLogger(),
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getMountManager(),
-	\OC::$server->getTagManager(),
-	\OC::$server->getRequest(),
-	\OC::$server->getPreviewManager(),
-	\OC::$server->getEventDispatcher(),
-	\OC::$server->getL10N('dav')
+    \OC::$server->getConfig(),
+    \OC::$server->getLogger(),
+    \OC::$server->getDatabaseConnection(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getMountManager(),
+    \OC::$server->getTagManager(),
+    \OC::$server->getRequest(),
+    \OC::$server->getPreviewManager(),
+    \OC::$server->getEventDispatcher(),
+    \OC::$server->getL10N('dav')
 );
 
 $requestUri = \OC::$server->getRequest()->getRequestUri();
@@ -65,45 +65,45 @@ 
 $filesDropPlugin = new \OCA\DAV\Files\Sharing\FilesDropPlugin();
 
 $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
-	$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
-	/** @var \OCA\FederatedFileSharing\FederatedShareProvider $shareProvider */
-	$federatedShareProvider = \OC::$server->query(\OCA\FederatedFileSharing\FederatedShareProvider::class);
-	if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
-		// this is what is thrown when trying to access a non-existing share
-		throw new \Sabre\DAV\Exception\NotAuthenticated();
-	}
+    $isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
+    /** @var \OCA\FederatedFileSharing\FederatedShareProvider $shareProvider */
+    $federatedShareProvider = \OC::$server->query(\OCA\FederatedFileSharing\FederatedShareProvider::class);
+    if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
+        // this is what is thrown when trying to access a non-existing share
+        throw new \Sabre\DAV\Exception\NotAuthenticated();
+    }
 
-	$share = $authBackend->getShare();
-	$owner = $share->getShareOwner();
-	$isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
-	$fileId = $share->getNodeId();
+    $share = $authBackend->getShare();
+    $owner = $share->getShareOwner();
+    $isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
+    $fileId = $share->getNodeId();
 
-	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
-	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
-		return new \OC\Files\Storage\Wrapper\PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE]);
-	});
-	\OC\Files\Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
-		return new \OCA\DAV\Storage\PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
-	});
-	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+    // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+    $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
+    \OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
+        return new \OC\Files\Storage\Wrapper\PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE]);
+    });
+    \OC\Files\Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
+        return new \OCA\DAV\Storage\PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
+    });
+    \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
 
-	OC_Util::tearDownFS();
-	OC_Util::setupFS($owner);
-	$ownerView = new \OC\Files\View('/'. $owner . '/files');
-	$path = $ownerView->getPath($fileId);
-	$fileInfo = $ownerView->getFileInfo($path);
-	$linkCheckPlugin->setFileInfo($fileInfo);
+    OC_Util::tearDownFS();
+    OC_Util::setupFS($owner);
+    $ownerView = new \OC\Files\View('/'. $owner . '/files');
+    $path = $ownerView->getPath($fileId);
+    $fileInfo = $ownerView->getFileInfo($path);
+    $linkCheckPlugin->setFileInfo($fileInfo);
 
-	// If not readble (files_drop) enable the filesdrop plugin
-	if (!$isReadable) {
-		$filesDropPlugin->enable();
-	}
+    // If not readble (files_drop) enable the filesdrop plugin
+    if (!$isReadable) {
+        $filesDropPlugin->enable();
+    }
 
-	$view = new \OC\Files\View($ownerView->getAbsolutePath($path));
-	$filesDropPlugin->setView($view);
+    $view = new \OC\Files\View($ownerView->getAbsolutePath($path));
+    $filesDropPlugin->setView($view);
 
-	return $view;
+    return $view;
 });
 
 $server->addPlugin($linkCheckPlugin);

apps/dav/lib/Connector/PublicAuth.php

Indentation +101 added lines, -101 removed lines

@@ -43,105 +43,105 @@
  * @package OCA\DAV\Connector
  */
 class PublicAuth extends AbstractBasic {
-	private const BRUTEFORCE_ACTION = 'public_webdav_auth';
-
-	/** @var \OCP\Share\IShare */
-	private $share;
-
-	/** @var IManager */
-	private $shareManager;
-
-	/** @var ISession */
-	private $session;
-
-	/** @var IRequest */
-	private $request;
-
-	/** @var Throttler */
-	private $throttler;
-
-	/**
-	 * @param IRequest $request
-	 * @param IManager $shareManager
-	 * @param ISession $session
-	 * @param Throttler $throttler
-	 */
-	public function __construct(IRequest $request,
-								IManager $shareManager,
-								ISession $session,
-								Throttler $throttler) {
-		$this->request = $request;
-		$this->shareManager = $shareManager;
-		$this->session = $session;
-		$this->throttler = $throttler;
-
-		// 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) {
-		$this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), self::BRUTEFORCE_ACTION);
-
-		try {
-			$share = $this->shareManager->getShareByToken($username);
-		} catch (ShareNotFound $e) {
-			$this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
-			return false;
-		}
-
-		$this->share = $share;
-
-		\OC_User::setIncognitoMode(true);
-
-		// check if the share is password protected
-		if ($share->getPassword() !== null) {
-			if ($share->getShareType() === IShare::TYPE_LINK
-				|| $share->getShareType() === IShare::TYPE_EMAIL
-				|| $share->getShareType() === IShare::TYPE_CIRCLE) {
-				if ($this->shareManager->checkPassword($share, $password)) {
-					return true;
-				} elseif ($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');
-					}
-
-					$this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
-					return false;
-				}
-			} elseif ($share->getShareType() === IShare::TYPE_REMOTE) {
-				return true;
-			} else {
-				$this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
-				return false;
-			}
-		} else {
-			return true;
-		}
-	}
-
-	/**
-	 * @return \OCP\Share\IShare
-	 */
-	public function getShare() {
-		return $this->share;
-	}
+    private const BRUTEFORCE_ACTION = 'public_webdav_auth';
+
+    /** @var \OCP\Share\IShare */
+    private $share;
+
+    /** @var IManager */
+    private $shareManager;
+
+    /** @var ISession */
+    private $session;
+
+    /** @var IRequest */
+    private $request;
+
+    /** @var Throttler */
+    private $throttler;
+
+    /**
+     * @param IRequest $request
+     * @param IManager $shareManager
+     * @param ISession $session
+     * @param Throttler $throttler
+     */
+    public function __construct(IRequest $request,
+                                IManager $shareManager,
+                                ISession $session,
+                                Throttler $throttler) {
+        $this->request = $request;
+        $this->shareManager = $shareManager;
+        $this->session = $session;
+        $this->throttler = $throttler;
+
+        // 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) {
+        $this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), self::BRUTEFORCE_ACTION);
+
+        try {
+            $share = $this->shareManager->getShareByToken($username);
+        } catch (ShareNotFound $e) {
+            $this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
+            return false;
+        }
+
+        $this->share = $share;
+
+        \OC_User::setIncognitoMode(true);
+
+        // check if the share is password protected
+        if ($share->getPassword() !== null) {
+            if ($share->getShareType() === IShare::TYPE_LINK
+                || $share->getShareType() === IShare::TYPE_EMAIL
+                || $share->getShareType() === IShare::TYPE_CIRCLE) {
+                if ($this->shareManager->checkPassword($share, $password)) {
+                    return true;
+                } elseif ($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');
+                    }
+
+                    $this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
+                    return false;
+                }
+            } elseif ($share->getShareType() === IShare::TYPE_REMOTE) {
+                return true;
+            } else {
+                $this->throttler->registerAttempt(self::BRUTEFORCE_ACTION, $this->request->getRemoteAddress());
+                return false;
+            }
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * @return \OCP\Share\IShare
+     */
+    public function getShare() {
+        return $this->share;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -114,13 +114,13 @@
 				if ($this->shareManager->checkPassword($share, $password)) {
 					return true;
 				} elseif ($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');
 					}