Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 18 additions & 8 deletions apps/workflowengine/lib/Check/FileSize.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

class FileSize implements ICheck {

/** @var int */
protected $size;

/** @var int|float|null */
protected int|float|null $size;

Check notice

Code scanning / Psalm

PropertyNotSetInConstructor Note

Property OCA\WorkflowEngine\Check\FileSize::$size is not defined in constructor of OCA\WorkflowEngine\Check\FileSize or in any methods called in the constructor
/** @var IL10N */
protected $l;

Expand Down Expand Up @@ -72,25 +72,35 @@
}

/**
* @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;

Check notice

Code scanning / Psalm

PossiblyFalsePropertyAssignmentValue Note

$this->size with non-falsable declared type 'float|int|null' cannot be assigned possibly false type 'false'
}

$this->size = $size;
return $this->size;
}

Expand Down
14 changes: 0 additions & 14 deletions build/psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1212,20 +1212,6 @@
<code><![CDATA[null]]></code>
</NullArgument>
</file>
<file src="apps/workflowengine/lib/Check/FileSize.php">
<FalsableReturnStatement>
<code><![CDATA[$this->size]]></code>
</FalsableReturnStatement>
<InvalidPropertyAssignmentValue>
<code><![CDATA[$size]]></code>
</InvalidPropertyAssignmentValue>
<InvalidReturnStatement>
<code><![CDATA[$this->size]]></code>
</InvalidReturnStatement>
<InvalidReturnType>
<code><![CDATA[string]]></code>
</InvalidReturnType>
</file>
<file src="apps/workflowengine/lib/Check/RequestRemoteAddress.php">
<InvalidArgument>
<code><![CDATA[$decodedValue[1]]]></code>
Expand Down
Loading