lanscape 1.2.8a2__tar.gz → 1.2.9a1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lanscape
-Version: 1.2.8a2
+Version: 1.2.9a1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 Project-URL: Homepage, https://github.com/mdennis281/py-lanscape
@@ -32,17 +32,15 @@ python -m lanscape
 
 ## Flags
  - `--port <port number>` port of the flask app (default: 5001)
- - `--nogui` run in web mode (default: false)
  - `--reloader` essentially flask debug mode- good for local development (default: false)
  - `--logfile` save log output to lanscape.log
  - `--loglevel <level>` set the logger's log level (default: INFO)
- - `--headless` similar to nogui but doesnt try to open a browser (default: false)
  
 
 Examples:
 ```shell
 python -m lanscape --reloader
-python -m lanscape --nogui --port 5002
+python -m lanscape --port 5002
 python -m lanscape --logfile --loglevel DEBUG
 ```
 
@@ -57,14 +55,6 @@ can sometimes require admin-level permissions to retrieve accurate results.
 This is a missing dependency related to the ARP lookup. This is handled in the code, but you would get marginally faster/better results with this installed: [npcap download](https://npcap.com/#download)
 
 
-### Unable to start webview client. Try --nogui (Linux)
-Linux and QT (GUI package) dont seem to play well with each other very well. If you really want the gui (`python -m lanscape --nogui` is almost as good) I had success on ubuntu desktop by running these:
-```sh
-sudo apt install libcairo2-dev libxt-dev libgirepository1.0-dev
-pip install pycairo PyGObject qtpy PyQt5 PyQtWebEngine
-```
-
-
 ### Something else
 Feel free to submit a github issue detailing your experience.
 

{lanscape-1.2.8a2 → lanscape-1.2.9a1}/README.md

@@ -11,17 +11,15 @@ python -m lanscape
 
 ## Flags
  - `--port <port number>` port of the flask app (default: 5001)
- - `--nogui` run in web mode (default: false)
  - `--reloader` essentially flask debug mode- good for local development (default: false)
  - `--logfile` save log output to lanscape.log
  - `--loglevel <level>` set the logger's log level (default: INFO)
- - `--headless` similar to nogui but doesnt try to open a browser (default: false)
  
 
 Examples:
 ```shell
 python -m lanscape --reloader
-python -m lanscape --nogui --port 5002
+python -m lanscape --port 5002
 python -m lanscape --logfile --loglevel DEBUG
 ```
 
@@ -36,14 +34,6 @@ can sometimes require admin-level permissions to retrieve accurate results.
 This is a missing dependency related to the ARP lookup. This is handled in the code, but you would get marginally faster/better results with this installed: [npcap download](https://npcap.com/#download)
 
 
-### Unable to start webview client. Try --nogui (Linux)
-Linux and QT (GUI package) dont seem to play well with each other very well. If you really want the gui (`python -m lanscape --nogui` is almost as good) I had success on ubuntu desktop by running these:
-```sh
-sudo apt install libcairo2-dev libxt-dev libgirepository1.0-dev
-pip install pycairo PyGObject qtpy PyQt5 PyQtWebEngine
-```
-
-
 ### Something else
 Feel free to submit a github issue detailing your experience.
 

{lanscape-1.2.8a2 → lanscape-1.2.9a1}/pyproject.toml

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

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

@@ -27,7 +27,14 @@ TCNT_DEVICE_ISALIVE = 256
 class ScanConfig:
     subnet: str
     port_list: str
-    parallelism: float = 1.0
+    t_multiplier: float = 1.0
+    t_cnt_port_scan: int = 10
+    t_cnt_port_test: int = 128
+    t_cnt_isalive: int = 256
+
+    def t_cnt(self, id: str) -> int:
+        return int(int(getattr(self, f't_cnt_{id}')) * float(self.t_multiplier))
+
 
 
 
@@ -40,8 +47,9 @@ class SubnetScanner:
         self.port_list = config.port_list
         self.ports: list = PortManager().get_port_list(config.port_list).keys()
         self.running = False
-        self.parallelism: float = float(config.parallelism)
         self.subnet_str = config.subnet
+
+        self.cfg = config
         self.job_stats = JobStats()
         self.uid = str(uuid.uuid4())
         self.results = ScannerResults(self)
@@ -58,7 +66,7 @@ class SubnetScanner:
         """
         self._set_stage('scanning devices')
         self.running = True
-        with ThreadPoolExecutor(max_workers=self._t_cnt(TCNT_DEVICE_ISALIVE)) as executor:
+        with ThreadPoolExecutor(max_workers=self.cfg.t_cnt('isalive')) as executor:
             futures = {executor.submit(self._get_host_details, str(ip)): str(ip) for ip in self.subnet}
             for future in futures:
                 ip = futures[future]
@@ -104,7 +112,7 @@ class SubnetScanner:
         remaining_isalive_sec = (self.results.devices_total - self.results.devices_scanned) * avg_host_detail_sec
         total_isalive_sec = self.results.devices_total * avg_host_detail_sec
 
-        isalive_multiplier = self._t_cnt(TCNT_DEVICE_ISALIVE)
+        isalive_multiplier = self.cfg.t_cnt('isalive')
 
         # --- Port scanning calculations ---
         device_ports_scanned = self.job_stats.finished.get('_test_port', 0)
@@ -116,7 +124,7 @@ class SubnetScanner:
         remaining_port_test_sec = device_ports_unscanned * avg_port_test_sec
         total_port_test_sec = est_subnet_devices * len(self.ports) * avg_port_test_sec
 
-        port_test_multiplier = self._t_cnt(TCNT_PORT_SCANS) * self._t_cnt(TCNT_PORT_TEST)
+        port_test_multiplier = self.cfg.t_cnt('port_scan') * self.cfg.t_cnt('port_test')
 
         # --- Overall progress ---
         est_total_time = (total_isalive_sec / isalive_multiplier) + (total_port_test_sec / port_test_multiplier)
@@ -157,7 +165,7 @@ class SubnetScanner:
         
     @terminator
     def _scan_network_ports(self):
-        with ThreadPoolExecutor(max_workers=self._t_cnt(TCNT_PORT_SCANS)) as executor:
+        with ThreadPoolExecutor(max_workers=self.cfg.t_cnt('port_scan')) as executor:
             futures = {executor.submit(self._scan_ports, device): device for device in self.results.devices}
             for future in futures:
                 future.result()
@@ -167,7 +175,7 @@ class SubnetScanner:
     def _scan_ports(self, device: Device):
         self.log.debug(f'[{device.ip}] Initiating port scan')
         device.stage = 'scanning'
-        with ThreadPoolExecutor(max_workers=self._t_cnt(TCNT_PORT_TEST)) as executor:
+        with ThreadPoolExecutor(max_workers=self.cfg.t_cnt('port_test')) as executor:
             futures = {executor.submit(self._test_port, device, int(port)): port for port in self.ports}
             for future in futures:
                 future.result()
@@ -192,13 +200,6 @@ class SubnetScanner:
         """
         return host.is_alive(host.ip)
     
-    def _t_cnt(self, base_threads: int) -> int:
-        """
-        Calculate the number of threads to use based on the base number 
-        of threads and the parallelism factor.
-        """
-        return int(base_threads * self.parallelism)
-    
     def _set_stage(self,stage):
         self.log.debug(f'[{self.uid}] Moving to Stage: {stage}')
         self.results.stage = stage
@@ -210,7 +211,6 @@ class ScannerResults:
         self.scan = scan
         self.port_list: str = scan.port_list
         self.subnet: str = scan.subnet_str
-        self.parallelism: float = scan.parallelism
         self.uid = scan.uid
 
         self.devices_total: int = len(list(scan.subnet))
@@ -249,6 +249,7 @@ class ScannerResults:
         out = vars(self).copy()
         out.pop('scan')
         out.pop('log')
+        out['cfg'] = vars(self.scan.cfg)
         
         devices: List[Device] = out.pop('devices')
         sortedDevices = sorted(devices, key=lambda obj: ipaddress.IPv4Address(obj.ip))

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

@@ -11,7 +11,7 @@ class LibraryTestCase(unittest.TestCase):
         self.assertIsNotNone(subnet)
         cfg = ScanConfig(
             subnet = right_size_subnet(subnet),
-            parallelism=1.0,
+            t_multiplier=1.0,
             port_list='small'
         )
         scan = sm.new_scan(cfg)

{lanscape-1.2.8a2 → lanscape-1.2.9a1}/src/lanscape/ui/app.py

@@ -106,8 +106,6 @@ def start_webserver(args: RuntimeArgs) -> int:
 
     app.run(**run_args)
 
-    
-
 if __name__ == "__main__":
     start_webserver(True)
 

{lanscape-1.2.8a2 → lanscape-1.2.9a1}/src/lanscape/ui/blueprints/api/scan.py

@@ -61,5 +61,5 @@ def get_scan_config():
     return ScanConfig(
         subnet = data['subnet'],
         port_list= data['port_list'],
-        parallelism=data.get('parallelism',1.0)
+        t_multiplier=data.get('parallelism',1.0)
     )

{lanscape-1.2.8a2 → lanscape-1.2.9a1}/src/lanscape/ui/blueprints/web/routes.py

@@ -22,7 +22,7 @@ def index():
             scan = scanner.results.export()
             subnet = scan['subnet']
             port_list = scan['port_list']
-            parallelism = scan['parallelism']
+            parallelism = scan['cfg']['t_multiplier']
         else:
             log.debug(f'Redirecting, scan {scan_id} doesnt exist in memory')
             return redirect('/')

{lanscape-1.2.8a2 → lanscape-1.2.9a1}/src/lanscape/ui/main.py

@@ -13,6 +13,7 @@ configure_logging(args.loglevel, args.logfile)
 
 from ..libraries.version_manager import get_installed_version, is_update_available
 from .app import start_webserver
+import socket
 
 
 log = logging.getLogger('core')
@@ -27,9 +28,12 @@ def main():
     if not IS_FLASK_RELOAD:
         log.info(f'LANscape v{get_installed_version()}')
         try_check_update()
-    else: 
+        
+    else:
         log.info('Flask reloaded app.')
         
+    args.port = get_valid_port(args.port)
+        
         
     try:
         
@@ -63,9 +67,8 @@ def open_browser(url: str,wait=2):
             time.sleep(wait)
             webbrowser.open(url, new=2)
         except:
-            srv_url = f"0.0.0.0:{url.split(':')[1]}"
             log.debug(traceback.format_exc())
-            log.info(f'unable to open web browser, server running on {srv_url}')
+            log.info(f'Unable to open web browser, server running on {url}')
 
     threading.Thread(target=do_open).start()
 
@@ -74,13 +77,21 @@ def no_gui(args: RuntimeArgs):
     # if it was, dont open the browser again
     if not IS_FLASK_RELOAD:
         open_browser(f'http://127.0.0.1:{args.port}')
-    
-    log.info(f'Server started: http://127.0.0.1:{args.port}')
+        log.info(f'Flask started: http://127.0.0.1:{args.port}')
     
     start_webserver(
         args
     )
 
+def get_valid_port(port: int):
+    """
+    Get the first available port starting from the specified port
+    """
+    while True:
+        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+            if s.connect_ex(('localhost', port)) != 0:
+                return port
+            port += 1
 
 if __name__ == "__main__":
     main()

{lanscape-1.2.8a2 → lanscape-1.2.9a1}/src/lanscape/ui/templates/base.html

@@ -11,7 +11,7 @@
         <div class="version">
             v{{app_version}}
             {% if is_local %}
-                <span class="text-info">(Local Run)</span> 
+                <span class="text-info">(Local)</span> 
             {% elif update_available %} 
                 <span>(Update Available)</span> 
             {% endif %}   

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lanscape
-Version: 1.2.8a2
+Version: 1.2.9a1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 Project-URL: Homepage, https://github.com/mdennis281/py-lanscape
@@ -32,17 +32,15 @@ python -m lanscape
 
 ## Flags
  - `--port <port number>` port of the flask app (default: 5001)
- - `--nogui` run in web mode (default: false)
  - `--reloader` essentially flask debug mode- good for local development (default: false)
  - `--logfile` save log output to lanscape.log
  - `--loglevel <level>` set the logger's log level (default: INFO)
- - `--headless` similar to nogui but doesnt try to open a browser (default: false)
  
 
 Examples:
 ```shell
 python -m lanscape --reloader
-python -m lanscape --nogui --port 5002
+python -m lanscape --port 5002
 python -m lanscape --logfile --loglevel DEBUG
 ```
 
@@ -57,14 +55,6 @@ can sometimes require admin-level permissions to retrieve accurate results.
 This is a missing dependency related to the ARP lookup. This is handled in the code, but you would get marginally faster/better results with this installed: [npcap download](https://npcap.com/#download)
 
 
-### Unable to start webview client. Try --nogui (Linux)
-Linux and QT (GUI package) dont seem to play well with each other very well. If you really want the gui (`python -m lanscape --nogui` is almost as good) I had success on ubuntu desktop by running these:
-```sh
-sudo apt install libcairo2-dev libxt-dev libgirepository1.0-dev
-pip install pycairo PyGObject qtpy PyQt5 PyQtWebEngine
-```
-
-
 ### Something else
 Feel free to submit a github issue detailing your experience.