Land #18855, Use database_name for SQL sessions

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

@@ -26,8 +26,7 @@ module Rex
             # The mssql client context
             self.session = session
             self.client = session.client
-            self.cwd = session.client.mssql_query('SELECT DB_NAME();')[:rows][0][0]
-            prompt = "%undMSSQL @ #{client.sock.peerinfo} (#{cwd})%clr"
+            prompt = "%undMSSQL @ #{client.sock.peerinfo} (#{database_name})%clr"
             history_manager = Msf::Config.mssql_session_history
             super(prompt, '>', history_manager, nil, :mssql)
 
@@ -126,13 +125,14 @@ module Rex
           attr_reader :client
 
           # @return [String]
-          attr_accessor :cwd
+          def database_name
+            session.client.mssql_query('SELECT DB_NAME();')[:rows][0][0]
+          end
 
           # @param [Object] val
           # @return [String]
           def format_prompt(val)
-            self.cwd ||= ''
-            prompt = "%undMSSQL @ #{client.sock.peerinfo} (#{@cwd})%clr > "
+            prompt = "%undMSSQL @ #{client.sock.peerinfo} (#{database_name})%clr > "
             substitute_colors(prompt, true)
           end
 

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

@@ -23,8 +23,7 @@ module Rex
             # The mysql client context
             self.session = session
             self.client = session.client
-            self.cwd = client.database
-            prompt = "%undMySQL @ #{client.socket.peerinfo} (#{cwd})%clr"
+            prompt = "%undMySQL @ #{client.socket.peerinfo} (#{database_name})%clr"
             history_manager = Msf::Config.mysql_session_history
             super(prompt, '>', history_manager, nil, :mysql)
 
@@ -119,13 +118,14 @@ module Rex
           attr_reader :client
 
           # @return [String]
-          attr_accessor :cwd
+          def database_name
+            client.database
+          end
 
           # @param [Object] val
           # @return [String]
           def format_prompt(val)
-            @cwd ||= client.database
-            prompt = "%undMySQL @ #{client.socket.peerinfo} (#{@cwd})%clr > "
+            prompt = "%undMySQL @ #{client.socket.peerinfo} (#{database_name})%clr > "
             substitute_colors(prompt, true)
           end
 

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

@@ -30,8 +30,7 @@ module Rex
             # The postgresql client context
             self.session = session
             self.client = session.client
-            self.cwd = client.params['database']
-            prompt = "%undPostgreSQL @ #{client.conn.peerinfo} (#{cwd})%clr"
+            prompt = "%undPostgreSQL @ #{client.conn.peerinfo} (#{database_name})%clr"
             history_manager = Msf::Config.postgresql_session_history
             super(prompt, '>', history_manager, nil, :postgresql)
 
@@ -136,11 +135,12 @@ module Rex
           attr_reader :client # :nodoc:
 
           # @return [String]
-          attr_accessor :cwd
+          def database_name
+            client.params['database']
+          end
 
           def format_prompt(val)
-            cwd ||= client.params['database']
-            prompt = "%undPostgreSQL @ #{client.conn.peerinfo} (#{cwd})%clr > "
+            prompt = "%undPostgreSQL @ #{client.conn.peerinfo} (#{database_name})%clr > "
             substitute_colors(prompt, true)
           end
 

modules/auxiliary/scanner/mssql/mssql_login.rb

@@ -133,7 +133,7 @@ class MetasploitModule < Msf::Auxiliary
   def session_setup(result, client)
     return unless (result && client)
     rstream = client.sock
-    my_session = Msf::Sessions::MSSQL.new(rstream, { client: client }) # is cwd right?
+    my_session = Msf::Sessions::MSSQL.new(rstream, { client: client })
     merging = {
       'USERPASS_FILE' => nil,
       'USER_FILE'     => nil,

spec/lib/msf/base/sessions/mssql_spec.rb

@@ -6,7 +6,7 @@ require 'rex/post/mssql/ui/console/command_dispatcher/core'
 RSpec.describe Msf::Sessions::MSSQL do
   let(:rstream) { instance_double(::Rex::Socket) }
   let(:client) { instance_double(Rex::Proto::MSSQL::Client) }
-  let(:opts) { { client: client, cwd: 'name' } }
+  let(:opts) { { client: client } }
   let(:console_class) { Rex::Post::MSSQL::Ui::Console }
   let(:user_input) { instance_double(Rex::Ui::Text::Input::Readline) }
   let(:user_output) { instance_double(Rex::Ui::Text::Output::Stdio) }

spec/lib/rex/post/mssql/ui/console/command_dispatcher/core_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe Rex::Post::MSSQL::Ui::Console::CommandDispatcher::Core do
   let(:query_result) do
     { rows: [['mssql']]}
   end
-  let(:session) { Msf::Sessions::MSSQL.new(nil, { client: client, cwd: 'mssql' }) }
+  let(:session) { Msf::Sessions::MSSQL.new(nil, { client: client }) }
   let(:address) { '192.0.2.1' }
   let(:port) { '1433' }
   let(:peer_info) { "#{address}:#{port}" }