From: Sage Weil <sage@inktank.com>
Date: Fri, 23 Aug 2013 21:56:37 +0000 (-0700)
Subject: mon/MonCap: allow . in unquoted string
X-Git-Tag: v0.69~62
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f573c885cce776a7e8b2f3d4b91a304a8bc15c5;p=ceph.git

mon/MonCap: allow . in unquoted string

Fixes: #5967
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc
index d8bccce9bc2..644d614bdf9 100644
--- a/src/mon/MonCap.cc
+++ b/src/mon/MonCap.cc
@@ -346,7 +346,7 @@ struct MonCapParser : qi::grammar<Iterator, MonCap()>
     quoted_string %=
       lexeme['"' >> +(char_ - '"') >> '"'] | 
       lexeme['\'' >> +(char_ - '\'') >> '\''];
-    unquoted_word %= +char_("a-zA-Z0-9_-");
+    unquoted_word %= +char_("a-zA-Z0-9_.-");
     str %= quoted_string | unquoted_word;
 
     spaces = +lit(' ');
diff --git a/src/test/mon/moncap.cc b/src/test/mon/moncap.cc
index 19f82f55ecf..238442b90d8 100644
--- a/src/test/mon/moncap.cc
+++ b/src/test/mon/moncap.cc
@@ -51,6 +51,7 @@ const char *parse_good[] = {
   "allow service foo-foo r, allow service bar r",
   "allow service \" foo \" w, allow service bar r",
   "allow command abc with arg=foo arg2=bar, allow service foo r",
+  "allow command abc.def with arg=foo arg2=bar, allow service foo r",
   "allow command \"foo bar\" with arg=\"baz\"",
   "allow command \"foo bar\" with arg=\"baz.xx\"",
   0