lanscape 1.2.7a1__tar.gz → 1.2.7a2__tar.gz

{lanscape-1.2.7a1/src/lanscape.egg-info → lanscape-1.2.7a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lanscape
-Version: 1.2.7a1
+Version: 1.2.7a2
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 Project-URL: Homepage, https://github.com/mdennis281/py-lanscape

{lanscape-1.2.7a1 → lanscape-1.2.7a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lanscape"
-version = "1.2.7a1"
+version = "1.2.7a2"
 authors = [
   { name="Michael Dennis", email="michael@dipduo.com" },
 ]

{lanscape-1.2.7a1 → lanscape-1.2.7a2}/src/lanscape/libraries/mac_lookup.py

@@ -3,7 +3,7 @@ import json
 import logging
 import platform
 import subprocess
-from typing import Optional
+from typing import List
 
 from .app_scope import ResourceManager
 
@@ -22,7 +22,7 @@ def lookup_mac(mac: str) -> str:
                 return DB[m]
     return None
         
-def get_mac(ip: str) -> Optional[str]:
+def get_macs(ip: str) -> List[str]:
     """Try to get the MAC address using Scapy, fallback to ARP if it fails."""
     if mac := get_mac_by_scapy(ip):
         log.debug(f"Used Scapy to resolve ip {ip} to mac {mac}")
@@ -31,7 +31,8 @@ def get_mac(ip: str) -> Optional[str]:
     log.debug(f"Used ARP to resolve ip {ip} to mac {arp}")
     return arp
 
-def get_mac_by_arp(ip: str) -> Optional[str]:
+
+def get_mac_by_arp(ip: str) -> List[str]:
     """Retrieve the last MAC address instance using the ARP command."""
     try:
         # Use the appropriate ARP command based on the platform
@@ -44,11 +45,11 @@ def get_mac_by_arp(ip: str) -> Optional[str]:
 
         macs = re.findall(r'..:..:..:..:..:..', output)
         # found that typically last mac is the correct one
-        return macs[-1] if macs else None
+        return macs
     except:
-        return None
+        return []
 
-def get_mac_by_scapy(ip: str) -> Optional[str]:
+def get_mac_by_scapy(ip: str) -> List[str]:
     """Retrieve the MAC address using the Scapy library."""
     try:
         from scapy.all import ARP, Ether, srp
@@ -61,7 +62,9 @@ def get_mac_by_scapy(ip: str) -> Optional[str]:
         # Send the packet and wait for a response
         result = srp(packet, timeout=1, verbose=0)[0]
 
-        # Extract the MAC address from the response
-        return result[0][1].hwsrc if result else None
+        # Extract the MAC addresses from the response
+        return [res[1].hwsrc for res in result]
+        # return result[0][1].hwsrc if result else None
     except:
-        return None
+        return None
+

{lanscape-1.2.7a1 → lanscape-1.2.7a2}/src/lanscape/libraries/net_tools.py

@@ -11,7 +11,7 @@ from time import sleep
 from typing import List
 from scapy.all import ARP, Ether, srp
 
-from .mac_lookup import lookup_mac, get_mac
+from .mac_lookup import lookup_mac, get_macs
 from .ip_parser import get_address_count, MAX_IPS_ALLOWED
 
 log = logging.getLogger('NetTools')
@@ -61,13 +61,15 @@ class IPAlive:
                     pass  # Ping failed
                 sleep(retry_delay)
             return False
+    
+
 
 class Device(IPAlive):
     def __init__(self,ip:str):
         self.ip: str = ip
         self.alive: bool = None
         self.hostname: str = None
-        self.mac_addr: str = None
+        self.macs: List[str] = []
         self.manufacturer: str = None
         self.ports: List[int] = []
         self.stage: str = 'found'
@@ -76,8 +78,16 @@ class Device(IPAlive):
     def get_metadata(self):
         if self.alive:
             self.hostname = self._get_hostname()
-            self.mac_addr = self._get_mac_address()
-            self.manufacturer = self._get_manufacturer()
+            self.macs = self._get_mac_addresses()
+
+    def dict(self) -> dict:
+        obj = vars(self).copy()
+        obj.pop('log')
+        primary_mac = self.get_mac()
+        obj['mac_addr'] = primary_mac
+        obj['manufacturer'] = self._get_manufacturer(primary_mac)
+
+        return obj
             
     
     def test_port(self,port:int) -> bool:
@@ -89,12 +99,19 @@ class Device(IPAlive):
             self.ports.append(port)
             return True
         return False
+    
+    def get_mac(self):
+        if not self.macs:
+            self.macs = self._get_mac_addresses()
+        return mac_selector.choose_mac(self.macs)
 
-    def _get_mac_address(self):
+    def _get_mac_addresses(self):
         """
         Get the MAC address of a network device given its IP address.
         """
-        return get_mac(self.ip)
+        macs = get_macs(self.ip)
+        mac_selector.import_macs(macs)
+        return macs
         
     def _get_hostname(self):
         """
@@ -106,11 +123,38 @@ class Device(IPAlive):
         except socket.herror:
             return None
         
-    def _get_manufacturer(self):
+    def _get_manufacturer(self,mac_addr=None):
         """
         Get the manufacturer of a network device given its MAC address.
         """
-        return lookup_mac(self.mac_addr) if self.mac_addr else None
+        return lookup_mac(mac_addr) if mac_addr else None
+    
+
+class MacSelector:
+    def __init__(self):
+        self.macs = {}
+    
+    def choose_mac(self,macs:List[str]) -> str:
+        if len(macs) == 1:
+            return macs[0]
+        lowest = 9999
+        lowest_i = -1
+
+        for mac in macs:
+            if self.macs[mac] < lowest:
+                lowest = self.macs[mac]
+                lowest_i = macs.index(mac)
+        return macs[lowest_i] if lowest_i != -1 else None
+
+    
+    def import_macs(self,macs:List[str]):
+        for mac in macs:
+            self.macs[mac] = self.macs.get(mac,0) + 1
+    
+    def clear(self):
+        self.macs = {}
+
+mac_selector = MacSelector()
     
 
 def get_ip_address(interface: str):
@@ -262,4 +306,6 @@ def smart_select_primary_subnet(subnets: List[dict]=get_all_network_subnets()) -
             selected = subnet
     if not selected and len(subnets):
         selected = subnets[0]
-    return selected['subnet']
+    return selected['subnet']
+
+

{lanscape-1.2.7a1 → lanscape-1.2.7a2}/src/lanscape/libraries/subnet_scan.py

@@ -250,10 +250,9 @@ class ScannerResults:
         out.pop('scan')
         out.pop('log')
         
-        devices: Device = out.pop('devices')
+        devices: List[Device] = out.pop('devices')
         sortedDevices = sorted(devices, key=lambda obj: ipaddress.IPv4Address(obj.ip))
-        out['devices'] = [vars(device).copy() for device in sortedDevices]
-        for device in out['devices']: device.pop('log') 
+        out['devices'] = [device.dict() for device in sortedDevices]
 
         if out_type == str:
             return json.dumps(out, indent=2)

{lanscape-1.2.7a1 → lanscape-1.2.7a2}/src/lanscape/tests/test_library.py

@@ -30,8 +30,8 @@ class LibraryTestCase(unittest.TestCase):
         for d in scan.results.devices:
             if d.hostname: cnt_with_hostname += 1
             # ensure there arent dupe mac addresses
-            self.assertNotIn(d.mac_addr, macs)
-            macs.append(d.mac_addr)
+            self.assertNotIn(d.get_mac(), macs)
+            macs.append(d.get_mac())
 
             # ensure there arent dupe ips
             self.assertNotIn(d.ip, ips)

{lanscape-1.2.7a1 → lanscape-1.2.7a2}/src/lanscape/ui/webviewer.py

@@ -1,6 +1,7 @@
 import webview
 from .app import start_webserver_dameon
 from ..libraries.runtime_args import RuntimeArgs
+from time import sleep
 
 
 
@@ -10,6 +11,7 @@ def start_webview(args: RuntimeArgs) -> None:
 
     # Start the Pywebview window
     webview.create_window('LANscape', f'http://127.0.0.1:{args.port}')
+    sleep(1)
     webview.start()
 
 

{lanscape-1.2.7a1 → lanscape-1.2.7a2/src/lanscape.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lanscape
-Version: 1.2.7a1
+Version: 1.2.7a2
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 Project-URL: Homepage, https://github.com/mdennis281/py-lanscape