Land rapid7#2779, @wchen-r7's mod to raise Msf::OptionValidateError when PORTS is invalid

Author: jvazquez-r7

modules/auxiliary/bnat/bnat_scan.rb

@@ -77,6 +77,10 @@ def run_host(ip)
 
     ports = Rex::Socket.portspec_crack(datastore['PORTS'])
 
+    if ports.empty?
+      raise Msf::OptionValidateError.new(['PORTS'])
+    end
+
     ports.each_with_index do |port,i|
       p.tcp_dst = port
       p.tcp_src = rand(64511)+1024

modules/auxiliary/scanner/http/squid_pivot_scanning.rb

@@ -56,6 +56,10 @@ def run_host(target_host)
         dead = false
         portlist = Rex::Socket.portspec_crack(datastore['PORTS'])
 
+        if portlist.empty?
+          raise Msf::OptionValidateError.new(['PORTS'])
+        end
+
         vprint_status("[#{rhost}] Verifying manual testing is not required...")
 
         manual = false

modules/auxiliary/scanner/portscan/ack.rb

@@ -50,8 +50,7 @@ def run_batch(hosts)
     ports = Rex::Socket.portspec_crack(datastore['PORTS'])
 
     if ports.empty?
-      print_error("Error: No valid ports specified")
-      return
+      raise Msf::OptionValidateError.new(['PORTS'])
     end
 
     to = (datastore['TIMEOUT'] || 500).to_f / 1000.0

modules/auxiliary/scanner/portscan/ftpbounce.rb

@@ -43,8 +43,7 @@ def run_host(ip)
     ports = Rex::Socket.portspec_crack(datastore['PORTS'])
 
     if ports.empty?
-      print_error("Error: No valid ports specified")
-      return
+      raise Msf::OptionValidateError.new(['PORTS'])
     end
 
     datastore['RHOST'] = datastore['BOUNCEHOST']

modules/auxiliary/scanner/portscan/syn.rb

@@ -48,8 +48,7 @@ def run_batch(hosts)
     ports = Rex::Socket.portspec_crack(datastore['PORTS'])
 
     if ports.empty?
-      print_error("Error: No valid ports specified")
-      return
+      raise Msf::OptionValidateError.new(['PORTS'])
     end
 
     to = (datastore['TIMEOUT'] || 500).to_f / 1000.0

modules/auxiliary/scanner/portscan/tcp.rb

@@ -41,8 +41,7 @@ def run_host(ip)
     ports = Rex::Socket.portspec_crack(datastore['PORTS'])
 
     if ports.empty?
-      print_error("Error: No valid ports specified")
-      return
+      raise Msf::OptionValidateError.new(['PORTS'])
     end
 
     while(ports.length > 0)

modules/auxiliary/scanner/portscan/xmas.rb

@@ -50,8 +50,7 @@ def run_batch(hosts)
     ports = Rex::Socket.portspec_crack(datastore['PORTS'])
 
     if ports.empty?
-      print_error("Error: No valid ports specified")
-      return
+      raise Msf::OptionValidateError.new(['PORTS'])
     end
 
     to = (datastore['TIMEOUT'] || 500).to_f / 1000.0

modules/auxiliary/scanner/sap/sap_router_portscanner.rb

@@ -282,8 +282,7 @@ def run_host(ip)
     ports = build_sap_ports(ports)
 
     if ports.empty?
-      print_error('Error: No valid ports specified')
-      return
+      raise Msf::OptionValidateError.new(['PORTS'])
     end
 
     print_status("Scanning #{ip}")