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

Remove cmd notes sort operation

GSoC/Meterpreter_Web_Console
Matthew Kienow 2018-04-11 17:46:13 -04:00
parent cb2366d2eb
commit 087ae447c5
No known key found for this signature in database
GPG Key ID: 40787F8B1EAC6E41
1 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -923,12 +923,11 @@ class Db
print_line " -R,--rhosts Set RHOSTS from the results of the search" print_line " -R,--rhosts Set RHOSTS from the results of the search"
print_line " -S,--search Search string to filter by" print_line " -S,--search Search string to filter by"
print_line " -o,--output Save the notes to a csv file" print_line " -o,--output Save the notes to a csv file"
print_line " --sort <field1,field2> Fields to sort by (case sensitive)"
print_line print_line
print_line "Examples:" print_line "Examples:"
print_line " notes --add -t apps -n 'winzip' 10.1.1.34 10.1.20.41" print_line " notes --add -t apps -n 'winzip' 10.1.1.34 10.1.20.41"
print_line " notes -t smb.fingerprint 10.1.1.34 10.1.20.41" print_line " notes -t smb.fingerprint 10.1.1.34 10.1.20.41"
print_line " notes -S 'nmap.nse.(http|rtsp)' --sort type,output" print_line " notes -S 'nmap.nse.(http|rtsp)'"
print_line print_line
end end
@ -969,8 +968,6 @@ class Db
set_rhosts = true set_rhosts = true
when '-S', '--search' when '-S', '--search'
search_term = args.shift search_term = args.shift
when '--sort'
sort_term = args.shift
when '-o', '--output' when '-o', '--output'
output_file = args.shift output_file = args.shift
when '-u', '--update' # TODO: This is currently undocumented because it's not officially supported. when '-u', '--update' # TODO: This is currently undocumented because it's not officially supported.
@ -1042,42 +1039,6 @@ class Db
end end
end end
# Sort the notes based on the sort_term provided
if sort_term != nil
sort_terms = sort_term.split(",")
note_list.sort_by! do |note|
orderlist = []
sort_terms.each do |term|
term = "ntype" if term == "type"
term = "created_at" if term == "Time"
if term == nil
orderlist << ""
elsif term == "service"
if note.service != nil
orderlist << make_sortable(note.service.name)
end
elsif term == "port"
if note.service != nil
orderlist << make_sortable(note.service.port)
end
elsif term == "output"
orderlist << make_sortable(note.data["output"])
elsif note.respond_to?(term, true)
orderlist << make_sortable(note.send(term))
elsif note.respond_to?(term.to_sym, true)
orderlist << make_sortable(note.send(term.to_sym))
elsif note.respond_to?("data", true) && note.send("data").respond_to?(term, true)
orderlist << make_sortable(note.send("data").send(term))
elsif note.respond_to?("data", true) && note.send("data").respond_to?(term.to_sym, true)
orderlist << make_sortable(note.send("data").send(term.to_sym))
else
orderlist << ""
end
end
orderlist
end
end
# Now display them # Now display them
table = Rex::Text::Table.new( table = Rex::Text::Table.new(
'Header' => 'Notes', 'Header' => 'Notes',