Land rapid7#18862, Align SQL sessions peerhost and peerport

Author: cgranleese-r7

lib/msf/core/exploit/remote/mysql.rb

@@ -62,15 +62,17 @@ def mysql_login(user='root', pass='', db=nil)
       return false
     end
 
-    vprint_good "#{mysql_conn.host}:#{mysql_conn.port} MySQL - Logged in to '#{db}' with '#{user}':'#{pass}'"
+    vprint_good "#{mysql_conn.peerhost}:#{mysql_conn.peerport} MySQL - Logged in to '#{db}' with '#{user}':'#{pass}'"
 
     return true
   end
 
   def mysql_logoff
+    temp_rhost = mysql_conn.peerhost if mysql_conn
+    temp_rport = mysql_conn.peerport if mysql_conn
     mysql_conn.close if mysql_conn
     disconnect if sock
-    vprint_status "#{rhost}:#{rport} MySQL - Disconnected"
+    vprint_status "#{temp_rhost || rhost}:#{temp_rport || rport} MySQL - Disconnected"
   end
 
   def mysql_login_datastore
@@ -95,7 +97,7 @@ def mysql_query(sql)
       return nil
     end
 
-    vprint_status "#{mysql_conn.host}:#{mysql_conn.port} MySQL - querying with '#{sql}'"
+    vprint_status "#{mysql_conn.peerhost}:#{mysql_conn.peerport} MySQL - querying with '#{sql}'"
     res
   end
 

lib/msf/core/exploit/remote/postgres.rb

@@ -121,7 +121,7 @@ def postgres_login(opts={})
       return :connection_refused
     end
     if self.postgres_conn
-      print_good "#{self.postgres_conn.address}:#{self.postgres_conn.port} Postgres - Logged in to '#{db}' with '#{username}':'#{password}'" if verbose
+      print_good "#{self.postgres_conn.peerhost}:#{self.postgres_conn.peerport} Postgres - Logged in to '#{db}' with '#{username}':'#{password}'" if verbose
       return :connected
     end
   end
@@ -130,8 +130,8 @@ def postgres_login(opts={})
   #
   # @return [void]
   def postgres_logout
-    ip = self.postgres_conn.address
-    port = self.postgres_conn.port
+    ip = self.postgres_conn.peerhost
+    port = self.postgres_conn.peerport
     verbose = datastore['VERBOSE']
 
     if self.postgres_conn
@@ -158,7 +158,7 @@ def postgres_query(sql=nil,doprint=false)
 
     if self.postgres_conn
       sql ||= datastore['SQL']
-      vprint_status "#{self.postgres_conn.address}:#{self.postgres_conn.port} Postgres - querying with '#{sql}'"
+      vprint_status "#{self.postgres_conn.peerhost}:#{self.postgres_conn.peerport} Postgres - querying with '#{sql}'"
       begin
         resp = self.postgres_conn.query(sql)
       rescue RuntimeError => e
@@ -196,7 +196,7 @@ def postgres_print_reply(resp=nil,sql=nil)
     return :error unless resp.kind_of? Connection::Result
 
     if resp.rows and resp.fields
-      print_status "#{postgres_conn.address}:#{postgres_conn.port} Rows Returned: #{resp.rows.size}" if verbose
+      print_status "#{postgres_conn.peerhost}:#{postgres_conn.peerport} Rows Returned: #{resp.rows.size}" if verbose
       if resp.rows.size > 0
         tbl = Rex::Text::Table.new(
           'Indent' => 4,

lib/msf/core/post/common.rb

@@ -30,8 +30,6 @@ def rhost
       session.sock.peerhost
     when 'shell', 'powershell'
       session.session_host
-    when 'postgresql', 'mysql'
-      session.address
     end
   rescue
     return nil
@@ -45,8 +43,6 @@ def rport
       session.sock.peerport
     when 'shell', 'powershell'
       session.session_port
-    when 'postgresql', 'mysql'
-      session.port
     end
   rescue
     return nil

lib/postgres/postgres-pr/connection.rb

@@ -121,18 +121,22 @@ def initialize(database, user, password=nil, uri = nil, proxies = nil)
     end
   end
 
-  def address
+  def peerhost
     @conn.peerhost
   end
 
-  def port
+  def peerport
     @conn.peerport
   end
 
   def current_database
     @params['database']
   end
 
+  def peerinfo
+    "#{peerhost}:#{peerport}"
+  end
+
   def close
     raise "connection already closed" if @conn.nil?
     @conn.shutdown

lib/rex/post/mssql/ui/console.rb

@@ -54,17 +54,6 @@ def initialize(session, opts={})
           # @return [MSSQL::Client]
           attr_reader :client
 
-          # @param [Object] val
-          # @return [String]
-          def format_prompt(val)
-            # TODO: Once the client peerhost alignment is landed, extract this out to the generic SQL class.
-            # prompt = "%und#{session.type} @ #{client.peerhost}:#{client.peerport} (#{current_database})%clr > "
-            # or
-            # prompt = "%und#{session.type} @ #{client.peerinfo} (#{current_database})%clr > "
-            prompt = "%undMSSQL @ #{client.sock.peerinfo} (#{current_database})%clr > "
-            substitute_colors(prompt, true)
-          end
-
           protected
 
           attr_writer :session, :client # :nodoc:

lib/rex/post/mysql/ui/console.rb

@@ -51,13 +51,6 @@ def initialize(session)
           # @return [MySQL::Client]
           attr_reader :client
 
-          # @param [Object] val
-          # @return [String]
-          def format_prompt(val)
-            prompt = "%undMySQL @ #{client.socket.peerinfo} (#{current_database})%clr > "
-            substitute_colors(prompt, true)
-          end
-
           protected
 
           attr_writer :session, :client # :nodoc:

lib/rex/post/postgresql/ui/console.rb

@@ -53,11 +53,6 @@ def initialize(session)
           # @return [PostgreSQL::Client]
           attr_reader :client # :nodoc:
 
-          def format_prompt(val)
-            prompt = "%undPostgreSQL @ #{client.conn.peerinfo} (#{current_database})%clr > "
-            substitute_colors(prompt, true)
-          end
-
           protected
 
           attr_writer :session, :client # :nodoc:

lib/rex/post/sql/ui/console.rb

@@ -93,6 +93,13 @@ def interact_with_client(client_dispatcher: nil)
             client.reset_ui
           end
 
+          # @param [Object] val
+          # @return [String]
+          def format_prompt(val)
+            prompt = "%und#{session.type} @ #{client.peerinfo} (#{current_database})%clr > "
+            substitute_colors(prompt, true)
+          end
+
           #
           # Log that an error occurred.
           #

lib/rex/proto/mssql/client.rb

@@ -661,14 +661,18 @@ def initial_info_for_envchange(envchange: nil)
           self.initial_connection_info[:envs]&.select { |hash| hash[:type] == envchange }&.first || {}
         end
 
-        def address
+        def peerhost
           rhost
         end
 
-        def port
+        def peerport
           rport
         end
 
+        def peerinfo
+          "#{peerhost}:#{peerport}"
+        end
+
         protected
 
         def rhost

lib/rex/proto/mysql/client.rb

@@ -18,6 +18,11 @@ def peerport
           io.remote_address.ip_port
         end
 
+        # @return [String] The remote peer information containing IP and port
+        def peerinfo
+          "#{peerhost}:#{peerport}"
+        end
+
         # @return [String] The database this client is currently connected to
         def current_database
           # Current database is stored as an array under the type 1 key.