Port publicpreview.php to the share 2.0 API #26611
Conversation
|
@PVince81, thanks for your PR! By analyzing the history of the files in this pull request, we identified @georgehrke, @schiessle and @LukasReschke to be potential reviewers. |
| \OC_Response::setStatus(\OC_Response::STATUS_NOT_FOUND); | ||
| \OCP\Util::writeLog('core-preview', 'Passed token parameter is not valid', \OCP\Util::DEBUG); | ||
| exit; | ||
| } | ||
|
|
||
| if(!isset($linkedItem['uid_owner']) || !isset($linkedItem['file_source'])) { | ||
| if(is_null($linkedItem->getShareOwner()) || is_null($linkedItem->getNode())) { |
There was a problem hiding this comment.
We could check each item separately. Some lines below we ask again for the share owner, which is a bit awkward. There is also a check for the "getNode" function which seems that it might throw an exception, but such exception would be thrown here before.
| \OC_Response::setStatus(\OC_Response::STATUS_NOT_FOUND); | ||
| \OCP\Util::writeLog('core-preview', 'Could not resolve file for shared item', \OCP\Util::WARN); | ||
| exit; |
There was a problem hiding this comment.
Keep going if the file / node isn't found? 😕 It would explode below with the $node->getPath()
There was a problem hiding this comment.
oops, I think I didn't mean to remove this exit
| } | ||
|
|
||
| $pathInfo = $view->getFileInfo($path); | ||
| $sharedFile = null; | ||
| $path = $node->getPath(); |
There was a problem hiding this comment.
Just to confirm, I expect we don't need extra checks here because at this point the node should be valid and should return a valid and sane path.
There was a problem hiding this comment.
Yes. If the node is not valid it would throw an exception above.
ae9c6bf to
d6300d9
Compare
|
@jvillafanez fixed, I removed the extra check for the node. Then I tested the following:
|
|
|
||
| if($path === null) { | ||
| // FS setup and file existence check is already done in getNode() | ||
| $node = null; |
There was a problem hiding this comment.
This could be deleted because the variable is reassigned below or the script would finish otherwise.
d6300d9 to
7d57c77
Compare
|
👍 |
|
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Description
Use share 2.0 API in publicpreview.php.
Related Issue
Ref #22209 and #26608
Motivation and Context
Goal is to move away from the old API for files.
How Has This Been Tested?
Share a folder "test" with link. Put a pic in the folder.
Share a file "test.jpg" with link.
Open both links: previews appear.
Also try copying the preview links and messing with the file name, it should then return 404 for unknown or invalid files or tokens.
Screenshots (if appropriate):
Types of changes
Checklist:
@DeepDiver1975 @jvillafanez
(yes I could also try and make this a controller but I'd prefer to focus on #26608 for now, PRs or additional commits welcome)