From d258c5288b34527613d89d4baafc0bd98e98917f Mon Sep 17 00:00:00 2001 From: Dean Welch Date: Wed, 14 Feb 2024 12:15:23 +0000 Subject: [PATCH] Use mssql option session mixin with mssql modules --- lib/msf/core/optional_session/mssql.rb | 8 +++++++- lib/msf/core/optional_session/mysql.rb | 4 ++-- lib/msf/core/optional_session/postgresql.rb | 4 ++-- lib/msf/core/optional_session/smb.rb | 4 ++-- modules/auxiliary/admin/mssql/mssql_enum.rb | 2 +- modules/auxiliary/admin/mssql/mssql_escalate_dbowner.rb | 2 +- .../auxiliary/admin/mssql/mssql_escalate_execute_as.rb | 2 +- modules/auxiliary/admin/mssql/mssql_exec.rb | 2 +- modules/auxiliary/admin/mssql/mssql_findandsampledata.rb | 2 +- modules/auxiliary/admin/mssql/mssql_idf.rb | 2 +- modules/auxiliary/admin/mssql/mssql_sql.rb | 2 +- modules/auxiliary/admin/mssql/mssql_sql_file.rb | 2 +- modules/auxiliary/scanner/mssql/mssql_hashdump.rb | 2 +- modules/auxiliary/scanner/mssql/mssql_schemadump.rb | 2 +- modules/exploits/windows/mssql/mssql_payload.rb | 2 +- 15 files changed, 24 insertions(+), 18 deletions(-) diff --git a/lib/msf/core/optional_session/mssql.rb b/lib/msf/core/optional_session/mssql.rb index 9fa061597105d..aee985f45f7ce 100644 --- 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 index f67c24b037209..d354a13651165 100644 --- 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 index b218dbdabb31a..93993fc7aa808 100644 --- 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 index 6f94910b23619..9a1c7cc0fa97e 100644 --- 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 index eb0b0a468dd38..ba71ee1a4a10e 100644 --- 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 index a597f31912e5e..1ec1b8bc31354 100644 --- 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 index bbd91d9d11737..2c4f09aa5cb9d 100644 --- 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 index 0bd65c774567f..22fc703245418 100644 --- 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 index d8338ef866fe7..c78b08320f745 100644 --- 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 index a88e0e9bf37f6..44f6c51d1e497 100644 --- 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 index 294b8a78d5ee8..fc94c82e527e5 100644 --- 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 index 69bbc6cdcbdc6..56f363c54630b 100644 --- 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 index e94461b9814ae..f7eb1d2451b04 100644 --- 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 index 34bf344c71819..b4d9b9c18c453 100644 --- 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 index 36ace61e6fe84..f2bbdd0be8afd 100644 --- 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