crush: add is_valid_crush_name() helper

[A-Za-z0-9-_.]+

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 8a9addfb6c2801c06df1a022784e5af0875ef080..1a4097c08b96ddfd4398b0e6d8b038dfa9e30f40 100644 (file)
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -1109,3 +1109,20 @@ void CrushWrapper::generate_test_instances(list<CrushWrapper*>& o)
   o.push_back(new CrushWrapper);
   // fixme
 }
+
+
+bool CrushWrapper::is_valid_crush_name(const string& s)
+{
+  if (s.empty())
+    return false;
+  for (string::const_iterator p = s.begin(); p != s.end(); ++p) {
+    if (!(*p == '-') &&
+       !(*p == '_') &&
+       !(*p == '.') &&
+       !(*p >= '0' && *p <= '9') &&
+       !(*p >= 'A' && *p <= 'Z') &&
+       !(*p >= 'a' && *p <= 'z'))
+      return false;
+  }
+  return true;
+}

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index f5a88c8bdd55571cf31564d82ef15a805d411970..f399e342110de81ef62f50aae74d28f0d64923e3 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -790,6 +790,9 @@ public:
   void dump_rules(Formatter *f) const;
   void list_rules(Formatter *f) const;
   static void generate_test_instances(list<CrushWrapper*>& o);
+
+
+  static bool is_valid_crush_name(const string& s);
 };
 WRITE_CLASS_ENCODER(CrushWrapper)