BIND 10 trac1357, updated. c0d2f860c8125033c4433b801559b363702f231d [1357] Clear the renderer on Message::toWire()
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Sep 11 09:37:18 UTC 2012
The branch, trac1357 has been updated
via c0d2f860c8125033c4433b801559b363702f231d (commit)
via f1f86f353832e37b7987756bcba5071a5ef7101e (commit)
via e8a8a442cba80d9c9f2c0a7df1db981ccd195791 (commit)
from 803c67a839d109dea0b040ab2471a27ad995b419 (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 c0d2f860c8125033c4433b801559b363702f231d
Author: Jelte Jansen <jelte at isc.org>
Date: Tue Sep 11 11:06:58 2012 +0200
[1357] Clear the renderer on Message::toWire()
Because of the jumping back and forward, the renderer needs to be cleared at the start of toWire(). Length Limit and Compression mode that were set are kept.
This fixes an uninitialized memory error.
commit f1f86f353832e37b7987756bcba5071a5ef7101e
Author: Jelte Jansen <jelte at isc.org>
Date: Mon Sep 10 12:32:26 2012 +0200
[1357] a few editorial fixes
commit e8a8a442cba80d9c9f2c0a7df1db981ccd195791
Author: Jelte Jansen <jelte at isc.org>
Date: Mon Sep 10 12:31:46 2012 +0200
[1357] remove debug exception
-----------------------------------------------------------------------
Summary of changes:
src/bin/xfrin/tests/xfrin_test.py | 2 +-
src/bin/xfrin/xfrin.py.in | 1 -
src/lib/dns/message.cc | 9 +++++++++
src/lib/dns/message.h | 8 ++++++++
src/lib/dns/python/tests/message_python_test.py | 14 +++++++-------
src/lib/dns/python/tsig_python.cc | 2 +-
src/lib/dns/tests/message_unittest.cc | 4 ++--
src/lib/dns/tsig.h | 8 ++++----
8 files changed, 32 insertions(+), 16 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/xfrin/tests/xfrin_test.py b/src/bin/xfrin/tests/xfrin_test.py
index 1c3256b..4ee36b7 100644
--- a/src/bin/xfrin/tests/xfrin_test.py
+++ b/src/bin/xfrin/tests/xfrin_test.py
@@ -2948,7 +2948,7 @@ class TestFormatting(unittest.TestCase):
self.assertEqual("example.org/IN",
format_zone_str(isc.dns.Name("example.org"),
isc.dns.RRClass("IN")))
-
+
def test_format_addrinfo(self):
# This test may need to be updated if the input type is changed,
# right now it is a nested tuple:
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index d26e8aa..2613307 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -432,7 +432,6 @@ class XfrinIXFRAdd(XfrinState):
str(conn._current_serial) +
', got ' + str(soa_serial))
else:
- raise Exception()
conn._check_response_tsig_last()
conn._diff.commit()
self.set_xfrstate(conn, XfrinIXFRDeleteSOA())
diff --git a/src/lib/dns/message.cc b/src/lib/dns/message.cc
index 1cb1ea8..dba0e7b 100644
--- a/src/lib/dns/message.cc
+++ b/src/lib/dns/message.cc
@@ -254,6 +254,13 @@ MessageImpl::toWire(AbstractMessageRenderer& renderer, TSIGContext* tsig_ctx) {
const size_t orig_msg_len_limit = renderer.getLengthLimit();
const AbstractMessageRenderer::CompressMode orig_compress_mode =
renderer.getCompressMode();
+
+ // We are going to skip soon, so we need to clear the renderer
+ // But we'll leave the length limit and the compress mode intact
+ // (or shortened in case of TSIG)
+ renderer.clear();
+ renderer.setCompressMode(orig_compress_mode);
+
if (tsig_len > 0) {
if (tsig_len > orig_msg_len_limit) {
isc_throw(InvalidParameter, "Failed to render DNS message: "
@@ -261,6 +268,8 @@ MessageImpl::toWire(AbstractMessageRenderer& renderer, TSIGContext* tsig_ctx) {
orig_msg_len_limit << ")");
}
renderer.setLengthLimit(orig_msg_len_limit - tsig_len);
+ } else {
+ renderer.setLengthLimit(orig_msg_len_limit);
}
// reserve room for the header
diff --git a/src/lib/dns/message.h b/src/lib/dns/message.h
index 3b80357..85754ac 100644
--- a/src/lib/dns/message.h
+++ b/src/lib/dns/message.h
@@ -556,6 +556,10 @@ public:
/// \c Rcode must have been set beforehand; otherwise, an exception of
/// class \c InvalidMessageOperation will be thrown.
///
+ /// \note The renderer's internal buffers and data are automatically
+ /// cleared, keeping the length limit and the compression mode intact.
+ /// In case truncation is triggered, the renderer is cleared completely.
+ ///
/// \param renderer DNS message rendering context that encapsulates the
/// output buffer and name compression information.
void toWire(AbstractMessageRenderer& renderer);
@@ -581,6 +585,10 @@ public:
/// it should mean a bug either in the TSIG context or in the renderer
/// implementation.
///
+ /// \note The renderer's internal buffers and data are automatically
+ /// cleared, keeping the length limit and the compression mode intact.
+ /// In case truncation is triggered, the renderer is cleared completely.
+ ///
/// \param renderer See the other version
/// \param tsig_ctx A TSIG context that is to be used for signing the
/// message
diff --git a/src/lib/dns/python/tests/message_python_test.py b/src/lib/dns/python/tests/message_python_test.py
index 6f32b11..b9c0d5c 100644
--- a/src/lib/dns/python/tests/message_python_test.py
+++ b/src/lib/dns/python/tests/message_python_test.py
@@ -453,7 +453,7 @@ class MessageTest(unittest.TestCase):
def test_to_text(self):
message_render = create_message()
-
+
msg_str =\
""";; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 4149
;; flags: qr aa rd; QUERY: 1, ANSWER: 2, AUTHORITY: 0, ADDITIONAL: 0
@@ -484,7 +484,7 @@ test.example.com. 3600 IN A 192.0.2.2
Message.from_wire, self.p, bytes())
test_name = Name("test.example.com");
-
+
message_parse = Message(0)
factoryFromFile(message_parse, "message_fromWire1")
self.assertEqual(0x1035, message_parse.get_qid())
@@ -493,7 +493,7 @@ test.example.com. 3600 IN A 192.0.2.2
self.assertTrue(message_parse.get_header_flag(Message.HEADERFLAG_QR))
self.assertTrue(message_parse.get_header_flag(Message.HEADERFLAG_RD))
self.assertTrue(message_parse.get_header_flag(Message.HEADERFLAG_AA))
-
+
#QuestionPtr q = *message_parse.beginQuestion()
q = message_parse.get_question()[0]
self.assertEqual(test_name, q.get_name())
@@ -503,7 +503,7 @@ test.example.com. 3600 IN A 192.0.2.2
self.assertEqual(2, message_parse.get_rr_count(Message.SECTION_ANSWER))
self.assertEqual(0, message_parse.get_rr_count(Message.SECTION_AUTHORITY))
self.assertEqual(0, message_parse.get_rr_count(Message.SECTION_ADDITIONAL))
-
+
#RRsetPtr rrset = *message_parse.beginSection(Message.SECTION_ANSWER)
rrset = message_parse.get_section(Message.SECTION_ANSWER)[0]
self.assertEqual(test_name, rrset.get_name())
@@ -569,12 +569,12 @@ test.example.com. 3600 IN A 192.0.2.2
message_parse = Message(Message.PARSE)
factoryFromFile(message_parse, "message_fromWire10.wire")
self.assertEqual(Rcode.BADVERS(), message_parse.get_rcode())
-
+
# Maximum extended Rcode
message_parse.clear(Message.PARSE)
factoryFromFile(message_parse, "message_fromWire11.wire")
self.assertEqual(0xfff, message_parse.get_rcode().get_code())
-
+
def test_BadEDNS0(self):
message_parse = Message(Message.PARSE)
# OPT RR in the answer section
@@ -596,7 +596,7 @@ test.example.com. 3600 IN A 192.0.2.2
factoryFromFile,
message_parse,
"message_fromWire6")
-
+
# Compressed owner name of OPT RR points to a root name.
# Not necessarily bogus, but very unusual and mostly pathological.
# We accept it, but is it okay?
diff --git a/src/lib/dns/python/tsig_python.cc b/src/lib/dns/python/tsig_python.cc
index 96df29a..abb7733 100644
--- a/src/lib/dns/python/tsig_python.cc
+++ b/src/lib/dns/python/tsig_python.cc
@@ -92,7 +92,7 @@ PyMethodDef TSIGContext_methods[] = {
"Verify a DNS message." },
{ "last_had_signature",
reinterpret_cast<PyCFunction>(TSIGContext_lastHadSignature), METH_NOARGS,
- "Return if the last verified message contained a signature" },
+ "Return True if the last verified message contained a signature" },
{ NULL, NULL, 0, NULL }
};
diff --git a/src/lib/dns/tests/message_unittest.cc b/src/lib/dns/tests/message_unittest.cc
index 33e677f..835aa48 100644
--- a/src/lib/dns/tests/message_unittest.cc
+++ b/src/lib/dns/tests/message_unittest.cc
@@ -534,7 +534,7 @@ TEST_F(MessageTest, appendSection) {
RRClass::IN(), RRType::A()));
EXPECT_TRUE(target.hasRRset(Message::SECTION_ANSWER, test_name,
RRClass::IN(), RRType::AAAA()));
-
+
}
TEST_F(MessageTest, parseHeader) {
@@ -1091,7 +1091,7 @@ TEST_F(MessageTest, toWireWithoutRcode) {
TEST_F(MessageTest, toText) {
// Check toText() output for a typical DNS response with records in
// all sections
-
+
factoryFromFile(message_parse, "message_toText1.wire");
{
SCOPED_TRACE("Message toText test (basic case)");
diff --git a/src/lib/dns/tsig.h b/src/lib/dns/tsig.h
index e2a531a..9ccc580 100644
--- a/src/lib/dns/tsig.h
+++ b/src/lib/dns/tsig.h
@@ -352,11 +352,11 @@ public:
TSIGError verify(const TSIGRecord* const record, const void* const data,
const size_t data_len);
- /// \brief If the last verified message was signed.
+ /// \brief Check whether the last verified message was signed.
///
- /// The RFC2845 allows for some of the messages not to be signed. However,
- /// the last message must be signed and the class has knowledge if a given
- /// message is last, therefore it can't check that.
+ /// RFC2845 allows for some of the messages not to be signed. However,
+ /// the last message must be signed and the class has no knowledge if a
+ /// given message is the last one, therefore it can't check directly.
///
/// It is up to the caller to check if the last verified message was signed
/// after all are verified by calling this function.
More information about the bind10-changes
mailing list