Use mssql option session mixin with mssql modules

rapid7 · Feb 14, 2024 · 0d4e1ed · 0d4e1ed
1 parent 587a869
commit 0d4e1ed
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 18 deletions.
diff --git a/lib/msf/core/optional_session/mssql.rb b/lib/msf/core/optional_session/mssql.rb
@@ -6,7 +6,13 @@ module MSSQL
       include Msf::OptionalSession
 
       def initialize(info = {})
-        super
+        super(
+          update_info(
+            info,
+            'SessionTypes' => %w[MSSQL]
+          )
+        )
+
         if framework.features.enabled?(Msf::FeatureManager::MSSQL_SESSION_TYPE)
           register_options(
             [

diff --git a/lib/msf/core/optional_session/mysql.rb b/lib/msf/core/optional_session/mysql.rb
@@ -9,7 +9,7 @@ def initialize(info = {})
         super(
           update_info(
             info,
-            'SessionTypes' => %w[MySQL]
+            'SessionTypes' => %w[mysql]
           )
         )
 
@@ -18,7 +18,7 @@ def initialize(info = {})
             [
               Msf::OptInt.new('SESSION', [ false, 'The session to run this module on' ]),
               Msf::Opt::RHOST(nil, false),
-              Msf::Opt::RPORT(nil, false)
+              Msf::Opt::RPORT(3306, false)
             ]
           )
           add_info('New in Metasploit 6.4 - This module can target a %grnSESSION%clr or an %grnRHOST%clr')

diff --git a/lib/msf/core/optional_session/postgresql.rb b/lib/msf/core/optional_session/postgresql.rb
@@ -9,7 +9,7 @@ def initialize(info = {})
         super(
           update_info(
             info,
-            'SessionTypes' => %w[PostgreSQL]
+            'SessionTypes' => %w[postgresql]
           )
         )
         if framework.features.enabled?(Msf::FeatureManager::POSTGRESQL_SESSION_TYPE)
@@ -19,7 +19,7 @@ def initialize(info = {})
               Msf::OptString.new('DATABASE', [ false, 'The database to authenticate against', 'postgres']),
               Msf::OptString.new('USERNAME', [ false, 'The username to authenticate as', 'postgres']),
               Msf::Opt::RHOST(nil, false),
-              Msf::Opt::RPORT(nil, false)
+              Msf::Opt::RPORT(5432, false)
             ]
           )
           add_info('New in Metasploit 6.4 - This module can target a %grnSESSION%clr or an %grnRHOST%clr')

diff --git a/lib/msf/core/optional_session/smb.rb b/lib/msf/core/optional_session/smb.rb
@@ -9,7 +9,7 @@ def initialize(info = {})
         super(
           update_info(
             info,
-            'SessionTypes' => %w[SMB]
+            'SessionTypes' => %w[smb]
           )
         )
 
@@ -19,7 +19,7 @@ def initialize(info = {})
             [
               Msf::OptInt.new('SESSION', [ false, 'The session to run this module on' ]),
               Msf::Opt::RHOST(nil, false),
-              Msf::Opt::RPORT(nil, false)
+              Msf::Opt::RPORT(443, false)
             ]
           )
           add_info('New in Metasploit 6.4 - This module can target a %grnSESSION%clr or an %grnRHOST%clr')

diff --git a/modules/auxiliary/admin/mssql/mssql_enum.rb b/modules/auxiliary/admin/mssql/mssql_enum.rb
@@ -6,7 +6,7 @@
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Report
-  include Msf::OptionalSession
+  include Msf::OptionalSession::MSSQL
 
   def initialize(info = {})
     super(update_info(info,

diff --git a/modules/auxiliary/admin/mssql/mssql_escalate_dbowner.rb b/modules/auxiliary/admin/mssql/mssql_escalate_dbowner.rb
@@ -5,7 +5,7 @@
 
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::MSSQL
-  include Msf::OptionalSession
+  include Msf::OptionalSession::MSSQL
 
   def initialize(info = {})
     super(update_info(info,

diff --git a/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb b/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb
@@ -6,7 +6,7 @@
 
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::MSSQL
-  include Msf::OptionalSession
+  include Msf::OptionalSession::MSSQL
 
   def initialize(info = {})
     super(update_info(info,

diff --git a/modules/auxiliary/admin/mssql/mssql_exec.rb b/modules/auxiliary/admin/mssql/mssql_exec.rb
@@ -5,7 +5,7 @@
 
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::MSSQL
-  include Msf::OptionalSession
+  include Msf::OptionalSession::MSSQL
 
   def initialize(info = {})
     super(

diff --git a/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb b/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb
@@ -7,7 +7,7 @@ class MetasploitModule < Msf::Auxiliary
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::MSSQL
-  include Msf::OptionalSession
+  include Msf::OptionalSession::MSSQL
 
   def initialize(info = {})
     super(update_info(info,

diff --git a/modules/auxiliary/admin/mssql/mssql_idf.rb b/modules/auxiliary/admin/mssql/mssql_idf.rb
@@ -14,7 +14,7 @@
 
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::MSSQL
-  include Msf::OptionalSession
+  include Msf::OptionalSession::MSSQL
 
   def initialize(info = {})
     super(update_info(info,

diff --git a/modules/auxiliary/admin/mssql/mssql_sql.rb b/modules/auxiliary/admin/mssql/mssql_sql.rb
@@ -5,7 +5,7 @@
 
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::MSSQL
-  include Msf::OptionalSession
+  include Msf::OptionalSession::MSSQL
 
   def initialize(info = {})
     super(update_info(info,

diff --git a/modules/auxiliary/admin/mssql/mssql_sql_file.rb b/modules/auxiliary/admin/mssql/mssql_sql_file.rb
@@ -5,7 +5,7 @@
 
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::MSSQL
-  include Msf::OptionalSession
+  include Msf::OptionalSession::MSSQL
 
   def initialize(info = {})
     super(update_info(info,

diff --git a/modules/auxiliary/scanner/mssql/mssql_hashdump.rb b/modules/auxiliary/scanner/mssql/mssql_hashdump.rb
@@ -7,7 +7,7 @@ class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
-  include Msf::OptionalSession
+  include Msf::OptionalSession::MSSQL
 
   def initialize
     super(

diff --git a/modules/auxiliary/scanner/mssql/mssql_schemadump.rb b/modules/auxiliary/scanner/mssql/mssql_schemadump.rb
@@ -8,7 +8,7 @@ class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
-  include Msf::OptionalSession
+  include Msf::OptionalSession::MSSQL
 
   def initialize
     super(

diff --git a/modules/exploits/windows/mssql/mssql_payload.rb b/modules/exploits/windows/mssql/mssql_payload.rb
@@ -8,7 +8,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
   include Msf::Exploit::Remote::MSSQL
   include Msf::Exploit::CmdStager
-  include Msf::OptionalSession
+  include Msf::OptionalSession::MSSQL
   #include Msf::Exploit::CmdStagerDebugAsm
   #include Msf::Exploit::CmdStagerDebugWrite
   #include Msf::Exploit::CmdStagerTFTP