Use and set a single _NODE_GETTERS constant with platform test outsid…

…e getnode() Move _netstat_getnode() find alg so that it can be tested using unittest.mock Add new test `test_uuid/find_mac_netstat` for AIX and netstat
python · taleinat · Sep 26, 2019 · Aug 4, 2018 · Aug 4, 2018 · Aug 4, 2018
commit 399e8ec61382b3f040822d26599e72de55c09114
diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py
@@ -325,8 +325,7 @@ def test_uuid1_eui64(self):
         with unittest.mock.patch.multiple(
             self.uuid,
             _node=None,  # Ignore any cached node value.
-            _NODE_GETTERS_WIN32=[too_large_getter],
-            _NODE_GETTERS_UNIX=[too_large_getter],
+            _NODE_GETTERS=[too_large_getter],
         ):
             node = self.uuid.getnode()
         self.assertTrue(0 < node < (1 << 48), '%012x' % node)
@@ -516,21 +515,39 @@ class TestUUIDWithExtModule(BaseTestUUID, unittest.TestCase):
 class BaseTestInternals:
     uuid = None
 
+    @unittest.skipUnless(AIX, 'requires AIX')
+    def test_find_mac_netstat(self):
+        data = '''Name  Mtu   Network     Address           Ipkts Ierrs    Opkts Oerrs  Coll
+en0   1500  link#2      fe.ad.c.1.23.4   1714807956     0 711348489     0     0
+                        01:00:5e:00:00:01
+en0   1500  192.168.129 x071             1714807956     0 711348489     0     0
+                        224.0.0.1
+en0   1500  192.168.90  x071             1714807956     0 711348489     0     0
+                        224.0.0.1
+'''
+        popen = unittest.mock.MagicMock()
+        popen.stdout = io.BytesIO(data.encode())
+
+        with unittest.mock.patch.object(shutil, 'which',
+                                        return_value='/usr/bin/netstat'):
+            with unittest.mock.patch.object(subprocess, 'Popen',
+                                            return_value=popen):
+                mac = self.uuid._find_mac_netstat(
+                    command='netstat',
+                    args='-ia',
+                    hw_identifiers=b'Address',
+                    get_index=lambda x: x * 1,
+                )
+
+        self.assertEqual(mac, 0xfead0c012304)
+
     @unittest.skipUnless(os.name == 'posix', 'requires Posix')
+    @unittest.skipIf(AIX, 'because AIX "ifconfig" does not provide macaddr')
     def test_find_mac(self):
-        if not AIX:
-            data = '''
-fake hwaddr
+        data = '''fake      Link encap:UNSPEC  hwaddr 00-00
 cscotun0  Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
 eth0      Link encap:Ethernet  HWaddr 12:34:56:78:90:ab
 '''
-        else:
-            data = '''
-fake hwaddr
-cscotun0  Link encap:UNSPEC  HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
-eth0      Link encap:Ethernet  HWaddr 12.34.56.78.90.ab
-'''
-
         popen = unittest.mock.MagicMock()
         popen.stdout = io.BytesIO(data.encode())
 

diff --git a/Lib/uuid.py b/Lib/uuid.py
@@ -52,6 +52,7 @@
 
 __author__ = 'Ka-Ping Yee <ping@zesty.ca>'
 
+_WIN32 = sys.platform == 'win32'
 _AIX = sys.platform.startswith("aix")
 _MAC_DELIM =  b':' if not _AIX else b'.'
 
@@ -391,6 +392,48 @@ def _find_mac(command, args, hw_identifiers, get_index):
         pass
     return first_local_mac or None
 
+def _find_mac_netstat(command, args, hw_identifiers, get_index):
+    first_local_mac = None
+    mac = None
+    try:
+        proc = _popen(command, *args.split())
+        if not proc:
+            return None
+        with proc:
+            words = proc.stdout.readline().rstrip().split()
+            try:
+                i = words.index(hw_identifiers)
+            except ValueError:
+                return None
+            for line in proc.stdout:
+                try:
+                    words = line.rstrip().split()
+                    word = words[get_index(i)]
+                    if len(word) == 17 and word.count(_MAC_DELIM) == 5:
+                        mac = int(word.replace(_MAC_DELIM, b''), 16)
+                    elif _AIX and  word.count(_MAC_DELIM) == 5:
+                        # the extracted hex string is not a 12 hex digit
+                        # string, so add the fields piece by piece
+                        if len(word) < 17 and len(word) >= 11:
+                            mac = 0
+                            fields = word.split(_MAC_DELIM)
+                            for hex in fields:
+                                mac <<= 8
+                                mac += int(hex, 16)
+                    if mac and _is_universal(mac):
+                        return mac
+                    first_local_mac = first_local_mac or mac
+                except (ValueError, IndexError):
+                    # Virtual interfaces, such as those provided by
+                    # VPNs, do not have a colon-delimited MAC address
+                    # as expected, but a 16-byte HWAddr separated by
+                    # dashes. These should be ignored in favor of a
+                    # real MAC address
+                    pass
+    except OSError:
+        pass
+    return first_local_mac or None
+
 def _ifconfig_getnode():
     """Get the hardware address on Unix by running ifconfig."""
     # This works on Linux ('' or '-a'), Tru64 ('-av'), but not all Unixes.
@@ -442,42 +485,9 @@ def _lanscan_getnode():
 
 def _netstat_getnode():
     """Get the hardware address on Unix by running netstat."""
-    # This might work on AIX, Tru64 UNIX.
-    first_local_mac = None
-    try:
-        proc = _popen('netstat', '-ia')
-        if not proc:
-            return None
-        with proc:
-            words = proc.stdout.readline().rstrip().split()
-            try:
-                i = words.index(b'Address')
-            except ValueError:
-                return None
-            for line in proc.stdout:
-                try:
-                    words = line.rstrip().split()
-                    word = words[i]
-                    if word.count(_MAC_DELIM) == 5:
-                        if len(word) == 17:
-                            mac = int(word.replace(_MAC_DELIM, b''), 16)
-                        # the extracted hex string will not be a 12 hex digit
-                        # string, so extract the fields and add them in
-                        # piece by piece
-                        elif len(word) < 17 and len(word) >= 11:
-                            mac = 0
-                            hexs = word.split(_MAC_DELIM)
-                            for hex in hexs:
-                                mac <<= 8
-                                mac += int(hex, 16)
-                        if _is_universal(mac):
-                            return mac
-                        first_local_mac = first_local_mac or mac
-                except (ValueError, IndexError):
-                    pass
-    except OSError:
-        pass
-    return first_local_mac or None
+    # This works on AIX and might work on Tru64 UNIX.
+    mac = _find_mac_netstat('netstat', '-ia', b'Address', lambda i: i+0)
+    return mac if mac else None
 
 def _ipconfig_getnode():
     """Get the hardware address on Windows by running ipconfig.exe."""
@@ -669,15 +679,15 @@ def _random_getnode():
     return random.getrandbits(48) | (1 << 40)
 
 
+if _AIX:
+    _NODE_GETTERS = [_unix_getnode, _netstat_getnode]
+elif _WIN32:
+    _NODE_GETTERS = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
+else:
+    _NODE_GETTERS = [_unix_getnode, _ifconfig_getnode, _ip_getnode,
+                          _arp_getnode, _lanscan_getnode, _netstat_getnode]
 _node = None
 
-_NODE_GETTERS_WIN32 = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
-
-_NODE_GETTERS_UNIX = [_unix_getnode, _ifconfig_getnode, _ip_getnode,
-                      _arp_getnode, _lanscan_getnode, _netstat_getnode]
-
-_NODE_GETTERS_AIX = [_unix_getnode, _netstat_getnode]
-
 def getnode(*, getters=None):
     """Get the hardware address as a 48-bit positive integer.
 
@@ -690,12 +700,7 @@ def getnode(*, getters=None):
     if _node is not None:
         return _node
 
-    if sys.platform == 'win32':
-        getters = _NODE_GETTERS_WIN32
-    else:
-        getters = _NODE_GETTERS_UNIX if not _AIX else _NODE_GETTERS_AIX
-
-    for getter in getters + [_random_getnode]:
+    for getter in _NODE_GETTERS + [_random_getnode]:
         try:
             _node = getter()
         except:
@@ -704,7 +709,6 @@ def getnode(*, getters=None):
             return _node
     assert False, '_random_getnode() returned invalid value: {}'.format(_node)
 
-
 _last_timestamp = None
 
 def uuid1(node=None, clock_seq=None):