Skip to content

Commit 9519eef

Browse files
author
Brent Cook
committed
Land rapid7#5993, handle ADSI exceptions nicely
2 parents 157bab4 + 415fa3a commit 9519eef

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

modules/post/windows/gather/credentials/enum_laps.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def run
5151

5252
begin
5353
q = query(search_filter, max_search, FIELDS)
54-
rescue RuntimeError => e
54+
rescue ::RuntimeError, ::Rex::Post::Meterpreter::RequestError => e
5555
print_error(e.message)
5656
return
5757
end

modules/post/windows/gather/enum_ad_bitlocker.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,13 @@ def run
3939
fields = datastore['FIELDS'].gsub(/\s+/, "").split(',')
4040
search_filter = datastore['FILTER']
4141
max_search = datastore['MAX_SEARCH']
42-
q = query(search_filter, max_search, fields)
42+
43+
begin
44+
q = query(search_filter, max_search, fields)
45+
rescue ::RuntimeError, ::Rex::Post::Meterpreter::RequestError => e
46+
print_error(e.message)
47+
return
48+
end
4349

4450
if q.nil? || q[:results].empty?
4551
print_status('No results found...')

modules/post/windows/gather/enum_ad_computers.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,13 @@ def run
6060
fields = datastore['FIELDS'].gsub(/\s+/,"").split(',')
6161
search_filter = datastore['FILTER']
6262
max_search = datastore['MAX_SEARCH']
63-
q = query(search_filter, max_search, fields)
63+
64+
begin
65+
q = query(search_filter, max_search, fields)
66+
rescue ::RuntimeError, ::Rex::Post::Meterpreter::RequestError => e
67+
print_error(e.message)
68+
return
69+
end
6470

6571
return if q.nil? or q[:results].empty?
6672

0 commit comments

Comments
 (0)