ipmg 2.0.0__tar.gz → 2.1.1__tar.gz

{ipmg-2.0.0/src/ipmg.egg-info → ipmg-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipmg
-Version: 2.0.0
+Version: 2.1.1
 Summary: IP Management & Ping Monitoring CLI Tool
 Author: Sameer Alam
 Maintainer-email: Sameer Alam <sameeralam3127@gmail.com>
@@ -10,7 +10,7 @@ Project-URL: Documentation, https://github.com/sameeralam3127/ipmg#readme
 Project-URL: Repository, https://github.com/sameeralam3127/ipmg
 Project-URL: Issues, https://github.com/sameeralam3127/ipmg/issues
 Project-URL: Changelog, https://github.com/sameeralam3127/ipmg/releases
-Keywords: ip,network,ping,monitoring,cli,port-scan
+Keywords: ip,network,ping,monitoring,cli,port-scan,network-scanner,ping-sweep,subnet-scanner,homelab,sysadmin
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9
@@ -29,7 +29,7 @@ Classifier: Environment :: Console
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas>=2.0
+Requires-Dist: pandas>=2.2.2
 Requires-Dist: openpyxl>=3.1
 Requires-Dist: rich>=13.0
 Requires-Dist: fastapi>=0.110
@@ -38,6 +38,7 @@ Requires-Dist: websockets>=12
 Requires-Dist: python-multipart>=0.0.9
 Provides-Extra: dev
 Requires-Dist: pytest>=7.4; extra == "dev"
+Requires-Dist: pytest-cov>=5.0; extra == "dev"
 Requires-Dist: ruff>=0.4; extra == "dev"
 Requires-Dist: pre-commit>=3.5.0; extra == "dev"
 Requires-Dist: python-semantic-release>=10.5.3; extra == "dev"
@@ -58,8 +59,19 @@ can send to someone: Excel, CSV, JSON, or Markdown. It works from the command
 line or from IPMG Web, a local browser UI, and it remembers every scan so it can tell
 you what moved.
 
+<p align="center">
+  <img src="https://raw.githubusercontent.com/sameeralam3127/ipmg/main/docs/assets/ipmg-demo.gif" alt="ipmg scanning 13 hosts in parallel: live results with reverse DNS names and latency, then a summary of 10 active and 3 timed out" width="820">
+</p>
+
+**Why not `nmap -sn`, `fping`, or Angry IP Scanner?** They tell you what is up
+right now. IPMG also remembers every scan and tells you what changed since the
+last one: the host that dropped off, the device that appeared, the latency that
+doubled. It writes the report you would otherwise build by hand.
+[How it compares](#how-it-compares)
+
 **Website:** [sameeralam3127.github.io/ipmg](https://sameeralam3127.github.io/ipmg/) ·
-**Live demo:** [IPMG Web with sample data](https://sameeralam3127.github.io/ipmg/demo/)
+**Live demo:** [IPMG Web with sample data](https://sameeralam3127.github.io/ipmg/demo/) ·
+**Command builder:** [pick what you want, copy the command](https://sameeralam3127.github.io/ipmg/#builder)
 
 ```bash
 pip install ipmg
@@ -71,6 +83,7 @@ ipmg --discover        # scan the network you are on, right now
 
 **Contents**
 
+[How it compares](#how-it-compares) ·
 [Install](#install) ·
 [Your first scan](#your-first-scan) ·
 [Common tasks](#common-tasks) ·
@@ -86,6 +99,26 @@ ipmg --discover        # scan the network you are on, right now
 
 ---
 
+## How it compares
+
+| | IPMG | `nmap -sn` | `fping` | Angry IP Scanner |
+| --- | --- | --- | --- | --- |
+| Parallel ping sweep | Yes | Yes | Yes | Yes |
+| Scan history and "what changed" | Built in | Save XML, compare with `ndiff` | No | No |
+| Reports | Excel, CSV, JSON, Markdown | XML, grepable text | Plain text | CSV, TXT, XML |
+| Browser UI | IPMG Web, local | No (Zenmap is a desktop app) | No | Desktop app (Java) |
+| Port checks | Common TCP ports | Full port and OS scanner | No | Via fetchers |
+
+Reach for nmap when you need a real port or OS scanner. Reach for IPMG when you
+look after a network and need to know what moved since yesterday, with a report
+you can hand to someone.
+
+<p align="center">
+  <img src="https://raw.githubusercontent.com/sameeralam3127/ipmg/main/docs/assets/ipmg-web.png" alt="IPMG Web dashboard: scan totals, a status donut of 16 active, 1 timeout and 1 inactive host, a latency trend chart, and a list of recent scans" width="820">
+</p>
+
+---
+
 ## Install
 
 **Linux and macOS — one command, works on every distribution:**
@@ -280,6 +313,19 @@ exist yet. A file you name with `--input` must already exist.
 
 ## Common tasks
 
+Not sure which flags you need? The
+[command builder](https://sameeralam3127.github.io/ipmg/#builder) on the
+website puts the command together as you pick what you want to know, and
+explains every flag it adds.
+
+<p align="center">
+  <a href="https://sameeralam3127.github.io/ipmg/#builder">
+    <img src="https://raw.githubusercontent.com/sameeralam3127/ipmg/main/docs/assets/ipmg-builder.png" alt="IPMG command builder: choose Scan, Compare, History, or Web, enter a target such as 192.168.1.0/24, switch on options like live results or hostnames, and copy the generated ipmg command with each flag explained" width="820">
+  </a>
+</p>
+
+Or pick a ready-made command:
+
 | I want to… | Command |
 | --- | --- |
 | Scan the network I am on | `ipmg --discover` |
@@ -390,6 +436,12 @@ ipmg web               # starts http://127.0.0.1:8080 and opens your browser
 
 `ipmg --web` does the same thing, so whichever one you reach for first works.
 
+Each start creates a new access token. The browser opens with it already in
+the link, and IPMG Web prints that link (`http://127.0.0.1:8080/#token=…`)
+in the terminal. If you open IPMG Web in another browser, or after a
+restart, use the link from the terminal. To keep the same token across
+restarts, for example behind a reverse proxy, set `IPMG_WEB_TOKEN`.
+
 It runs fully offline — every stylesheet and script is bundled with the
 package, nothing is loaded from a CDN. It gives you:
 
@@ -419,12 +471,13 @@ it from your workstation with an SSH tunnel:
 
 ```bash
 ssh -L 8080:127.0.0.1:8080 user@server
-# then open http://127.0.0.1:8080 locally
+# then open the link the server printed (http://127.0.0.1:8080/#token=…) locally
 ```
 
-Alternatively, bind to all interfaces with `--host 0.0.0.0` — this exposes an
-unauthenticated API on the network, so only do this on a trusted network or
-behind a reverse proxy with authentication (see [Security](#security)).
+Alternatively, bind to all interfaces with `--host 0.0.0.0`. Every request
+still needs the access token. The traffic, token included, is plain HTTP,
+so on anything but a trusted network put a reverse proxy with TLS in front
+of it (see [Security](#security)).
 
 ---
 
@@ -478,7 +531,16 @@ Status is one of `Active`, `Inactive`, `Timeout`, `Unreachable`, `Invalid IP`,
 or `Error`. `Hostname` is filled in when you pass `--resolve`.
 
 The `md` format produces a shareable Markdown report with a status summary
-table — handy for tickets, handoffs, and incident timelines.
+table — handy for tickets, handoffs, and incident timelines. `jsonl` writes one
+JSON object per line, which streams into `jq` and log pipelines.
+
+**Reports survive an interrupted scan.** A scan writes its report as it goes,
+so pressing Ctrl+C halfway through a /16 leaves a valid report of everything
+scanned so far instead of nothing at all. `csv` and `jsonl` are appended per
+host; `xlsx`, `json`, and `md` are re-saved every `--autosave` seconds (30 by
+default). A finished scan overwrites those files with the complete report, so
+the file names and contents are the same as they always were. Use
+`--no-incremental` to go back to writing only at the end.
 
 **Open ports.** `Open Ports` is only populated when `--scan-ports` is set: for
 each host that answers, IPMG probes a list of common TCP ports (SSH, HTTP,
@@ -507,7 +569,9 @@ them — so piping IPMG into a file or a log gives you clean text.
 | `--input` | `ip_list.xlsx` | What to scan: a file (`.xlsx`, `.xls`, `.csv`, `.txt`, `.list`), a single IP, a CIDR block, or a range (`10.0.0.1-10.0.0.50`) |
 | `--discover` | off | Auto-detect and scan the local subnet instead |
 | `--output` | `results` | Report file name prefix |
-| `--formats` | `xlsx` | One or more of `xlsx`, `csv`, `json`, `md` |
+| `--formats` | `xlsx` | One or more of `xlsx`, `csv`, `json`, `jsonl`, `md` |
+| `--no-incremental` | off | Only write the report once the scan has finished |
+| `--autosave` | `30` | How often a running scan re-saves `xlsx`, `json`, and `md` |
 
 **Speed and accuracy**
 
@@ -555,15 +619,18 @@ itself is hardened accordingly:
   validated as an IP address first
 - IPMG Web binds to `127.0.0.1` by default and serves everything
   locally — no CDN assets, no outbound requests
-- WebSocket connections are origin-checked, so a web page you happen to
-  visit cannot connect to your local IPMG Web and read your scan results
+- Every API request and WebSocket needs the access token created when
+  IPMG Web starts, so other users on the machine and web pages you happen
+  to visit cannot start scans or read your results
+- WebSocket connections are also origin-checked, and a client that stops
+  reading live updates is disconnected rather than buffered without limit
 - Uploads are capped at 5 MB and one scan expands to at most 65,536 hosts,
   so a bad input file cannot exhaust memory
 - All database access uses parameterized SQL
 
-If you bind to a non-local address with `--host`, anyone who can reach that
-interface can start scans and read results — put a reverse proxy with
-authentication in front of it.
+If you bind to a non-local address with `--host`, the token still guards the
+API. It travels over plain HTTP, though, so use an SSH tunnel or a reverse
+proxy with TLS on any network you don't trust.
 
 Found a vulnerability? See [SECURITY.md](SECURITY.md) for how to report it.
 

{ipmg-2.0.0 → ipmg-2.1.1}/README.md

@@ -12,8 +12,19 @@ can send to someone: Excel, CSV, JSON, or Markdown. It works from the command
 line or from IPMG Web, a local browser UI, and it remembers every scan so it can tell
 you what moved.
 
+<p align="center">
+  <img src="https://raw.githubusercontent.com/sameeralam3127/ipmg/main/docs/assets/ipmg-demo.gif" alt="ipmg scanning 13 hosts in parallel: live results with reverse DNS names and latency, then a summary of 10 active and 3 timed out" width="820">
+</p>
+
+**Why not `nmap -sn`, `fping`, or Angry IP Scanner?** They tell you what is up
+right now. IPMG also remembers every scan and tells you what changed since the
+last one: the host that dropped off, the device that appeared, the latency that
+doubled. It writes the report you would otherwise build by hand.
+[How it compares](#how-it-compares)
+
 **Website:** [sameeralam3127.github.io/ipmg](https://sameeralam3127.github.io/ipmg/) ·
-**Live demo:** [IPMG Web with sample data](https://sameeralam3127.github.io/ipmg/demo/)
+**Live demo:** [IPMG Web with sample data](https://sameeralam3127.github.io/ipmg/demo/) ·
+**Command builder:** [pick what you want, copy the command](https://sameeralam3127.github.io/ipmg/#builder)
 
 ```bash
 pip install ipmg
@@ -25,6 +36,7 @@ ipmg --discover        # scan the network you are on, right now
 
 **Contents**
 
+[How it compares](#how-it-compares) ·
 [Install](#install) ·
 [Your first scan](#your-first-scan) ·
 [Common tasks](#common-tasks) ·
@@ -40,6 +52,26 @@ ipmg --discover        # scan the network you are on, right now
 
 ---
 
+## How it compares
+
+| | IPMG | `nmap -sn` | `fping` | Angry IP Scanner |
+| --- | --- | --- | --- | --- |
+| Parallel ping sweep | Yes | Yes | Yes | Yes |
+| Scan history and "what changed" | Built in | Save XML, compare with `ndiff` | No | No |
+| Reports | Excel, CSV, JSON, Markdown | XML, grepable text | Plain text | CSV, TXT, XML |
+| Browser UI | IPMG Web, local | No (Zenmap is a desktop app) | No | Desktop app (Java) |
+| Port checks | Common TCP ports | Full port and OS scanner | No | Via fetchers |
+
+Reach for nmap when you need a real port or OS scanner. Reach for IPMG when you
+look after a network and need to know what moved since yesterday, with a report
+you can hand to someone.
+
+<p align="center">
+  <img src="https://raw.githubusercontent.com/sameeralam3127/ipmg/main/docs/assets/ipmg-web.png" alt="IPMG Web dashboard: scan totals, a status donut of 16 active, 1 timeout and 1 inactive host, a latency trend chart, and a list of recent scans" width="820">
+</p>
+
+---
+
 ## Install
 
 **Linux and macOS — one command, works on every distribution:**
@@ -234,6 +266,19 @@ exist yet. A file you name with `--input` must already exist.
 
 ## Common tasks
 
+Not sure which flags you need? The
+[command builder](https://sameeralam3127.github.io/ipmg/#builder) on the
+website puts the command together as you pick what you want to know, and
+explains every flag it adds.
+
+<p align="center">
+  <a href="https://sameeralam3127.github.io/ipmg/#builder">
+    <img src="https://raw.githubusercontent.com/sameeralam3127/ipmg/main/docs/assets/ipmg-builder.png" alt="IPMG command builder: choose Scan, Compare, History, or Web, enter a target such as 192.168.1.0/24, switch on options like live results or hostnames, and copy the generated ipmg command with each flag explained" width="820">
+  </a>
+</p>
+
+Or pick a ready-made command:
+
 | I want to… | Command |
 | --- | --- |
 | Scan the network I am on | `ipmg --discover` |
@@ -344,6 +389,12 @@ ipmg web               # starts http://127.0.0.1:8080 and opens your browser
 
 `ipmg --web` does the same thing, so whichever one you reach for first works.
 
+Each start creates a new access token. The browser opens with it already in
+the link, and IPMG Web prints that link (`http://127.0.0.1:8080/#token=…`)
+in the terminal. If you open IPMG Web in another browser, or after a
+restart, use the link from the terminal. To keep the same token across
+restarts, for example behind a reverse proxy, set `IPMG_WEB_TOKEN`.
+
 It runs fully offline — every stylesheet and script is bundled with the
 package, nothing is loaded from a CDN. It gives you:
 
@@ -373,12 +424,13 @@ it from your workstation with an SSH tunnel:
 
 ```bash
 ssh -L 8080:127.0.0.1:8080 user@server
-# then open http://127.0.0.1:8080 locally
+# then open the link the server printed (http://127.0.0.1:8080/#token=…) locally
 ```
 
-Alternatively, bind to all interfaces with `--host 0.0.0.0` — this exposes an
-unauthenticated API on the network, so only do this on a trusted network or
-behind a reverse proxy with authentication (see [Security](#security)).
+Alternatively, bind to all interfaces with `--host 0.0.0.0`. Every request
+still needs the access token. The traffic, token included, is plain HTTP,
+so on anything but a trusted network put a reverse proxy with TLS in front
+of it (see [Security](#security)).
 
 ---
 
@@ -432,7 +484,16 @@ Status is one of `Active`, `Inactive`, `Timeout`, `Unreachable`, `Invalid IP`,
 or `Error`. `Hostname` is filled in when you pass `--resolve`.
 
 The `md` format produces a shareable Markdown report with a status summary
-table — handy for tickets, handoffs, and incident timelines.
+table — handy for tickets, handoffs, and incident timelines. `jsonl` writes one
+JSON object per line, which streams into `jq` and log pipelines.
+
+**Reports survive an interrupted scan.** A scan writes its report as it goes,
+so pressing Ctrl+C halfway through a /16 leaves a valid report of everything
+scanned so far instead of nothing at all. `csv` and `jsonl` are appended per
+host; `xlsx`, `json`, and `md` are re-saved every `--autosave` seconds (30 by
+default). A finished scan overwrites those files with the complete report, so
+the file names and contents are the same as they always were. Use
+`--no-incremental` to go back to writing only at the end.
 
 **Open ports.** `Open Ports` is only populated when `--scan-ports` is set: for
 each host that answers, IPMG probes a list of common TCP ports (SSH, HTTP,
@@ -461,7 +522,9 @@ them — so piping IPMG into a file or a log gives you clean text.
 | `--input` | `ip_list.xlsx` | What to scan: a file (`.xlsx`, `.xls`, `.csv`, `.txt`, `.list`), a single IP, a CIDR block, or a range (`10.0.0.1-10.0.0.50`) |
 | `--discover` | off | Auto-detect and scan the local subnet instead |
 | `--output` | `results` | Report file name prefix |
-| `--formats` | `xlsx` | One or more of `xlsx`, `csv`, `json`, `md` |
+| `--formats` | `xlsx` | One or more of `xlsx`, `csv`, `json`, `jsonl`, `md` |
+| `--no-incremental` | off | Only write the report once the scan has finished |
+| `--autosave` | `30` | How often a running scan re-saves `xlsx`, `json`, and `md` |
 
 **Speed and accuracy**
 
@@ -509,15 +572,18 @@ itself is hardened accordingly:
   validated as an IP address first
 - IPMG Web binds to `127.0.0.1` by default and serves everything
   locally — no CDN assets, no outbound requests
-- WebSocket connections are origin-checked, so a web page you happen to
-  visit cannot connect to your local IPMG Web and read your scan results
+- Every API request and WebSocket needs the access token created when
+  IPMG Web starts, so other users on the machine and web pages you happen
+  to visit cannot start scans or read your results
+- WebSocket connections are also origin-checked, and a client that stops
+  reading live updates is disconnected rather than buffered without limit
 - Uploads are capped at 5 MB and one scan expands to at most 65,536 hosts,
   so a bad input file cannot exhaust memory
 - All database access uses parameterized SQL
 
-If you bind to a non-local address with `--host`, anyone who can reach that
-interface can start scans and read results — put a reverse proxy with
-authentication in front of it.
+If you bind to a non-local address with `--host`, the token still guards the
+API. It travels over plain HTTP, though, so use an SSH tunnel or a reverse
+proxy with TLS on any network you don't trust.
 
 Found a vulnerability? See [SECURITY.md](SECURITY.md) for how to report it.
 

{ipmg-2.0.0 → ipmg-2.1.1}/pyproject.toml

@@ -13,7 +13,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ipmg"
-version = "2.0.0"  # Managed automatically by semantic-release
+version = "2.1.1"  # Managed automatically by semantic-release
 description = "IP Management & Ping Monitoring CLI Tool"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -28,7 +28,7 @@ maintainers = [
     { name = "Sameer Alam", email = "sameeralam3127@gmail.com" }
 ]
 
-keywords = ["ip", "network", "ping", "monitoring", "cli", "port-scan"]
+keywords = ["ip", "network", "ping", "monitoring", "cli", "port-scan", "network-scanner", "ping-sweep", "subnet-scanner", "homelab", "sysadmin"]
 
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -49,7 +49,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "pandas>=2.0",
+    "pandas>=2.2.2",
     "openpyxl>=3.1",
     "rich>=13.0",
     "fastapi>=0.110",
@@ -68,6 +68,7 @@ Changelog = "https://github.com/sameeralam3127/ipmg/releases"
 [project.optional-dependencies]
 dev = [
     "pytest>=7.4",
+    "pytest-cov>=5.0",
     "ruff>=0.4",
     "pre-commit>=3.5.0",
     "python-semantic-release>=10.5.3",
@@ -85,6 +86,7 @@ ipmg = "ipmg.cli.commands:run"
 [dependency-groups]
 dev = [
     "pytest>=7.4",
+    "pytest-cov>=5.0",
     "ruff>=0.4",
     "pre-commit>=3.5.0",
     "python-semantic-release>=10.5.3",
@@ -130,6 +132,14 @@ where = ["src"]
 testpaths = ["tests"]
 pythonpath = ["src"]
 
+[tool.coverage.run]
+source = ["ipmg"]
+branch = true
+
+[tool.coverage.report]
+# Current coverage is ~95%; this floor catches a large untested addition.
+fail_under = 90
+
 
 # ==========================================================
 # Ruff

{ipmg-2.0.0 → ipmg-2.1.1}/src/ipmg/__init__.py

@@ -2,4 +2,4 @@
 ipmg - IP Management & Ping Monitoring Tool
 """
 
-__version__ = "2.0.0"
+__version__ = "2.1.1"

{ipmg-2.0.0 → ipmg-2.1.1}/src/ipmg/cli/parser.py

@@ -7,6 +7,12 @@ import argparse
 from ipmg import __version__
 from ipmg.core.portscan import DEFAULT_PORTS, parse_port_list
 from ipmg.infrastructure.file_io import DEFAULT_INPUT_FILE
+from ipmg.infrastructure.incremental import (
+    DEFAULT_AUTOSAVE_S,
+    MAX_AUTOSAVE_S,
+    MIN_AUTOSAVE_S,
+    REPORT_FORMATS,
+)
 from ipmg.reporting.diff_report import DIFF_FORMATS
 from ipmg.reporting.live import DEFAULT_REFRESH_S, MAX_REFRESH_S, MIN_REFRESH_S
 
@@ -135,9 +141,9 @@ def build_parser() -> argparse.ArgumentParser:
         "--formats",
         nargs="+",
         default=["xlsx"],
-        choices=["xlsx", "csv", "json", "md"],
+        choices=list(REPORT_FORMATS),
         metavar="FORMAT",
-        help="One or more report formats: xlsx, csv, json, md (default: xlsx).",
+        help=f"One or more report formats: {', '.join(REPORT_FORMATS)} (default: xlsx).",
     )
     parser.add_argument(
         "--discover",
@@ -196,6 +202,24 @@ def build_parser() -> argparse.ArgumentParser:
         help="Connect timeout per port when --scan-ports is set (default: 1).",
     )
 
+    reports = parser.add_argument_group("report writing")
+    reports.add_argument(
+        "--no-incremental",
+        action="store_true",
+        help="Only write the report once the scan has finished.",
+    )
+    reports.add_argument(
+        "--autosave",
+        type=float,
+        default=DEFAULT_AUTOSAVE_S,
+        metavar="SECONDS",
+        help=(
+            "How often a running scan re-saves the xlsx, json, and md reports "
+            f"(default: {DEFAULT_AUTOSAVE_S:g}, range: {MIN_AUTOSAVE_S:g}-{MAX_AUTOSAVE_S:g}). "
+            "csv and jsonl are written per host regardless."
+        ),
+    )
+
     live = parser.add_argument_group("live output")
     live.add_argument(
         "--stream",

{ipmg-2.0.0 → ipmg-2.1.1}/src/ipmg/core/engine.py

@@ -11,6 +11,11 @@ from ipmg.core.portscan import DEFAULT_PORTS, scan_ports
 from ipmg.exceptions import PingError
 from ipmg.utils.helpers import HostnameCache, clamp_int
 
+#: Upper bound on TCP connect probes in flight across a whole scan. Every host
+#: worker shares this one pool, so --scan-ports cannot create
+#: threads x ports probe threads.
+MAX_PORT_PROBE_WORKERS = 128
+
 
 @dataclass(frozen=True)
 class ScanConfig:
@@ -65,37 +70,71 @@ def execute_scan(
     cache = HostnameCache(config.dns_cache_ttl) if config.resolve else None
     results: List[HostResult] = []
 
+    port_executor: Optional[concurrent.futures.ThreadPoolExecutor] = None
+    if config.scan_ports and config.ports:
+        port_executor = concurrent.futures.ThreadPoolExecutor(
+            max_workers=min(MAX_PORT_PROBE_WORKERS, config.threads * len(config.ports)),
+            thread_name_prefix="ipmg-port",
+        )
+
     executor = concurrent.futures.ThreadPoolExecutor(max_workers=config.threads)
     try:
-        futures = {executor.submit(ping_ip, ip, config.timeout, config.count): ip for ip in ips}
+        futures = [executor.submit(_probe_host, ip, config, cache, port_executor) for ip in ips]
 
         for future in concurrent.futures.as_completed(futures):
             if should_stop is not None and should_stop():
                 executor.shutdown(wait=False, cancel_futures=True)
                 break
 
-            ip = futures[future]
             try:
-                status, latency = future.result()
+                result = future.result()
             except PingError:
                 executor.shutdown(wait=False, cancel_futures=True)
                 raise
-            except Exception:
-                status, latency = "Error", None
-
-            hostname = cache.resolve(ip) if cache else ""
-            open_ports: Tuple[int, ...] = ()
-            if config.scan_ports and status == "Active":
-                open_ports = tuple(scan_ports(ip, config.ports, config.port_timeout))
-
-            result = HostResult(
-                ip=ip, status=status, latency=latency, hostname=hostname, open_ports=open_ports
-            )
             results.append(result)
 
             if on_result is not None:
                 on_result(result, len(results), len(ips))
+    except BaseException:
+        # Ctrl+C must not be followed by minutes of queued pings: drop the
+        # hosts that have not started, and let the finally below wait only
+        # for the handful already in flight.
+        executor.shutdown(wait=False, cancel_futures=True)
+        raise
     finally:
         executor.shutdown(wait=True)
+        if port_executor is not None:
+            port_executor.shutdown(wait=True)
 
     return results
+
+
+def _probe_host(
+    ip: str,
+    config: ScanConfig,
+    cache: Optional[HostnameCache],
+    port_executor: Optional[concurrent.futures.Executor],
+) -> HostResult:
+    """Ping one host, then resolve its name and probe its ports.
+
+    Runs on a pool worker, so reverse DNS is spread across ``config.threads``
+    workers instead of running one host at a time on the thread that collects
+    results. Port probes go to the scan's shared, bounded ``port_executor``.
+    """
+    try:
+        status, latency = ping_ip(ip, config.timeout, config.count)
+    except PingError:
+        raise
+    except Exception:
+        status, latency = "Error", None
+
+    hostname = cache.resolve(ip) if cache else ""
+    open_ports: Tuple[int, ...] = ()
+    if config.scan_ports and status == "Active":
+        open_ports = tuple(
+            scan_ports(ip, config.ports, config.port_timeout, executor=port_executor)
+        )
+
+    return HostResult(
+        ip=ip, status=status, latency=latency, hostname=hostname, open_ports=open_ports
+    )

{ipmg-2.0.0 → ipmg-2.1.1}/src/ipmg/core/portscan.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import concurrent.futures
 import socket
-from typing import Iterable, List, Tuple
+from typing import Iterable, List, Optional, Tuple
 
 #: Common services worth a quick TCP connect once a host is known to be up.
 DEFAULT_PORTS: Tuple[int, ...] = (21, 22, 25, 53, 80, 443, 445, 1433, 3306, 3389, 5432)
@@ -65,18 +65,27 @@ def parse_port_list(value: str) -> Tuple[int, ...]:
     return tuple(ports)
 
 
-def scan_ports(ip: str, ports: Iterable[int], timeout: float = 1.0) -> List[int]:
-    """Probe ``ports`` on ``ip`` concurrently; return the ones that accepted a connection."""
+def scan_ports(
+    ip: str,
+    ports: Iterable[int],
+    timeout: float = 1.0,
+    executor: Optional[concurrent.futures.Executor] = None,
+) -> List[int]:
+    """Probe ``ports`` on ``ip`` concurrently; return the ones that accepted a connection.
+
+    Pass ``executor`` to share one bounded pool across many hosts; otherwise a
+    pool with one worker per port is created for this call.
+    """
     ports = list(ports)
     if not ports:
         return []
 
-    with concurrent.futures.ThreadPoolExecutor(max_workers=len(ports)) as executor:
-        futures = {executor.submit(_probe, ip, port, timeout): port for port in ports}
-        open_ports = [
-            futures[future]
-            for future in concurrent.futures.as_completed(futures)
-            if future.result()
-        ]
+    if executor is None:
+        with concurrent.futures.ThreadPoolExecutor(max_workers=len(ports)) as own:
+            return scan_ports(ip, ports, timeout, executor=own)
 
+    futures = {executor.submit(_probe, ip, port, timeout): port for port in ports}
+    open_ports = [
+        futures[future] for future in concurrent.futures.as_completed(futures) if future.result()
+    ]
     return sorted(open_ports)