sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52767 from nextcloud/backport/52686/stable31 

[stable31] fix(files_external): Safely check if the timestamp is numeric
pull/52864/head
Andy Scherzinger 2025-05-25 19:37:04 +07:00 committed by GitHub
parent 6be6a66af4 0eeb8335a9
commit fd7438aade
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/files_external/lib/Lib/Storage/Swift.php
Unescape Escape View File

@ -285,7 +285,6 @@ class Swift extends Common {
public function stat(string $path): array|false {
$path = $this->normalizePath($path);
if ($path === '.') {
$path = '';
} elseif ($this->is_dir($path)) {
@ -305,22 +304,23 @@ class Swift extends Common {
return false;
}
$dateTime = $object->lastModified ? \DateTime::createFromFormat(\DateTime::RFC1123, $object->lastModified) : false;
$mtime = $dateTime ? $dateTime->getTimestamp() : null;
$objectMetadata = $object->getMetadata();
if (isset($objectMetadata['timestamp'])) {
$mtime = $objectMetadata['timestamp'];
$mtime = null;
if (!empty($object->lastModified)) {
$dateTime = \DateTime::createFromFormat(\DateTime::RFC1123, $object->lastModified);
if ($dateTime !== false) {
$mtime = $dateTime->getTimestamp();
}
}
if (!empty($mtime)) {
$mtime = floor($mtime);
if (is_numeric($object->getMetadata()['timestamp'] ?? null)) {
$mtime = (float)$object->getMetadata()['timestamp'];
}
$stat = [];
$stat['size'] = (int)$object->contentLength;
$stat['mtime'] = $mtime;
$stat['atime'] = time();
return $stat;
return [
'size' => (int)$object->contentLength,
'mtime' => isset($mtime) ? (int)floor($mtime) : null,
'atime' => time(),
];
}
public function filetype(string $path) {