1 files changed, 3 insertions, 49 deletions

diff --git a/src/zenstore/cache/cacherpc.cpp b/src/zenstore/cache/cacherpc.cpp
index 5acb2b8c9..e6ba6629d 100644
--- a/src/zenstore/cache/cacherpc.cpp
+++ b/src/zenstore/cache/cacherpc.cpp
@@ -14,55 +14,9 @@
 #include <zenstore/cache/structuredcachestore.h>
 #include <zenstore/cache/upstreamcacheclient.h>
 #include <zenstore/cidstore.h>
+#include <zenutil/cache/cacherequests.h>
 #include <zenutil/packageformat.h>
 
-namespace zen { namespace {
-
-	constinit AsciiSet ValidNamespaceNameCharactersSet{"abcdefghijklmnopqrstuvwxyz0123456789-_.ABCDEFGHIJKLMNOPQRSTUVWXYZ"};
-	constinit AsciiSet ValidBucketNameCharactersSet{"abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"};
-
-	std::optional<std::string> GetValidNamespaceName(std::string_view Name)
-	{
-		if (Name.empty())
-		{
-			ZEN_WARN("Namespace is invalid, empty namespace is not allowed");
-			return {};
-		}
-
-		if (Name.length() > 64)
-		{
-			ZEN_WARN("Namespace '{}' is invalid, length exceeds 64 characters", Name);
-			return {};
-		}
-
-		if (!AsciiSet::HasOnly(Name, ValidNamespaceNameCharactersSet))
-		{
-			ZEN_WARN("Namespace '{}' is invalid, invalid characters detected", Name);
-			return {};
-		}
-
-		return ToLower(Name);
-	}
-
-	std::optional<std::string> GetValidBucketName(std::string_view Name)
-	{
-		if (Name.empty())
-		{
-			ZEN_WARN("Bucket name is invalid, empty bucket name is not allowed");
-			return {};
-		}
-
-		if (!AsciiSet::HasOnly(Name, ValidBucketNameCharactersSet))
-		{
-			ZEN_WARN("Bucket name '{}' is invalid, invalid characters detected", Name);
-			return {};
-		}
-
-		return ToLower(Name);
-	}
-
-}}	// namespace zen::
-
 //////////////////////////////////////////////////////////////////////////
 
 namespace zen {
@@ -86,7 +40,7 @@ GetRpcRequestNamespace(const CbObjectView Params)
 	{
 		return {};
 	}
-	return GetValidNamespaceName(NamespaceField.AsString());
+	return cacherequests::GetValidNamespaceName(NamespaceField.AsString());
 }
 
 bool
@@ -101,7 +55,7 @@ GetRpcRequestCacheKey(const CbObjectView& KeyView, CacheKey& Key)
 	{
 		return false;
 	}
-	std::optional<std::string> Bucket = GetValidBucketName(BucketField.AsString());
+	std::optional<std::string> Bucket = cacherequests::GetValidBucketName(BucketField.AsString());
 	if (!Bucket.has_value())
 	{
 		return false;