Skip to content

Commit 268de94

Browse files
committed
Merge branch 'tasos-r7-web-modules'
2 parents a59c474 + b53e8c7 commit 268de94

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

lib/msf/core/auxiliary/crawler.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,13 @@ def crawl_target(t)
216216
# Bubble this up to the top-level handler
217217
raise $!
218218
rescue ::Exception => e
219-
print_error("Crawler Exception: #{url} #{e} #{e.backtrace}")
219+
# Ridiculous f'ing anonymous timeout exception which I've no idea
220+
# how it comes into existence.
221+
if e.to_s =~ /execution expired/
222+
raise ::Timeout::Error
223+
else
224+
print_error("Crawler Exception: #{url} #{e} #{e.backtrace}")
225+
end
220226
ensure
221227
@crawler.shutdown rescue nil
222228
@crawler = nil

0 commit comments

Comments
 (0)