Skip to content

fix(dav): handle out-of-range datetime values in file search #60364

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

fix(dav): handle out-of-range datetime values in file search #60364

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
30 changes: 25 additions & 5 deletions apps/dav/lib/Files/FileSearchBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,16 +505,36 @@ private function castValue(SearchPropertyDefinition $property, $value) {
case SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER:
return 0 + $value;
case SearchPropertyDefinition::DATATYPE_DATETIME:
if (is_numeric($value)) {
return max(0, 0 + $value);
}
$date = \DateTime::createFromFormat(\DateTimeInterface::ATOM, (string)$value);
return ($date instanceof \DateTime && $date->getTimestamp() !== false) ? $date->getTimestamp() : 0;
return $this->castDateTimeValue($value);
default:
return $value;
}
}

private function castDateTimeValue($value) {
if (is_numeric($value)) {
return max(0, 0 + $value);
}

$date = \DateTime::createFromFormat(\DateTimeInterface::ATOM, (string)$value);
if (!$date instanceof \DateTime) {
return 0;
}

try {
return $date->getTimestamp();
} catch (\Error $e) {
if (!$e instanceof \ValueError && !is_a($e, 'DateRangeError')) {
throw $e;
}

// On 32-bit PHP, getTimestamp() fails for dates outside the
// representable integer range. Clamp broad search bounds instead of
// failing the whole WebDAV SEARCH request.
return (int) $date->format("Y") >= 2038 ? PHP_INT_MAX : 0;
}
}

/**
* Get a specific property from the were clause
*/
Expand Down