infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update services signature

GSoC/Meterpreter_Web_Console
James Barnett 2018-03-07 13:59:09 -06:00
parent c52daf43bf
commit c670748fe3
No known key found for this signature in database
GPG Key ID: 647983861A4EC5EA
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/metasploit/framework/data_service/proxy/service_data_proxy.rb
View File

@ -1,16 +1,9 @@
module ServiceDataProxy
def services(wspace = workspace, only_up = false, proto = nil, addresses = nil, ports = nil, names = nil, search_term = nil)
def services(wspace = workspace, opts = {})
begin
data_service = self.get_data_service()
opts = {}
opts[:workspace] = wspace
opts[:only_up] = only_up
opts[:proto] = proto
opts[:addresses] = addresses
opts[:port] = ports
opts[:name] = names
opts[:search_term] = search_term
data_service.services(opts)
rescue Exception => e
self.log_error(e, 'Problem retrieving services')

8
lib/msf/ui/console/command_dispatcher/db.rb
View File

@ -579,6 +579,7 @@ module Msf
rhosts = []
delete_count = 0
search_term = nil
opts = {}
# option parsing
while (arg = args.shift)
@ -591,6 +592,7 @@ module Msf
mode = :update
when '-u','--up'
onlyup = true
opts[:onlyup] = onlyup
when '-c'
list = args.shift
if(!list)
@ -615,6 +617,7 @@ module Msf
return
end
proto = proto.strip
opts[:proto] = proto
when '-s'
namelist = args.shift
if (!namelist)
@ -622,6 +625,7 @@ module Msf
return
end
names = namelist.strip().split(",")
opts[:name] = names
when '-o'
output_file = args.shift
if (!output_file)
@ -638,6 +642,7 @@ module Msf
set_rhosts = true
when '-S', '--search'
search_term = args.shift
opts[:search_term] = search_term
when '-h','--help'
print_line
print_line "Usage: services [-h] [-u] [-a] [-r <proto>] [-p <port1,port2>] [-s <name1,name2>] [-o <filename>] [addr1 addr2 ...]"
@ -714,7 +719,8 @@ module Msf
each_host_range_chunk(host_ranges) do |host_search|
break if !host_search.nil? && host_search.empty?
framework.db.services(framework.db.workspace, onlyup, nil, host_search, nil, nil, search_term).each do |service|
opts[:addresses] = host_search
framework.db.services(framework.db.workspace, opts).each do |service|
host = service.host
matched_service_ids << service.id