Fixes the create session datastore option from appearing for payloads

Author: cgranleese-r7

documentation/modules/auxiliary/cloud/aws/enum_ssm.md

@@ -4,7 +4,7 @@ Provided AWS credentials, this module will call the authenticated API of Amazon
 instances accessible to the account. Once enumerated as SSM-enabled, the instances can be controlled using out-of-band
 WebSocket sessions provided by the AWS API (nominally, privileged out of the box). This module provides not only the API
 enumeration identifying EC2 instances accessible via SSM with given credentials, but enables session initiation for all
-identified targets (without requiring target-level credentials) using the CreateSession mixin option. The module also
+identified targets (without requiring target-level credentials) using the CreateSession datastore option. The module also
 provides an EC2 ID filter and a limiting throttle to prevent session stampedes or expensive messes.
 
 ## Verification Steps

lib/msf/base/sessions/command_shell_options.rb

@@ -15,12 +15,6 @@ module CommandShellOptions
   def initialize(info = {})
     super(info)
 
-    register_options(
-      [
-        OptBool.new('CreateSession', [false, 'Create a new session for every successful login', true])
-      ]
-    )
-
     register_advanced_options(
       [
         OptString.new('InitialAutoRunScript', "An initial script to run on session creation (before AutoRunScript)"),

lib/msf/base/sessions/create_session_options.rb

@@ -0,0 +1,25 @@
+# -*- coding: binary -*-
+
+##
+# This file is part of the Metasploit Framework and may be subject to
+# redistribution and commercial restrictions. Please see the Metasploit
+# Framework web site for more information on licensing and terms of use.
+# https://metasploit.com/framework/
+##
+
+
+module Msf
+  module Sessions
+    module CreateSessionOptions
+      def initialize(info = {})
+        super(info)
+
+        register_options(
+          [
+            OptBool.new('CreateSession', [false, 'Create a new session for every successful login', true])
+          ]
+        )
+      end
+    end
+  end
+end

modules/auxiliary/cloud/aws/enum_ssm.rb

@@ -10,6 +10,8 @@ class MetasploitModule < Msf::Auxiliary
   include Rex::Proto::Http::WebSocket::AmazonSsm
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::CommandShell
+  include Msf::Sessions::CreateSessionOptions
+
   def initialize(info = {})
     super(
       update_info(
@@ -24,7 +26,7 @@ def initialize(info = {})
           This module provides not only the API enumeration identifying EC2
           instances accessible via SSM with given credentials, but enables
           session initiation for all identified targets (without requiring
-          target-level credentials) using the CreateSession mixin option.
+          target-level credentials) using the CreateSession datastore option.
           The module also provides an EC2 ID filter and a limiting throttle
           to prevent session stampedes or expensive messes.
         },

modules/auxiliary/scanner/mssql/mssql_login.rb

@@ -14,6 +14,7 @@ class MetasploitModule < Msf::Auxiliary
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::CommandShell
   include Msf::Auxiliary::Scanner
+  include Msf::Sessions::CreateSessionOptions
 
   def initialize
     super(
@@ -29,13 +30,13 @@ def initialize
       'DefaultOptions' =>
         {
           'USERNAME' => 'sa',
-          'BLANK_PASSWORDS' => true
+          'BLANK_PASSWORDS' => true,
+          'CreateSession' => false
         }
     )
     register_options([
       Opt::Proxies,
-      OptBool.new('TDSENCRYPTION', [ true, 'Use TLS/SSL for TDS data "Force Encryption"', false]),
-      OptBool.new('CreateSession', [false, 'Create a new session for every successful login', false])
+      OptBool.new('TDSENCRYPTION', [ true, 'Use TLS/SSL for TDS data "Force Encryption"', false])
     ])
 
     options_to_deregister = %w[PASSWORD_SPRAY]

modules/auxiliary/scanner/mysql/mysql_login.rb

@@ -11,6 +11,7 @@ class MetasploitModule < Msf::Auxiliary
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Scanner
+  include Msf::Sessions::CreateSessionOptions
   include Msf::Auxiliary::CommandShell
 
   def initialize(info = {})
@@ -27,14 +28,14 @@ def initialize(info = {})
       'DefaultOptions' =>
         {
           'USERNAME' => 'root',
-          'BLANK_PASSWORDS' => true
+          'BLANK_PASSWORDS' => true,
+          'CreateSession'  => false
         }
     ))
 
     register_options(
       [
         Opt::Proxies,
-        OptBool.new('CreateSession', [false, 'Create a new session for every successful login', false])
       ])
 
     options_to_deregister = %w[PASSWORD_SPRAY]

modules/auxiliary/scanner/postgres/postgres_login.rb

@@ -13,6 +13,7 @@ class MetasploitModule < Msf::Auxiliary
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::CommandShell
+  include Msf::Sessions::CreateSessionOptions
 
   # Creates an instance of this module.
   def initialize(info = {})
@@ -26,6 +27,7 @@ def initialize(info = {})
       },
       'Author'         => [ 'todb' ],
       'License'        => MSF_LICENSE,
+      'DefaultOptions' => { 'CreateSession' => false },
       'References'     =>
         [
           [ 'URL', 'https://www.postgresql.org/' ],
@@ -37,7 +39,6 @@ def initialize(info = {})
     register_options(
       [
         Opt::Proxies,
-        OptBool.new('CreateSession', [false, 'Create a new session for every successful login', false]),
         OptPath.new('USERPASS_FILE',  [ false, "File containing (space-separated) users and passwords, one pair per line",
           File.join(Msf::Config.data_directory, "wordlists", "postgres_default_userpass.txt") ]),
         OptPath.new('USER_FILE',      [ false, "File containing users, one per line",

modules/auxiliary/scanner/rservices/rexec_login.rb

@@ -9,6 +9,7 @@ class MetasploitModule < Msf::Auxiliary
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::CommandShell
+  include Msf::Sessions::CreateSessionOptions
 
   def initialize
     super(

modules/auxiliary/scanner/rservices/rlogin_login.rb

@@ -11,6 +11,7 @@ class MetasploitModule < Msf::Auxiliary
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Login
   include Msf::Auxiliary::CommandShell
+  include Msf::Sessions::CreateSessionOptions
 
   def initialize
     super(

modules/auxiliary/scanner/rservices/rsh_login.rb

@@ -10,6 +10,7 @@ class MetasploitModule < Msf::Auxiliary
   include Msf::Auxiliary::RServices
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::CommandShell
+  include Msf::Sessions::CreateSessionOptions
 
   def initialize
     super(