Remove the remaining mimikatz extension code

rapid7 · Apr 29, 2021 · 4912abe · 4912abe
1 parent cbd7a31
commit 4912abe
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 28 deletions.
diff --git a/lib/rex/post/meterpreter/extensions/mimikatz/command_ids.rb b/lib/rex/post/meterpreter/extensions/mimikatz/command_ids.rb
diff --git a/lib/rex/post/meterpreter/packet.rb b/lib/rex/post/meterpreter/packet.rb
@@ -155,7 +155,7 @@ module Meterpreter
 COMMAND_ID_START_POWERSHELL = 14000
 COMMAND_ID_START_LANATTACKS = 15000
 COMMAND_ID_START_PEINJECTOR = 16000
-COMMAND_ID_START_MIMIKATZ   = 17000
+COMMAND_ID_START_MIMIKATZ   = 17000 # removed in MSF v6
 
 COMMAND_ID_MAP_CORE = {
   'core_channel_close'            => COMMAND_ID_START_CORE + 1,
@@ -387,10 +387,6 @@ module Meterpreter
   'lanattacks_stop_tftp'       => COMMAND_ID_START_LANATTACKS + 9,
 }
 
-COMMAND_ID_MAP_MIMIKATZ = {
-  'mimikatz_custom_command' => COMMAND_ID_START_MIMIKATZ + 1,
-}
-
 COMMAND_ID_MAP_NETWORKPUG = {
   'networkpug_start' => COMMAND_ID_START_NETWORKPUG + 1,
   'networkpug_stop'  => COMMAND_ID_START_NETWORKPUG + 2,
@@ -454,7 +450,6 @@ module Meterpreter
   COMMAND_ID_MAP_POWERSHELL,
   COMMAND_ID_MAP_LANATTACKS,
   COMMAND_ID_MAP_PEINJECTOR,
-  COMMAND_ID_MAP_MIMIKATZ,
 ].inject({}) {|m1, m2| m1.merge(m2)}
 
 def self.generate_command_id_map_c
@@ -473,7 +468,6 @@ def self.generate_command_id_map_c
     COMMAND_ID_MAP_POWERSHELL,
     COMMAND_ID_MAP_LANATTACKS,
     COMMAND_ID_MAP_PEINJECTOR,
-    COMMAND_ID_MAP_MIMIKATZ,
   ].inject({}) {|m1, m2| m1.merge(m2)}
 
   command_ids = id_map.map {|k, v| "#define COMMAND_ID_#{k.upcase} #{v}"}
@@ -563,7 +557,6 @@ def self.generate_command_id_map_python_extension
     COMMAND_ID_MAP_POWERSHELL,
     COMMAND_ID_MAP_LANATTACKS,
     COMMAND_ID_MAP_PEINJECTOR,
-    COMMAND_ID_MAP_MIMIKATZ,
   ].inject({}) {|m1, m2| m1.merge(m2)}
   command_ids = id_map.map {|k, v| "COMMAND_ID_#{k.upcase} = #{v}"}
   %Q^
@@ -592,7 +585,6 @@ def self.generate_command_id_map_csharp
     COMMAND_ID_MAP_POWERSHELL,
     COMMAND_ID_MAP_LANATTACKS,
     COMMAND_ID_MAP_PEINJECTOR,
-    COMMAND_ID_MAP_MIMIKATZ,
   ].inject({}) {|m1, m2| m1.merge(m2)}
   command_ids = id_map.map {|k, v| "#{k.split('_').map(&:capitalize).join} = #{v},"}
   %Q^

diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb
@@ -1800,7 +1800,7 @@ def unknown_command(cmd, line)
       # Check to see if we can find this command in another extension. This relies on the core extension being the last
       # in the dispatcher stack which it should be since it's the first loaded.
       Rex::Post::Meterpreter::ExtensionMapper.get_extension_names.each do |ext_name|
-        next if ext_name == 'mimikatz' || extensions.include?(ext_name)
+        next if extensions.include?(ext_name)
         ext_klass = get_extension_client_class(ext_name)
         next if ext_klass.nil?