dnspython 2.9.1__tar.gz → 2.9.2__tar.gz

{dnspython-2.9.1 → dnspython-2.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dnspython
-Version: 2.9.1
+Version: 2.9.2
 Summary: DNS toolkit
 Author: Bob Halley
 Author-email: Bob Halley <halley@dnspython.org>
@@ -85,7 +85,7 @@ testing of DNS software.
 
 ## ABOUT THIS RELEASE
 
-This is `dnspython` 2.9.1.
+This is `dnspython` 2.9.2.
 Please read
 [What's New](https://dnspython.readthedocs.io/en/stable/whatsnew.html) for
 information about the changes in this release.

{dnspython-2.9.1 → dnspython-2.9.2}/README.md

@@ -29,7 +29,7 @@ testing of DNS software.
 
 ## ABOUT THIS RELEASE
 
-This is `dnspython` 2.9.1.
+This is `dnspython` 2.9.2.
 Please read
 [What's New](https://dnspython.readthedocs.io/en/stable/whatsnew.html) for
 information about the changes in this release.

{dnspython-2.9.1 → dnspython-2.9.2}/dns/rdtypes/IN/WKS.py

@@ -45,6 +45,10 @@ class WKS(dns.rdata.Rdata):
         self.address = self._as_ipv4_address(address)
         self.protocol = self._as_uint8(protocol)
         self.bitmap = self._as_bytes(bitmap)
+        if len(self.bitmap) > 8192:
+            raise ValueError(
+                "service bitmap must be between 0 and 8192 bytes inclusive"
+            )
 
     def to_styled_text(self, style: dns.rdata.RdataStyle) -> str:
         bits = []
@@ -78,11 +82,12 @@ class WKS(dns.rdata.Rdata):
                 else:
                     protocol_text = "tcp"
                 serv = socket.getservbyname(value, protocol_text)
+            if serv < 0 or serv > 65535:
+                raise ValueError("service must be between 0 and 65535 inclusive")
             i = serv // 8
             l = len(bitmap)
             if l < i + 1:
-                for _ in range(l, i + 1):
-                    bitmap.append(0)
+                bitmap.extend(bytes(i + 1 - l))
             bitmap[i] = bitmap[i] | (0x80 >> (serv % 8))
         bitmap = dns.rdata._truncate_bitmap(bitmap)
         return cls(rdclass, rdtype, address, protocol, bitmap)

{dnspython-2.9.1 → dnspython-2.9.2}/dns/version.py

@@ -22,7 +22,7 @@ MAJOR = 2
 #: MINOR
 MINOR = 9
 #: MICRO
-MICRO = 1
+MICRO = 2
 #: RELEASELEVEL
 RELEASELEVEL = 0x0F
 #: SERIAL

{dnspython-2.9.1 → dnspython-2.9.2}/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = []
-version = "2.9.1"
+version = "2.9.2"
 
 [[project.authors]]
 name = "Bob Halley"

{dnspython-2.9.1 → dnspython-2.9.2}/pyproject.toml.orig

@@ -27,7 +27,7 @@ classifiers = [
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = []
-version = "2.9.1"
+version = "2.9.2"
 
 [project.optional-dependencies]
 dev = [

{dnspython-2.9.1 → dnspython-2.9.2}/tests/test_rdata.py

@@ -45,6 +45,7 @@ from dns.rdtypes.ANY.CAA import CAA
 from dns.rdtypes.ANY.GPOS import GPOS
 from dns.rdtypes.ANY.LOC import LOC
 from dns.rdtypes.ANY.OPT import OPT
+from dns.rdtypes.IN.WKS import WKS
 from tests.util import here
 
 
@@ -511,6 +512,22 @@ class RdataTestCase(unittest.TestCase):
         except dns.exception.SyntaxError as e:
             self.assertIsInstance(e.__cause__, NotImplementedError)
 
+    def test_wks_bounds(self):
+        rd = dns.rdata.from_text("IN", "WKS", "10.0.0.1 udp 0")
+        self.assertEqual(rd.bitmap, b"\x80")
+        rd = dns.rdata.from_text("IN", "WKS", "10.0.0.1 udp 65535")
+        self.assertEqual(len(rd.bitmap), 8192)
+        self.assertEqual(rd.bitmap[-1], 1)
+        with self.assertRaises(dns.exception.SyntaxError):
+            rd = dns.rdata.from_text("IN", "WKS", "10.0.0.1 udp -1")
+        with self.assertRaises(dns.exception.SyntaxError):
+            rd = dns.rdata.from_text("IN", "WKS", "10.0.0.1 udp 65536")
+        # test direct invocation of the constructor too
+        rd = WKS(dns.rdataclass.IN, dns.rdatatype.WKS, "10.0.0.1", 1, bytes())
+        rd = WKS(dns.rdataclass.IN, dns.rdatatype.WKS, "10.0.0.1", 1, bytes(8192))
+        with self.assertRaises(ValueError):
+            WKS(dns.rdataclass.IN, dns.rdatatype.WKS, "10.0.0.1", 1, bytes(8193))
+
     def test_GPOS_float_converters(self):
         rd = dns.rdata.from_text("in", "gpos", "49 0 0")
         self.assertEqual(rd.float_latitude, 49.0)