From 085071da0219b6546ea7a520ce225f4eb69c156f Mon Sep 17 00:00:00 2001 From: sjanusz-r7 Date: Wed, 21 Feb 2024 18:01:55 +0000 Subject: [PATCH] Convert generic SQL mixin into a class --- lib/msf/base/sessions/mssql.rb | 5 +---- lib/msf/base/sessions/mysql.rb | 5 +---- lib/msf/base/sessions/postgresql.rb | 5 +---- lib/msf/base/sessions/sql.rb | 3 ++- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/msf/base/sessions/mssql.rb b/lib/msf/base/sessions/mssql.rb index bd040ab73d..df42b15463 100644 --- a/lib/msf/base/sessions/mssql.rb +++ b/lib/msf/base/sessions/mssql.rb @@ -2,10 +2,7 @@ require 'rex/post/mssql' -class Msf::Sessions::MSSQL - - include Msf::Sessions::Scriptable - include Msf::Sessions::Sql +class Msf::Sessions::MSSQL < Msf::Sessions::Sql # @return [String] The address MSSQL is running on attr_accessor :address diff --git a/lib/msf/base/sessions/mysql.rb b/lib/msf/base/sessions/mysql.rb index 31b26056b7..5e1f445abf 100644 --- a/lib/msf/base/sessions/mysql.rb +++ b/lib/msf/base/sessions/mysql.rb @@ -2,10 +2,7 @@ require 'rex/post/mysql' -class Msf::Sessions::MySQL - - include Msf::Sessions::Scriptable - include Msf::Sessions::Sql +class Msf::Sessions::MySQL < Msf::Sessions::Sql # @param[Rex::IO::Stream] rstream # @param [Hash] opts diff --git a/lib/msf/base/sessions/postgresql.rb b/lib/msf/base/sessions/postgresql.rb index 7d34dcacaf..1341f0748f 100644 --- a/lib/msf/base/sessions/postgresql.rb +++ b/lib/msf/base/sessions/postgresql.rb @@ -2,10 +2,7 @@ require 'rex/post/postgresql' -class Msf::Sessions::PostgreSQL - - include Msf::Sessions::Scriptable - include Msf::Sessions::Sql +class Msf::Sessions::PostgreSQL < Msf::Sessions::Sql # @param[Rex::IO::Stream] rstream # @param [Hash] opts diff --git a/lib/msf/base/sessions/sql.rb b/lib/msf/base/sessions/sql.rb index 9bdb0b97b3..23e3388031 100644 --- a/lib/msf/base/sessions/sql.rb +++ b/lib/msf/base/sessions/sql.rb @@ -1,9 +1,10 @@ # -*- coding: binary -*- -module Msf::Sessions::Sql +class Msf::Sessions::Sql # This interface supports basic interaction. include Msf::Session::Basic + include Msf::Sessions::Scriptable # @return console The interactive console attr_accessor :console