add path to the loot table printout, use the proper help for vulns

git-svn-id: file:///home/svn/framework3/trunk@13378 4d416f70-5f16-0410-b530-b9f4589650da
unstable
James Lee 2011-07-27 19:38:34 +00:00
parent 2a6b9957d0
commit 91790d186a
1 changed files with 7 additions and 6 deletions

View File

@ -507,7 +507,7 @@ class Db
# Short-circuit help # Short-circuit help
if args.delete "-h" if args.delete "-h"
cmd_creds_help cmd_vulns_help
return return
end end
@ -882,7 +882,7 @@ class Db
end end
tbl = Rex::Ui::Text::Table.new({ tbl = Rex::Ui::Text::Table.new({
'Header' => "Loot", 'Header' => "Loot",
'Columns' => [ 'host', 'service', 'type', 'name', 'content', 'info' ], 'Columns' => [ 'host', 'service', 'type', 'name', 'content', 'info', 'path' ],
}) })
# Sentinal value meaning all # Sentinal value meaning all
@ -895,15 +895,16 @@ class Db
row = [] row = []
row.push( (loot.host ? loot.host.address : "") ) row.push( (loot.host ? loot.host.address : "") )
if (loot.service) if (loot.service)
name = (loot.service.name ? loot.service.name : "#{loot.service.port}/#{loot.service.proto}") svc = (loot.service.name ? loot.service.name : "#{loot.service.port}/#{loot.service.proto}")
row.push name row.push svc
else else
row.push "" row.push ""
end end
row.push(loot.ltype) row.push(loot.ltype)
row.push(loot.name) row.push(loot.name || "")
row.push(loot.content_type) row.push(loot.content_type)
row.push(loot.info) row.push(loot.info || "")
row.push(loot.path)
tbl << row tbl << row
if (mode == :delete) if (mode == :delete)