OSDCap: remove grants added during failed parsing

Parsing has side effects that must be undone if it fails.  A
capability string like 'allow rwx pool=bar' will add the grant for
'allow rwx' and then fail on the 'pool=bar'. Thus, the client will
effectively have 'rwx' permissions on all pools.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/src/osd/OSDCap.cc b/src/osd/OSDCap.cc
index 0687a3c0aab057983c6c9c08c7410255906d584f..c1a9e9e3370201a88a216dfae8f8ed3fa719b954 100644 (file)
--- a/src/osd/OSDCap.cc
+++ b/src/osd/OSDCap.cc
@@ -206,6 +206,9 @@ bool OSDCap::parse(const string& str, ostream *err)
   if (r && iter == end)
     return true;
 
+  // Make sure no grants are kept after parsing failed!
+  grants.clear();
+
   if (err)
     *err << "osdcap parse failed, stopped at '" << std::string(iter, end)
         << "' of '" << str << "'\n";