From d6bad0c0ba7d62ea769732bf8170cfe03aab8ab8 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 1 Dec 2021 21:09:11 +0100 Subject: [PATCH] list.php files are only invoked via ViewController and APIController Both of them actually check that the user is logged in before and also the list.php files themselves would break with getUserSession()->getUser()->getUID() which they contain. Signed-off-by: Joas Schilling --- apps/files/list.php | 2 +- apps/files/recentlist.php | 3 +-- apps/files_external/list.php | 3 +-- apps/files_sharing/list.php | 2 -- apps/files_trashbin/list.php | 2 -- apps/systemtags/list.php | 17 ----------------- 6 files changed, 3 insertions(+), 26 deletions(-) diff --git a/apps/files/list.php b/apps/files/list.php index 259713ae68ec9..54bdd814ada24 100644 --- a/apps/files/list.php +++ b/apps/files/list.php @@ -29,7 +29,7 @@ // TODO: move this to the generated config.js /** @var IManager $shareManager */ $shareManager = \OC::$server->get(IManager::class); -$publicUploadEnabled = $shareManager->shareApiLinkAllowPublicUpload() ? 'yes' : 'no';; +$publicUploadEnabled = $shareManager->shareApiLinkAllowPublicUpload() ? 'yes' : 'no'; $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false); $isIE = OC_Util::isIe(); diff --git a/apps/files/recentlist.php b/apps/files/recentlist.php index 899591013e2e5..daa69a374ef2d 100644 --- a/apps/files/recentlist.php +++ b/apps/files/recentlist.php @@ -23,8 +23,7 @@ * along with this program. If not, see . * */ -// Check if we are a user -OC_Util::checkLoggedIn(); + $config = \OC::$server->getConfig(); $userSession = \OC::$server->getUserSession(); diff --git a/apps/files_external/list.php b/apps/files_external/list.php index 0107bf92e6fbf..00f69bf881fd9 100644 --- a/apps/files_external/list.php +++ b/apps/files_external/list.php @@ -23,8 +23,7 @@ * along with this program. If not, see * */ -// Check if we are a user -OC_Util::checkLoggedIn(); + $config = \OC::$server->getConfig(); $userSession = \OC::$server->getUserSession(); diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php index 759f87179a1e5..875d4251c98bd 100644 --- a/apps/files_sharing/list.php +++ b/apps/files_sharing/list.php @@ -28,8 +28,6 @@ use OCA\Viewer\Event\LoadViewer; use OCP\EventDispatcher\GenericEvent; -// Check if we are a user -OC_Util::checkLoggedIn(); $config = \OC::$server->getConfig(); $userSession = \OC::$server->getUserSession(); $legacyEventDispatcher = \OC::$server->getEventDispatcher(); diff --git a/apps/files_trashbin/list.php b/apps/files_trashbin/list.php index 9ee833319fce4..ec348a227f5ad 100644 --- a/apps/files_trashbin/list.php +++ b/apps/files_trashbin/list.php @@ -24,8 +24,6 @@ * along with this program. If not, see * */ -// Check if we are a user -OC_Util::checkLoggedIn(); $config = \OC::$server->getConfig(); $userSession = \OC::$server->getUserSession(); diff --git a/apps/systemtags/list.php b/apps/systemtags/list.php index d7ba2c9eed9ac..b5bbf223f29ac 100644 --- a/apps/systemtags/list.php +++ b/apps/systemtags/list.php @@ -20,23 +20,6 @@ * along with this program. If not, see * */ -// WARNING: this should be moved to proper AppFramework handling -// Check if we are a user -if (!\OC::$server->getUserSession()->isLoggedIn()) { - header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute( - 'core.login.showLoginForm', - [ - 'redirect_url' => \OC::$server->getRequest()->getRequestUri(), - ] - ) - ); - exit(); -} -// Redirect to 2FA challenge selection if 2FA challenge was not solved yet -if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) { - header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge')); - exit(); -} $tmpl = new OCP\Template('systemtags', 'list', ''); $tmpl->printPage();