dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow more flexible (Nmap-esque) port specifications in TCP portscan aux module, 

so things like "21-25,80,443", "1024-" and "-" behave like you expect.  This
replaces the PORTSTART and PORTSTOP options with a single PORTS option.



git-svn-id: file:///home/svn/framework3/trunk@5796 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
kris 2008-10-27 23:33:34 +00:00
parent 3e8c5ecebc
commit 71885912b8
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/auxiliary/scanner/portscan/tcp.rb
View File

@ -26,15 +26,14 @@ class Metasploit3 < Msf::Auxiliary
'Name' => 'TCP Port Scanner',
'Version' => '$Revision$',
'Description' => 'Enumerate open TCP services',
'Author' => 'hdm',
'Author' => [ 'hdm', 'Kris Katterjohn <katterjohn[at]gmail.com>' ],
'License' => MSF_LICENSE
)
register_options(
[
OptPort.new('PORTSTART', [true, 'The starting port number', 1]),
OptPort.new('PORTSTOP', [true, 'The stopping port number', 10000]),
OptInt.new('TIMEOUT', [true, "The socket connect timeout in milliseconds", 1000]),
OptString.new('PORTS', [true, "Ports to scan (e.g. 22-25,80,110-900)", "1-10000"]),
OptInt.new('TIMEOUT', [true, "The socket connect timeout in milliseconds", 1000])
], self.class)
deregister_options('RPORT')
@ -44,17 +43,30 @@ class Metasploit3 < Msf::Auxiliary
def run_host(ip)
port_start = datastore['PORTSTART'].to_i
port_stop = datastore['PORTSTOP'].to_i
timeout = datastore['TIMEOUT'].to_i
if(port_stop < port_start)
tmp = port_start
port_start = port_stop
port_stop = tmp
timeout = datastore['TIMEOUT'].to_i
ports = []
# Build ports array from port specification
datastore['PORTS'].split(/,/).each do |item|
start, stop = item.split(/-/).map { |p| p.to_i }
start ||= 0
stop ||= item.match(/-/) ? 65535 : start
start, stop = stop, start if stop < start
start.upto(stop) { |p| ports << p }
end
port_start.upto(port_stop) do |port|
# Sort, and remove dups and invalid ports
ports = ports.sort.uniq.delete_if { |p| p < 0 or p > 65535 }
if ports.empty?
print_status("Error: No valid ports specified")
return
end
ports.each do |port|
begin
s = connect(false,
@ -82,4 +94,4 @@ class Metasploit3 < Msf::Auxiliary
end
end