Land rapid7#4372

Author: jhart-r7

modules/auxiliary/scanner/oracle/isqlplus_login.rb

@@ -46,8 +46,13 @@ def initialize
 
   end
 
-  def verbose; datastore['VERBOSE']; end
-  def uri; datastore['URI'].to_s; end
+  def verbose
+    datastore['VERBOSE']
+  end
+
+  def uri
+    datastore['URI'].to_s
+  end
 
   def timeout
     (datastore['TIMEOUT'] || 60).to_i

modules/exploits/linux/http/linksys_wrt110_cmd_exec.rb

@@ -105,8 +105,13 @@ def execute_command(cmd, opts)
   end
 
   # Helper methods
-  def user; datastore['USERNAME']; end
-  def pass; datastore['PASSWORD'] || ''; end
+  def user
+    datastore['USERNAME']
+  end
+
+  def pass
+    datastore['PASSWORD'] || ''
+  end
 
   def send_auth_request_cgi(opts={}, timeout=nil)
     timeout ||= datastore['TIMEOUT']

modules/exploits/osx/local/persistence.rb

@@ -115,7 +115,9 @@ def check_for_duplicate_entry
   end
 
   # @return [Boolean] user wants the persistence to be restarted constantly if it exits
-  def keepalive?; datastore['KEEPALIVE']; end
+  def keepalive?
+    datastore['KEEPALIVE']
+  end
 
   # useful if you want to remove the persistence.
   # prints out a list of paths to remove and commands to run.
@@ -133,10 +135,14 @@ def plist_path
   end
 
   # @return [Boolean] user wants to launch the LaunchAgent immediately
-  def run_now?; datastore['RUN_NOW']; end
+  def run_now?
+    datastore['RUN_NOW']
+  end
 
   # @return [String] username of the session
-  def user; @user ||= cmd_exec('whoami').strip; end
+  def user
+    @user ||= cmd_exec('whoami').strip
+  end
 
   # drops the file to disk, then makes it executable
   # @param [String] exe the executable to drop

modules/exploits/osx/local/sudo_password_bypass.rb

@@ -227,8 +227,14 @@ def cmd_exec(cmd, args=nil, timeout=CMD_TIMEOUT)
   end
 
   # helper methods for accessing datastore
-  def using_native_target?; target.name =~ /native/i; end
-  def using_cmd_target?; target.name =~ /cmd/i; end
+  def using_native_target?
+    target.name =~ /native/i
+  end
+
+  def using_cmd_target?
+    target.name =~ /cmd/i
+  end
+
   def drop_path
     @_drop_path ||= datastore['TMP_FILE'].gsub('<random>') { Rex::Text.rand_text_alpha(10) }
   end
@@ -239,7 +245,10 @@ def user_in_admin_group?
   end
 
   # helper methods for dealing with sudo's vn num
-  def parse_vn(vn_str); vn_str.split(/[\.p]/).map(&:to_i); end
+  def parse_vn(vn_str)
+    vn_str.split(/[\.p]/).map(&:to_i)
+  end
+
   def vn_bt(vn, ranges) # e.g. ('1.7.1', [['1.7.0', '1.7.6p44']])
     vn_parts = parse_vn(vn)
     ranges.any? do |range|

modules/exploits/windows/ftp/easyftp_mkd_fixret.rb

@@ -78,7 +78,9 @@ def check
       return Exploit::CheckCode::Safe
   end
 
-  def make_nops(num); "C" * num; end
+  def make_nops(num)
+    "C" * num
+  end
 
   def exploit
     connect_login

modules/post/multi/escalate/cups_root_file_read.rb

@@ -137,9 +137,17 @@ def cleanup
 
   private
 
-  def prev_error_log_path; datastore['ERROR_LOG']; end
-  def ctl_path; @ctl_path ||= whereis("cupsctl"); end
-  def strip_http_headers(http); http.gsub(/\A(^.*\r\n)*/, ''); end
+  def prev_error_log_path
+    datastore['ERROR_LOG']
+  end
+
+  def ctl_path
+    @ctl_path ||= whereis("cupsctl")
+  end
+
+  def strip_http_headers(http)
+    http.gsub(/\A(^.*\r\n)*/, '')
+  end
 
   def whereis(exe)
     line = cmd_exec("whereis #{exe}")

modules/post/osx/gather/hashdump.rb

@@ -126,7 +126,9 @@ def gt_lion?
   end
 
   # @return [String] hostname
-  def host; session.session_host; end
+  def host
+    session.session_host
+  end
 
   # @return [Bool] system version is 10.7
   def lion?

modules/post/osx/manage/mount_share.rb

@@ -217,5 +217,7 @@ def print_uri(line)
   end
 
   # path to osascript on the remote system
-  def osascript_path; datastore['OSASCRIPT_PATH'].shellescape; end
+  def osascript_path
+    datastore['OSASCRIPT_PATH'].shellescape
+  end
 end

modules/post/osx/manage/record_mic.rb

@@ -123,6 +123,11 @@ def cleanup
 
   private
 
-  def poll_timeout; POLL_TIMEOUT; end
-  def fail_with(msg); raise msg; end
+  def poll_timeout
+    POLL_TIMEOUT
+  end
+
+  def fail_with(msg)
+    raise msg
+  end
 end

modules/post/osx/manage/webcam.rb

@@ -144,6 +144,11 @@ def cleanup
 
   private
 
-  def poll_timeout; POLL_TIMEOUT; end
-  def fail_with(msg); raise msg; end
+  def poll_timeout
+    POLL_TIMEOUT
+  end
+
+  def fail_with(msg)
+    raise msg
+  end
 end