commit 2015f75bb169b9ee8b185716b4550492fcae7493
author Johnathan Mantey <johnathanx.mantey@intel.com> Tue Mar 26 15:22:31 2019 -0700
committer James Feist <james.feist@linux.intel.com> Fri Mar 29 18:00:21 2019 +0000
tree 373dbc208904419549dc5f4b9111c8b0716b8131
parent dd9c79be08bd236e28121ff9b7a8741ecfbc17fa

Fix DBus illegal character regex to exclude '.' characters

The regex that massaged illegal DBus member names allowed '.'
characters.  The '.' is not permitted in member names.

Change-Id: I42ab41b8bd0cbebf5d3108b73c1ffa17577ce25b
Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com>

src/EntityManager.cpp

diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index cb1272b..b28dc9a 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -99,7 +99,8 @@
 // todo: pass this through nicer
 std::shared_ptr<sdbusplus::asio::connection> SYSTEM_BUS;
 
-const std::regex ILLEGAL_DBUS_REGEX("[^A-Za-z0-9_.]");
+const std::regex ILLEGAL_DBUS_PATH_REGEX("[^A-Za-z0-9_.]");
+const std::regex ILLEGAL_DBUS_MEMBER_REGEX("[^A-Za-z0-9_]");
 
 void registerCallbacks(boost::asio::io_service& io,
                        std::vector<sdbusplus::bus::match::match>& dbusMatches,
@@ -861,7 +862,7 @@
             std::string dbusName = *name;
 
             std::regex_replace(dbusName.begin(), dbusName.begin(),
-                               dbusName.end(), ILLEGAL_DBUS_REGEX, "_");
+                               dbusName.end(), ILLEGAL_DBUS_MEMBER_REGEX, "_");
             auto iface = objServer.add_interface(
                 path + "/" + dbusName,
                 "xyz.openbmc_project.Configuration." + *type);
@@ -899,7 +900,7 @@
         {
             boardType = findBoardType->get<std::string>();
             std::regex_replace(boardType.begin(), boardType.begin(),
-                               boardType.end(), ILLEGAL_DBUS_REGEX, "_");
+                               boardType.end(), ILLEGAL_DBUS_MEMBER_REGEX, "_");
         }
         else
         {
@@ -910,7 +911,7 @@
         std::string boardtypeLower = boost::algorithm::to_lower_copy(boardType);
 
         std::regex_replace(boardKey.begin(), boardKey.begin(), boardKey.end(),
-                           ILLEGAL_DBUS_REGEX, "_");
+                           ILLEGAL_DBUS_MEMBER_REGEX, "_");
         std::string boardName = "/xyz/openbmc_project/inventory/system/" +
                                 boardtypeLower + "/" + boardKey;
 
@@ -977,7 +978,8 @@
             {
                 itemType = findType->get<std::string>();
                 std::regex_replace(itemType.begin(), itemType.begin(),
-                                   itemType.end(), ILLEGAL_DBUS_REGEX, "_");
+                                   itemType.end(), ILLEGAL_DBUS_PATH_REGEX,
+                                   "_");
             }
             else
             {
@@ -985,7 +987,7 @@
             }
             std::string itemName = findName->get<std::string>();
             std::regex_replace(itemName.begin(), itemName.begin(),
-                               itemName.end(), ILLEGAL_DBUS_REGEX, "_");
+                               itemName.end(), ILLEGAL_DBUS_MEMBER_REGEX, "_");
 
             auto itemIface = objServer.add_interface(
                 boardName + "/" + itemName,
@@ -1141,8 +1143,8 @@
 {
     // find configuration files
     std::vector<std::filesystem::path> jsonPaths;
-    if (!findFiles(std::filesystem::path(configurationDirectory),
-                   R"(.*\.json)", jsonPaths))
+    if (!findFiles(std::filesystem::path(configurationDirectory), R"(.*\.json)",
+                   jsonPaths))
     {
         std::cerr << "Unable to find any configuration files in "
                   << configurationDirectory << "\n";