Properly redirect if accessing invalid file though /f/ entrypoint

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 9f9cd0b33c15d2887daa01bcf509501d2c049e38..cf1b4374da4dfd6b5092ecd0720d00ff6cf69b8c 100644 (file)
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -31,6 +31,7 @@ namespace OCA\Files\Controller;
 use OCA\Files\Activity\Helper;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
+use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -138,7 +139,11 @@ class ViewController extends Controller {
         */
        public function showFile(string $fileid = null): Response {
                // This is the entry point from the `/f/{fileid}` URL which is hardcoded in the server.
-               return $this->redirectToFile($fileid);
+               try {
+                       return $this->redirectToFile($fileid);
+               } catch (NotFoundException $e) {
+                       return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
+               }
        }
 
        /**