github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-01-22 07:59:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1239 from trapexit/validation

Browse Source 
Add proper input validation for readdir policy
This commit is contained in:
trapexit 2023-09-02 15:48:43 -05:00 committed by GitHub
commit 211e6c7115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fuse_readdir.cpp
View File

@ -81,6 +81,9 @@ FUSE::ReadDir::from_string(std::string const &str_)
{
std::lock_guard<std::mutex> lg(_mutex);
if(!FUSE::ReadDirFactory::valid(str_))
return -EINVAL;
_type = str_;
}

33
src/fuse_readdir_factory.cpp
View File

@ -26,13 +26,14 @@
#include <cmath>
#include <cstdio>
#include <cstdlib>
#include <set>
namespace l
{
static
void
read_cfg(std::string const cfgstr_,
read_cfg(std::string const str_,
std::string &type_,
int &concurrency_)
{
@ -40,7 +41,7 @@ namespace l
int concurrency;
concurrency = 0;
std::sscanf(cfgstr_.c_str(),"%15[a-z]:%u",type,&concurrency);
std::sscanf(str_.c_str(),"%15[a-z]:%d",type,&concurrency);
if(concurrency == 0)
concurrency = std::thread::hardware_concurrency();
@ -55,14 +56,36 @@ namespace l
}
}
bool
FUSE::ReadDirFactory::valid(std::string const str_)
{
int concurrency;
std::string type;
static const std::set<std::string> types =
{
"seq", "cosr", "cor"
};
l::read_cfg(str_,type,concurrency);
if(types.find(type) == types.end())
return false;
if(concurrency <= 0)
return false;
return true;
}
std::shared_ptr<FUSE::ReadDirBase>
FUSE::ReadDirFactory::make(std::string const cfgstr_)
FUSE::ReadDirFactory::make(std::string const str_)
{
int concurrency;
std::string type;
l::read_cfg(cfgstr_,type,concurrency);
assert(concurrency);
if(!valid(str_))
return {};
l::read_cfg(str_,type,concurrency);
if(type == "seq")
return std::make_shared<FUSE::ReadDirSeq>();

3
src/fuse_readdir_factory.hpp
View File

@ -29,6 +29,7 @@ namespace FUSE
class ReadDirFactory
{
public:
static std::shared_ptr<ReadDirBase> make(std::string const cfgstr);
static bool valid(std::string str);
static std::shared_ptr<ReadDirBase> make(std::string const str);
};
}