From 4e50d60d64249e3d0b5514937261d1aa2207861d Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Fri, 10 Jun 2022 15:59:08 +0200 Subject: namespace/bucket validation now uses AsciiSet for more efficient validation (#127) --- zenserver/cache/structuredcache.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'zenserver/cache/structuredcache.cpp') diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp index 07866d4f0..45bbe062b 100644 --- a/zenserver/cache/structuredcache.cpp +++ b/zenserver/cache/structuredcache.cpp @@ -77,7 +77,7 @@ struct PutRequestData }; namespace { - static constexpr std::string_view HttpZCacheRPCPrefix = "$rpc"sv; + static constinit std::string_view HttpZCacheRPCPrefix = "$rpc"sv; struct HttpRequestData { @@ -87,8 +87,8 @@ namespace { std::optional ValueContentId; }; - const char* ValidNamespaceNameCharacters = "abcdefghijklmnopqrstuvwxyz0123456789-_.ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - const char* ValidBucketNameCharacters = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + constinit AsciiSet ValidNamespaceNameCharactersSet{"abcdefghijklmnopqrstuvwxyz0123456789-_.ABCDEFGHIJKLMNOPQRSTUVWXYZ"}; + constinit AsciiSet ValidBucketNameCharactersSet{"abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"}; std::optional GetValidNamespaceName(std::string_view Name) { @@ -104,7 +104,7 @@ namespace { return {}; } - if (Name.find_first_not_of(ValidNamespaceNameCharacters) != std::string::npos) + if (!AsciiSet::HasOnly(Name, ValidNamespaceNameCharactersSet)) { ZEN_WARN("Namespace '{}' is invalid, invalid characters detected", Name); return {}; @@ -120,11 +120,13 @@ namespace { ZEN_WARN("Bucket name is invalid, empty bucket name is not allowed"); return {}; } - if (Name.find_first_not_of(ValidBucketNameCharacters) != std::string::npos) + + if (!AsciiSet::HasOnly(Name, ValidBucketNameCharactersSet)) { ZEN_WARN("Bucket name '{}' is invalid, invalid characters detected", Name); return {}; } + return ToLower(Name); } -- cgit v1.2.3