[svn] commit: r3773 - in /branches/trac423/src/lib/dns: master.cc master.h tests/master_unittest.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Dec 9 00:00:57 UTC 2010
Author: jinmei
Date: Thu Dec 9 00:00:57 2010
New Revision: 3773
Log:
added an origin argument and some origin related validations.
Modified:
branches/trac423/src/lib/dns/master.cc
branches/trac423/src/lib/dns/master.h
branches/trac423/src/lib/dns/tests/master_unittest.cc
Modified: branches/trac423/src/lib/dns/master.cc
==============================================================================
--- branches/trac423/src/lib/dns/master.cc (original)
+++ branches/trac423/src/lib/dns/master.cc Thu Dec 9 00:00:57 2010
@@ -37,8 +37,8 @@
namespace isc {
namespace dns {
void
-masterLoad(const char* const filename, const RRClass& zone_class,
- MasterLoadCallback callback)
+masterLoad(const char* const filename, const Name& origin,
+ const RRClass& zone_class, MasterLoadCallback callback)
{
ifstream ifs;
@@ -46,12 +46,12 @@
if (ifs.fail()) {
isc_throw(MasterError, "Failed to open master file: " << filename);
}
- masterLoad(ifs, zone_class, callback);
+ masterLoad(ifs, origin, zone_class, callback);
ifs.close();
}
void
-masterLoad(istream& input, const RRClass& zone_class,
+masterLoad(istream& input, const Name& origin, const RRClass& zone_class,
MasterLoadCallback callback)
{
RRsetPtr rrset;
@@ -109,6 +109,17 @@
<< ": " << ex.what());
}
+ const NameComparisonResult cmp_result = owner->compare(origin);
+ if (cmp_result.getRelation() != NameComparisonResult::EQUAL &&
+ cmp_result.getRelation() != NameComparisonResult::SUBDOMAIN) {
+ isc_throw(MasterError, "Out-of-zone data at line " << line_count);
+ }
+ if (*rrtype == RRType::SOA() &&
+ cmp_result.getRelation() != NameComparisonResult::EQUAL) {
+ isc_throw(MasterError, "SOA not at top of zone at line "
+ << line_count);
+ }
+
if (*rrclass != zone_class) {
isc_throw(MasterError, "RR class (" << rrclass_txt
<< ") does not match the zone class (" << zone_class
Modified: branches/trac423/src/lib/dns/master.h
==============================================================================
--- branches/trac423/src/lib/dns/master.h (original)
+++ branches/trac423/src/lib/dns/master.h Thu Dec 9 00:00:57 2010
@@ -24,6 +24,7 @@
namespace isc {
namespace dns {
+class Name;
class RRClass;
/// TBD documentation
@@ -85,11 +86,11 @@
// we need that level of abstraction.
// may want to have load options; may want to support incremental load.
// may want to support "generous" mode.
-void masterLoad(const char* const filename, const RRClass& zone_class,
- MasterLoadCallback callback);
+void masterLoad(const char* const filename, const Name& origin,
+ const RRClass& zone_class, MasterLoadCallback callback);
-void masterLoad(std::istream& input, const RRClass& zone_class,
- MasterLoadCallback callback);
+void masterLoad(std::istream& input, const Name& origin,
+ const RRClass& zone_class, MasterLoadCallback callback);
}
}
Modified: branches/trac423/src/lib/dns/tests/master_unittest.cc
==============================================================================
--- branches/trac423/src/lib/dns/tests/master_unittest.cc (original)
+++ branches/trac423/src/lib/dns/tests/master_unittest.cc Thu Dec 9 00:00:57 2010
@@ -22,6 +22,7 @@
#include <gtest/gtest.h>
#include <dns/master.h>
+#include <dns/name.h>
#include <dns/rrclass.h>
#include <dns/rrset.h>
@@ -46,7 +47,10 @@
class MasterTest : public ::testing::Test {
protected:
- MasterTest() : callback(results) {}
+ MasterTest() : origin("example.com"), zclass(RRClass::IN()),
+ callback(results) {}
+ Name origin;
+ RRClass zclass;
vector<ConstRRsetPtr> results;
stringstream rr_stream;
TestCallback callback;
@@ -57,35 +61,35 @@
const char* const a_rr2 = "www.example.com. 60 IN A 192.0.2.2\n";
const char* const a_rr3 = "ftp.example.com. 60 IN A 192.0.2.3\n";
// multi-field RR case
-const char* const mx_rr = "example.com. 7200 IN MX 10 mail.example.com.\n";
+const char* const soa_rr = "example.com. 7200 IN SOA . . 0 0 0 0 0\n";
TEST_F(MasterTest, loadRRs) {
// a simple case: loading 3 RRs, each consists of a single RRset.
- rr_stream << txt_rr << a_rr1 << mx_rr;
- masterLoad(rr_stream, RRClass::IN(), callback);
+ rr_stream << txt_rr << a_rr1 << soa_rr;
+ masterLoad(rr_stream, origin, zclass, callback);
ASSERT_EQ(3, results.size());
EXPECT_EQ(txt_rr, results[0]->toText());
EXPECT_EQ(a_rr1, results[1]->toText());
- EXPECT_EQ(mx_rr, results[2]->toText());
+ EXPECT_EQ(soa_rr, results[2]->toText());
}
TEST_F(MasterTest, loadWithFunctionCallback) {
// The same test as loadRRs but using a normal function (not a functor
// object)
- rr_stream << txt_rr << a_rr1 << mx_rr;
- masterLoad(rr_stream, RRClass::IN(),
+ rr_stream << txt_rr << a_rr1 << soa_rr;
+ masterLoad(rr_stream, origin, zclass,
bind2nd(ptr_fun(testCallback), &results));
ASSERT_EQ(3, results.size());
EXPECT_EQ(txt_rr, results[0]->toText());
EXPECT_EQ(a_rr1, results[1]->toText());
- EXPECT_EQ(mx_rr, results[2]->toText());
+ EXPECT_EQ(soa_rr, results[2]->toText());
}
TEST_F(MasterTest, loadComments) {
rr_stream << ";; comment line, should be skipped\n"
<< "\n" // blank line (should be skipped)
<< txt_rr;
- masterLoad(rr_stream, RRClass::IN(), callback);
+ masterLoad(rr_stream, origin, zclass, callback);
ASSERT_EQ(1, results.size());
EXPECT_EQ(txt_rr, results[0]->toText());
}
@@ -93,7 +97,7 @@
TEST_F(MasterTest, loadRRset) {
// load an RRset containing two RRs
rr_stream << a_rr1 << a_rr2;
- masterLoad(rr_stream, RRClass::IN(), callback);
+ masterLoad(rr_stream, origin, zclass, callback);
ASSERT_EQ(1, results.size());
EXPECT_EQ(string(a_rr1) + string(a_rr2), results[0]->toText());
}
@@ -102,7 +106,7 @@
// load two RRsets with the same RR type and different owner names.
// the loader must distinguish them as separate RRsets.
rr_stream << a_rr1 << a_rr3;
- masterLoad(rr_stream, RRClass::IN(), callback);
+ masterLoad(rr_stream, origin, zclass, callback);
ASSERT_EQ(2, results.size());
EXPECT_EQ(a_rr1, results[0]->toText());
EXPECT_EQ(a_rr3, results[1]->toText());
@@ -114,7 +118,7 @@
// not considered an error. The loader will simply treat them separate
// RRsets.
rr_stream << a_rr1 << a_rr3 << a_rr2;
- masterLoad(rr_stream, RRClass::IN(), callback);
+ masterLoad(rr_stream, origin, zclass, callback);
ASSERT_EQ(3, results.size());
EXPECT_EQ(a_rr1, results[0]->toText());
EXPECT_EQ(a_rr3, results[1]->toText());
@@ -127,59 +131,70 @@
string rr_string(a_rr1);
rr_string.erase(rr_string.end() - 1);
rr_stream << rr_string;
- masterLoad(rr_stream, RRClass::IN(), callback);
+ masterLoad(rr_stream, origin, zclass, callback);
ASSERT_EQ(1, results.size());
EXPECT_EQ(a_rr1, results[0]->toText());
}
TEST_F(MasterTest, loadEmpty) {
// an unusual case: empty input. load must succeed with an empty result.
- masterLoad(rr_stream, RRClass::IN(), callback);
+ masterLoad(rr_stream, origin, zclass, callback);
EXPECT_EQ(0, results.size());
}
TEST_F(MasterTest, loadWithBeginningSpace) {
rr_stream << " " << a_rr1;
- EXPECT_THROW(masterLoad(rr_stream, RRClass::IN(), callback), MasterError);
+ EXPECT_THROW(masterLoad(rr_stream, origin, zclass, callback), MasterError);
}
TEST_F(MasterTest, loadWithBeginningTab) {
rr_stream << "\t" << a_rr1;
- EXPECT_THROW(masterLoad(rr_stream, RRClass::IN(), callback), MasterError);
+ EXPECT_THROW(masterLoad(rr_stream, origin, zclass, callback), MasterError);
}
TEST_F(MasterTest, loadInvalidRRClass) {
rr_stream << "example.com. 3600 CH TXT \"test text\"";
- EXPECT_THROW(masterLoad(rr_stream, RRClass::IN(), callback), MasterError);
+ EXPECT_THROW(masterLoad(rr_stream, origin, zclass, callback), MasterError);
+}
+
+TEST_F(MasterTest, loadOutOfZoneData) {
+ rr_stream << "example.org. 3600 IN A 192.0.2.255";
+ EXPECT_THROW(masterLoad(rr_stream, origin, zclass, callback), MasterError);
+}
+
+TEST_F(MasterTest, loadNonAtopSOA) {
+ // SOA's owner name must be zone's origin.
+ rr_stream << "soa.example.com. 3600 IN SOA . . 0 0 0 0 0";
+ EXPECT_THROW(masterLoad(rr_stream, origin, zclass, callback), MasterError);
}
TEST_F(MasterTest, loadBadRRText) {
rr_stream << "example..com. 3600 IN A 192.0.2.1"; // bad owner name
- EXPECT_THROW(masterLoad(rr_stream, RRClass::IN(), callback), MasterError);
+ EXPECT_THROW(masterLoad(rr_stream, origin, zclass, callback), MasterError);
// currently we only support numeric TTLs
stringstream rr_stream2("example.com. 1D IN A 192.0.2.1");
- EXPECT_THROW(masterLoad(rr_stream2, RRClass::IN(), callback), MasterError);
+ EXPECT_THROW(masterLoad(rr_stream2, origin, zclass, callback), MasterError);
// bad RR class text
stringstream rr_stream3("example.com. 3600 BAD A 192.0.2.1");
- EXPECT_THROW(masterLoad(rr_stream3, RRClass::IN(), callback), MasterError);
+ EXPECT_THROW(masterLoad(rr_stream3, origin, zclass, callback), MasterError);
// bad RR type text
stringstream rr_stream4("example.com. 3600 IN BAD 192.0.2.1");
- EXPECT_THROW(masterLoad(rr_stream4, RRClass::IN(), callback), MasterError);
+ EXPECT_THROW(masterLoad(rr_stream4, origin, zclass, callback), MasterError);
// bad RDATA text
stringstream rr_stream5("example.com. 3600 IN A 2001:db8::1");
- EXPECT_THROW(masterLoad(rr_stream5, RRClass::IN(), callback), MasterError);
+ EXPECT_THROW(masterLoad(rr_stream5, origin, zclass, callback), MasterError);
// incomplete RR text
stringstream rr_stream6("example.com. 3600 IN A");
- EXPECT_THROW(masterLoad(rr_stream6, RRClass::IN(), callback), MasterError);
+ EXPECT_THROW(masterLoad(rr_stream6, origin, zclass, callback), MasterError);
// owner name is not absolute
stringstream rr_stream7("example.com 3600 IN A 192.0.2.1");
- EXPECT_THROW(masterLoad(rr_stream7, RRClass::IN(), callback), MasterError);
+ EXPECT_THROW(masterLoad(rr_stream7, origin, zclass, callback), MasterError);
}
// This is a helper callback to test the case the input stream becomes bad
@@ -197,21 +212,21 @@
TEST_F(MasterTest, loadBadStream) {
rr_stream << txt_rr << a_rr1;
StreamInvalidator invalidator(rr_stream);
- EXPECT_THROW(masterLoad(rr_stream, RRClass::IN(), invalidator),
+ EXPECT_THROW(masterLoad(rr_stream, origin, zclass, invalidator),
MasterError);
}
TEST_F(MasterTest, loadFromFile) {
// The main parser is shared with the stream version, so we simply test
// file I/O specific parts.
- masterLoad(TEST_DATA_BUILDDIR "/masterload.txt", RRClass::IN(), callback);
+ masterLoad(TEST_DATA_BUILDDIR "/masterload.txt", origin, zclass, callback);
ASSERT_EQ(2, results.size());
EXPECT_EQ(txt_rr, results[0]->toText());
EXPECT_EQ(string(a_rr1) + string(a_rr2), results[1]->toText());
}
TEST_F(MasterTest, loadFromFileFailure) {
- EXPECT_THROW(masterLoad(TEST_DATA_BUILDDIR "/notexistent.txt",
- RRClass::IN(), callback), MasterError);
+ EXPECT_THROW(masterLoad(TEST_DATA_BUILDDIR "/notexistent.txt", origin,
+ zclass, callback), MasterError);
}
} // end namespace
More information about the bind10-changes
mailing list