Merge pull request rapid7#2277 from Meatballs1/service_exes

Looks good. Surprised we didn't have this before.

I also agree with the sentiment about refactor. I think we should get all these changes in and deconflicted, then we can look towards cleanup/refactor. or we'll end up down a rabbit-hole.

Author: dmaloney-r7

lib/msf/util/exe.rb

@@ -2011,6 +2011,13 @@ def self.to_executable_fmt(framework, arch, plat, code, fmt, exeopts)
 				when ARCH_X64     then to_win64pe(framework, code, exeopts)
 				end
 
+		when 'exe-service'
+			output = case arch
+				when ARCH_X86,nil then to_win32pe_service(framework, code, exeopts)
+				when ARCH_X86_64  then to_win64pe_service(framework, code, exeopts)
+				when ARCH_X64     then to_win64pe_service(framework, code, exeopts)
+			end
+
 		when 'exe-small'
 			output = case arch
 				when ARCH_X86,nil then to_win32pe_old(framework, code, exeopts)
@@ -2085,7 +2092,7 @@ def self.to_executable_fmt(framework, arch, plat, code, fmt, exeopts)
 
 	def self.to_executable_fmt_formats
 		[
-			'dll','exe','exe-small','exe-only','elf','macho','vba','vba-exe',
+			'dll','exe','exe-service','exe-small','exe-only','elf','macho','vba','vba-exe',
 			'vbs','loop-vbs','asp','aspx','war','psh','psh-net'
 		]
 	end

spec/support/shared/contexts/msf/util/exe.rb

@@ -15,6 +15,9 @@
       { :format => "exe-only",  :arch => "x86", :file_fp => /PE32 /  },
       { :format => "exe-only",  :arch => "x64", :file_fp => /PE32\+ /  },
       { :format => "exe-only",  :arch => "x86_64", :file_fp => /PE32\+ /  },
+      { :format => "exe-service",  :arch => "x86", :file_fp => /PE32 /  },
+      { :format => "exe-service",  :arch => "x64", :file_fp => /PE32\+ /  },
+      { :format => "exe-service",  :arch => "x86_64", :file_fp => /PE32\+ /  },
     ],
     "linux" => [
       { :format => "elf", :arch => "x86",    :file_fp => /ELF 32.*SYSV/ },