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

simplify and fix rpc_get_note

bug/bundler_fix
Brent Cook 2015-05-01 16:00:20 -05:00
parent 52b9fc8fca
commit 8bd2a69112
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/msf/core/rpc/v10/rpc_db.rb
View File

@ -107,14 +107,10 @@ private
def get_notes(xopts) def get_notes(xopts)
::ActiveRecord::Base.connection_pool.with_connection { ::ActiveRecord::Base.connection_pool.with_connection {
opts, wspace = init_db_opts_workspace(xopts) opts, wspace = init_db_opts_workspace(xopts)
notes = []
ret = {}
ret[:note] = []
host = self.framework.db.get_host(opts) host = self.framework.db.get_host(opts)
return notes if not host
return ret if not host
notes = []
if opts[:proto] && opts[:port] if opts[:proto] && opts[:port]
services = [] services = []
@ -833,6 +829,9 @@ public
# @example Here's how you would use this from the client: # @example Here's how you would use this from the client:
# rpc.call('db.get_note', {:proto => 'tcp', :port => 80}) # rpc.call('db.get_note', {:proto => 'tcp', :port => 80})
def rpc_get_note(xopts) def rpc_get_note(xopts)
ret = {}
ret[:note] = []
notes = get_notes(xopts) notes = get_notes(xopts)
notes.each do |n| notes.each do |n|