diff options
Diffstat (limited to 'lib/public/AppFramework/PublicShareController.php')
| -rw-r--r-- | lib/public/AppFramework/PublicShareController.php | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/lib/public/AppFramework/PublicShareController.php b/lib/public/AppFramework/PublicShareController.php index 4548f885133..999b3827565 100644 --- a/lib/public/AppFramework/PublicShareController.php +++ b/lib/public/AppFramework/PublicShareController.php @@ -1,27 +1,10 @@ <?php + +declare(strict_types=1); /** - * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl> - * - * @author Roeland Jago Douma <roeland@famdouma.nl> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * 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 - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * + * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later */ -declare(strict_types=1); - namespace OCP\AppFramework; use OCP\IRequest; @@ -35,14 +18,13 @@ use OCP\ISession; * * Use this for example for a controller that is not to be called via a webbrowser * directly. For example a PublicPreviewController. As this is not meant to be - * called by a user direclty. + * called by a user directly. * * To show an auth page extend the AuthPublicShareController * * @since 14.0.0 */ abstract class PublicShareController extends Controller { - /** @var ISession */ protected $session; @@ -53,8 +35,8 @@ abstract class PublicShareController extends Controller { * @since 14.0.0 */ public function __construct(string $appName, - IRequest $request, - ISession $session) { + IRequest $request, + ISession $session) { parent::__construct($appName, $request); $this->session = $session; @@ -86,7 +68,7 @@ abstract class PublicShareController extends Controller { * * @since 14.0.0 */ - abstract protected function getPasswordHash(): string; + abstract protected function getPasswordHash(): ?string; /** * Is the provided token a valid token @@ -109,15 +91,15 @@ abstract class PublicShareController extends Controller { * * @since 14.0.0 */ - final public function isAuthenticated(): bool { + public function isAuthenticated(): bool { // Always authenticated against non password protected shares if (!$this->isPasswordProtected()) { return true; } // If we are authenticated properly - if ($this->session->get('public_link_authenticated_token') === $this->getToken() && - $this->session->get('public_link_authenticated_password_hash') === $this->getPasswordHash()) { + if ($this->session->get('public_link_authenticated_token') === $this->getToken() + && $this->session->get('public_link_authenticated_password_hash') === $this->getPasswordHash()) { return true; } |