BIND 10 master, updated. e663cfecd5385a0d2e27c301f089e1f60d3e9a28 [master] Merge branch 'trac1788'
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Apr 5 08:24:56 UTC 2012
The branch, master has been updated
via e663cfecd5385a0d2e27c301f089e1f60d3e9a28 (commit)
via efb79bb638d7c88d3f46c9486d7f29f2d2e6e8df (commit)
via 2645b194340a5a7fe315505f6d4cab874573c2ae (commit)
via 00bc99c5a2c8412994dd67b0e01318abb2bde893 (commit)
via 36ec15a2721f408c1868001f8dfa4c358f2f0ec3 (commit)
via f4489fa39cb50a2d0a80925ac6709d4c2beffc29 (commit)
from 635e3dae01973485a2d81487fb684d40c8db930a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e663cfecd5385a0d2e27c301f089e1f60d3e9a28
Merge: 635e3da efb79bb
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Thu Apr 5 01:20:18 2012 -0700
[master] Merge branch 'trac1788'
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/auth.spec.pre.in | 4 ++
src/bin/auth/auth_config.cc | 9 +++-
src/bin/auth/tests/Makefile.am | 2 +
src/bin/auth/tests/config_syntax_unittest.cc | 71 ++++++++++++++++++++++++++
src/bin/auth/tests/config_unittest.cc | 22 ++++++++
5 files changed, 107 insertions(+), 1 deletions(-)
create mode 100644 src/bin/auth/tests/config_syntax_unittest.cc
-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth.spec.pre.in b/src/bin/auth/auth.spec.pre.in
index 97b0e79..3eeb35e 100644
--- a/src/bin/auth/auth.spec.pre.in
+++ b/src/bin/auth/auth.spec.pre.in
@@ -47,6 +47,10 @@
"item_type": "string",
"item_optional": false,
"item_default": ""
+ },
+ { "item_name": "filetype",
+ "item_type": "string",
+ "item_optional": true
}]
}
}]
diff --git a/src/bin/auth/auth_config.cc b/src/bin/auth/auth_config.cc
index cbd4ba9..3b391d3 100644
--- a/src/bin/auth/auth_config.cc
+++ b/src/bin/auth/auth_config.cc
@@ -163,7 +163,14 @@ MemoryDatasourceConfig::build(ConstElementPtr config_value) {
const string file_txt = file ? file->stringValue() : "";
if (file_txt.empty()) {
isc_throw(AuthConfigError, "Missing zone file for zone: "
- << origin->str());
+ << origin_txt);
+ }
+ ConstElementPtr filetype = zone_config->get("filetype");
+ const string filetype_txt = filetype ? filetype->stringValue() :
+ "text";
+ if (filetype_txt != "text") {
+ isc_throw(AuthConfigError, "Invalid filetype for zone "
+ << origin_txt << ": " << filetype_txt);
}
// Note: we don't want to have such small try-catch blocks for each
diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index d24ba89..521890e 100644
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -3,6 +3,7 @@ AM_CPPFLAGS += -I$(top_builddir)/src/bin # for generated spec_config.h header
AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/bin
AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += -DAUTH_OBJ_DIR=\"$(abs_top_builddir)/src/bin/auth\"
AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_top_srcdir)/src/lib/testutils/testdata\"
AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/testutils/testdata\"
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
@@ -30,6 +31,7 @@ run_unittests_SOURCES += ../common.h ../common.cc
run_unittests_SOURCES += ../statistics.h ../statistics.cc
run_unittests_SOURCES += auth_srv_unittest.cc
run_unittests_SOURCES += config_unittest.cc
+run_unittests_SOURCES += config_syntax_unittest.cc
run_unittests_SOURCES += command_unittest.cc
run_unittests_SOURCES += common_unittest.cc
run_unittests_SOURCES += query_unittest.cc
diff --git a/src/bin/auth/tests/config_syntax_unittest.cc b/src/bin/auth/tests/config_syntax_unittest.cc
new file mode 100644
index 0000000..8caedfd
--- /dev/null
+++ b/src/bin/auth/tests/config_syntax_unittest.cc
@@ -0,0 +1,71 @@
+// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+#include <cc/data.h>
+#include <config/module_spec.h>
+
+#include <gtest/gtest.h>
+
+using namespace isc::data;
+using namespace isc::config;
+
+namespace {
+
+const char* const SPEC_FILE = AUTH_OBJ_DIR "/auth.spec";
+
+class AuthConfigSyntaxTest : public ::testing::Test {
+protected:
+ AuthConfigSyntaxTest() : mspec_(moduleSpecFromFile(SPEC_FILE))
+ {}
+ ModuleSpec mspec_;
+};
+
+TEST_F(AuthConfigSyntaxTest, inmemoryDefaultFileType) {
+ // filetype is optional
+ EXPECT_TRUE(
+ mspec_.validateConfig(
+ Element::fromJSON(
+ "{\"listen_on\": [], \"datasources\": "
+ " [{\"type\": \"memory\", \"class\": \"IN\", "
+ " \"zones\": [{\"origin\": \"example.com\","
+ " \"file\": \""
+ TEST_DATA_DIR "/example.zone\"}]}]}"), true));
+}
+
+TEST_F(AuthConfigSyntaxTest, inmemorySQLite3Backend) {
+ // Specifying non-default in-memory filetype
+ EXPECT_TRUE(
+ mspec_.validateConfig(
+ Element::fromJSON(
+ "{\"datasources\": "
+ " [{\"type\": \"memory\","
+ " \"zones\": [{\"origin\": \"example.com\","
+ " \"file\": \""
+ TEST_DATA_DIR "/example.zone\","
+ " \"filetype\": \"sqlite3\"}]}]}"), false));
+}
+
+TEST_F(AuthConfigSyntaxTest, badInmemoryFileType) {
+ // filetype must be a string
+ EXPECT_FALSE(
+ mspec_.validateConfig(
+ Element::fromJSON(
+ "{\"datasources\": "
+ " [{\"type\": \"memory\","
+ " \"zones\": [{\"origin\": \"example.com\","
+ " \"file\": \""
+ TEST_DATA_DIR "/example.zone\","
+ " \"filetype\": 42}]}]}"), false));
+}
+}
diff --git a/src/bin/auth/tests/config_unittest.cc b/src/bin/auth/tests/config_unittest.cc
index 96e447c..7b4a225 100644
--- a/src/bin/auth/tests/config_unittest.cc
+++ b/src/bin/auth/tests/config_unittest.cc
@@ -201,6 +201,28 @@ TEST_F(MemoryDatasrcConfigTest, addOneZone) {
RRType::A())->code);
}
+TEST_F(MemoryDatasrcConfigTest, addOneWithFiletype) {
+ // Until #1792 is completed, only "text" filetype is allowed.
+ EXPECT_THROW(parser->build(
+ Element::fromJSON(
+ "[{\"type\": \"memory\","
+ " \"zones\": [{\"origin\": \"example.com\","
+ " \"file\": \""
+ TEST_DATA_DIR "/example.zone\","
+ " \"filetype\": \"sqlite3\"}]}]")),
+ AuthConfigError);
+
+ // Explicitly specifying "text" is okay.
+ parser->build(Element::fromJSON(
+ "[{\"type\": \"memory\","
+ " \"zones\": [{\"origin\": \"example.com\","
+ " \"file\": \""
+ TEST_DATA_DIR "/example.zone\","
+ " \"filetype\": \"text\"}]}]"));
+ parser->commit();
+ EXPECT_EQ(1, server.getInMemoryClient(rrclass)->getZoneCount());
+}
+
TEST_F(MemoryDatasrcConfigTest, addMultiZones) {
EXPECT_NO_THROW(parser->build(Element::fromJSON(
"[{\"type\": \"memory\","
More information about the bind10-changes
mailing list