Use PostgreSQL connection address & port when outputting info

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

@@ -88,11 +88,6 @@ def verbose; datastore['VERBOSE']; end
   # @return [:error] if some other error occurred
   # @return [:connected] if everything went as planned
   def postgres_login(opts={})
-    unless defined?(session).nil? || session.nil?
-      self.postgres_conn = session.client
-      return :connected
-    end
-
     postgres_logout if self.postgres_conn
     db = opts[:database]       || datastore['DATABASE']
     username = opts[:username] || datastore['USERNAME']
@@ -125,7 +120,7 @@ def postgres_login(opts={})
       return :connection_refused
     end
     if self.postgres_conn
-      print_good "#{ip}:#{port} Postgres - Logged in to '#{db}' with '#{username}':'#{password}'" if verbose
+      print_good "#{self.postgres_conn.address}:#{self.postgres_conn.port} Postgres - Logged in to '#{db}' with '#{username}':'#{password}'" if verbose
       return :connected
     end
   end
@@ -134,20 +129,15 @@ def postgres_login(opts={})
   #
   # @return [void]
   def postgres_logout
-    ip = datastore['RHOST']
-    port = datastore['RPORT']
+    ip = self.postgres_conn.address
+    port = self.postgres_conn.port
     verbose = datastore['VERBOSE']
-    # Don't log out if we are using a session.
-    if defined?(session) && session
-      print_status "#{ip}:#{port} Postgres - Skipping disconnecting from the session" if verbose
-      return
-    end
 
     if self.postgres_conn
       self.postgres_conn.close if(self.postgres_conn.kind_of?(Connection) && self.postgres_conn.instance_variable_get("@conn"))
       self.postgres_conn = nil
+      print_status "#{ip}:#{port} Postgres - Disconnected" if verbose
     end
-    print_status "#{ip}:#{port} Postgres - Disconnected" if verbose
   end
 
   # If not currently connected, attempt to connect. If an
@@ -158,17 +148,16 @@ def postgres_logout
   # @param doprint [Boolean] Whether the result should be printed
   # @return [Hash]
   def postgres_query(sql=nil,doprint=false)
-    ip = datastore['RHOST']
-    port = datastore['RPORT']
     unless self.postgres_conn
       result = postgres_login
       unless result == :connected
-        return { :conn_error => result }
+        return { conn_error: result }
       end
     end
+
     if self.postgres_conn
       sql ||= datastore['SQL']
-      vprint_status "#{ip}:#{port} Postgres - querying with '#{sql}'"
+      vprint_status "#{self.postgres_conn.address}:#{self.postgres_conn.port} Postgres - querying with '#{sql}'"
       begin
         resp = self.postgres_conn.query(sql)
       rescue RuntimeError => e
@@ -202,12 +191,11 @@ def postgres_query(sql=nil,doprint=false)
   # Otherwise, create a rowset using Rex::Text::Table (if there's
   # more than 0 rows) and return :complete.
   def postgres_print_reply(resp=nil,sql=nil)
-    ip = datastore['RHOST']
-    port = datastore['RPORT']
     verbose = datastore['VERBOSE']
     return :error unless resp.kind_of? Connection::Result
+
     if resp.rows and resp.fields
-      print_status "#{ip}:#{port} Rows Returned: #{resp.rows.size}" if verbose
+      print_status "#{postgres_conn.address}:#{postgres_conn.port} Rows Returned: #{resp.rows.size}" if verbose
       if resp.rows.size > 0
         tbl = Rex::Text::Table.new(
           'Indent' => 4,
@@ -230,10 +218,6 @@ def postgres_print_reply(resp=nil,sql=nil)
   # @see #postgres_authed_fingerprint
   # @see #analyze_auth_error
   def postgres_fingerprint(args={})
-    unless defined?(session).nil? || session.nil?
-      self.postgres_conn = session.client
-    end
-
     return postgres_authed_fingerprint if self.postgres_conn
     db = args[:database]       || datastore['DATABASE']
     username = args[:username] || datastore['USERNAME']

lib/postgres/postgres-pr/connection.rb

@@ -121,6 +121,14 @@ def initialize(database, user, password=nil, uri = nil)
     end
   end
 
+  def address
+    @conn.peerhost
+  end
+
+  def port
+    @conn.peerport
+  end
+
   def close
     raise "connection already closed" if @conn.nil?
     @conn.shutdown