diff --git a/lib/msf/core/optional_session/mssql.rb b/lib/msf/core/optional_session/mssql.rb index 8544c3202758..9fa061597105 100644 --- a/lib/msf/core/optional_session/mssql.rb +++ b/lib/msf/core/optional_session/mssql.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -# frozen_string_literal: true - module Msf module OptionalSession module MSSQL diff --git a/modules/auxiliary/admin/mysql/mysql_enum.rb b/modules/auxiliary/admin/mysql/mysql_enum.rb index 05b390cce59e..3d3f1e36fac6 100644 --- a/modules/auxiliary/admin/mysql/mysql_enum.rb +++ b/modules/auxiliary/admin/mysql/mysql_enum.rb @@ -6,7 +6,7 @@ class MetasploitModule < Msf::Auxiliary include Msf::Auxiliary::Report include Msf::Exploit::Remote::MYSQL - include Msf::OptionalSession + include Msf::OptionalSession::MySQL def initialize(info = {}) super(update_info(info, diff --git a/modules/auxiliary/admin/mysql/mysql_sql.rb b/modules/auxiliary/admin/mysql/mysql_sql.rb index ce2ad10cff07..2734ab401f07 100644 --- a/modules/auxiliary/admin/mysql/mysql_sql.rb +++ b/modules/auxiliary/admin/mysql/mysql_sql.rb @@ -5,7 +5,7 @@ class MetasploitModule < Msf::Auxiliary include Msf::Exploit::Remote::MYSQL - include Msf::OptionalSession + include Msf::OptionalSession::MySQL def initialize(info = {}) super(update_info(info, diff --git a/modules/auxiliary/admin/postgres/postgres_readfile.rb b/modules/auxiliary/admin/postgres/postgres_readfile.rb index 5045ad9c682c..8f468d225348 100644 --- a/modules/auxiliary/admin/postgres/postgres_readfile.rb +++ b/modules/auxiliary/admin/postgres/postgres_readfile.rb @@ -6,7 +6,7 @@ class MetasploitModule < Msf::Auxiliary include Msf::Exploit::Remote::Postgres include Msf::Auxiliary::Report - include Msf::OptionalSession + include Msf::OptionalSession::PostgreSQL def initialize(info = {}) super(update_info(info, diff --git a/modules/auxiliary/admin/postgres/postgres_sql.rb b/modules/auxiliary/admin/postgres/postgres_sql.rb index 7d1818072ede..86cc5d2c3a5d 100644 --- a/modules/auxiliary/admin/postgres/postgres_sql.rb +++ b/modules/auxiliary/admin/postgres/postgres_sql.rb @@ -5,7 +5,7 @@ class MetasploitModule < Msf::Auxiliary include Msf::Exploit::Remote::Postgres - include Msf::OptionalSession + include Msf::OptionalSession::PostgreSQL def initialize(info = {}) super(update_info(info, diff --git a/modules/auxiliary/scanner/mysql/mysql_file_enum.rb b/modules/auxiliary/scanner/mysql/mysql_file_enum.rb index 54b3468324f2..e45ba69e0649 100644 --- a/modules/auxiliary/scanner/mysql/mysql_file_enum.rb +++ b/modules/auxiliary/scanner/mysql/mysql_file_enum.rb @@ -9,7 +9,7 @@ class MetasploitModule < Msf::Auxiliary include Msf::Exploit::Remote::MYSQL include Msf::Auxiliary::Report include Msf::Auxiliary::Scanner - include Msf::OptionalSession + include Msf::OptionalSession::MySQL def initialize super( diff --git a/modules/auxiliary/scanner/mysql/mysql_hashdump.rb b/modules/auxiliary/scanner/mysql/mysql_hashdump.rb index d0bb79480025..a68413977c81 100644 --- a/modules/auxiliary/scanner/mysql/mysql_hashdump.rb +++ b/modules/auxiliary/scanner/mysql/mysql_hashdump.rb @@ -7,7 +7,7 @@ class MetasploitModule < Msf::Auxiliary include Msf::Exploit::Remote::MYSQL include Msf::Auxiliary::Report include Msf::Auxiliary::Scanner - include Msf::OptionalSession + include Msf::OptionalSession::MySQL def initialize super( diff --git a/modules/auxiliary/scanner/mysql/mysql_schemadump.rb b/modules/auxiliary/scanner/mysql/mysql_schemadump.rb index 981bef6b70d4..e27c32e981e1 100644 --- a/modules/auxiliary/scanner/mysql/mysql_schemadump.rb +++ b/modules/auxiliary/scanner/mysql/mysql_schemadump.rb @@ -9,7 +9,7 @@ class MetasploitModule < Msf::Auxiliary include Msf::Exploit::Remote::MYSQL include Msf::Auxiliary::Report include Msf::Auxiliary::Scanner - include Msf::OptionalSession + include Msf::OptionalSession::MySQL def initialize super( diff --git a/modules/auxiliary/scanner/mysql/mysql_version.rb b/modules/auxiliary/scanner/mysql/mysql_version.rb index 28fcd951bbe6..482d7e252d4d 100644 --- a/modules/auxiliary/scanner/mysql/mysql_version.rb +++ b/modules/auxiliary/scanner/mysql/mysql_version.rb @@ -7,7 +7,7 @@ class MetasploitModule < Msf::Auxiliary include Msf::Exploit::Remote::Tcp include Msf::Auxiliary::Scanner include Msf::Auxiliary::Report - include Msf::OptionalSession + include Msf::OptionalSession::MySQL def initialize super( diff --git a/modules/auxiliary/scanner/mysql/mysql_writable_dirs.rb b/modules/auxiliary/scanner/mysql/mysql_writable_dirs.rb index 6f29044b31de..db504d104e15 100644 --- a/modules/auxiliary/scanner/mysql/mysql_writable_dirs.rb +++ b/modules/auxiliary/scanner/mysql/mysql_writable_dirs.rb @@ -7,7 +7,7 @@ class MetasploitModule < Msf::Auxiliary include Msf::Exploit::Remote::MYSQL include Msf::Auxiliary::Report include Msf::Auxiliary::Scanner - include Msf::OptionalSession + include Msf::OptionalSession::MySQL def initialize super( diff --git a/modules/auxiliary/scanner/postgres/postgres_hashdump.rb b/modules/auxiliary/scanner/postgres/postgres_hashdump.rb index a6dc26b1539a..b6e6047fb28b 100644 --- a/modules/auxiliary/scanner/postgres/postgres_hashdump.rb +++ b/modules/auxiliary/scanner/postgres/postgres_hashdump.rb @@ -7,7 +7,7 @@ class MetasploitModule < Msf::Auxiliary include Msf::Exploit::Remote::Postgres include Msf::Auxiliary::Report include Msf::Auxiliary::Scanner - include Msf::OptionalSession + include Msf::OptionalSession::PostgreSQL def initialize super( diff --git a/modules/auxiliary/scanner/postgres/postgres_version.rb b/modules/auxiliary/scanner/postgres/postgres_version.rb index cd9807b8dae3..d07e3630e9c4 100644 --- a/modules/auxiliary/scanner/postgres/postgres_version.rb +++ b/modules/auxiliary/scanner/postgres/postgres_version.rb @@ -7,7 +7,7 @@ class MetasploitModule < Msf::Auxiliary include Msf::Exploit::Remote::Postgres include Msf::Auxiliary::Scanner include Msf::Auxiliary::Report - include Msf::OptionalSession + include Msf::OptionalSession::PostgreSQL # Creates an instance of this module. def initialize(info = {}) diff --git a/modules/exploits/linux/postgres/postgres_payload.rb b/modules/exploits/linux/postgres/postgres_payload.rb index 1165ae24f3cd..0d7424797cc4 100644 --- a/modules/exploits/linux/postgres/postgres_payload.rb +++ b/modules/exploits/linux/postgres/postgres_payload.rb @@ -9,7 +9,7 @@ class MetasploitModule < Msf::Exploit::Remote include Msf::Exploit::Remote::Postgres include Msf::Auxiliary::Report - include Msf::OptionalSession + include Msf::OptionalSession::PostgreSQL # Creates an instance of this module. def initialize(info = {}) diff --git a/modules/exploits/multi/mysql/mysql_udf_payload.rb b/modules/exploits/multi/mysql/mysql_udf_payload.rb index c5cd0352699e..eab8b1b8b4db 100644 --- a/modules/exploits/multi/mysql/mysql_udf_payload.rb +++ b/modules/exploits/multi/mysql/mysql_udf_payload.rb @@ -8,7 +8,7 @@ class MetasploitModule < Msf::Exploit::Remote include Msf::Exploit::Remote::MYSQL include Msf::Exploit::CmdStager - include Msf::OptionalSession + include Msf::OptionalSession::MySQL def initialize(info = {}) super( diff --git a/modules/exploits/multi/postgres/postgres_copy_from_program_cmd_exec.rb b/modules/exploits/multi/postgres/postgres_copy_from_program_cmd_exec.rb index 59e538e4b28d..3dc8c412fe6a 100644 --- a/modules/exploits/multi/postgres/postgres_copy_from_program_cmd_exec.rb +++ b/modules/exploits/multi/postgres/postgres_copy_from_program_cmd_exec.rb @@ -10,7 +10,7 @@ class MetasploitModule < Msf::Exploit::Remote include Msf::Exploit::Remote::Postgres include Msf::Exploit::Remote::Tcp include Msf::Auxiliary::Report - include Msf::OptionalSession + include Msf::OptionalSession::PostgreSQL def initialize(info = {}) super(update_info(info, diff --git a/modules/exploits/multi/postgres/postgres_createlang.rb b/modules/exploits/multi/postgres/postgres_createlang.rb index e8352a251fe1..3c2ec63fe42d 100644 --- a/modules/exploits/multi/postgres/postgres_createlang.rb +++ b/modules/exploits/multi/postgres/postgres_createlang.rb @@ -10,7 +10,7 @@ class MetasploitModule < Msf::Exploit::Remote include Msf::Exploit::Remote::Postgres include Msf::Exploit::Remote::Tcp include Msf::Auxiliary::Report - include Msf::OptionalSession + include Msf::OptionalSession::PostgreSQL def initialize(info = {}) super(update_info(info, diff --git a/modules/exploits/windows/mysql/mysql_mof.rb b/modules/exploits/windows/mysql/mysql_mof.rb index 782516c4eb1b..c5184dbd3222 100644 --- a/modules/exploits/windows/mysql/mysql_mof.rb +++ b/modules/exploits/windows/mysql/mysql_mof.rb @@ -10,7 +10,7 @@ class MetasploitModule < Msf::Exploit::Remote include Msf::Exploit::WbemExec include Msf::Exploit::EXE include Msf::Exploit::FileDropper - include Msf::OptionalSession + include Msf::OptionalSession::MySQL def initialize(info = {}) super(update_info(info, diff --git a/modules/exploits/windows/mysql/mysql_start_up.rb b/modules/exploits/windows/mysql/mysql_start_up.rb index eea229be6f25..27e27c5b38c2 100644 --- a/modules/exploits/windows/mysql/mysql_start_up.rb +++ b/modules/exploits/windows/mysql/mysql_start_up.rb @@ -9,7 +9,7 @@ class MetasploitModule < Msf::Exploit::Remote include Msf::Exploit::Remote::MYSQL include Msf::Exploit::EXE include Msf::Exploit::FileDropper - include Msf::OptionalSession + include Msf::OptionalSession::MySQL def initialize(info = {}) super(update_info(info, diff --git a/modules/exploits/windows/postgres/postgres_payload.rb b/modules/exploits/windows/postgres/postgres_payload.rb index 3ab640f19b9b..037af50eae7b 100644 --- a/modules/exploits/windows/postgres/postgres_payload.rb +++ b/modules/exploits/windows/postgres/postgres_payload.rb @@ -10,7 +10,7 @@ class MetasploitModule < Msf::Exploit::Remote include Msf::Auxiliary::Report include Msf::Exploit::EXE include Msf::Exploit::FileDropper - include Msf::OptionalSession + include Msf::OptionalSession::PostgreSQL # Creates an instance of this module. def initialize(info = {})