1 files changed, 102 insertions, 0 deletions
diff --git a/src/zenserver/storage/objectstore/objectstore.cpp b/src/zenserver/storage/objectstore/objectstore.cpp
index e347e2dfe..493326a32 100644
--- a/src/zenserver/storage/objectstore/objectstore.cpp
+++ b/src/zenserver/storage/objectstore/objectstore.cpp
@@ -280,6 +280,16 @@ HttpObjectStoreService::Inititalize()
 						[](std::string_view Str) -> bool { return !Str.empty() && AsciiSet::HasOnly(Str, ValidBucketCharactersSet); });
 
 	m_Router.RegisterRoute(
+		"",
+		[this](zen::HttpRouterRequest& Request) { ListBuckets(Request); },
+		HttpVerb::kGet);
+
+	m_Router.RegisterRoute(
+		"bucket",
+		[this](zen::HttpRouterRequest& Request) { ListBuckets(Request); },
+		HttpVerb::kGet);
+
+	m_Router.RegisterRoute(
 		"bucket",
 		[this](zen::HttpRouterRequest& Request) { CreateBucket(Request); },
 		HttpVerb::kPost | HttpVerb::kPut);
@@ -332,6 +342,98 @@ HttpObjectStoreService::GetBucketDirectory(std::string_view BucketName)
 }
 
 void
+HttpObjectStoreService::ListBuckets(zen::HttpRouterRequest& Request)
+{
+	namespace fs = std::filesystem;
+
+	const fs::path BucketsPath = m_Cfg.RootDirectory / "buckets";
+
+	CbObjectWriter Response;
+	Response.BeginArray("buckets");
+	{
+		std::lock_guard _(BucketsMutex);
+
+		// Configured buckets
+		for (const ObjectStoreConfig::BucketConfig& Bucket : m_Cfg.Buckets)
+		{
+			Response.BeginObject();
+			Response << "name" << Bucket.Name;
+
+			const fs::path Dir = Bucket.Directory.empty() ? (m_Cfg.RootDirectory / Bucket.Name) : Bucket.Directory;
+			if (IsDir(Dir))
+			{
+				uint64_t TotalSize = 0;
+				uint64_t FileCount = 0;
+				for (const fs::directory_entry& Entry :
+					 fs::recursive_directory_iterator(Dir, fs::directory_options::skip_permission_denied))
+				{
+					if (Entry.is_regular_file())
+					{
+						TotalSize += Entry.file_size();
+						FileCount++;
+					}
+				}
+				Response << "size" << TotalSize;
+				Response << "object_count" << FileCount;
+			}
+			Response.EndObject();
+		}
+
+		// Dynamic buckets (on-disk directories not in config)
+		if (IsDir(BucketsPath))
+		{
+			for (const fs::directory_entry& Entry : fs::directory_iterator(BucketsPath))
+			{
+				if (!Entry.is_directory())
+				{
+					continue;
+				}
+				const std::string Name = Entry.path().filename().string();
+
+				// Skip if already listed as a configured bucket
+				bool IsConfigured = false;
+				for (const ObjectStoreConfig::BucketConfig& Bucket : m_Cfg.Buckets)
+				{
+					if (Bucket.Name == Name)
+					{
+						IsConfigured = true;
+						break;
+					}
+				}
+				if (IsConfigured)
+				{
+					continue;
+				}
+
+				Response.BeginObject();
+				Response << "name" << Name;
+
+				uint64_t TotalSize = 0;
+				uint64_t FileCount = 0;
+				for (const fs::directory_entry& FileEntry :
+					 fs::recursive_directory_iterator(Entry.path(), fs::directory_options::skip_permission_denied))
+				{
+					if (FileEntry.is_regular_file())
+					{
+						TotalSize += FileEntry.file_size();
+						FileCount++;
+					}
+				}
+				Response << "size" << TotalSize;
+				Response << "object_count" << FileCount;
+
+				Response.EndObject();
+			}
+		}
+	}
+	Response.EndArray();
+
+	Response << "total_bytes_served" << TotalBytesServed.load();
+
+	return Request.ServerRequest().WriteResponse(HttpResponseCode::OK, Response.Save());
+}
+
+void
 HttpObjectStoreService::CreateBucket(zen::HttpRouterRequest& Request)
 {
 	namespace fs = std::filesystem;