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

Make workspace -v work with updates

GSoC/Meterpreter_Web_Console
James Barnett 2018-03-28 13:31:49 -05:00
parent 1b6aa86d92
commit d23e33a7bc
No known key found for this signature in database
GPG Key ID: 647983861A4EC5EA
9 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/metasploit/framework/data_service/proxy/core.rb
View File

@ -123,6 +123,11 @@ class DataProxy
raise Exception, "#{ui_message}: #{exception.message}. See log for more details."
end
def add_opts_workspace(opts)
opts[:workspace] = workspace if opts[:workspace].nil? && opts[:wspace].nil?
opts
end
#######
private
#######

2
lib/metasploit/framework/data_service/proxy/event_data_proxy.rb
View File

@ -3,7 +3,7 @@ module EventDataProxy
def report_event(opts)
begin
data_service = self.get_data_service
opts[:workspace] = workspace.name if opts[:workspace].nil?
add_opts_workspace(opts)
data_service.report_event(opts)
rescue Exception => e
self.log_error(e, "Problem reporting event")

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

@ -2,7 +2,8 @@ module ExploitDataProxy
def report_exploit_attempt(host, opts)
begin
data_service = self.get_data_service()
data_service = self.get_data_service
add_opts_workspace(opts)
data_service.report_exploit_attempt(host, opts)
rescue Exception => e
self.log_error(e, "Problem reporting exploit attempt")
@ -11,7 +12,8 @@ module ExploitDataProxy
def report_exploit_failure(opts)
begin
data_service = self.get_data_service()
data_service = self.get_data_service
add_opts_workspace(opts)
data_service.report_exploit_failure(opts)
rescue Exception => e
self.log_error(e, "Problem reporting exploit failure")
@ -20,7 +22,8 @@ module ExploitDataProxy
def report_exploit_success(opts)
begin
data_service = self.get_data_service()
data_service = self.get_data_service
add_opts_workspace(opts)
data_service.report_exploit_success(opts)
rescue Exception => e
self.log_error(e, "Problem reporting exploit success")

14
lib/metasploit/framework/data_service/proxy/host_data_proxy.rb
View File

@ -2,7 +2,7 @@ module HostDataProxy
def hosts(wspace = workspace, non_dead = false, addresses = nil, search_term = nil)
begin
data_service = self.get_data_service()
data_service = self.get_data_service
opts = {}
opts[:wspace] = wspace
opts[:non_dead] = non_dead
@ -24,7 +24,8 @@ module HostDataProxy
return unless valid(opts)
begin
data_service = self.get_data_service()
data_service = self.get_data_service
add_opts_workspace(opts)
data_service.report_host(opts)
rescue Exception => e
self.log_error(e, "Problem reporting host")
@ -33,7 +34,8 @@ module HostDataProxy
def report_hosts(hosts)
begin
data_service = self.get_data_service()
data_service = self.get_data_service
add_opts_workspace(opts)
data_service.report_hosts(hosts)
rescue Exception => e
self.log_error(e, "Problem reporting hosts")
@ -42,7 +44,8 @@ module HostDataProxy
def update_host(opts)
begin
data_service = self.get_data_service()
data_service = self.get_data_service
add_opts_workspace(opts)
data_service.update_host(opts)
rescue Exception => e
self.log_error(e, "Problem updating host")
@ -51,7 +54,8 @@ module HostDataProxy
def delete_host(opts)
begin
data_service = self.get_data_service()
data_service = self.get_data_service
add_opts_workspace(opts)
data_service.delete_host(opts)
rescue Exception => e
self.log_error(e, "Problem deleting host")

4
lib/metasploit/framework/data_service/proxy/loot_data_proxy.rb
View File

@ -2,10 +2,11 @@ module LootDataProxy
def report_loot(opts)
begin
data_service = self.get_data_service()
data_service = self.get_data_service
if !data_service.is_a?(Msf::DBManager)
opts[:data] = Base64.urlsafe_encode64(opts[:data]) if opts[:data]
end
add_opts_workspace(opts)
data_service.report_loot(opts)
rescue Exception => e
self.log_error(e, "Problem reporting loot")
@ -33,6 +34,7 @@ module LootDataProxy
def update_loot(opts)
begin
data_service = self.get_data_service
add_opts_workspace(opts)
data_service.update_loot(opts)
rescue Exception => e
self.log_error(e, "Problem updating loot")

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

@ -2,7 +2,7 @@ module ServiceDataProxy
def services(wspace = workspace, opts = {})
begin
data_service = self.get_data_service()
data_service = self.get_data_service
opts[:workspace] = wspace
data_service.services(opts)
rescue Exception => e
@ -16,7 +16,8 @@ module ServiceDataProxy
def report_service(opts)
begin
data_service = self.get_data_service()
data_service = self.get_data_service
add_opts_workspace(opts)
data_service.report_service(opts)
rescue Exception => e
self.log_error(e, 'Problem reporting service')
@ -25,7 +26,8 @@ module ServiceDataProxy
def update_service(opts)
begin
data_service = self.get_data_service()
data_service = self.get_data_service
add_opts_workspace(opts)
data_service.update_service(opts)
rescue Exception => e
self.log_error(e, 'Problem updating service')
@ -34,7 +36,8 @@ module ServiceDataProxy
def delete_service(opts)
begin
data_service = self.get_data_service()
data_service = self.get_data_service
add_opts_workspace(opts)
data_service.delete_service(opts)
rescue Exception => e
self.log_error(e, 'Problem deleting service')

4
lib/metasploit/framework/data_service/remote/http/core.rb
View File

@ -225,8 +225,8 @@ class RemoteHTTPDataService
end
def append_workspace(data_hash)
workspace = data_hash[:workspace]
workspace = data_hash.delete(:wspace) unless workspace
# Some methods use the key :wspace. Let's standardize on :workspace and clean it up here.
workspace = data_hash.keys.include?(:wspace) ? data_hash.delete(:wspace) : data_hash[:workspace]
if workspace && (workspace.is_a?(OpenStruct) || workspace.is_a?(::Mdm::Workspace))
data_hash[:workspace] = workspace.name

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

@ -192,12 +192,12 @@ class Db
return
end
else
workspace = framework.db.workspace
current_workspace = framework.db.workspace
unless verbose
current = nil
framework.db.workspaces.sort_by {|s| s.name}.each do |s|
if s.name == workspace.name
if s.name == current_workspace.name
current = s.name
else
print_line(" #{s.name}")
@ -206,8 +206,6 @@ class Db
print_line("%red* #{current}%clr") unless current.nil?
return
end
workspace = framework.db.workspace
col_names = %w{current name hosts services vulns creds loots notes}
tbl = Rex::Text::Table.new(
@ -217,17 +215,16 @@ class Db
'SearchTerm' => search_term
)
# List workspaces
framework.db.workspace_associations_counts.each do |ws|
framework.db.workspaces.each do |ws|
tbl << [
ws[:name] == workspace.name ? '*' : '',
ws[:name],
ws[:hosts_count],
ws[:services_count],
ws[:vulns_count],
ws[:creds_count],
ws[:loots_count],
ws[:notes_count]
current_workspace.name == ws.name ? '*' : '',
ws.name,
framework.db.hosts(ws.name).count,
framework.db.services(ws.name).count,
framework.db.vulns({:workspace => ws.name}).count,
framework.db.creds({:workspace => ws.name}).count,
framework.db.loots(ws.name).count,
framework.db.notes({:workspace => ws.name}).count
]
end

2
lib/msf/util/db_manager.rb
View File

@ -17,7 +17,7 @@ module DBManager
def self.process_opts_workspace(opts, framework)
wspace = opts.delete(:wspace) || opts.delete(:workspace)
raise ArgumentError.new("opts must include a valid :workspace or :wspace value.") if wspace.nil? || ((wspace.kind_of? String) && wspace.empty?)
raise ArgumentError.new("opts must include a valid :workspace.") if wspace.nil? || ((wspace.kind_of? String) && wspace.empty?)
if wspace.kind_of? String
wspace = framework.db.find_workspace(wspace)