Land #6392, @wchen-r7's 'def peer' cleanup, fixing #6362

lib/msf/core/auxiliary/redis.rb

@@ -31,10 +31,6 @@ module Msf
       )
     end
 
-    def peer
-      "#{rhost}:#{rport}"
-    end
-
     def read_timeout
       datastore['READ_TIMEOUT']
     end

lib/msf/core/exploit/java/rmi/client.rb

@@ -51,12 +51,6 @@ module Msf
               datastore['RPORT']
             end
 
-            # Returns the RMI server peer
-            #
-            # @return [String]
-            def peer
-              "#{rhost}:#{rport}"
-            end
 
             # Sends a RMI header stream
             #

lib/msf/core/exploit/tcp.rb

@@ -82,6 +82,11 @@ module Exploit::Remote::Tcp
     )
   end
 
+  # Returns the rhost:rport
+  def peer
+    "#{rhost}:#{rport}"
+  end
+
   #
   # Establishes a TCP connection to the specified RHOST/RPORT
   #

modules/auxiliary/admin/atg/atg_client.rb

@@ -190,10 +190,6 @@ class Metasploit3 < Msf::Auxiliary
     response
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def protocol
     datastore['PROTOCOL']
   end

modules/auxiliary/admin/misc/sercomm_dump_config.rb

@@ -134,9 +134,6 @@ class Metasploit3 < Msf::Auxiliary
     return nil
   end
 
-  def peer
-    return "#{rhost}:#{rport}"
-  end
 
   def fingerprint_endian
     begin

modules/auxiliary/admin/mssql/mssql_escalate_dbowner_sqli.rb

@@ -89,10 +89,6 @@ class Metasploit3 < Msf::Auxiliary
     end
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def get_username
     # Setup query to check for database username
     clue_start = Rex::Text.rand_text_alpha(8 + rand(4))

modules/auxiliary/admin/smb/delete_file.rb

@@ -40,10 +40,6 @@ class Metasploit3 < Msf::Auxiliary
     ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def smb_delete_files
     vprint_status("#{peer}: Connecting to the server...")
     connect()

modules/auxiliary/admin/smb/download_file.rb

@@ -40,10 +40,6 @@ class Metasploit3 < Msf::Auxiliary
     ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def smb_download
     vprint_status("#{peer}: Connecting...")
     connect()

modules/auxiliary/admin/smb/upload_file.rb

@@ -47,10 +47,6 @@ class Metasploit3 < Msf::Auxiliary
 
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def run_host(_ip)
     begin
       vprint_status("#{peer}: Connecting to the server...")

modules/auxiliary/dos/misc/ibm_sametime_webplayer_dos.rb

@@ -116,10 +116,6 @@ class Metasploit3 < Msf::Auxiliary
 
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def dos_user
     length = 12000 # enough to overflow the end of allocated memory
     msg = create_message(length)

modules/auxiliary/scanner/dlsw/dlsw_leak_capture.rb

@@ -42,10 +42,6 @@ class Metasploit3 < Msf::Auxiliary
       ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def get_response(size = 72)
     connect
     response = sock.get_once(size)

modules/auxiliary/scanner/elasticsearch/indices_enum.rb

@@ -31,10 +31,6 @@ class Metasploit3 < Msf::Auxiliary
       ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def run_host(ip)
     vprint_status("#{peer} - Querying indices...")
     begin

modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb

@@ -36,10 +36,6 @@ class Metasploit3 < Msf::Auxiliary
       ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def extract_words(wordfile)
     return [] unless wordfile && File.readable?(wordfile)
     begin

modules/auxiliary/scanner/mysql/mysql_file_enum.rb

@@ -43,10 +43,6 @@ class Metasploit3 < Msf::Auxiliary
     res
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def run_host(ip)
     vprint_status("#{peer} - Login...")
 

modules/auxiliary/scanner/rdp/ms12_020_check.rb

@@ -124,9 +124,6 @@ class Metasploit3 < Msf::Auxiliary
     "\x02\xf0\x80\x38"
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
 
   def check_rdp_vuln
     # check if rdp is open

modules/auxiliary/scanner/rsync/modules_list.rb

@@ -56,10 +56,6 @@ class Metasploit3 < Msf::Auxiliary
     )
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def read_timeout
     datastore['READ_TIMEOUT']
   end

modules/auxiliary/scanner/smtp/smtp_relay.rb

@@ -38,10 +38,6 @@ class Metasploit3 < Msf::Auxiliary
       ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def run_host(ip)
     begin
       connect

modules/auxiliary/scanner/ssh/ssh_version.rb

@@ -37,10 +37,6 @@ class Metasploit3 < Msf::Auxiliary
     )
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def timeout
     datastore['TIMEOUT'] <= 0 ? DEFAULT_TIMEOUT : datastore['TIMEOUT']
   end

modules/auxiliary/scanner/ssl/openssl_ccs.rb

@@ -111,10 +111,6 @@ class Metasploit3 < Msf::Auxiliary
       ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def response_timeout
     datastore['RESPONSE_TIMEOUT']
   end

modules/auxiliary/scanner/ssl/openssl_heartbleed.rb

@@ -170,10 +170,6 @@ class Metasploit3 < Msf::Auxiliary
 
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   #
   # Main methods
   #

modules/exploits/linux/http/nginx_chunked_size.rb

@@ -33,7 +33,7 @@ class Metasploit4 < Msf::Exploit::Remote
           ['CVE', '2013-2028'],
           ['OSVDB', '93037'],
           ['URL', 'http://nginx.org/en/security_advisories.html'],
-          ['URL', 'http://packetstormsecurity.com/files/121560/Nginx-1.3.9-1.4.0-Stack-Buffer-Overflow.html']
+          ['PACKETSTORM', '121560']
         ],
       'Privileged'     => false,
       'Payload'        =>
@@ -73,9 +73,6 @@ class Metasploit4 < Msf::Exploit::Remote
 
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
 
   def check
     begin

modules/exploits/linux/misc/jenkins_java_deserialize.rb

@@ -54,10 +54,6 @@ class Metasploit3 < Msf::Exploit::Remote
     ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def exploit
     unless vulnerable?
       fail_with(Failure::Unknown, "#{peer} - Jenkins is not vulnerable, aborting...")

modules/exploits/multi/misc/hp_data_protector_exec_integutil.rb

@@ -129,10 +129,6 @@ class Metasploit3 < Msf::Exploit::Remote
     end
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def build_pkt(fields)
     data = "\xff\xfe" # BOM Unicode
     fields.each do |v|

modules/exploits/multi/misc/java_jdwp_debugger.rb

@@ -147,10 +147,6 @@ class Metasploit3 < Msf::Exploit::Remote
   end
 
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def default_timeout
     datastore['RESPONSE_TIMEOUT']
   end

modules/exploits/multi/misc/java_rmi_server.rb

@@ -106,10 +106,6 @@ class Metasploit3 < Msf::Exploit::Remote
     end
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def primer
     connect
 

modules/exploits/windows/misc/hp_dataprotector_cmd_exec.rb

@@ -87,9 +87,6 @@ class Metasploit3 < Msf::Exploit::Remote
     Exploit::CheckCode::Detected
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
 
   def get_fingerprint
     ommni = connect

modules/exploits/windows/misc/hp_dataprotector_exec_bar.rb

@@ -105,9 +105,6 @@ class Metasploit3 < Msf::Exploit::Remote
     end
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
 
   def build_pkt(fields)
     data = "\xff\xfe" # BOM Unicode

modules/exploits/windows/misc/hp_dataprotector_traversal.rb

@@ -101,10 +101,6 @@ class Metasploit3 < Msf::Exploit::Remote
     register_file_for_cleanup("wbem\\mof\\good\\#{mof_name}")
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def build_pkt(fields)
     data = "\xff\xfe" # BOM Unicode
     fields.each do |v|

modules/exploits/windows/misc/solidworks_workgroup_pdmwservice_file_write.rb

@@ -66,10 +66,6 @@ class Metasploit3 < Msf::Exploit::Remote
     ], self.class)
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   #
   # Check
   #

modules/exploits/windows/mysql/mysql_mof.rb

@@ -59,10 +59,6 @@ class Metasploit3 < Msf::Exploit::Remote
     return Exploit::CheckCode::Safe
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def query(q)
     rows = []
 

modules/exploits/windows/mysql/mysql_start_up.rb

@@ -64,10 +64,6 @@ class Metasploit3 < Msf::Exploit::Remote
     Exploit::CheckCode::Safe
   end
 
-  def peer
-    "#{rhost}:#{rport}"
-  end
-
   def query(q)
     rows = []
 

modules/post/multi/manage/play_youtube.rb

@@ -31,11 +31,6 @@ class Metasploit3 < Msf::Post
       ], self.class)
   end
 
-  def peer
-    "#{session.session_host}:#{session.session_port}"
-  end
-
-
   #
   # The OSX version uses an apple script to do this
   #

modules/post/osx/gather/safari_lastsession.rb

@@ -58,11 +58,6 @@ class Metasploit3 < Msf::Post
     version
   end
 
-  def peer
-    "#{session.session_host}:#{session.session_port}"
-  end
-
-
   #
   # Converts LastSession.plist to xml, and then read it
   # @param filename [String] The path to LastSession.plist

modules/post/windows/gather/credentials/smartermail.rb

@@ -38,22 +38,6 @@ class Metasploit3 < Msf::Post
     ))
   end
 
-  def r_host
-    if session.type =~ /meterpreter/
-      session.sock.peerhost
-    else
-      session.session_host
-    end
-  end
-
-  def peer
-    if session.type =~ /meterpreter/
-      "#{r_host} (#{sysinfo['Computer']})"
-    else
-      r_host
-    end
-  end
-
   #
   # Decrypt DES encrypted password string
   #
@@ -215,7 +199,7 @@ class Metasploit3 < Msf::Post
     print_good "#{peer} - Found Username: '#{user}' Password: '#{pass}'"
 
     report_cred(
-      ip: r_host,
+      ip: rhost,
       port: port,
       service_name: 'http',
       user: user,