diff options
| author | Dan Engelbrecht <[email protected]> | 2026-02-04 13:20:20 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2026-02-04 13:20:20 +0100 |
| commit | 05108dad394952733838daf442ffdd553a62b727 (patch) | |
| tree | 8fd64eb6ba26e93da5b1a165750a9f7ad2fc67de /src/zenserver/storage/objectstore/objectstore.cpp | |
| parent | implemented chunking for TransmitFile path (#736) (diff) | |
| download | zen-05108dad394952733838daf442ffdd553a62b727.tar.xz zen-05108dad394952733838daf442ffdd553a62b727.zip | |
use matcher over regex (#744)
* replace http router AddPattern with AddMatcher
* fix scrub logging
Diffstat (limited to 'src/zenserver/storage/objectstore/objectstore.cpp')
| -rw-r--r-- | src/zenserver/storage/objectstore/objectstore.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/zenserver/storage/objectstore/objectstore.cpp b/src/zenserver/storage/objectstore/objectstore.cpp index d8ad40621..052c3d630 100644 --- a/src/zenserver/storage/objectstore/objectstore.cpp +++ b/src/zenserver/storage/objectstore/objectstore.cpp @@ -271,8 +271,13 @@ HttpObjectStoreService::Inititalize() CreateDirectories(BucketsPath); } - m_Router.AddPattern("path", "([[:alnum:]/_.,;$~\\{\\}\\+\\-\\[\\]\\%\\(\\)]+)"); - m_Router.AddPattern("bucket", "([[:alnum:]\\-_.]+)"); + static constexpr AsciiSet ValidPathCharactersSet{"abcdefghijklmnopqrstuvwxyz0123456789/_.,;$~{}+-[]%()]ABCDEFGHIJKLMNOPQRSTUVWXYZ"}; + static constexpr AsciiSet ValidBucketCharactersSet{"abcdefghijklmnopqrstuvwxyz0123456789-_.ABCDEFGHIJKLMNOPQRSTUVWXYZ"}; + + m_Router.AddMatcher("path", + [](std::string_view Str) -> bool { return !Str.empty() && AsciiSet::HasOnly(Str, ValidPathCharactersSet); }); + m_Router.AddMatcher("bucket", + [](std::string_view Str) -> bool { return !Str.empty() && AsciiSet::HasOnly(Str, ValidBucketCharactersSet); }); m_Router.RegisterRoute( "bucket", |