BIND 10 master, updated. 2e92b2f8a977a376fa38e3a51c9646ea9e83c4b8 [master] ChangeLog
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Apr 8 03:10:03 UTC 2011
The branch, master has been updated
via 2e92b2f8a977a376fa38e3a51c9646ea9e83c4b8 (commit)
via ce281e646be9f0f273229d94ccd75bf7e08d17cf (commit)
via ca268cc4ca8f7505b996fa3076959b5ef3934658 (commit)
via c4d150ae4528f15fe8f05dbc85a1025abc92e78a (commit)
via ad3dfb04a335ed4c65722063bd351be51dae33b4 (commit)
via ba6927dc78e991f8a5c608beee4c9807895914cd (commit)
via 21718d6ffdc3f782ffa1b5960088786da9b77e4e (commit)
via 238735e15837b8dcb878bbdb627ea4b61682db60 (commit)
via ac453e66538072059954b8ca3e3d53bfc7c8cef3 (commit)
via 3cc446d3ed8a1b6c899ee19faeda2c41a4b5bdb2 (commit)
via 3e6c2a9c09722a48fe3e6c8a1ee35724a9397360 (commit)
from 778e7b5aa3c55ffc7947454459fd02263725303d (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 2e92b2f8a977a376fa38e3a51c9646ea9e83c4b8
Author: chenzhengzhang <jerry.zzpku at gmail.com>
Date: Fri Apr 8 11:09:45 2011 +0800
[master] ChangeLog
commit ce281e646be9f0f273229d94ccd75bf7e08d17cf
Author: chenzhengzhang <jerry.zzpku at gmail.com>
Date: Fri Apr 8 11:09:03 2011 +0800
[master] merge #363
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++
src/lib/dns/python/edns_python.cc | 11 +++--
src/lib/dns/python/message_python.cc | 35 ++++++++-----
src/lib/dns/python/messagerenderer_python.cc | 16 ++++--
src/lib/dns/python/name_python.cc | 54 +++++++++++++++----
src/lib/dns/python/question_python.cc | 2 +-
src/lib/dns/python/rcode_python.cc | 10 ++--
src/lib/dns/python/rrclass_python.cc | 11 ++--
src/lib/dns/python/rrttl_python.cc | 8 ++-
src/lib/dns/python/rrtype_python.cc | 12 ++--
src/lib/dns/python/tests/edns_python_test.py | 13 ++---
src/lib/dns/python/tests/message_python_test.py | 28 +++++++---
.../python/tests/messagerenderer_python_test.py | 5 ++
src/lib/dns/python/tests/name_python_test.py | 19 ++++++-
src/lib/dns/python/tests/question_python_test.py | 2 +-
src/lib/dns/python/tests/rcode_python_test.py | 19 +++++--
src/lib/dns/python/tests/rrclass_python_test.py | 9 +++-
src/lib/dns/python/tests/rrttl_python_test.py | 10 +++-
src/lib/dns/python/tests/rrtype_python_test.py | 16 ++++--
19 files changed, 198 insertions(+), 88 deletions(-)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 3f0d24d..c73499e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+ 217. [bug] jerry
+ src/lib/dns/python: Use a signed version of larger size of integer and
+ perform more strict range checks with PyArg_ParseTuple() in case of
+ overflows.
+ (Trac #363, git ce281e646be9f0f273229d94ccd75bf7e08d17cf)
+
216. [func] vorner
The BIND10_XFROUT_SOCKET_FILE environment variable can be used to specify
which socket should be used for communication between b10-auth and
diff --git a/src/lib/dns/python/edns_python.cc b/src/lib/dns/python/edns_python.cc
index e54dba0..82db8d8 100644
--- a/src/lib/dns/python/edns_python.cc
+++ b/src/lib/dns/python/edns_python.cc
@@ -297,12 +297,15 @@ EDNS_getUDPSize(const s_EDNS* const self) {
PyObject*
EDNS_setUDPSize(s_EDNS* self, PyObject* args) {
- unsigned int size;
- if (!PyArg_ParseTuple(args, "I", &size)) {
+ long size;
+ if (!PyArg_ParseTuple(args, "l", &size)) {
+ PyErr_Clear();
+ PyErr_SetString(PyExc_TypeError,
+ "No valid type in set_udp_size argument");
return (NULL);
}
- if (size > 65535) {
- PyErr_SetString(PyExc_OverflowError,
+ if (size < 0 || size > 0xffff) {
+ PyErr_SetString(PyExc_ValueError,
"UDP size is not an unsigned 16-bit integer");
return (NULL);
}
diff --git a/src/lib/dns/python/message_python.cc b/src/lib/dns/python/message_python.cc
index e19547e..97bc28d 100644
--- a/src/lib/dns/python/message_python.cc
+++ b/src/lib/dns/python/message_python.cc
@@ -226,9 +226,9 @@ static PyTypeObject message_type = {
static int
Message_init(s_Message* self, PyObject* args) {
- unsigned int i;
-
- if (PyArg_ParseTuple(args, "I", &i)) {
+ int i;
+
+ if (PyArg_ParseTuple(args, "i", &i)) {
PyErr_Clear();
if (i == Message::PARSE) {
self->message = new Message(Message::PARSE);
@@ -274,17 +274,17 @@ Message_getHeaderFlag(s_Message* self, PyObject* args) {
static PyObject*
Message_setHeaderFlag(s_Message* self, PyObject* args) {
- int messageflag;
+ long messageflag;
PyObject *on = Py_True;
- if (!PyArg_ParseTuple(args, "i|O!", &messageflag, &PyBool_Type, &on)) {
+ if (!PyArg_ParseTuple(args, "l|O!", &messageflag, &PyBool_Type, &on)) {
PyErr_Clear();
PyErr_SetString(PyExc_TypeError,
"no valid type in set_header_flag argument");
return (NULL);
}
- if (messageflag < 0) {
- PyErr_SetString(PyExc_TypeError, "invalid Message header flag");
+ if (messageflag < 0 || messageflag > 0xffff) {
+ PyErr_SetString(PyExc_ValueError, "Message header flag out of range");
return (NULL);
}
@@ -310,10 +310,19 @@ Message_getQid(s_Message* self) {
static PyObject*
Message_setQid(s_Message* self, PyObject* args) {
- uint16_t id;
- if (!PyArg_ParseTuple(args, "H", &id)) {
+ long id;
+ if (!PyArg_ParseTuple(args, "l", &id)) {
+ PyErr_Clear();
+ PyErr_SetString(PyExc_TypeError,
+ "no valid type in set_qid argument");
return (NULL);
}
+ if (id < 0 || id > 0xffff) {
+ PyErr_SetString(PyExc_ValueError,
+ "Message id out of range");
+ return (NULL);
+ }
+
try {
self->message->setQid(id);
Py_RETURN_NONE;
@@ -565,9 +574,9 @@ Message_addQuestion(s_Message* self, PyObject* args) {
static PyObject*
Message_addRRset(s_Message* self, PyObject* args) {
PyObject *sign = Py_False;
- unsigned int section;
+ int section;
s_RRset* rrset;
- if (!PyArg_ParseTuple(args, "IO!|O!", §ion, &rrset_type, &rrset,
+ if (!PyArg_ParseTuple(args, "iO!|O!", §ion, &rrset_type, &rrset,
&PyBool_Type, &sign)) {
return (NULL);
}
@@ -591,8 +600,8 @@ Message_addRRset(s_Message* self, PyObject* args) {
static PyObject*
Message_clear(s_Message* self, PyObject* args) {
- unsigned int i;
- if (PyArg_ParseTuple(args, "I", &i)) {
+ int i;
+ if (PyArg_ParseTuple(args, "i", &i)) {
PyErr_Clear();
if (i == Message::PARSE) {
self->message->clear(Message::PARSE);
diff --git a/src/lib/dns/python/messagerenderer_python.cc b/src/lib/dns/python/messagerenderer_python.cc
index a00d8d4..f12001d 100644
--- a/src/lib/dns/python/messagerenderer_python.cc
+++ b/src/lib/dns/python/messagerenderer_python.cc
@@ -178,8 +178,16 @@ static PyObject*
MessageRenderer_setLengthLimit(s_MessageRenderer* self,
PyObject* args)
{
- unsigned int lengthlimit;
- if (!PyArg_ParseTuple(args, "I", &lengthlimit)) {
+ long lengthlimit;
+ if (!PyArg_ParseTuple(args, "l", &lengthlimit)) {
+ PyErr_Clear();
+ PyErr_SetString(PyExc_TypeError,
+ "No valid type in set_length_limit argument");
+ return (NULL);
+ }
+ if (lengthlimit < 0) {
+ PyErr_SetString(PyExc_ValueError,
+ "MessageRenderer length limit out of range");
return (NULL);
}
self->messagerenderer->setLengthLimit(lengthlimit);
@@ -190,8 +198,8 @@ static PyObject*
MessageRenderer_setCompressMode(s_MessageRenderer* self,
PyObject* args)
{
- unsigned int mode;
- if (!PyArg_ParseTuple(args, "I", &mode)) {
+ int mode;
+ if (!PyArg_ParseTuple(args, "i", &mode)) {
return (NULL);
}
diff --git a/src/lib/dns/python/name_python.cc b/src/lib/dns/python/name_python.cc
index 3d7a196..7d8913a 100644
--- a/src/lib/dns/python/name_python.cc
+++ b/src/lib/dns/python/name_python.cc
@@ -321,14 +321,20 @@ Name_init(s_Name* self, PyObject* args) {
PyObject* bytes_obj;
const char* bytes;
Py_ssize_t len;
- unsigned int position = 0;
+ long position = 0;
// It was not a string (see comment above), so try bytes, and
// create with buffer object
- if (PyArg_ParseTuple(args, "O|IO!", &bytes_obj, &position,
+ if (PyArg_ParseTuple(args, "O|lO!", &bytes_obj, &position,
&PyBool_Type, &downcase) &&
PyObject_AsCharBuffer(bytes_obj, &bytes, &len) != -1) {
try {
+ if (position < 0) {
+ // Throw IndexError here since name index should be unsigned
+ PyErr_SetString(PyExc_IndexError,
+ "Name index shouldn't be negative");
+ return (-1);
+ }
InputBuffer buffer(bytes, len);
buffer.setPosition(position);
@@ -363,10 +369,17 @@ Name_destroy(s_Name* self) {
static PyObject*
Name_at(s_Name* self, PyObject* args) {
- unsigned int pos;
- if (!PyArg_ParseTuple(args, "I", &pos)) {
+ int pos;
+ if (!PyArg_ParseTuple(args, "i", &pos)) {
+ return (NULL);
+ }
+ if (pos < 0) {
+ // Throw IndexError here since name index should be unsigned
+ PyErr_SetString(PyExc_IndexError,
+ "name index shouldn't be negative");
return (NULL);
}
+
try {
return (Py_BuildValue("I", self->name->at(pos)));
} catch (const isc::OutOfRange&) {
@@ -405,10 +418,10 @@ static PyObject*
Name_toWire(s_Name* self, PyObject* args) {
PyObject* bytes;
s_MessageRenderer* mr;
-
+
if (PyArg_ParseTuple(args, "O", &bytes) && PySequence_Check(bytes)) {
PyObject* bytes_o = bytes;
-
+
OutputBuffer buffer(Name::MAX_WIRE);
self->name->toWire(buffer);
PyObject* name_bytes = PyBytes_FromStringAndSize(static_cast<const char*>(buffer.getData()), buffer.getLength());
@@ -457,12 +470,18 @@ Name_equals(s_Name* self, PyObject* args) {
Py_RETURN_FALSE;
}
-static PyObject*
+static PyObject*
Name_split(s_Name* self, PyObject* args) {
- unsigned int first, n;
+ int first, n;
s_Name* ret = NULL;
-
- if (PyArg_ParseTuple(args, "II", &first, &n)) {
+
+ if (PyArg_ParseTuple(args, "ii", &first, &n)) {
+ if (first < 0 || n < 0) {
+ // Throw IndexError here since name index should be unsigned
+ PyErr_SetString(PyExc_IndexError,
+ "name index shouldn't be negative");
+ return (NULL);
+ }
ret = PyObject_New(s_Name, &name_type);
if (ret != NULL) {
ret->name = NULL;
@@ -477,7 +496,14 @@ Name_split(s_Name* self, PyObject* args) {
return (NULL);
}
}
- } else if (PyArg_ParseTuple(args, "I", &n)) {
+ } else if (PyArg_ParseTuple(args, "i", &n)) {
+ PyErr_Clear();
+ if (n < 0) {
+ // Throw IndexError here since name index should be unsigned
+ PyErr_SetString(PyExc_IndexError,
+ "name index shouldn't be negative");
+ return (NULL);
+ }
ret = PyObject_New(s_Name, &name_type);
if (ret != NULL) {
ret->name = NULL;
@@ -493,6 +519,10 @@ Name_split(s_Name* self, PyObject* args) {
}
}
}
+
+ PyErr_Clear();
+ PyErr_SetString(PyExc_TypeError,
+ "No valid type in split argument");
return (ret);
}
#include <iostream>
@@ -502,7 +532,7 @@ Name_split(s_Name* self, PyObject* args) {
// It is translated to a function that gets 3 arguments, an object,
// an object to compare to, and an operator.
//
-static PyObject*
+static PyObject*
Name_richcmp(s_Name* self, s_Name* other, int op) {
bool c;
diff --git a/src/lib/dns/python/question_python.cc b/src/lib/dns/python/question_python.cc
index a039284..2889350 100644
--- a/src/lib/dns/python/question_python.cc
+++ b/src/lib/dns/python/question_python.cc
@@ -169,7 +169,7 @@ Question_init(s_Question* self, PyObject* args) {
}
self->question = QuestionPtr();
-
+
PyErr_Clear();
PyErr_SetString(PyExc_TypeError,
"no valid type in constructor argument");
diff --git a/src/lib/dns/python/rcode_python.cc b/src/lib/dns/python/rcode_python.cc
index fce8eef..b80a93c 100644
--- a/src/lib/dns/python/rcode_python.cc
+++ b/src/lib/dns/python/rcode_python.cc
@@ -171,18 +171,18 @@ PyTypeObject rcode_type = {
int
Rcode_init(s_Rcode* const self, PyObject* args) {
- int code = 0;
+ long code = 0;
int ext_code = 0;
- if (PyArg_ParseTuple(args, "i", &code)) {
+ if (PyArg_ParseTuple(args, "l", &code)) {
if (code < 0 || code > 0xffff) {
- PyErr_SetString(PyExc_OverflowError, "Rcode out of range");
+ PyErr_SetString(PyExc_ValueError, "Rcode out of range");
return (-1);
}
ext_code = -1;
- } else if (PyArg_ParseTuple(args, "ii", &code, &ext_code)) {
+ } else if (PyArg_ParseTuple(args, "li", &code, &ext_code)) {
if (code < 0 || code > 0xff || ext_code < 0 || ext_code > 0xff) {
- PyErr_SetString(PyExc_OverflowError, "Rcode out of range");
+ PyErr_SetString(PyExc_ValueError, "Rcode out of range");
return (-1);
}
} else {
diff --git a/src/lib/dns/python/rrclass_python.cc b/src/lib/dns/python/rrclass_python.cc
index 3cfed4c..ca20e68 100644
--- a/src/lib/dns/python/rrclass_python.cc
+++ b/src/lib/dns/python/rrclass_python.cc
@@ -152,7 +152,7 @@ static PyTypeObject rrclass_type = {
static int
RRClass_init(s_RRClass* self, PyObject* args) {
const char* s;
- unsigned int i;
+ long i;
PyObject* bytes = NULL;
// The constructor argument can be a string ("IN"), an integer (1),
// or a sequence of numbers between 0 and 65535 (wire code)
@@ -165,10 +165,11 @@ RRClass_init(s_RRClass* self, PyObject* args) {
if (PyArg_ParseTuple(args, "s", &s)) {
self->rrclass = new RRClass(s);
return (0);
- } else if (PyArg_ParseTuple(args, "I", &i)) {
- PyErr_Clear();
- if (i > 65535) {
- PyErr_SetString(po_InvalidRRClass, "RR class number too high");
+ } else if (PyArg_ParseTuple(args, "l", &i)) {
+ if (i < 0 || i > 0xffff) {
+ PyErr_Clear();
+ PyErr_SetString(PyExc_ValueError,
+ "RR class number out of range");
return (-1);
}
self->rrclass = new RRClass(i);
diff --git a/src/lib/dns/python/rrttl_python.cc b/src/lib/dns/python/rrttl_python.cc
index e7391d0..696e1a0 100644
--- a/src/lib/dns/python/rrttl_python.cc
+++ b/src/lib/dns/python/rrttl_python.cc
@@ -145,7 +145,7 @@ static PyTypeObject rrttl_type = {
static int
RRTTL_init(s_RRTTL* self, PyObject* args) {
const char* s;
- unsigned long i;
+ long long i;
PyObject* bytes = NULL;
// The constructor argument can be a string ("1234"), an integer (1),
// or a sequence of numbers between 0 and 255 (wire code)
@@ -158,8 +158,12 @@ RRTTL_init(s_RRTTL* self, PyObject* args) {
if (PyArg_ParseTuple(args, "s", &s)) {
self->rrttl = new RRTTL(s);
return (0);
- } else if (PyArg_ParseTuple(args, "I", &i)) {
+ } else if (PyArg_ParseTuple(args, "L", &i)) {
PyErr_Clear();
+ if (i < 0 || i > 0xffffffff) {
+ PyErr_SetString(PyExc_ValueError, "RR TTL number out of range");
+ return (-1);
+ }
self->rrttl = new RRTTL(i);
return (0);
} else if (PyArg_ParseTuple(args, "O", &bytes) &&
diff --git a/src/lib/dns/python/rrtype_python.cc b/src/lib/dns/python/rrtype_python.cc
index 012f251..4fc0284 100644
--- a/src/lib/dns/python/rrtype_python.cc
+++ b/src/lib/dns/python/rrtype_python.cc
@@ -182,7 +182,7 @@ static PyTypeObject rrtype_type = {
static int
RRType_init(s_RRType* self, PyObject* args) {
const char* s;
- unsigned int i;
+ long i;
PyObject* bytes = NULL;
// The constructor argument can be a string ("A"), an integer (1),
// or a sequence of numbers between 0 and 65535 (wire code)
@@ -195,10 +195,10 @@ RRType_init(s_RRType* self, PyObject* args) {
if (PyArg_ParseTuple(args, "s", &s)) {
self->rrtype = new RRType(s);
return (0);
- } else if (PyArg_ParseTuple(args, "I", &i)) {
+ } else if (PyArg_ParseTuple(args, "l", &i)) {
PyErr_Clear();
- if (i > 65535) {
- PyErr_SetString(po_InvalidRRType, "RR Type number too high");
+ if (i < 0 || i > 0xffff) {
+ PyErr_SetString(PyExc_ValueError, "RR Type number out of range");
return (-1);
}
self->rrtype = new RRType(i);
@@ -259,10 +259,10 @@ static PyObject*
RRType_toWire(s_RRType* self, PyObject* args) {
PyObject* bytes;
s_MessageRenderer* mr;
-
+
if (PyArg_ParseTuple(args, "O", &bytes) && PySequence_Check(bytes)) {
PyObject* bytes_o = bytes;
-
+
OutputBuffer buffer(2);
self->rrtype->toWire(buffer);
PyObject* n = PyBytes_FromStringAndSize(static_cast<const char*>(buffer.getData()), buffer.getLength());
diff --git a/src/lib/dns/python/tests/edns_python_test.py b/src/lib/dns/python/tests/edns_python_test.py
index 3f03c90..b249213 100644
--- a/src/lib/dns/python/tests/edns_python_test.py
+++ b/src/lib/dns/python/tests/edns_python_test.py
@@ -62,17 +62,16 @@ class EDNSTest(unittest.TestCase):
edns = EDNS()
edns.set_udp_size(511)
self.assertEqual(511, edns.get_udp_size())
- edns.set_udp_size(0)
- self.assertEqual(0, edns.get_udp_size())
- edns.set_udp_size(65535)
- self.assertEqual(65535, edns.get_udp_size())
-
self.assertRaises(TypeError, edns.set_udp_size, "wrong")
# Range check. We need to do this at the binding level, so we need
# explicit tests for it.
- self.assertRaises(OverflowError, edns.set_udp_size, 65536)
- self.assertRaises(OverflowError, edns.set_udp_size, -1)
+ edns.set_udp_size(0)
+ self.assertEqual(0, edns.get_udp_size())
+ edns.set_udp_size(65535)
+ self.assertEqual(65535, edns.get_udp_size())
+ self.assertRaises(ValueError, edns.set_udp_size, 0x10000)
+ self.assertRaises(ValueError, edns.set_udp_size, -1)
def test_get_version(self):
self.assertEqual(EDNS.SUPPORTED_VERSION, EDNS().get_version())
diff --git a/src/lib/dns/python/tests/message_python_test.py b/src/lib/dns/python/tests/message_python_test.py
index 6ef42d4..bccc596 100644
--- a/src/lib/dns/python/tests/message_python_test.py
+++ b/src/lib/dns/python/tests/message_python_test.py
@@ -80,8 +80,10 @@ class MessageTest(unittest.TestCase):
"2001:db8::134"))
self.bogus_section = Message.SECTION_ADDITIONAL + 1
+ self.bogus_below_section = Message.SECTION_QUESTION - 1
def test_init(self):
+ self.assertRaises(TypeError, Message, -1)
self.assertRaises(TypeError, Message, 3)
self.assertRaises(TypeError, Message, "wrong")
@@ -109,22 +111,28 @@ class MessageTest(unittest.TestCase):
self.assertRaises(InvalidParameter, self.r.set_header_flag, 0)
self.assertRaises(InvalidParameter, self.r.set_header_flag, 0x7000)
self.assertRaises(InvalidParameter, self.r.set_header_flag, 0x0800)
- self.assertRaises(InvalidParameter, self.r.set_header_flag, 0x10000)
- self.assertRaises(TypeError, self.r.set_header_flag, 0x80000000)
- # this would cause overflow and result in a "valid" flag
- self.assertRaises(TypeError, self.r.set_header_flag,
- Message.HEADERFLAG_AA | 0x100000000)
- self.assertRaises(TypeError, self.r.set_header_flag, -1)
-
self.assertRaises(InvalidMessageOperation,
self.p.set_header_flag, Message.HEADERFLAG_AA)
+ # Range check. We need to do this at the binding level, so we need
+ # explicit tests for it.
+ self.assertRaises(ValueError, self.r.set_header_flag, 0x10000)
+ self.assertRaises(ValueError, self.r.set_header_flag, -1)
+
def test_set_qid(self):
self.assertRaises(TypeError, self.r.set_qid, "wrong")
self.assertRaises(InvalidMessageOperation,
self.p.set_qid, 123)
self.r.set_qid(1234)
self.assertEqual(1234, self.r.get_qid())
+ # Range check. We need to do this at the binding level, so we need
+ # explicit tests for it.
+ self.r.set_qid(0)
+ self.assertEqual(0, self.r.get_qid())
+ self.r.set_qid(0xffff)
+ self.assertEqual(0xffff, self.r.get_qid())
+ self.assertRaises(ValueError, self.r.set_qid, -1)
+ self.assertRaises(ValueError, self.r.set_qid, 0x10000)
def test_set_rcode(self):
self.assertRaises(TypeError, self.r.set_rcode, "wrong")
@@ -135,7 +143,7 @@ class MessageTest(unittest.TestCase):
self.assertRaises(InvalidMessageOperation,
self.p.set_rcode, rcode)
-
+
self.assertRaises(InvalidMessageOperation, self.p.get_rcode)
def test_set_opcode(self):
@@ -197,7 +205,7 @@ class MessageTest(unittest.TestCase):
self.assertRaises(InvalidMessageOperation, self.p.add_rrset,
Message.SECTION_ANSWER, self.rrset_a)
-
+
self.assertFalse(compare_rrset_list(section_rrset, self.r.get_section(Message.SECTION_ANSWER)))
self.assertEqual(0, self.r.get_rr_count(Message.SECTION_ANSWER))
self.r.add_rrset(Message.SECTION_ANSWER, self.rrset_a)
@@ -239,6 +247,8 @@ class MessageTest(unittest.TestCase):
Message.SECTION_ANSWER, self.rrset_a)
self.assertRaises(OverflowError, self.r.add_rrset,
self.bogus_section, self.rrset_a)
+ self.assertRaises(OverflowError, self.r.add_rrset,
+ self.bogus_below_section, self.rrset_a)
def test_clear(self):
self.assertEqual(None, self.r.clear(Message.PARSE))
diff --git a/src/lib/dns/python/tests/messagerenderer_python_test.py b/src/lib/dns/python/tests/messagerenderer_python_test.py
index 544ad23..5362496 100644
--- a/src/lib/dns/python/tests/messagerenderer_python_test.py
+++ b/src/lib/dns/python/tests/messagerenderer_python_test.py
@@ -98,6 +98,11 @@ class MessageRendererTest(unittest.TestCase):
renderer.set_length_limit(1024)
self.assertEqual(1024, renderer.get_length_limit())
self.assertRaises(TypeError, renderer.set_length_limit, "wrong")
+ # Range check. We need to do this at the binding level, so we need
+ # explicit tests for it.
+ renderer.set_length_limit(0)
+ self.assertEqual(0, renderer.get_length_limit())
+ self.assertRaises(ValueError, renderer.set_length_limit, -1)
def test_messagerenderer_set_compress_mode(self):
renderer = MessageRenderer()
diff --git a/src/lib/dns/python/tests/name_python_test.py b/src/lib/dns/python/tests/name_python_test.py
index 81060e9..b8e625a 100644
--- a/src/lib/dns/python/tests/name_python_test.py
+++ b/src/lib/dns/python/tests/name_python_test.py
@@ -95,11 +95,14 @@ class NameTest(unittest.TestCase):
b = bytearray()
b += b'\x07example'*32 + b'\x03com\x00'
self.assertRaises(DNSMessageFORMERR, Name, b, 0)
+ self.assertRaises(IndexError, Name, b, -1)
def test_at(self):
self.assertEqual(7, self.name1.at(0))
self.assertEqual(101, self.name1.at(1))
self.assertRaises(IndexError, self.name1.at, 100)
+ self.assertRaises(IndexError, self.name1.at, 0x10000)
+ self.assertRaises(IndexError, self.name1.at, -1)
self.assertRaises(TypeError, self.name1.at, "wrong")
def test_get_length(self):
@@ -151,14 +154,25 @@ class NameTest(unittest.TestCase):
self.assertEqual("completely.different.", s.to_text())
self.assertRaises(TypeError, self.name1.split, "wrong", 1)
self.assertRaises(TypeError, self.name1.split, 1, "wrong")
- self.assertRaises(IndexError, self.name1.split, 123, 1)
- self.assertRaises(IndexError, self.name1.split, 1, 123)
s = self.name1.split(1)
self.assertEqual("com.", s.to_text())
+
+ # Range check. We need to do this at the binding level, so we need
+ # explicit tests for it.
+ self.assertRaises(IndexError, self.name1.split, 123, 1)
+ self.assertRaises(IndexError, self.name1.split, 1, 123)
+ self.assertRaises(IndexError, self.name1.split, 0x10000, 5)
+ self.assertRaises(IndexError, self.name1.split, -1, -1)
+ self.assertRaises(IndexError, self.name1.split, 0, -1)
+ self.assertRaises(IndexError, self.name1.split, -1, 0x10000)
+
s = self.name1.split(0)
self.assertEqual("example.com.", s.to_text())
self.assertRaises(IndexError, self.name1.split, 123)
+ self.assertRaises(IndexError, self.name1.split, 0x10000)
+ self.assertRaises(IndexError, self.name1.split, -123)
+ self.assertRaises(TypeError, self.name1.split, -1)
def test_reverse(self):
self.assertEqual("com.example.", self.name1.reverse().to_text())
@@ -169,7 +183,6 @@ class NameTest(unittest.TestCase):
self.assertEqual("example.com.example.com.", self.name1.concatenate(self.name1).to_text())
self.assertRaises(TypeError, self.name1.concatenate, "wrong")
self.assertRaises(TooLongName, self.name1.concatenate, Name("example."*31))
-
def test_downcase(self):
self.assertEqual("EXAMPLE.com.", self.name4.to_text())
diff --git a/src/lib/dns/python/tests/question_python_test.py b/src/lib/dns/python/tests/question_python_test.py
index 6c4db4b..69e3051 100644
--- a/src/lib/dns/python/tests/question_python_test.py
+++ b/src/lib/dns/python/tests/question_python_test.py
@@ -45,7 +45,7 @@ class QuestionTest(unittest.TestCase):
# tests below based on cpp unit tests
# also tests get_name, get_class and get_type
def test_from_wire(self):
-
+
q = question_from_wire("question_fromWire")
self.assertEqual(self.example_name1, q.get_name())
diff --git a/src/lib/dns/python/tests/rcode_python_test.py b/src/lib/dns/python/tests/rcode_python_test.py
index 3577f84..77fed3a 100644
--- a/src/lib/dns/python/tests/rcode_python_test.py
+++ b/src/lib/dns/python/tests/rcode_python_test.py
@@ -23,12 +23,8 @@ from pydnspp import *
class RcodeTest(unittest.TestCase):
def test_init(self):
self.assertRaises(TypeError, Rcode, "wrong")
- self.assertRaises(OverflowError, Rcode, 65536)
- self.assertEqual(Rcode(0).get_code(), 0)
-
- self.assertEqual(0, Rcode(0).get_code())
self.assertEqual(0xfff, Rcode(0xfff).get_code()) # possible max code
-
+
# should fail on attempt of construction with an out of range code
self.assertRaises(OverflowError, Rcode, 0x1000)
self.assertRaises(OverflowError, Rcode, 0xffff)
@@ -38,7 +34,18 @@ class RcodeTest(unittest.TestCase):
self.assertEqual(Rcode.BADVERS_CODE, Rcode(0, 1).get_code())
self.assertEqual(0xfff, Rcode(0xf, 0xff).get_code())
self.assertRaises(OverflowError, Rcode, 0x10, 0xff)
-
+
+ # Range check. We need to do this at the binding level, so we need
+ # explicit tests for it.
+ self.assertEqual(Rcode(0).get_code(), 0)
+ self.assertEqual(Rcode(4095).get_code(), 4095)
+ self.assertEqual(Rcode(0, 0).get_code(), 0)
+ self.assertEqual(Rcode(0, 0).get_extended_code(), 0)
+ self.assertEqual(Rcode(15, 255).get_code(), 4095)
+ self.assertRaises(ValueError, Rcode, 65536)
+ self.assertRaises(ValueError, Rcode, 0x10, 0x100)
+ self.assertRaises(ValueError, Rcode, 0x100, 0x10)
+
def test_constants(self):
self.assertEqual(Rcode.NOERROR_CODE, Rcode(0).get_code())
self.assertEqual(Rcode.FORMERR_CODE, Rcode(1).get_code())
diff --git a/src/lib/dns/python/tests/rrclass_python_test.py b/src/lib/dns/python/tests/rrclass_python_test.py
index b5e8b5e..38d8c8c 100644
--- a/src/lib/dns/python/tests/rrclass_python_test.py
+++ b/src/lib/dns/python/tests/rrclass_python_test.py
@@ -32,12 +32,17 @@ class RRClassTest(unittest.TestCase):
b = bytearray(1)
b[0] = 123
self.assertRaises(TypeError, RRClass, b)
- self.assertRaises(InvalidRRClass, RRClass, 65536)
self.assertEqual(self.c1, RRClass(1))
b = bytearray()
self.c1.to_wire(b)
self.assertEqual(self.c1, RRClass(b))
-
+ # Range check. We need to do this at the binding level, so we need
+ # explicit tests for it.
+ self.assertRaises(ValueError, RRClass, 65536)
+ self.assertRaises(TypeError, RRClass, -1)
+ self.assertEqual(RRClass(65535).get_code(), 65535)
+ self.assertEqual(RRClass(0).get_code(), 0)
+
def test_rrclass_to_text(self):
self.assertEqual("IN", self.c1.to_text())
self.assertEqual("IN", str(self.c1))
diff --git a/src/lib/dns/python/tests/rrttl_python_test.py b/src/lib/dns/python/tests/rrttl_python_test.py
index 095a0b1..aa4a34d 100644
--- a/src/lib/dns/python/tests/rrttl_python_test.py
+++ b/src/lib/dns/python/tests/rrttl_python_test.py
@@ -25,7 +25,7 @@ class RRTTLTest(unittest.TestCase):
def setUp(self):
self.t1 = RRTTL(1)
self.t2 = RRTTL(3600)
-
+
def test_init(self):
self.assertRaises(InvalidRRTTL, RRTTL, "wrong")
self.assertRaises(TypeError, RRTTL, Exception())
@@ -39,7 +39,13 @@ class RRTTLTest(unittest.TestCase):
b[2] = 0
b[3] = 15
self.assertEqual(15, RRTTL(b).get_value())
-
+ # Range check. We need to do this at the binding level, so we need
+ # explicit tests for it.
+ self.assertRaises(TypeError, RRTTL, -1)
+ self.assertRaises(ValueError, RRTTL, 4294967296)
+ self.assertEqual(0, RRTTL(0).get_value())
+ self.assertEqual(4294967295, RRTTL(4294967295).get_value())
+
def test_rrttl_to_text(self):
self.assertEqual("1", self.t1.to_text())
self.assertEqual("1", str(self.t1))
diff --git a/src/lib/dns/python/tests/rrtype_python_test.py b/src/lib/dns/python/tests/rrtype_python_test.py
index c35e1e7..7135426 100644
--- a/src/lib/dns/python/tests/rrtype_python_test.py
+++ b/src/lib/dns/python/tests/rrtype_python_test.py
@@ -22,7 +22,7 @@ import os
from pydnspp import *
class TestModuleSpec(unittest.TestCase):
-
+
rrtype_1 = RRType(1)
rrtype_0x80 = RRType(0x80);
rrtype_0x800 = RRType(0x800);
@@ -32,24 +32,28 @@ class TestModuleSpec(unittest.TestCase):
def test_init(self):
- self.assertRaises(InvalidRRType, RRType, 65537)
b = bytearray(b'\x00\x01')
self.assertEqual(RRType("A"), RRType(b))
b = bytearray(b'\x01')
self.assertRaises(IncompleteRRType, RRType, b)
self.assertRaises(TypeError, RRType, Exception)
-
+ # Range check. We need to do this at the binding level, so we need
+ # explicit tests for it.
+ self.assertRaises(ValueError, RRType, 65536)
+ self.assertRaises(TypeError, RRType, -1)
+ self.assertEqual("TYPE65535", RRType(65535).to_text());
+ self.assertEqual("TYPE0", RRType(0).to_text());
+
def test_init_from_text(self):
self.assertEqual("A", RRType("A").to_text())
self.assertEqual("NS", RRType("NS").to_text());
self.assertEqual("NS", str(RRType("NS")));
-
self.assertEqual("TYPE65535", RRType("TYPE65535").to_text());
-
+
self.assertEqual(53, RRType("TYPE00053").get_code());
self.assertRaises(InvalidRRType, RRType, "TYPE000053");
-
+
self.assertRaises(InvalidRRType, RRType, "TYPE");
self.assertRaises(InvalidRRType, RRType, "TYPE-1");
self.assertRaises(InvalidRRType, RRType, "TYPExxx");
More information about the bind10-changes
mailing list