Land rapid7#9438, address cmd_exec inconsistencies

Author: busterb

Gemfile.lock

@@ -20,7 +20,7 @@ PATH
       metasploit-model
       metasploit-payloads (= 1.3.25)
       metasploit_data_models
-      metasploit_payloads-mettle (= 0.3.3)
+      metasploit_payloads-mettle (= 0.3.6)
       mqtt
       msgpack
       nessus_rest
@@ -192,7 +192,7 @@ GEM
       postgres_ext
       railties (~> 4.2.6)
       recog (~> 2.0)
-    metasploit_payloads-mettle (0.3.3)
+    metasploit_payloads-mettle (0.3.6)
     method_source (0.9.0)
     mini_portile2 (2.3.0)
     minitest (5.11.1)

lib/msf/core/post/common.rb

@@ -111,14 +111,13 @@ def cmd_exec(cmd, args=nil, time_out=15)
       o = ""
       # Wait up to time_out seconds for the first bytes to arrive
       while (d = process.channel.read)
+        o << d
         if d == ""
-          if (Time.now.to_i - start < time_out) && (o == '')
+          if Time.now.to_i - start < time_out
             sleep 0.1
           else
             break
           end
-        else
-          o << d
         end
       end
       o.chomp! if o

metasploit-framework.gemspec

@@ -72,7 +72,7 @@ Gem::Specification.new do |spec|
   # Needed for Meterpreter
   spec.add_runtime_dependency 'metasploit-payloads', '1.3.25'
   # Needed for the next-generation POSIX Meterpreter
-  spec.add_runtime_dependency 'metasploit_payloads-mettle', '0.3.3'
+  spec.add_runtime_dependency 'metasploit_payloads-mettle', '0.3.6'
   # Needed by msfgui and other rpc components
   spec.add_runtime_dependency 'msgpack'
   # get list of network interfaces, like eth* from OS.

modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_http.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 692552
+  CachedSize = 692904
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions

modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_https.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 692552
+  CachedSize = 692904
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions

modules/payloads/singles/apple_ios/aarch64/meterpreter_reverse_tcp.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 692552
+  CachedSize = 692904
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions

modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 966336
+  CachedSize = 967672
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions

modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 966336
+  CachedSize = 967672
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions

modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 966336
+  CachedSize = 967672
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions

modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb

@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 902448
+  CachedSize = 902836
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions