Skip to content

[stable29] Improve share token handling in AttachmentService #7937

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

Draft
wants to merge 1 commit into
base: stable29
Choose a base branch
from
+36 −19
Draft

[stable29] Improve share token handling in AttachmentService #7937

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 36 additions & 19 deletions lib/Service/AttachmentService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
namespace OCA\Text\Service;

use OC\User\NoUserException;
use OCA\DAV\Connector\Sabre\PublicAuth;
use OCA\Files_Sharing\SharedStorage;
use OCA\Text\Controller\AttachmentController;
use OCA\Text\Db\Session;
Expand All @@ -40,6 +41,7 @@
use OCP\Files\NotPermittedException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\IPreview;
use OCP\ISession;
use OCP\IURLGenerator;
use OCP\Lock\LockedException;
use OCP\Share\Exceptions\ShareNotFound;
Expand Down Expand Up @@ -310,9 +312,33 @@ public function uploadAttachment(int $documentId, string $newFileName, $newFileR
* @throws NoUserException
*/
public function uploadAttachmentPublic(?int $documentId, string $newFileName, $newFileResource, string $shareToken): array {
if (!$this->hasUpdatePermissions($shareToken)) {
try {
$share = $this->shareManager->getShareByToken($shareToken);
} catch (ShareNotFound) {
throw new NotFoundException('Share not found');
}

if (!$this->hasUpdatePermissions($share)) {
throw new NotPermittedException('No write permissions');
}

if ($share->getPassword() !== null) {
$key = PublicAuth::DAV_AUTHENTICATED;

if (!$this->session->exists($key)) {
throw new NotPermittedException('Share not authenticated');
}

$allowedShareIds = $this->session->get($key);
if (!is_array($allowedShareIds)) {
throw new NotPermittedException('Share not authenticated');
}

if (!in_array($share->getId(), $allowedShareIds, true)) {
throw new NotPermittedException('Share not authenticated');
}
}

$textFile = $this->getTextFilePublic($documentId, $shareToken);
$saveDir = $this->getAttachmentDirectoryForFile($textFile, true);
$fileName = self::getUniqueFileName($saveDir, $newFileName);
Expand Down Expand Up @@ -398,25 +424,16 @@ public static function getUniqueFileName(Folder $dir, string $fileName): string

/**
* Check if the shared access has write permissions
*
* @param string $shareToken
*
* @return bool
*/
private function hasUpdatePermissions(string $shareToken): bool {
try {
$share = $this->shareManager->getShareByToken($shareToken);
return (
in_array(
$share->getShareType(),
[IShare::TYPE_LINK, IShare::TYPE_EMAIL, IShare::TYPE_ROOM],
true
)
&& $share->getPermissions() & Constants::PERMISSION_UPDATE
&& $share->getNode()->getPermissions() & Constants::PERMISSION_UPDATE);
} catch (ShareNotFound|NotFoundException $e) {
return false;
}
private function hasUpdatePermissions(IShare $share): bool {
return (
in_array(
$share->getShareType(),
[IShare::TYPE_LINK, IShare::TYPE_EMAIL, IShare::TYPE_ROOM],
true
)
&& $share->getPermissions() & Constants::PERMISSION_UPDATE
&& $share->getNode()->getPermissions() & Constants::PERMISSION_UPDATE);
}

/**
Expand Down