[trac981] Register the creators

diff --git a/src/lib/acl/dns.cc b/src/lib/acl/dns.cc
index 16f1bf5dcb7452b05f68c3569f9220f0cf419c44..4dae297f50a01764c3232cc728039a37308d1eb2 100644 (file)
--- a/src/lib/acl/dns.cc
+++ b/src/lib/acl/dns.cc
@@ -13,6 +13,9 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include "dns.h"
+#include "logic_check.h"
+
+using boost::shared_ptr;
 
 namespace isc {
 namespace acl {
@@ -22,9 +25,19 @@ Loader&
 getLoader() {
     static Loader* loader(NULL);
     if (loader == NULL) {
+        // TODO:
+        // There's some trick with auto_ptr in the branch when IP check
+        // is added here. That one is better, bring it in on merge.
         loader = new Loader(REJECT);
-        // TODO: This is the place where we register default check creators
-        // like IP check, etc, once we have them.
+        loader->registerCreator(
+            shared_ptr<NotCreator<RequestContext> >(
+                new NotCreator<RequestContext>("NOT")));
+        loader->registerCreator(
+            shared_ptr<LogicCreator<AnyOfSpec, RequestContext> >(
+                new LogicCreator<AnyOfSpec, RequestContext>("ANY")));
+        loader->registerCreator(
+            shared_ptr<LogicCreator<AllOfSpec, RequestContext> >(
+                new LogicCreator<AllOfSpec, RequestContext>("ALL")));
     }
     return (*loader);
 }

diff --git a/src/lib/acl/tests/dns_test.cc b/src/lib/acl/tests/dns_test.cc
index e5e0f3a18a78011a281c4cb463ab043d2ad5febf..b2f967843e693f4e90cd93f6282243a6948c02cc 100644 (file)
--- a/src/lib/acl/tests/dns_test.cc
+++ b/src/lib/acl/tests/dns_test.cc
@@ -32,4 +32,24 @@ TEST(DNSACL, getLoader) {
     // check, are loaded.
 }
 
+// The following tests test only the creators are registered, they are tested
+// elsewhere
+
+// TODO: Enable the tests when we merge the IP check branch here (is it called
+// "from" in the branch?)
+TEST(DNSACL, DISABLED_notLoad) {
+    EXPECT_NO_THROW(getLoader().loadCheck(isc::data::Element::fromJSON(
+        "{\"NOT\": {\"from\": \"192.0.2.1\"}}")));
+}
+
+TEST(DNSACL, DISABLED_allLoad) {
+    EXPECT_NO_THROW(getLoader().loadCheck(isc::data::Element::fromJSON(
+        "{\"ALL\": [{\"from\": \"192.0.2.1\"}]}")));
+}
+
+TEST(DNSACL, DISABLED_anyLoad) {
+    EXPECT_NO_THROW(getLoader().loadCheck(isc::data::Element::fromJSON(
+        "{\"ANY\": [{\"from\": \"192.0.2.1\"}]}")));
+}
+
 }