Skip to content

[stable33] fix(sessions): only use share node matching the session document #9522

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

Open
backportbot wants to merge 1 commit into
base: stable33
Choose a base branch
from
Open

[stable33] fix(sessions): only use share node matching the session document #9522

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion lib/Service/DocumentService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ public function getFileForSession(Session $session, ?string $shareToken = null):
if ($node instanceof Folder) {
$node = $node->getFirstNodeById($session->getDocumentId());
}
if ($node instanceof File) {
if ($node instanceof File && $node->getId() === $session->getDocumentId()) {
return $node;
}
throw new \InvalidArgumentException('No proper share data');
Expand Down
29 changes: 29 additions & 0 deletions tests/unit/Service/DocumentServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
namespace OCA\Text\Tests;

use OCA\Text\Db\DocumentMapper;
use OCA\Text\Db\Session;
use OCA\Text\Db\SessionMapper;
use OCA\Text\Db\StepMapper;
use OCA\Text\Service\DocumentService;
use OCP\Constants;
use OCP\Files\Config\IUserMountCache;
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\IAppData;
use OCP\Files\IRootFolder;
Expand All @@ -17,6 +19,7 @@
use OCP\IConfig;
use OCP\IRequest;
use OCP\Share\IManager;
use OCP\Share\IShare;
use Psr\Log\LoggerInterface;

class DocumentServiceTest extends \PHPUnit\Framework\TestCase {
Expand Down Expand Up @@ -104,4 +107,30 @@ public function testGetFileByIdNoRead() {
$this->expectException(NotPermittedException::class);
$actual = $this->documentService->getFileById(1234);
}

public function testGetFileForSessionFromShare() {
$file = $this->createMock(File::class);
$file->method('getId')->willReturn(1234);
$share = $this->createMock(IShare::class);
$share->method('getNode')->willReturn($file);
$this->shareManager->method('getShareByToken')->willReturn($share);

$session = new Session();
$session->setDocumentId(1234);
$actual = $this->documentService->getFileForSession($session, 'shareToken');
self::assertEquals($file, $actual);
}

public function testGetFileForSessionFromShareOfOtherFile() {
$file = $this->createMock(\OCP\Files\File::class);
$file->method('getId')->willReturn(5678);
$share = $this->createMock(IShare::class);
$share->method('getNode')->willReturn($file);
$this->shareManager->method('getShareByToken')->willReturn($share);

$session = new Session();
$session->setDocumentId(1234);
$this->expectException(\InvalidArgumentException::class);
$this->documentService->getFileForSession($session, 'shareToken');
}
}
Loading