Merge pull request #228 from CppMicroServices/227-ldapfilter-match

Fix LDAPFilter::Match bug

framework/include/cppmicroservices/LDAPFilter.h

@@ -120,16 +120,18 @@ class US_Framework_EXPORT LDAPFilter {
   bool Match(const ServiceReferenceBase& reference) const;
 
  /**
-   * Filter using a bundle's manifest properties.
+   * Filter using a bundle's manifest headers.
    * <p>
    * This <code>LDAPFilter</code> is executed using the keys and values of the
-   * bundle's manifest properties. The keys are looked up in a case insensitive
+   * bundle's manifest headers. The keys are looked up in a case insensitive
    * manner.
    *
-   * @param bundle The bundle whose properties are used
+   * @param bundle The bundle whose manifest's headers are used
    *        in the match.
-   * @return <code>true</code> if the bundle's properties match this
+   * @return <code>true</code> if the bundle's manifest headers match this
    *         <code>LDAPFilter</code> <code>false</code> otherwise.
+   * @throws std::runtime_error If the number of keys of the bundle's manifest
+   *         headers exceeds the value returned by std::numeric_limits<int>::max().
    */
   bool Match(const Bundle& bundle) const;
 
@@ -142,6 +144,10 @@ class US_Framework_EXPORT LDAPFilter {
    *        in the match.
    * @return <code>true</code> if the <code>AnyMap</code>'s values match this
    *         filter; <code>false</code> otherwise.
+   * @throws std::runtime_error If the number of keys in the <code>dictionary</code>
+   *         exceeds the value returned by std::numeric_limits<int>::max().
+   * @throws std::runtime_error If the <code>dictionary</code> contains case variants
+   *         of the same key name.
    */
   bool Match(const AnyMap& dictionary) const;
 
@@ -154,6 +160,10 @@ class US_Framework_EXPORT LDAPFilter {
    *        in the match.
    * @return <code>true</code> if the <code>AnyMap</code>'s values match this
    *         filter; <code>false</code> otherwise.
+   * @throws std::runtime_error If the number of keys in the <code>dictionary</code>
+   *         exceeds the value returned by std::numeric_limits<int>::max().
+   * @throws std::runtime_error If the <code>dictionary</code> contains case variants
+   *         of the same key name.
    */
   bool MatchCase(const AnyMap& dictionary) const;
 

framework/src/util/Properties.cpp

@@ -95,7 +95,8 @@ int Properties::Find_unlocked(const std::string& key) const
 {
   for (std::size_t i = 0; i < keys.size(); ++i)
   {
-    if (ci_compare(key.c_str(), keys[i].c_str(), key.size()) == 0)
+    if (key.size() == keys[i].size() &&
+        ci_compare(key.c_str(), keys[i].c_str(), key.size()) == 0)
     {
       return static_cast<int>(i);
     }

framework/test/bundles/libLQ/resources/manifest.json

@@ -1,5 +1,8 @@
 {
   "bundle.symbolic_name" : "TestBundleLQ",
   "bundle.testproperty" : "YES",
-  "bundle.activator" : true
+  "bundle.activator" : true,
+  "hosed" : "1",
+  "hosedd" : "2",
+  "hose" : "3"
 }

framework/test/driver/LDAPQueryTest.cpp

@@ -46,6 +46,34 @@ void TestLDAPFilterMatchBundle(const Bundle& bundle)
   US_TEST_CONDITION(!ldapValueMismatchCase.Match(bundle), " Evaluating LDAP expr: " + ldapValueMismatchCase.ToString());
 }
 
+void TestLDAPFilterMatchNoException(const Bundle& bundle)
+{
+  LDAPFilter ldapMatch( "(hosed=1)" );
+  AnyMap props(AnyMap::UNORDERED_MAP);
+  props["hosed"] = std::string("1");
+  props["hosedd"] = std::string("yum");
+  props["hose"] = std::string("yum");
+
+  // Testing no exception is thrown.
+  US_TEST_NO_EXCEPTION( ldapMatch.Match(props) );
+
+  // Testing key match
+  US_TEST_CONDITION(ldapMatch.Match(props) == true, "Evaluating LDAP expr: " + ldapMatch.ToString());
+
+  // Testing no exception is thrown.
+  US_TEST_NO_EXCEPTION( ldapMatch.Match(bundle) );
+
+  // Testing key match
+  US_TEST_CONDITION(ldapMatch.Match(bundle) == true, "Evaluating LDAP expr: " + ldapMatch.ToString());
+
+  AnyMap props1(AnyMap::UNORDERED_MAP);
+  props1["hosed"] = std::string("1");
+  props1["HOSED"] = std::string("yum");
+
+  // Testing exception for case variants of the same key.
+  US_TEST_FOR_EXCEPTION(std::runtime_error, ldapMatch.Match(props1) );
+}
+
 void TestLDAPFilterMatchServiceReferenceBase(Bundle bundle)
 {
   LDAPFilter ldapMatchCase( "(service.testproperty=YES)" );
@@ -92,6 +120,9 @@ int LDAPQueryTest(int /*argc*/, char* /*argv*/[])
   US_TEST_OUTPUT(<< "Testing LDAP query of service properties:")
   TestLDAPFilterMatchServiceReferenceBase(bundle);
 
+  US_TEST_OUTPUT(<< "Testing LDAP queries that no longer throw exceptions:")
+  TestLDAPFilterMatchNoException(bundle);
+
   framework.Stop();
 
   US_TEST_END()