Merge pull request #3105 from guedou/Issue_#3051

Test get_if_addr() errors

Author: guedou

scapy/arch/bpf/core.py

@@ -70,10 +70,10 @@ def get_if_raw_addr(ifname):
     )
     stdout, stderr = subproc.communicate()
     if subproc.returncode:
-        warning("Failed to execute ifconfig: (%s)", plain_str(stderr))
+        warning("Failed to execute ifconfig: (%s)", plain_str(stderr).strip())
         return b"\0\0\0\0"
-    # Get IPv4 addresses
 
+    # Get IPv4 addresses
     addresses = [
         line.strip() for line in plain_str(stdout).splitlines()
         if "inet " in line
@@ -108,7 +108,7 @@ def get_if_raw_hwaddr(ifname):
     stdout, stderr = subproc.communicate()
     if subproc.returncode:
         raise Scapy_Exception("Failed to execute ifconfig: (%s)" %
-                              (plain_str(stderr)))
+                              plain_str(stderr).strip())
 
     # Get MAC addresses
     addresses = [

scapy/arch/unix.py

@@ -118,23 +118,22 @@ def read_routes():
             from scapy.arch import get_if_addr
             try:
                 ifaddr = get_if_addr(netif)
-                routes.append((dest, netmask, gw, netif, ifaddr, metric))
-            except OSError as exc:
-                if 'Device not configured' in str(exc):
+                if ifaddr == "0.0.0.0":
                     # This means the interface name is probably truncated by
                     # netstat -nr. We attempt to guess it's name and if not we
                     # ignore it.
                     guessed_netif = _guess_iface_name(netif)
                     if guessed_netif is not None:
                         ifaddr = get_if_addr(guessed_netif)
-                        routes.append((dest, netmask, gw, guessed_netif, ifaddr, metric))  # noqa: E501
+                        netif = guessed_netif
                     else:
                         log_runtime.info(
                             "Could not guess partial interface name: %s",
                             netif
                         )
-                else:
-                    raise
+                routes.append((dest, netmask, gw, netif, ifaddr, metric))
+            except OSError:
+                raise
         else:
             pending_if.append((dest, netmask, gw))
     f.close()

test/regression.uts

@@ -2320,7 +2320,7 @@ default            link#11            UCSI            1        0 bridge1
     def se_get_if_addr(iface):
         """Perform specific side effects"""
         if iface == "bridge1":
-            raise OSError("Device not configured")
+            return "0.0.0.0"
         return "1.2.3.4"
     mock_get_if_addr.side_effect = se_get_if_addr
     # Test the function
@@ -2457,9 +2457,10 @@ test_osx_10_15_ipv4()
 import mock
 from io import StringIO
 
+@mock.patch("scapy.arch.get_if_addr")
 @mock.patch("scapy.arch.unix.OPENBSD")
 @mock.patch("scapy.arch.unix.os")
-def test_openbsd_6_3(mock_os, mock_openbsd):
+def test_openbsd_6_3(mock_os, mock_openbsd, mock_get_if_addr):
     """Test read_routes() on OpenBSD 6.3"""
     # 'netstat -rn -f inet' output
     netstat_output = u"""
@@ -2489,6 +2490,16 @@ default            10.0.1.254         UGS        0        0     -     8 bge0
 
     # Mocked OpenBSD parsing behavior
     mock_openbsd = True
+    
+    # Mocked get_if_addr() output
+    def se_get_if_addr(iface):
+        """Perform specific side effects"""
+        import socket
+        if iface == "bge0":
+            return "192.168.122.42"
+        return "10.0.1.26"
+    mock_get_if_addr.side_effect = se_get_if_addr
+    
     # Test the function
     from scapy.arch.unix import read_routes
     return read_routes()
@@ -2518,9 +2529,10 @@ from io import StringIO
 
 # Mocked Solaris 11.1 parsing behavior
 
+@mock.patch("scapy.arch.get_if_addr")
 @mock.patch("scapy.arch.unix.SOLARIS", True)
 @mock.patch("scapy.arch.unix.os")
-def test_solaris_111(mock_os):
+def test_solaris_111(mock_os, mock_get_if_addr):
     """Test read_routes() on Solaris 11.1"""
     # 'netstat -rvn -f inet' output
     netstat_output = u"""
@@ -2536,6 +2548,15 @@ default              0.0.0.0         10.0.2.2             net0    1500   2 UG
     mock_os.popen = mock.MagicMock(return_value=strio)
     print(scapy.arch.unix.SOLARIS)
 
+    # Mocked get_if_addr() output
+    def se_get_if_addr(iface):
+        """Perform specific side effects"""
+        import socket
+        if iface == "net0":
+            return "10.0.2.15"
+        return "127.0.0.1"
+    mock_get_if_addr.side_effect = se_get_if_addr
+    
     # Test the function
     from scapy.arch.unix import read_routes
     return read_routes()
@@ -2857,9 +2878,10 @@ test_freebsd_10_2()
 
 import mock
 from io import StringIO
-
+ 
+@mock.patch("scapy.arch.get_if_addr")
 @mock.patch("scapy.arch.unix.os")
-def test_freebsd_13(mock_os):
+def test_freebsd_13(mock_os, mock_get_if_addr):
     """Test read_routes() on FreeBSD 13"""
     # 'netstat -rnW -f inet' output
     netstat_output = u"""
@@ -2875,6 +2897,13 @@ default            10.0.0.1           UGS         3   1500     vtnet0
     # Mocked file descriptor
     strio = StringIO(netstat_output)
     mock_os.popen = mock.MagicMock(return_value=strio)
+    # Mocked get_if_addr() behavior
+    def se_get_if_addr(iface):
+        """Perform specific side effects"""
+        if iface == "vtnet0":
+            return "10.0.0.1"
+        return "1.2.3.4"
+    mock_get_if_addr.side_effect = se_get_if_addr
     # Test the function
     from scapy.arch.unix import read_routes
     routes = read_routes()