Implement -p- for full range scan

Author: alex-vulnebify

tests/test_cli.py

@@ -68,6 +68,28 @@ def test_run_scan_ip():
     assert "Scan started with ID" in result.stdout
 
 
+def test_run_scan_ip_full_range_ports():
+    result = subprocess.run(
+        ["vulnebify", "run", "scan", "45.33.32.156", "-p-", "--wait"],
+        capture_output=True,
+        text=True,
+    )
+    assert result.returncode == 0
+    assert "Scan started with ID" in result.stdout
+
+    result = subprocess.run(
+        ["vulnebify", "get", "host", "45.33.32.156", "-o", "json"],
+        capture_output=True,
+        text=True,
+    )
+
+    json = parse_json_output(result.stdout)
+    print(json)
+    ports = [s["port"] for s in json[0]["services"]]
+
+    assert set(ports) == {22, 80, 9929, 31337}
+
+
 # vulnebify run scan 1.1.1.1 --wait
 def test_run_scan_ip_with_wait():
     result = subprocess.run(

vulnebify/cli.py

@@ -39,6 +39,12 @@ def parse_scopes(args):
     return []
 
 
+def parse_ports(args):
+    if not args.ports:
+        return ["top100"]  # default
+    return ["top65535" if p == "-" else p for p in args.ports]
+
+
 def get_api_key():
     api_key = os.getenv(VULNEBIFY_API_KEY)
 
@@ -203,7 +209,7 @@ def cli():
     run_scans_parser.add_argument("-p", "--ports", nargs="*", help="Ports to scan (default: top100)")
     run_scans_parser.add_argument("-s", "--scanners", nargs="*", help="Scanners to use (default: empty)")
     run_scans_parser.add_argument("-w", "--wait", action="store_true", help="Wait for scan to finish (default: false)")
-    run_scans_parser.set_defaults(func=lambda args: run_scan(parse_scopes(args), args.ports or ["top100"], args.scanners or [], args.wait))
+    run_scans_parser.set_defaults(func=lambda args: run_scan(parse_scopes(args), parse_ports(args), args.scanners or [], args.wait))
 
     # CANCEL group
     cancel_parser = subparsers.add_parser("cancel", help="Cancel scan")