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

The tags column should be a virtual column

bug/bundler_fix
sinn3r 2015-03-22 21:04:37 -05:00
parent 182018786b
commit 23685694ad
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,9 +326,9 @@ class Db
output = nil output = nil
default_columns = ::Mdm::Host.column_names.sort default_columns = ::Mdm::Host.column_names.sort
default_columns << 'tags' # Special case default_columns << 'tags' # Special case
virtual_columns = [ 'svcs', 'vulns', 'workspace' ] virtual_columns = [ 'svcs', 'vulns', 'workspace', 'tags' ]
col_search = [ 'address', 'mac', 'name', 'os_name', 'os_flavor', 'os_sp', 'purpose', 'info', 'comments', 'tags'] col_search = [ 'address', 'mac', 'name', 'os_name', 'os_flavor', 'os_sp', 'purpose', 'info', 'comments']
default_columns.delete_if {|v| (v[-2,2] == "id")} default_columns.delete_if {|v| (v[-2,2] == "id")}
while (arg = args.shift) while (arg = args.shift)
@ -469,13 +469,13 @@ class Db
when "svcs"; host.services.length when "svcs"; host.services.length
when "vulns"; host.vulns.length when "vulns"; host.vulns.length
when "workspace"; host.workspace.name when "workspace"; host.workspace.name
when "tags"
found_tags = Mdm::Tag.includes(:hosts).where("hosts.workspace_id = ? and hosts.address = ?", framework.db.workspace.id, host.address).order("tags.id DESC")
tag_names = []
found_tags.each {|t| tag_names << t.name}
found_tags * ", "
end end
# Otherwise, it's just an attribute # Otherwise, it's just an attribute
elsif n == 'tags'
found_tags = Mdm::Tag.includes(:hosts).where("hosts.workspace_id = ? and hosts.address = ?", framework.db.workspace.id, host.address).order("tags.id DESC")
tag_names = []
found_tags.each {|t| tag_names << t.name}
found_tags * ", "
else else
host.attributes[n] || "" host.attributes[n] || ""
end end