Land rapid7#7374, use templates from the gem for psh

Author: pbarry-r7

Gemfile.lock

@@ -256,7 +256,7 @@ GEM
       rex-arch
     rex-ole (0.1.2)
       rex-text
-    rex-powershell (0.1.64)
+    rex-powershell (0.1.65)
       rex-random_identifier
       rex-text
     rex-random_identifier (0.1.0)

data/templates/scripts/to_mem_dotnet.ps1.template

@@ -194,9 +194,7 @@ def cmd_psh_payload(pay, payload_arch, opts = {})
     unless opts.key? :shorten
       opts[:shorten] = (datastore['Powershell::method'] != 'old')
     end
-    template_path = File.join(Msf::Config.data_directory,
-                              "templates",
-                              "scripts")
+    template_path = Rex::Powershell::Templates::TEMPLATE_DIR
 
     command = Rex::Powershell::Command.cmd_psh_payload(pay,
                                                                      payload_arch,

data/templates/scripts/to_mem_old.ps1.template

@@ -1227,9 +1227,7 @@ def self.to_vba(framework,code,opts = {})
   # @param code       [String]
   #
   def self.to_powershell_vba(framework, arch, code)
-    template_path = File.join(Msf::Config.data_directory,
-                              "templates",
-                              "scripts")
+    template_path = Rex::Powershell::Templates::TEMPLATE_DIR
 
     powershell = Rex::Powershell::Command.cmd_psh_payload(code,
                     arch,
@@ -1374,9 +1372,7 @@ def self.to_win32pe_psh_reflection(framework, code, opts = {})
   end
 
   def self.to_powershell_command(framework, arch, code)
-    template_path = File.join(Msf::Config.data_directory,
-                              "templates",
-                              "scripts")
+    template_path = Rex::Powershell::Templates::TEMPLATE_DIR
     Rex::Powershell::Command.cmd_psh_payload(code,
                     arch,
                     template_path,
@@ -1385,9 +1381,7 @@ def self.to_powershell_command(framework, arch, code)
   end
 
   def self.to_powershell_hta(framework, arch, code)
-    template_path = File.join(Msf::Config.data_directory,
-                              "templates",
-                              "scripts")
+    template_path = Rex::Powershell::Templates::TEMPLATE_DIR
 
     powershell = Rex::Powershell::Command.cmd_psh_payload(code,
                     arch,