RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 00:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

OSDCap: parse spaces explicitly

Browse Source 
This is necessary to avoid matching things like "allow r poolfoo".
It's also needed to distinguish "allow r class-read" from
"allow r class -read".

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Josh Durgin 2012-10-01 10:26:06 -07:00
parent b57b86a215
commit 12bba4a5b2
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/osd/OSDCap.cc
View File

@ -124,7 +124,7 @@ namespace ascii = boost::spirit::ascii;
namespace phoenix = boost::phoenix;
template <typename Iterator>
struct OSDCapParser : qi::grammar<Iterator, OSDCap(), ascii::space_type>
struct OSDCapParser : qi::grammar<Iterator, OSDCap()>
{
OSDCapParser() : OSDCapParser::base_type(osdcap)
{
@ -146,24 +146,25 @@ struct OSDCapParser : qi::grammar<Iterator, OSDCap(), ascii::space_type>
str %= quoted_string | unquoted_word;
// match := [pool[=]<poolname> | auid <123>] [object_prefix <prefix>]
pool_name %= -(lit("pool") >> -lit("=") >> str);
object_prefix %= -(lit("object_prefix") >> str);
match = ( (lit("auid") >> int_ >> object_prefix) [_val = phoenix::construct<OSDCapMatch>(_1, _2)] |
(pool_name >> object_prefix) [_val = phoenix::construct<OSDCapMatch>(_1, _2)]);
pool_name %= -(lit(" pool") >> (lit('=') | lit(' ')) >> str);
object_prefix %= -(lit(" object_prefix ") >> str);
match = ( (lit(" auid ") >> int_ >> object_prefix)[_val = phoenix::construct<OSDCapMatch>(_1, _2)] |
(pool_name >> object_prefix) [_val = phoenix::construct<OSDCapMatch>(_1, _2)]);
// rwxa := * | [r][w][x]
rwxa =
lit('*')[_val = OSD_CAP_ANY] |
lit(" *")[_val = OSD_CAP_ANY] |
( eps[_val = 0] >>
( lit('r')[_val |= OSD_CAP_R] ||
lit('w')[_val |= OSD_CAP_W] ||
lit('x')[_val |= OSD_CAP_X] ));
(
lit(' ') >>
( lit('r')[_val |= OSD_CAP_R] ||
lit('w')[_val |= OSD_CAP_W] ||
lit('x')[_val |= OSD_CAP_X] )));
// capspec := * | rwx | class <name> [classcap]
capspec =
rwxa [_val = phoenix::construct<OSDCapSpec>(_1)] |
( lit("class") >> ((str >> str) [_val = phoenix::construct<OSDCapSpec>(_1, _2)] |
( lit(" class ") >> ((str >> lit(' ') >> str) [_val = phoenix::construct<OSDCapSpec>(_1, _2)] |
str [_val = phoenix::construct<OSDCapSpec>(_1, string())] ));
// grant := allow match capspec
@ -171,20 +172,20 @@ struct OSDCapParser : qi::grammar<Iterator, OSDCap(), ascii::space_type>
(match >> capspec) [_val = phoenix::construct<OSDCapGrant>(_1, _2)]);
// osdcap := grant [grant ...]
grants %= (grant % (lit(';') | lit(',')));
grants %= (grant % (*lit(' ') >> (lit(';') | lit(',')) >> *lit(' ')));
osdcap = grants [_val = phoenix::construct<OSDCap>(_1)];
}
qi::rule<Iterator, unsigned(), ascii::space_type> rwxa;
qi::rule<Iterator, string(), ascii::space_type> quoted_string;
qi::rule<Iterator, unsigned()> rwxa;
qi::rule<Iterator, string()> quoted_string;
qi::rule<Iterator, string()> unquoted_word;
qi::rule<Iterator, string(), ascii::space_type> str;
qi::rule<Iterator, OSDCapSpec(), ascii::space_type> capspec;
qi::rule<Iterator, string(), ascii::space_type> pool_name;
qi::rule<Iterator, string(), ascii::space_type> object_prefix;
qi::rule<Iterator, OSDCapMatch(), ascii::space_type> match;
qi::rule<Iterator, OSDCapGrant(), ascii::space_type> grant;
qi::rule<Iterator, std::vector<OSDCapGrant>(), ascii::space_type> grants;
qi::rule<Iterator, OSDCap(), ascii::space_type> osdcap;
qi::rule<Iterator, string()> str;
qi::rule<Iterator, OSDCapSpec()> capspec;
qi::rule<Iterator, string()> pool_name;
qi::rule<Iterator, string()> object_prefix;
qi::rule<Iterator, OSDCapMatch()> match;
qi::rule<Iterator, OSDCapGrant()> grant;
qi::rule<Iterator, std::vector<OSDCapGrant>()> grants;
qi::rule<Iterator, OSDCap()> osdcap;
};
bool OSDCap::parse(const string& str, ostream *err)

13
src/test/osd/osdcap.cc
View File

@ -25,7 +25,7 @@ const char *parse_good[] = {
"allow rwx",
"allow r pool foo ",
"allow r pool=foo",
" allow wx pool taco",
"allow wx pool taco",
"allow pool foo r",
"allow pool taco wx",
"allow wx pool taco object_prefix obj",
@ -44,10 +44,6 @@ const char *parse_good[] = {
"allow pool foo rwx ; allow pool bar r",
"allow pool foo rwx ;allow pool bar r",
"allow pool foo rwx; allow pool bar r",
" allow rwx pool foo; allow r pool bar ",
" allow rwx pool foo; allow r pool bar ",
" allow pool foo rwx; allow pool bar r ",
" allow pool foo rwx; allow pool bar r ",
"allow pool data rw, allow pool rbd rwx, allow pool images class rbd foo",
"allow class foo",
"allow class clsname \"clsthingidon'tunderstand\"",
@ -64,6 +60,13 @@ TEST(OSDCap, ParseGood) {
}
const char *parse_bad[] = {
" allow rwx pool foo; allow r pool bar ",
" allow rwx pool foo; allow r pool bar ",
" allow pool foo rwx; allow pool bar r ",
" allow pool foo rwx; allow pool bar r ",
" allow wx pool taco",
"allow r poolfoo",
"allow r w",
"ALLOW r",
"allow rwx,",
"allow rwx x",