Conditionally validate only when session type is enabled

Author: dwelch-r7

lib/msf/core/optional_session.rb

@@ -11,7 +11,7 @@ module OptionalSession
     # Validates options depending on whether we are using  SESSION or an RHOST for our connection
     def validate
       super
-      return unless framework.features.enabled?(Msf::FeatureManager::SMB_SESSION_TYPE)
+      return unless optional_session_enabled?
 
       # If the session is set use that by default regardless of rhost being (un)set
       if session
@@ -23,6 +23,12 @@ def validate
       end
     end
 
+    def session
+      return nil unless optional_session_enabled?
+
+      super
+    end
+
     protected
 
     # Used to validate options when RHOST has been set

lib/msf/core/optional_session/mssql.rb

@@ -15,7 +15,7 @@ def initialize(info = {})
           )
         )
 
-        if framework.features.enabled?(Msf::FeatureManager::MSSQL_SESSION_TYPE)
+        if optional_session_enabled?
           register_option_group(name: 'SESSION',
                                 description: 'Used when connecting via an existing SESSION',
                                 option_names: ['SESSION'])
@@ -37,10 +37,8 @@ def initialize(info = {})
         end
       end
 
-      def session
-        return nil unless framework.features.enabled?(Msf::FeatureManager::MSSQL_SESSION_TYPE)
-
-        super
+      def optional_session_enabled?
+        framework.features.enabled?(Msf::FeatureManager::MSSQL_SESSION_TYPE)
       end
     end
   end

lib/msf/core/optional_session/mysql.rb

@@ -15,7 +15,7 @@ def initialize(info = {})
           )
         )
 
-        if framework.features.enabled?(Msf::FeatureManager::MYSQL_SESSION_TYPE)
+        if optional_session_enabled?
           register_option_group(name: 'SESSION',
                                 description: 'Used when connecting via an existing SESSION',
                                 option_names: ['SESSION'])
@@ -35,10 +35,8 @@ def initialize(info = {})
         end
       end
 
-      def session
-        return nil unless framework.features.enabled?(Msf::FeatureManager::MYSQL_SESSION_TYPE)
-
-        super
+      def optional_session_enabled?
+        framework.features.enabled?(Msf::FeatureManager::MYSQL_SESSION_TYPE)
       end
     end
   end

lib/msf/core/optional_session/postgresql.rb

@@ -15,7 +15,7 @@ def initialize(info = {})
           )
         )
 
-        if framework.features.enabled?(Msf::FeatureManager::POSTGRESQL_SESSION_TYPE)
+        if optional_session_enabled?
           register_option_group(name: 'SESSION',
                                 description: 'Used when connecting via an existing SESSION',
                                 option_names: ['SESSION'])
@@ -37,10 +37,8 @@ def initialize(info = {})
         end
       end
 
-      def session
-        return nil unless framework.features.enabled?(Msf::FeatureManager::POSTGRESQL_SESSION_TYPE)
-
-        super
+      def optional_session_enabled?
+        framework.features.enabled?(Msf::FeatureManager::POSTGRESQL_SESSION_TYPE)
       end
     end
   end

lib/msf/core/optional_session/smb.rb

@@ -15,7 +15,7 @@ def initialize(info = {})
           )
         )
 
-        if framework.features.enabled?(Msf::FeatureManager::SMB_SESSION_TYPE)
+        if optional_session_enabled?
           register_option_group(name: 'SESSION',
                                 description: 'Used when connecting via an existing SESSION',
                                 option_names: ['SESSION'])
@@ -35,10 +35,8 @@ def initialize(info = {})
         end
       end
 
-      def session
-        return nil unless framework.features.enabled?(Msf::FeatureManager::SMB_SESSION_TYPE)
-
-        super
+      def optional_session_enabled?
+        framework.features.enabled?(Msf::FeatureManager::SMB_SESSION_TYPE)
       end
     end
   end