1 files changed, 48 insertions, 15 deletions

diff --git a/src/zenserver/storage/projectstore/httpprojectstore.cpp b/src/zenserver/storage/projectstore/httpprojectstore.cpp
index 03b8aa382..afd0d8f82 100644
--- a/src/zenserver/storage/projectstore/httpprojectstore.cpp
+++ b/src/zenserver/storage/projectstore/httpprojectstore.cpp
@@ -656,7 +656,8 @@ HttpProjectService::HttpProjectService(CidStore&					Store,
 									   JobQueue&					InJobQueue,
 									   bool							InRestrictContentTypes,
 									   const std::filesystem::path& InOidcTokenExePath,
-									   bool							InAllowExternalOidcTokenExe)
+									   bool							InAllowExternalOidcTokenExe,
+									   const ILocalRefPolicy*		InLocalRefPolicy)
 : m_Log(logging::Get("project"))
 , m_CidStore(Store)
 , m_ProjectStore(Projects)
@@ -668,6 +669,7 @@ HttpProjectService::HttpProjectService(CidStore&					Store,
 , m_RestrictContentTypes(InRestrictContentTypes)
 , m_OidcTokenExePath(InOidcTokenExePath)
 , m_AllowExternalOidcTokenExe(InAllowExternalOidcTokenExe)
+, m_LocalRefPolicy(InLocalRefPolicy)
 {
 	ZEN_MEMSCOPE(GetProjectHttpTag());
 
@@ -820,6 +822,18 @@ HttpProjectService::BaseUri() const
 	return "/prj/";
 }
 
+bool
+HttpProjectService::AcceptsLocalFileReferences() const
+{
+	return true;
+}
+
+const ILocalRefPolicy*
+HttpProjectService::GetLocalRefPolicy() const
+{
+	return m_LocalRefPolicy;
+}
+
 void
 HttpProjectService::HandleRequest(HttpServerRequest& Request)
 {
@@ -836,8 +850,17 @@ HttpProjectService::HandleRequest(HttpServerRequest& Request)
 	}
 }
 
-CbObject
-HttpProjectService::CollectStats()
+void
+HttpProjectService::HandleStatusRequest(HttpServerRequest& Request)
+{
+	ZEN_TRACE_CPU("HttpProjectService::Status");
+	CbObjectWriter Cbo;
+	Cbo << "ok" << true;
+	Request.WriteResponse(HttpResponseCode::OK, Cbo.Save());
+}
+
+void
+HttpProjectService::HandleStatsRequest(HttpServerRequest& HttpReq)
 {
 	ZEN_TRACE_CPU("ProjectService::Stats");
 
@@ -848,6 +871,8 @@ HttpProjectService::CollectStats()
 
 	EmitSnapshot("requests", m_HttpRequests, Cbo);
 
+	Cbo << "project_count" << (uint64_t)m_ProjectStore->ProjectCount();
+
 	Cbo.BeginObject("store");
 	{
 		Cbo.BeginObject("size");
@@ -903,22 +928,25 @@ HttpProjectService::CollectStats()
 	}
 	Cbo.EndObject();
 
-	return Cbo.Save();
+	HttpReq.WriteResponse(HttpResponseCode::OK, Cbo.Save());
 }
 
-void
-HttpProjectService::HandleStatsRequest(HttpServerRequest& HttpReq)
+CbObject
+HttpProjectService::CollectStats()
 {
-	HttpReq.WriteResponse(HttpResponseCode::OK, CollectStats());
+	CbObjectWriter Cbo;
+	// CollectStats does not use the HandleStatsRequest implementation to get stats since it uses some heavy operations such as
+	// m_ProjectStore->StorageSize();
+	EmitSnapshot("requests", m_HttpRequests, Cbo);
+	Cbo << "project_count" << (uint64_t)m_ProjectStore->ProjectCount();
+
+	return Cbo.Save();
 }
 
-void
-HttpProjectService::HandleStatusRequest(HttpServerRequest& Request)
+uint64_t
+HttpProjectService::GetActivityCounter()
 {
-	ZEN_TRACE_CPU("HttpProjectService::Status");
-	CbObjectWriter Cbo;
-	Cbo << "ok" << true;
-	Request.WriteResponse(HttpResponseCode::OK, Cbo.Save());
+	return m_HttpRequests.Count();
 }
 
 void
@@ -1654,7 +1682,8 @@ HttpProjectService::HandleOplogOpNewRequest(HttpRouterRequest& Req)
 
 	CbPackage Package;
 
-	if (!legacy::TryLoadCbPackage(Package, Payload, &UniqueBuffer::Alloc, &Resolver))
+	const bool ValidateHashes = false;
+	if (!legacy::TryLoadCbPackage(Package, Payload, &UniqueBuffer::Alloc, &Resolver, ValidateHashes))
 	{
 		CbValidateError ValidateResult;
 		if (CbObject Core = ValidateAndReadCompactBinaryObject(IoBuffer(Payload), ValidateResult);
@@ -2749,7 +2778,11 @@ HttpProjectService::HandleRpcRequest(HttpRouterRequest& Req)
 		case HttpContentType::kCbPackage:
 			try
 			{
-				Package = ParsePackageMessage(Payload);
+				ParseFlags PkgFlags = (HttpReq.IsLocalMachineRequest() && AcceptsLocalFileReferences()) ? ParseFlags::kAllowLocalReferences
+																										: ParseFlags::kDefault;
+				const ILocalRefPolicy* PkgPolicy =
+					EnumHasAllFlags(PkgFlags, ParseFlags::kAllowLocalReferences) ? GetLocalRefPolicy() : nullptr;
+				Package = ParsePackageMessage(Payload, {}, PkgFlags, PkgPolicy);
 				Cb		= Package.GetObject();
 			}
 			catch (const std::invalid_argument& ex)