last_name: The most recently read name when building a message object.
"""
- def __init__(self, text, message):
+ def __init__(self, text, message, idna_codec):
self.message = message
- self.tok = dns.tokenizer.Tokenizer(text)
+ self.tok = dns.tokenizer.Tokenizer(text, idna_codec=idna_codec)
self.last_name = None
self.zone_rdclass = dns.rdataclass.IN
self.updating = False
token = self.tok.get(want_leading=True)
if not token.is_whitespace():
- self.last_name = dns.name.from_text(token.value, None)
+ self.last_name = self.tok.as_name(token, None)
name = self.last_name
token = self.tok.get()
if not token.is_identifier():
# Name
token = self.tok.get(want_leading=True)
if not token.is_whitespace():
- self.last_name = dns.name.from_text(token.value, None)
+ self.last_name = self.tok.as_name(token, None)
name = self.last_name
token = self.tok.get()
if not token.is_identifier():
line_method(section)
-def from_text(text):
+def from_text(text, idna_codec=None):
"""Convert the text format message into a message object.
*text*, a ``text``, the text format message.
+ *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
+ encoder/decoder. If ``None``, the default IDNA 2003 encoder/decoder
+ is used.
+
Raises ``dns.message.UnknownHeaderField`` if a header is unknown.
Raises ``dns.exception.SyntaxError`` if the text is badly formed.
m = Message()
- reader = _TextReader(text, m)
+ reader = _TextReader(text, m, idna_codec)
reader.read()
return m
def make_query(qname, rdtype, rdclass=dns.rdataclass.IN, use_edns=None,
want_dnssec=False, ednsflags=None, payload=None,
- request_payload=None, options=None):
+ request_payload=None, options=None, idna_codec=None):
"""Make a query message.
The query name, type, and class may all be specified either
*options*, a list of ``dns.edns.Option`` objects or ``None``, the EDNS
options.
+ *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
+ encoder/decoder. If ``None``, the default IDNA 2003 encoder/decoder
+ is used.
+
Returns a ``dns.message.Message``
"""
if isinstance(qname, str):
- qname = dns.name.from_text(qname)
+ qname = dns.name.from_text(qname, idna_codec=idna_codec)
if isinstance(rdtype, str):
rdtype = dns.rdatatype.from_text(rdtype)
if isinstance(rdclass, str):
def is_response(self, other : Message) -> bool:
...
-def from_text(a : str) -> Message:
+def from_text(a : str, idna_codec : Optional[name.IDNACodec] = None) -> Message:
...
def from_wire(wire, keyring : Optional[Dict[name.Name,bytes]] = None, request_mac = b'', xfr=False, origin=None,
def from_text(rdclass : int, rdtype : int, tok : Optional[str], origin : Optional[Name] = None,
relativize : bool = True, relativize_to : Optional[Name] = None,
- idna_codec : Optional[IDNACodec]):
+ idna_codec : Optional[IDNACodec] = None):
...
def from_wire(rdclass : int, rdtype : int, wire : bytes, current : int, rdlen : int, origin : Optional[Name] = None):
return False
-def from_text_list(rdclass, rdtype, ttl, text_rdatas):
+def from_text_list(rdclass, rdtype, ttl, text_rdatas, idna_codec=None):
"""Create an rdataset with the specified class, type, and TTL, and with
the specified list of rdatas in text format.
+ *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
+ encoder/decoder to use; if ``None``, the default IDNA 2003
+ encoder/decoder is used.
+
Returns a ``dns.rdataset.Rdataset`` object.
"""
r = Rdataset(rdclass, rdtype)
r.update_ttl(ttl)
for t in text_rdatas:
- rd = dns.rdata.from_text(r.rdclass, r.rdtype, t)
+ rd = dns.rdata.from_text(r.rdclass, r.rdtype, t, idna_codec=idna_codec)
r.add(rd)
return r
...
-def from_text_list(rdclass : Union[int,str], rdtype : Union[int,str], ttl : int, text_rdatas : str) -> rdataset.Rdataset:
+def from_text_list(rdclass : Union[int,str], rdtype : Union[int,str], ttl : int, text_rdatas : str, idna_codec : Optional[name.IDNACodec] = None) -> rdataset.Rdataset:
...
def from_text(rdclass : Union[int,str], rdtype : Union[int,str], ttl : int, *text_rdatas : str) -> rdataset.Rdataset:
r = RRset(name, rdclass, rdtype)
r.update_ttl(ttl)
for t in text_rdatas:
- rd = dns.rdata.from_text(r.rdclass, r.rdtype, t)
+ rd = dns.rdata.from_text(r.rdclass, r.rdtype, t, idna_codec=idna_codec)
r.add(rd)
return r
"""Create an RRset with the specified name and TTL, and with
the specified list of rdata objects.
+ *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
+ encoder/decoder to use; if ``None``, the default IDNA 2003
+ encoder/decoder is used.
+
Returns a ``dns.rrset.RRset`` object.
+
"""
if isinstance(name, str):
raise UnknownOrigin
token = self.tok.get(want_leading=True)
if not token.is_whitespace():
- self.last_name = dns.name.from_text(
- token.value, self.current_origin)
+ self.last_name = self.tok.as_name(token, self.current_origin)
else:
token = self.tok.get()
if token.is_eol_or_eof():
name = lhs.replace('$%s' % (lmod), lzfindex)
rdata = rhs.replace('$%s' % (rmod), rzfindex)
- self.last_name = dns.name.from_text(name, self.current_origin)
+ self.last_name = dns.name.from_text(name, self.current_origin,
+ self.tok.idna_codec)
name = self.last_name
if not name.is_subdomain(self.zone.origin):
self._eat_line()
if token.is_identifier():
new_origin =\
dns.name.from_text(token.value,
- self.current_origin)
+ self.current_origin,
+ self.tok.idna_codec)
self.tok.get_eol()
elif not token.is_eol_or_eof():
raise dns.exception.SyntaxError(
def from_text(text, origin=None, rdclass=dns.rdataclass.IN,
relativize=True, zone_factory=Zone, filename=None,
- allow_include=False, check_origin=True):
+ allow_include=False, check_origin=True, idna_codec=None):
"""Build a zone object from a master file format string.
@param text: the master file format input
@param check_origin: should sanity checks of the origin node be done?
The default is True.
@type check_origin: bool
+ @param idna_codec: specifies the IDNA encoder/decoder. If ``None``, the
+ default IDNA 2003 encoder/decoder is used.
+ @type idna_codec: dns.name.IDNACodec or None
@raises dns.zone.NoSOA: No SOA RR was found at the zone origin
@raises dns.zone.NoNS: No NS RRset was found at the zone origin
@rtype: dns.zone.Zone object
if filename is None:
filename = '<string>'
- tok = dns.tokenizer.Tokenizer(text, filename)
+ tok = dns.tokenizer.Tokenizer(text, filename, idna_codec=idna_codec)
reader = _MasterReader(tok, origin, rdclass, relativize, zone_factory,
allow_include=allow_include,
check_origin=check_origin)
+# -*- coding: utf-8
# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
import dns.name
import dns.rdataclass
import dns.rdatatype
+import dns.rrset
query_text = """id 1234
opcode QUERY
goodwire3 = binascii.unhexlify(goodhex3)
+idna_text = """id 1234
+opcode QUERY
+rcode NOERROR
+flags QR AA RD
+;QUESTION
+Königsgäßchen. IN NS
+;ANSWER
+Königsgäßchen. 3600 IN NS Königsgäßchen.
+"""
+
class MessageTestCase(unittest.TestCase):
def test_comparison_eq1(self):
dns.message.from_wire(wire[:-3])
self.assertRaises(dns.message.Truncated, bad)
+ def test_IDNA_2003(self):
+ a = dns.message.from_text(idna_text, idna_codec=dns.name.IDNA_2003)
+ rrs = dns.rrset.from_text_list('xn--knigsgsschen-lcb0w.', 30,
+ 'in', 'ns',
+ ['xn--knigsgsschen-lcb0w.'],
+ idna_codec=dns.name.IDNA_2003)
+ self.assertEqual(a.answer[0], rrs)
+
+ def test_IDNA_2008(self):
+ a = dns.message.from_text(idna_text, idna_codec=dns.name.IDNA_2008)
+ rrs = dns.rrset.from_text_list('xn--knigsgchen-b4a3dun.', 30,
+ 'in', 'ns',
+ ['xn--knigsgchen-b4a3dun.'],
+ idna_codec=dns.name.IDNA_2008)
+ self.assertEqual(a.answer[0], rrs)
+
if __name__ == '__main__':
unittest.main()
--- /dev/null
+# -*- coding: utf-8
+# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
+
+import unittest
+
+import dns.name
+import dns.rdataset
+
+class RdatasetTestCase(unittest.TestCase):
+
+ def testCodec2003(self):
+ r1 = dns.rdataset.from_text_list('in', 'ns', 30,
+ ['Königsgäßchen'])
+ r2 = dns.rdataset.from_text_list('in', 'ns', 30,
+ ['xn--knigsgsschen-lcb0w'])
+ self.assertEqual(r1, r2)
+
+ def testCodec2008(self):
+ r1 = dns.rdataset.from_text_list('in', 'ns', 30,
+ ['Königsgäßchen'],
+ idna_codec=dns.name.IDNA_2008)
+ r2 = dns.rdataset.from_text_list('in', 'ns', 30,
+ ['xn--knigsgchen-b4a3dun'],
+ idna_codec=dns.name.IDNA_2008)
+ self.assertEqual(r1, r2)
+
+if __name__ == '__main__':
+ unittest.main()
+# -*- coding: utf-8
# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
import unittest
+import dns.name
import dns.rrset
class RRsetTestCase(unittest.TestCase):
r2 = dns.rrset.from_text('FOO', 30, 'in', 'a', '10.0.0.2', '10.0.0.1')
self.assertNotEqual(r1, r2)
+ def testCodec2003(self):
+ r1 = dns.rrset.from_text_list('Königsgäßchen', 30, 'in', 'ns',
+ ['Königsgäßchen'])
+ r2 = dns.rrset.from_text_list('xn--knigsgsschen-lcb0w', 30, 'in', 'ns',
+ ['xn--knigsgsschen-lcb0w'])
+ self.assertEqual(r1, r2)
+
+ def testCodec2008(self):
+ r1 = dns.rrset.from_text_list('Königsgäßchen', 30, 'in', 'ns',
+ ['Königsgäßchen'],
+ idna_codec=dns.name.IDNA_2008)
+ r2 = dns.rrset.from_text_list('xn--knigsgchen-b4a3dun', 30, 'in', 'ns',
+ ['xn--knigsgchen-b4a3dun'],
+ idna_codec=dns.name.IDNA_2008)
+ self.assertEqual(r1, r2)
+
if __name__ == '__main__':
unittest.main()
+# -*- coding: utf-8
# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
ns2 1w1D1h1m1S a 10.0.0.2
"""
+codec_text = """
+@ soa foo bar 1 2 3 4 5
+@ ns ns1
+@ ns ns2
+Königsgäßchen 300 NS Königsgäßchen
+"""
+
_keep_output = True
def _rdata_sort(a):
z2_rel = dns.zone.from_xfr(make_xfr(z1_rel), relativize=True)
self.assertEqual(z1_rel, z2_rel)
+ def testCodec2003(self):
+ z = dns.zone.from_text(codec_text, 'example.', relativize=True)
+ n2003 = dns.name.from_text('xn--knigsgsschen-lcb0w', None)
+ n2008 = dns.name.from_text('xn--knigsgchen-b4a3dun', None)
+ self.assertTrue(n2003 in z)
+ self.assertFalse(n2008 in z)
+ rrs = z.find_rrset(n2003, 'NS')
+ self.assertEqual(rrs[0].target, n2003)
+
+ def testCodec2008(self):
+ z = dns.zone.from_text(codec_text, 'example.', relativize=True,
+ idna_codec=dns.name.IDNA_2008)
+ n2003 = dns.name.from_text('xn--knigsgsschen-lcb0w', None)
+ n2008 = dns.name.from_text('xn--knigsgchen-b4a3dun', None)
+ self.assertFalse(n2003 in z)
+ self.assertTrue(n2008 in z)
+ rrs = z.find_rrset(n2008, 'NS')
+ self.assertEqual(rrs[0].target, n2008)
+
if __name__ == '__main__':
unittest.main()
projects / thirdparty / dnspython.git / commitdiff
