Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add correct method for hardcoded /f/{fileid} #14686

Merged
merged 2 commits into from
Mar 14, 2019
Merged

Add correct method for hardcoded /f/{fileid} #14686

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e5c5a1
Add correct method for hardcoded `/f/{fileid}`
nickvergessen Mar 14, 2019
37b1a9c
Import needed class
MorrisJobke Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions apps/files/lib/Controller/ViewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\App\IAppManager;
use OCP\Files\Folder;
Expand Down Expand Up @@ -128,6 +129,18 @@ protected function getStorageInfo() {
return \OC_Helper::getStorageInfo('/', $dirInfo);
}

/**
* @NoCSRFRequired
* @NoAdminRequired
*
* @param string $fileid
* @return TemplateResponse|RedirectResponse
*/
public function showFile(string $fileid = null): Response {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bildschirmfoto 2019-03-14 um 16 27 07

🙈 Let me fix that.

// This is the entry point from the `/f/{fileid}` URL which is hardcoded in the server.
return $this->redirectToFile($fileid);
}

/**
* @NoCSRFRequired
* @NoAdminRequired
Expand All @@ -140,7 +153,7 @@ protected function getStorageInfo() {
public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
if ($fileid !== null) {
try {
return $this->showFile($fileid);
return $this->redirectToFile($fileid);
} catch (NotFoundException $e) {
return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
}
Expand Down Expand Up @@ -285,7 +298,7 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal
* @return RedirectResponse redirect response or not found response
* @throws \OCP\Files\NotFoundException
*/
private function showFile($fileId) {
private function redirectToFile($fileId) {
$uid = $this->userSession->getUser()->getUID();
$baseFolder = $this->rootFolder->getUserFolder($uid);
$files = $baseFolder->getById($fileId);
Expand Down