Skip to content

Commit b91430c

Browse files
authored
Land rapid7#18886, Removes the 'run' command from SMB and SQL session types
2 parents 787a2cb + 76a1518 commit b91430c

File tree

11 files changed

+1
-294
lines changed

11 files changed

+1
-294
lines changed

lib/rex/post/mssql/ui/console.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class Console
1919
require 'rex/post/mssql/ui/console/command_dispatcher'
2020
require 'rex/post/mssql/ui/console/command_dispatcher/core'
2121
require 'rex/post/mssql/ui/console/command_dispatcher/client'
22-
require 'rex/post/mssql/ui/console/command_dispatcher/modules'
2322

2423
#
2524
# Initialize the MSSQL console.
@@ -42,7 +41,6 @@ def initialize(session, opts={})
4241

4342
enstack_dispatcher(::Rex::Post::MSSQL::Ui::Console::CommandDispatcher::Core)
4443
enstack_dispatcher(::Rex::Post::MSSQL::Ui::Console::CommandDispatcher::Client)
45-
enstack_dispatcher(::Rex::Post::MSSQL::Ui::Console::CommandDispatcher::Modules)
4644

4745
# Set up logging to whatever logsink 'core' is using
4846
if ! $dispatcher['mssql']

lib/rex/post/mssql/ui/console/command_dispatcher/modules.rb

Lines changed: 0 additions & 33 deletions
This file was deleted.

lib/rex/post/mysql/ui/console.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class Console
1616
require 'rex/post/mysql/ui/console/command_dispatcher'
1717
require 'rex/post/mysql/ui/console/command_dispatcher/core'
1818
require 'rex/post/mysql/ui/console/command_dispatcher/client'
19-
require 'rex/post/mysql/ui/console/command_dispatcher/modules'
2019

2120

2221
# Initialize the MySQL console.
@@ -39,7 +38,6 @@ def initialize(session)
3938

4039
enstack_dispatcher(::Rex::Post::MySQL::Ui::Console::CommandDispatcher::Core)
4140
enstack_dispatcher(::Rex::Post::MySQL::Ui::Console::CommandDispatcher::Client)
42-
enstack_dispatcher(::Rex::Post::MySQL::Ui::Console::CommandDispatcher::Modules)
4341

4442
# Set up logging to whatever logsink 'core' is using
4543
if ! $dispatcher['mysql']

lib/rex/post/mysql/ui/console/command_dispatcher/modules.rb

Lines changed: 0 additions & 30 deletions
This file was deleted.

lib/rex/post/postgresql/ui/console.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class Console
1919
require 'rex/post/postgresql/ui/console/command_dispatcher'
2020
require 'rex/post/postgresql/ui/console/command_dispatcher/core'
2121
require 'rex/post/postgresql/ui/console/command_dispatcher/client'
22-
require 'rex/post/postgresql/ui/console/command_dispatcher/modules'
2322

2423
#
2524
# Initialize the PostgreSQL console.
@@ -41,7 +40,6 @@ def initialize(session)
4140

4241
enstack_dispatcher(::Rex::Post::PostgreSQL::Ui::Console::CommandDispatcher::Core)
4342
enstack_dispatcher(::Rex::Post::PostgreSQL::Ui::Console::CommandDispatcher::Client)
44-
enstack_dispatcher(::Rex::Post::PostgreSQL::Ui::Console::CommandDispatcher::Modules)
4543

4644
# Set up logging to whatever logsink 'core' is using
4745
if ! $dispatcher['postgresql']

lib/rex/post/postgresql/ui/console/command_dispatcher/modules.rb

Lines changed: 0 additions & 33 deletions
This file was deleted.

lib/rex/post/smb/ui/console.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ class Console
1818
require 'rex/post/smb/ui/console/command_dispatcher'
1919
require 'rex/post/smb/ui/console/command_dispatcher/core'
2020
require 'rex/post/smb/ui/console/command_dispatcher/shares'
21-
require 'rex/post/smb/ui/console/command_dispatcher/modules'
2221

2322
#
2423
# Initialize the SMB console.
@@ -43,7 +42,6 @@ def initialize(session)
4342

4443
enstack_dispatcher(Rex::Post::SMB::Ui::Console::CommandDispatcher::Core)
4544
enstack_dispatcher(Rex::Post::SMB::Ui::Console::CommandDispatcher::Shares)
46-
enstack_dispatcher(Rex::Post::SMB::Ui::Console::CommandDispatcher::Modules)
4745

4846
# Set up logging to whatever logsink 'core' is using
4947
if !$dispatcher['smb']

lib/rex/post/smb/ui/console/command_dispatcher/modules.rb

Lines changed: 0 additions & 95 deletions
This file was deleted.

lib/rex/post/smb/ui/console/command_dispatcher/shares.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ def cmd_cd_tabs(_str, words)
324324
protected
325325

326326
def print_no_share_selected
327-
print_error('No active share selected')
327+
print_error('No active share selected. Use the %grnshares%clr command to view available shares, and %grnshares -i <id>%clr to interact with one')
328328
nil
329329
end
330330

lib/rex/post/sql/ui/console/command_dispatcher.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
require 'rex/post/sql/ui/console/command_dispatcher/client'
44
require 'rex/post/sql/ui/console/command_dispatcher/core'
5-
require 'rex/post/sql/ui/console/command_dispatcher/modules'
65

76
module Rex
87
module Post

0 commit comments

Comments
 (0)