Skip to content

[stable33] fix(attachments): do not double close content stream #8736

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

Merged
grnd-alt merged 1 commit into from
Nov 11, 2026
Merged

[stable33] fix(attachments): do not double close content stream #8736

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
19 changes: 17 additions & 2 deletions lib/Service/FilesAppService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use OCA\Deck\StatusException;
use OCP\AppFramework\Http\StreamResponse;
use OCP\Constants;
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\IFilenameValidator;
use OCP\Files\IMimeTypeDetector;
Expand Down Expand Up @@ -261,7 +262,22 @@ private function getUploadedFile() {

public function update(Attachment $attachment) {
$share = $this->getShareForAttachment($attachment);
$target = $share->getNode();

// Multiple mounts can expose the same file with different permissions.
$nodes = $this->rootFolder->getUserFolder($this->userId)->getById($share->getNodeId());
if ($nodes === []) {
throw new NotFoundException('File not found');
}
$target = null;
foreach ($nodes as $node) {
if ($node instanceof File && ($node->getPermissions() & Constants::PERMISSION_UPDATE) !== 0) {
$target = $node;
break;
}
}
if ($target === null) {
throw new NoPermissionException('The file is not writable for this user');
}
$file = $this->getUploadedFile();
$fileName = $file['name'];
$attachment->setData($fileName);
Expand All @@ -271,7 +287,6 @@ public function update(Attachment $attachment) {
throw new StatusException('Could not read file');
}
$target->putContent($content);
fclose($content);

$attachment->setLastModified(time());
return $attachment;
Expand Down
76 changes: 75 additions & 1 deletion tests/unit/Service/FilesAppServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

use OCA\Deck\BadRequestException;
use OCA\Deck\Db\Attachment;
use OCA\Deck\NoPermissionException;
use OCP\Files\IFilenameValidator;
use OCP\IL10N;
use OCP\IRequest;
Expand All @@ -25,6 +26,7 @@ class FilesAppServiceTest extends TestCase {
private \OCP\Files\IRootFolder&MockObject $rootFolder;
private ConfigService&MockObject $configService;
private \OCP\Share\IManager&MockObject $shareManager;
private \OCA\Deck\Sharing\DeckShareProvider&MockObject $shareProvider;
private FilesAppService $filesAppService;

public function setUp(): void {
Expand All @@ -39,14 +41,15 @@ public function setUp(): void {
$this->rootFolder = $this->createMock(\OCP\Files\IRootFolder::class);
$this->configService = $this->createMock(ConfigService::class);
$this->shareManager = $this->createMock(\OCP\Share\IManager::class);
$this->shareProvider = $this->createMock(\OCA\Deck\Sharing\DeckShareProvider::class);

$this->filesAppService = new FilesAppService(
$this->request,
$this->l10n,
$this->rootFolder,
$this->shareManager,
$this->configService,
$this->createMock(\OCA\Deck\Sharing\DeckShareProvider::class),
$this->shareProvider,
$this->createMock(\OCP\IPreview::class),
$this->createMock(\OCP\Files\IMimeTypeDetector::class),
$this->createMock(PermissionService::class),
Expand Down Expand Up @@ -167,4 +170,75 @@ public function testCreateWithValidFilename() {
// Other exceptions are expected since not everything is mocked.
}
}

private function mockShare(int $permissions): \OCP\Share\IShare&MockObject {
$share = $this->createMock(\OCP\Share\IShare::class);
$share->method('getSharedWith')->willReturn('123');
$share->method('getNodeId')->willReturn(279);
$share->method('getPermissions')->willReturn($permissions);
$this->shareProvider->method('getShareById')->with('6')->willReturn($share);
return $share;
}

private function createUpdateAttachment(): Attachment {
$attachment = new Attachment();
$attachment->setId(6);
$attachment->setCardId(123);
return $attachment;
}

public function testUpdateUsesCurrentUsersNode() {
$share = $this->mockShare(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE);
$share->expects($this->never())->method('getNode');

$readOnlyFile = $this->createMock(\OCP\Files\File::class);
$readOnlyFile->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_READ);
$file = $this->createMock(\OCP\Files\File::class);
$file->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE);
$userFolder = $this->createMock(\OCP\Files\Folder::class);
$userFolder->expects($this->once())
->method('getById')
->with(279)
->willReturn([$readOnlyFile, $file]);
$this->rootFolder->expects($this->once())
->method('getUserFolder')
->with('admin')
->willReturn($userFolder);

$this->request->method('getUploadedFile')
->with('file')
->willReturn([
'name' => 'normal.md',
'tmp_name' => __FILE__,
'error' => UPLOAD_ERR_OK,
]);
$readOnlyFile->expects($this->never())->method('putContent');
$file->expects($this->once())->method('putContent');

$attachment = $this->filesAppService->update($this->createUpdateAttachment());
$this->assertEquals('normal.md', $attachment->getData());
}

public function testUpdateRejectsWhenNoNodeIsWritable() {
$this->mockShare(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE);
$readOnlyFile = $this->createMock(\OCP\Files\File::class);
$readOnlyFile->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_READ);
$userFolder = $this->createMock(\OCP\Files\Folder::class);
$userFolder->method('getById')->willReturn([$readOnlyFile]);
$this->rootFolder->method('getUserFolder')->willReturn($userFolder);

$this->request->expects($this->never())->method('getUploadedFile');
$this->expectException(NoPermissionException::class);
$this->filesAppService->update($this->createUpdateAttachment());
}

public function testUpdateNodeNotAccessibleForUser() {
$this->mockShare(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE);
$userFolder = $this->createMock(\OCP\Files\Folder::class);
$userFolder->method('getById')->willReturn([]);
$this->rootFolder->method('getUserFolder')->willReturn($userFolder);

$this->expectException(\OCP\Files\NotFoundException::class);
$this->filesAppService->update($this->createUpdateAttachment());
}
}
Loading