Skip to content

fix(TaskProcessing): Normalize file ID before getting node #60218

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
marcelklehr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(TaskProcessing): Normalize file ID before getting node #60218

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
11 changes: 9 additions & 2 deletions lib/private/TaskProcessing/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,9 +1633,16 @@
* @throws ValidationException
*/
private function validateFileId(mixed $id): File {
Copy link
Copy Markdown
Member

@provokateurin provokateurin May 7, 2026

Choose a reason for hiding this comment

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

You should only pass int to this function and fix the string wherever it is coming from 🙈

Copy link
Copy Markdown
Member Author

@marcelklehr marcelklehr May 7, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

Please reconsider how task processing works before jumping to conclusions.

Copy link
Copy Markdown
Member

@julien-nc julien-nc May 7, 2026

Choose a reason for hiding this comment

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

The $id param value originally comes from the task input which can be invalid. We don't know what the API consumer will have set in there. This seems justified to validate this like that.

Or maybe you meant something different.

Copy link
Copy Markdown
Member

@provokateurin provokateurin May 7, 2026

Choose a reason for hiding this comment

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

I was just suggesting that this kind of validation should probably happen much earlier.

Anyway I'm fine with this, it was only a suggestion and therefore I didn't request changes.

$node = $this->rootFolder->getFirstNodeById($id);
if (is_int($fileId)) {

Check failure on line 1636 in lib/private/TaskProcessing/Manager.php

View workflow job for this annotation

GitHub Actions / static-code-analysis

UndefinedVariable 

lib/private/TaskProcessing/Manager.php:1636:14: UndefinedVariable: Cannot find referenced variable $fileId (see https://psalm.dev/024)
$normalizedFileId = $fileId;
} elseif (is_string($fileId) && ctype_digit($fileId)) {
$normalizedFileId = (int)$fileId;
} else {
throw new \InvalidArgumentException('File ID must be an integer: ' . $id);
}
$node = $this->rootFolder->getFirstNodeById($normalizedFileId);
if ($node === null) {
$node = $this->rootFolder->getFirstNodeByIdInPath($id, '/' . $this->rootFolder->getAppDataDirectoryName() . '/');
$node = $this->rootFolder->getFirstNodeByIdInPath($normalizedFileId, '/' . $this->rootFolder->getAppDataDirectoryName() . '/');
if ($node === null) {
throw new ValidationException('Could not find file ' . $id);
} elseif (!$node instanceof File) {
Expand Down
Loading