Add session type to info hash in the mixin

rapid7 · Feb 2, 2024 · 4bf4cc7 · 4bf4cc7
1 parent 557b9ec
commit 4bf4cc7
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 16 deletions.
diff --git a/lib/msf/core/optional_session/postgresql.rb b/lib/msf/core/optional_session/postgresql.rb
@@ -6,7 +6,12 @@ module PostgreSQL
       include Msf::OptionalSession
 
       def initialize(info = {})
-        super
+        super(
+          update_info(
+            info,
+            'SessionTypes' => %w[PostgreSQL]
+          )
+        )
         if framework.features.enabled?(Msf::FeatureManager::POSTGRESQL_SESSION_TYPE)
           register_options(
             [

diff --git a/lib/msf/core/optional_session/smb.rb b/lib/msf/core/optional_session/smb.rb
@@ -6,7 +6,14 @@ module SMB
       include Msf::OptionalSession
 
       def initialize(info = {})
-        super
+        super(
+          update_info(
+            info,
+            'SessionTypes' => %w[SMB]
+          )
+        )
+
+
         if framework.features.enabled?(Msf::FeatureManager::SMB_SESSION_TYPE)
           register_options(
             [

diff --git a/modules/auxiliary/admin/smb/delete_file.rb b/modules/auxiliary/admin/smb/delete_file.rb
@@ -32,7 +32,6 @@ def initialize
           'mubix' # copied from hdm upload_file module
         ],
       'License'     => MSF_LICENSE,
-      'SessionTypes' => %w[SMB]
       )
 
     register_options([

diff --git a/modules/auxiliary/admin/smb/download_file.rb b/modules/auxiliary/admin/smb/download_file.rb
@@ -26,7 +26,6 @@ def initialize
           'mubix' # copied from hdm upload_file module
         ],
       'License'     => MSF_LICENSE,
-      'SessionTypes' => %w[SMB]
     )
 
     register_options([

diff --git a/modules/auxiliary/admin/smb/psexec_ntdsgrab.rb b/modules/auxiliary/admin/smb/psexec_ntdsgrab.rb
@@ -35,7 +35,6 @@ def initialize(info = {})
         [ 'URL', 'http://sourceforge.net/projects/smbexec' ],
         [ 'URL', 'https://www.optiv.com/blog/owning-computers-without-shell-access' ]
       ],
-      'SessionTypes' => %w[SMB]
     ))
 
     register_options([

diff --git a/modules/auxiliary/admin/smb/upload_file.rb b/modules/auxiliary/admin/smb/upload_file.rb
@@ -30,7 +30,6 @@ def initialize
         [
         ],
       'License'     => MSF_LICENSE,
-      'SessionTypes' => %w[SMB]
     )
 
     register_options([

diff --git a/modules/auxiliary/gather/windows_secrets_dump.rb b/modules/auxiliary/gather/windows_secrets_dump.rb
@@ -75,7 +75,6 @@ def initialize(info = {})
           [ 'DOMAIN', { 'Description' => 'Dump domain secrets (credentials, password history, Kerberos keys, etc.)' } ]
         ],
         'DefaultAction' => 'ALL',
-        'SessionTypes' => %w[SMB]
       )
     )
 

diff --git a/modules/auxiliary/scanner/postgres/postgres_schemadump.rb b/modules/auxiliary/scanner/postgres/postgres_schemadump.rb
@@ -18,7 +18,6 @@ def initialize
       ),
       'Author' => ['theLightCosine'],
       'License' => MSF_LICENSE,
-      'SessionTypes' => %w[PostgreSQL]
     )
     register_options([
       OptBool.new('DISPLAY_RESULTS', [true, 'Display the Results to the Screen', true]),

diff --git a/modules/auxiliary/scanner/smb/pipe_auditor.rb b/modules/auxiliary/scanner/smb/pipe_auditor.rb
@@ -22,7 +22,6 @@ def initialize
       'Description' => 'Determine what named pipes are accessible over SMB',
       'Author'      => 'hdm',
       'License'     => MSF_LICENSE,
-      'SessionTypes' => %w[SMB]
     )
 
     deregister_options('RPORT', 'SMBDirect')

diff --git a/modules/auxiliary/scanner/smb/pipe_dcerpc_auditor.rb b/modules/auxiliary/scanner/smb/pipe_dcerpc_auditor.rb
@@ -22,7 +22,6 @@ def initialize
       'Description' => 'Determine what DCERPC services are accessible over a SMB pipe',
       'Author'      => 'hdm',
       'License'     => MSF_LICENSE,
-      'SessionTypes' => %w[SMB]
     )
 
     deregister_options('RPORT')

diff --git a/modules/auxiliary/scanner/smb/smb_enum_gpp.rb b/modules/auxiliary/scanner/smb/smb_enum_gpp.rb
@@ -38,7 +38,6 @@ def initialize
           ['URL', 'https://labs.portcullis.co.uk/blog/are-you-considering-using-microsoft-group-policy-preferences-think-again/']
         ],
       'License'     => MSF_LICENSE,
-      'SessionTypes' => %w[SMB]
     )
     register_options([
       OptString.new('SMBSHARE', [true, 'The name of the share on the server', 'SYSVOL']),

diff --git a/modules/auxiliary/scanner/smb/smb_enumshares.rb b/modules/auxiliary/scanner/smb/smb_enumshares.rb
@@ -41,7 +41,6 @@ def initialize(info = {})
         'DefaultOptions' => {
           'DCERPC::fake_bind_multi' => false
         },
-        'SessionTypes' => %w[SMB]
       )
     )
 

diff --git a/modules/auxiliary/scanner/smb/smb_enumusers.rb b/modules/auxiliary/scanner/smb/smb_enumusers.rb
@@ -26,7 +26,6 @@ def initialize
       'DefaultOptions' => {
         'DCERPC::fake_bind_multi' => false
       },
-      'SessionTypes' => %w[SMB]
     )
 
     register_options(

diff --git a/modules/auxiliary/scanner/smb/smb_enumusers_domain.rb b/modules/auxiliary/scanner/smb/smb_enumusers_domain.rb
@@ -30,7 +30,6 @@ def initialize
           [ 'URL', 'https://docs.microsoft.com/en-us/windows/win32/api/lmwksta/nf-lmwksta-netwkstauserenum' ]
         ],
       'License'     => MSF_LICENSE,
-      'SessionTypes' => %w[SMB]
     )
 
     deregister_options('RPORT')

diff --git a/modules/auxiliary/scanner/smb/smb_lookupsid.rb b/modules/auxiliary/scanner/smb/smb_lookupsid.rb
@@ -37,7 +37,6 @@ def initialize
           ['DOMAIN', { 'Description' => 'Enumerate domain accounts' } ]
         ],
       'DefaultAction' => 'LOCAL',
-      'SessionTypes' => %w[SMB]
     )
 
     register_options(

diff --git a/modules/exploits/windows/smb/psexec.rb b/modules/exploits/windows/smb/psexec.rb
@@ -69,7 +69,6 @@ def initialize(info = {})
           [ 'Command', { 'Arch' => [ARCH_CMD], 'Payload' => { 'Space' => 8191 } } ]
         ],
       'DefaultTarget'  => 0,
-      'SessionTypes' => %w[SMB],
       # For the CVE, PsExec was first released around February or March 2001
       'DisclosureDate' => '1999-01-01'
     ))
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ def initialize @@
             [
             ],
           'License'     => MSF_LICENSE,
-          'SessionTypes' => %w[SMB]
         )
         register_options([
@@ Expand Down @@