Allow an escaped newline in a quoted string.

diff --git a/dns/tokenizer.py b/dns/tokenizer.py
index 2a13e0f2edaf49dfddc6df206270eedee16dc6e1..bef720b64548bc1221cd27fc0bdcebbbc7e2037a 100644 (file)
--- a/dns/tokenizer.py
+++ b/dns/tokenizer.py
@@ -423,7 +423,7 @@ class Tokenizer:
                 token += c
                 has_escape = True
                 c = self._get_char()
-                if c == '' or c == '\n':
+                if c == '' or (c == '\n' and not self.quoting):
                     raise dns.exception.UnexpectedEnd
             token += c
         if token == '' and ttype != QUOTED_STRING:

diff --git a/tests/test_rdata.py b/tests/test_rdata.py
index 40f6f8da023c79cfa09fba7e5d441f70ca608c5f..ca509b893370af3f0370c7290a6b59979884cb74 100644 (file)
--- a/tests/test_rdata.py
+++ b/tests/test_rdata.py
@@ -459,6 +459,14 @@ class RdataTestCase(unittest.TestCase):
         self.assertEqual(mx, expected_mx)
         self.assertIsNone(mx.rdcomment)
 
+    def test_escaped_newline_in_quoted_string(self):
+        rd = dns.rdata.from_text('in', 'txt', '"foo\\\nbar"')
+        self.assertEqual(rd.strings, (b'foo\nbar',))
+        self.assertEqual(rd.to_text(), '"foo\\010bar"')
+
+    def test_escaped_newline_in_nonquoted_string(self):
+        with self.assertRaises(dns.exception.UnexpectedEnd):
+            dns.rdata.from_text('in', 'txt', 'foo\\\nbar')
 
 if __name__ == '__main__':
     unittest.main()