Merge pull request #51298 from terminalmage/issue51258

Fix edge case when minion ID is a 16-character string
saltstack · Jan 24, 2019 · d6f4f05 · d6f4f05
2 parents cd5b503 + f94e721
commit d6f4f05
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/salt/_compat.py b/salt/_compat.py
@@ -144,13 +144,6 @@ def __init__(self, address):
 
         :param address:
         '''
-        # pylint: disable-all
-        if not hasattr(self, '_is_packed_binary'):
-            # This method (below) won't be around for some Python 3 versions
-            # and we need check this differently anyway
-            self._is_packed_binary = lambda p: isinstance(p, bytes)
-        # pylint: enable-all
-
         if isinstance(address, string_types) and '%' in address:
             buff = address.split('%')
             if len(buff) != 2:
@@ -189,7 +182,7 @@ def _is_packed_binary(self, data):
         :return:
         '''
         packed = False
-        if len(data) == 16 and ':' not in data:
+        if isinstance(data, bytes) and len(data) == 16 and b':' not in data:
             try:
                 packed = bool(int(str(bytearray(data)).encode('hex'), 16))
             except ValueError:

diff --git a/tests/unit/utils/test_network.py b/tests/unit/utils/test_network.py
@@ -184,11 +184,17 @@ def test__generate_minion_id_with_unicode_in_etc_hosts(self):
     def test_is_ip(self):
         self.assertTrue(network.is_ip('10.10.0.3'))
         self.assertFalse(network.is_ip('0.9.800.1000'))
+        # Check 16-char-long unicode string
+        # https://github.com/saltstack/salt/issues/51258
+        self.assertFalse(network.is_ipv6('sixteen-char-str'))
 
     def test_is_ipv4(self):
         self.assertTrue(network.is_ipv4('10.10.0.3'))
         self.assertFalse(network.is_ipv4('10.100.1'))
         self.assertFalse(network.is_ipv4('2001:db8:0:1:1:1:1:1'))
+        # Check 16-char-long unicode string
+        # https://github.com/saltstack/salt/issues/51258
+        self.assertFalse(network.is_ipv4('sixteen-char-str'))
 
     def test_is_ipv6(self):
         self.assertTrue(network.is_ipv6('2001:db8:0:1:1:1:1:1'))
@@ -201,6 +207,9 @@ def test_is_ipv6(self):
         self.assertFalse(network.is_ipv6('2001:0db8:::0370:7334'))
         self.assertFalse(network.is_ipv6('10.0.1.2'))
         self.assertFalse(network.is_ipv6('2001.0db8.85a3.0000.0000.8a2e.0370.7334'))
+        # Check 16-char-long unicode string
+        # https://github.com/saltstack/salt/issues/51258
+        self.assertFalse(network.is_ipv6('sixteen-char-str'))
 
     def test_is_subnet(self):
         for subnet_data in (IPV4_SUBNETS, IPV6_SUBNETS):