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

Land #5993, handle ADSI exceptions nicely

bug/bundler_fix
Brent Cook 2015-09-23 22:56:44 -05:00
parent 157bab4f0d 415fa3a244
commit 9519eef55d
No known key found for this signature in database
GPG Key ID: 1FFAA0B24B708F96
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/post/windows/gather/credentials/enum_laps.rb
View File

@ -51,7 +51,7 @@ class Metasploit3 < Msf::Post
begin begin
q = query(search_filter, max_search, FIELDS) q = query(search_filter, max_search, FIELDS)
rescue RuntimeError => e rescue ::RuntimeError, ::Rex::Post::Meterpreter::RequestError => e
print_error(e.message) print_error(e.message)
return return
end end

6
modules/post/windows/gather/enum_ad_bitlocker.rb
View File

@ -39,7 +39,13 @@ class Metasploit3 < Msf::Post
fields = datastore['FIELDS'].gsub(/\s+/, "").split(',') fields = datastore['FIELDS'].gsub(/\s+/, "").split(',')
search_filter = datastore['FILTER'] search_filter = datastore['FILTER']
max_search = datastore['MAX_SEARCH'] max_search = datastore['MAX_SEARCH']
begin
q = query(search_filter, max_search, fields) q = query(search_filter, max_search, fields)
rescue ::RuntimeError, ::Rex::Post::Meterpreter::RequestError => e
print_error(e.message)
return
end
if q.nil? || q[:results].empty? if q.nil? || q[:results].empty?
print_status('No results found...') print_status('No results found...')

6
modules/post/windows/gather/enum_ad_computers.rb
View File

@ -60,7 +60,13 @@ class Metasploit3 < Msf::Post
fields = datastore['FIELDS'].gsub(/\s+/,"").split(',') fields = datastore['FIELDS'].gsub(/\s+/,"").split(',')
search_filter = datastore['FILTER'] search_filter = datastore['FILTER']
max_search = datastore['MAX_SEARCH'] max_search = datastore['MAX_SEARCH']
begin
q = query(search_filter, max_search, fields) q = query(search_filter, max_search, fields)
rescue ::RuntimeError, ::Rex::Post::Meterpreter::RequestError => e
print_error(e.message)
return
end
return if q.nil? or q[:results].empty? return if q.nil? or q[:results].empty?