From 1558b202663d9d18f87b384110891b190ad24ea2 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Tue, 3 Mar 2026 13:17:38 +0100
Subject: fix objectstore uri path parsing (#801)

* add objectstore tests
* in http router, for last matcher, test if it matches the remaining part of the uri
---
 src/zenserver-test/objectstore-tests.cpp | 74 ++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 src/zenserver-test/objectstore-tests.cpp

(limited to 'src/zenserver-test/objectstore-tests.cpp')

diff --git a/src/zenserver-test/objectstore-tests.cpp b/src/zenserver-test/objectstore-tests.cpp
new file mode 100644
index 000000000..f3db5fdf6
--- /dev/null
+++ b/src/zenserver-test/objectstore-tests.cpp
@@ -0,0 +1,74 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#if ZEN_WITH_TESTS
+#	include "zenserver-test.h"
+#	include <zencore/testing.h>
+#	include <zencore/testutils.h>
+#	include <zenutil/zenserverprocess.h>
+#	include <zenhttp/httpclient.h>
+
+ZEN_THIRD_PARTY_INCLUDES_START
+#	include <tsl/robin_set.h>
+ZEN_THIRD_PARTY_INCLUDES_END
+
+namespace zen::tests {
+
+using namespace std::literals;
+
+TEST_SUITE_BEGIN("server.objectstore");
+
+TEST_CASE("objectstore.blobs")
+{
+	std::string_view Bucket = "bkt"sv;
+
+	std::vector<IoHash>	  CompressedBlobsHashes;
+	std::vector<uint64_t> BlobsSizes;
+	std::vector<uint64_t> CompressedBlobsSizes;
+	{
+		ZenServerInstance Instance(TestEnv);
+
+		const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady(fmt::format("--objectstore-enabled"));
+		CHECK(PortNumber != 0);
+
+		HttpClient Client(Instance.GetBaseUri() + "/obj/");
+
+		for (size_t I = 0; I < 5; I++)
+		{
+			IoBuffer Blob = CreateSemiRandomBlob(4711 + I * 7);
+			BlobsSizes.push_back(Blob.GetSize());
+			CompressedBuffer CompressedBlob = CompressedBuffer::Compress(SharedBuffer(std::move(Blob)));
+			CompressedBlobsHashes.push_back(CompressedBlob.DecodeRawHash());
+			CompressedBlobsSizes.push_back(CompressedBlob.GetCompressedSize());
+			IoBuffer Payload = std::move(CompressedBlob).GetCompressed().Flatten().AsIoBuffer();
+			Payload.SetContentType(ZenContentType::kCompressedBinary);
+
+			std::string ObjectPath = fmt::format("{}/{}.utoc",
+												 CompressedBlobsHashes.back().ToHexString().substr(0, 2),
+												 CompressedBlobsHashes.back().ToHexString());
+
+			HttpClient::Response Result = Client.Put(fmt::format("bucket/{}/{}.utoc", Bucket, ObjectPath), Payload);
+			CHECK(Result);
+		}
+
+		for (size_t I = 0; I < 5; I++)
+		{
+			std::string ObjectPath =
+				fmt::format("{}/{}.utoc", CompressedBlobsHashes[I].ToHexString().substr(0, 2), CompressedBlobsHashes[I].ToHexString());
+			HttpClient::Response Result = Client.Get(fmt::format("bucket/{}/{}.utoc", Bucket, ObjectPath));
+			CHECK(Result);
+			CHECK_EQ(Result.ResponsePayload.GetSize(), CompressedBlobsSizes[I]);
+			IoHash			 RawHash;
+			uint64_t		 RawSize;
+			CompressedBuffer Compressed =
+				CompressedBuffer::FromCompressed(SharedBuffer(std::move(Result.ResponsePayload)), RawHash, RawSize);
+			CHECK(Compressed);
+			CHECK_EQ(RawHash, CompressedBlobsHashes[I]);
+			CHECK_EQ(RawSize, BlobsSizes[I]);
+		}
+	}
+}
+
+TEST_SUITE_END();
+
+}  // namespace zen::tests
+#endif
-- 
cgit v1.2.3