From a4d2edb9d30b60665d884ab707af4784cd1fff79 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 24 Sep 2025 11:18:07 -0400 Subject: [PATCH 1/3] fix(workflowenigne): stricter length headler handling Fixes #55276 and tidies things up a bit more for future maintenance. Signed-off-by: Josh --- apps/workflowengine/lib/Check/FileSize.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/apps/workflowengine/lib/Check/FileSize.php b/apps/workflowengine/lib/Check/FileSize.php index 9fcac0c98562b..7a14500456a9a 100644 --- a/apps/workflowengine/lib/Check/FileSize.php +++ b/apps/workflowengine/lib/Check/FileSize.php @@ -72,25 +72,35 @@ public function validateCheck($operator, $value) { } /** - * @return string + * Gets the file size from HTTP headers. + * + * Checks 'OC-Total-Length' first; if unavailable and the method is POST or PUT, + * checks 'Content-Length'. Returns the size as int, float, or false if not found or invalid. + * + * @return int|float|false File size in bytes, or false if unavailable. */ protected function getFileSizeFromHeader() { if ($this->size !== null) { + // Already have it cached? return $this->size; } $size = $this->request->getHeader('OC-Total-Length'); if ($size === '') { - if (in_array($this->request->getMethod(), ['POST', 'PUT'])) { + // Try fallback for upload methods + $method = $this->request->getMethod(); + if (in_array($method, ['POST', 'PUT'], true)) { $size = $this->request->getHeader('Content-Length'); } } - if ($size === '') { - $size = false; + if ($size !== '' && is_numeric($size)) { + $this->size = Util::numericToNumber($size); + } else { + // No valid size header found + $this->size = false; } - $this->size = $size; return $this->size; } From 38e67a04917e7fab3c302c6ea89dbccc77fc493c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 7 Oct 2025 13:50:59 +0200 Subject: [PATCH 2/3] fix(psalm): Update baseline Signed-off-by: Joas Schilling --- build/psalm-baseline.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 8ce1af0776e41..6991f790d7e28 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -1212,20 +1212,6 @@ - - - size]]> - - - - - - size]]> - - - - - From 9b677e66a504002d7cbd9719c528a9d146e162c2 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 7 Oct 2025 10:52:49 -0400 Subject: [PATCH 3/3] chore: Change size property type to int|float|null Signed-off-by: Josh --- apps/workflowengine/lib/Check/FileSize.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/workflowengine/lib/Check/FileSize.php b/apps/workflowengine/lib/Check/FileSize.php index 7a14500456a9a..aa2bb9279906d 100644 --- a/apps/workflowengine/lib/Check/FileSize.php +++ b/apps/workflowengine/lib/Check/FileSize.php @@ -14,9 +14,9 @@ class FileSize implements ICheck { - /** @var int */ - protected $size; - + /** @var int|float|null */ + protected int|float|null $size; + /** @var IL10N */ protected $l;