From a115b36be963c07ed7bf694c74a6ab0c86b48e34 Mon Sep 17 00:00:00 2001 From: Bartek Wajda Date: Tue, 14 Nov 2023 15:53:00 +0100 Subject: [PATCH 1/3] IBX-6880: Skipped normalizing directories in the `normalizePath` method --- eZ/Publish/Core/IO/FilePathNormalizer/Flysystem.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eZ/Publish/Core/IO/FilePathNormalizer/Flysystem.php b/eZ/Publish/Core/IO/FilePathNormalizer/Flysystem.php index fc96e6dbb1..dff3ed6062 100644 --- a/eZ/Publish/Core/IO/FilePathNormalizer/Flysystem.php +++ b/eZ/Publish/Core/IO/FilePathNormalizer/Flysystem.php @@ -35,8 +35,9 @@ public function normalizePath(string $filePath, bool $doHash = true): string ? (preg_match(self::HASH_PATTERN, $fileName) ? '' : bin2hex(random_bytes(6)) . '-') : ''; - $filePath = $directory . \DIRECTORY_SEPARATOR . $hash . $fileName; + $filePath = $directory . \DIRECTORY_SEPARATOR . $hash; + $normalizedFileName = Util::normalizePath($fileName); - return Util::normalizePath($filePath); + return $filePath . $normalizedFileName; } } From d241db91c31c991dc1f167668f249369b0014d04 Mon Sep 17 00:00:00 2001 From: Bartek Wajda Date: Tue, 14 Nov 2023 15:53:48 +0100 Subject: [PATCH 2/3] IBX-6880: Rollback --- eZ/Publish/Core/IO/FilePathNormalizer/Flysystem.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eZ/Publish/Core/IO/FilePathNormalizer/Flysystem.php b/eZ/Publish/Core/IO/FilePathNormalizer/Flysystem.php index dff3ed6062..fc96e6dbb1 100644 --- a/eZ/Publish/Core/IO/FilePathNormalizer/Flysystem.php +++ b/eZ/Publish/Core/IO/FilePathNormalizer/Flysystem.php @@ -35,9 +35,8 @@ public function normalizePath(string $filePath, bool $doHash = true): string ? (preg_match(self::HASH_PATTERN, $fileName) ? '' : bin2hex(random_bytes(6)) . '-') : ''; - $filePath = $directory . \DIRECTORY_SEPARATOR . $hash; - $normalizedFileName = Util::normalizePath($fileName); + $filePath = $directory . \DIRECTORY_SEPARATOR . $hash . $fileName; - return $filePath . $normalizedFileName; + return Util::normalizePath($filePath); } } From 369a277592620f318285762026c61bdcd02d9405 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Thu, 23 Nov 2023 14:46:33 +0100 Subject: [PATCH 3/3] Bumped Ibexa Fast Track version to v4.5.5 --- src/contracts/Ibexa.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/contracts/Ibexa.php b/src/contracts/Ibexa.php index 2591865be6..55c6ae2a84 100644 --- a/src/contracts/Ibexa.php +++ b/src/contracts/Ibexa.php @@ -13,5 +13,5 @@ final class Ibexa /** * Ibexa DXP Version. */ - public const VERSION = '4.5.4'; + public const VERSION = '4.5.5'; }