Land rapid7#8895, bump mettle, fix reverse_http/s shell command

Brent Cook · Brent Cook · commit d23edf5cd103 · 2017-08-28T05:49:05.000-05:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -19,7 +19,7 @@ PATH
       metasploit-model
       metasploit-payloads (= 1.3.1)
       metasploit_data_models
-      metasploit_payloads-mettle (= 0.2.0)
+      metasploit_payloads-mettle (= 0.2.2)
       msgpack
       nessus_rest
       net-ssh
@@ -162,7 +162,7 @@ GEM
       postgres_ext
       railties (~> 4.2.6)
       recog (~> 2.0)
-    metasploit_payloads-mettle (0.2.0)
+    metasploit_payloads-mettle (0.2.2)
     method_source (0.8.2)
     mini_portile2 (2.2.0)
     minitest (5.10.3)
@@ -253,7 +253,7 @@ GEM
     rex-powershell (0.1.72)
       rex-random_identifier
       rex-text
-    rex-random_identifier (0.1.2)
+    rex-random_identifier (0.1.3)
       rex-text
     rex-registry (0.1.3)
     rex-rop_builder (0.1.3)
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
@@ -72,7 +72,7 @@ Gem::Specification.new do |spec|
   # Needed for Meterpreter
   spec.add_runtime_dependency 'metasploit-payloads', '1.3.1'
   # Needed for the next-generation POSIX Meterpreter
-  spec.add_runtime_dependency 'metasploit_payloads-mettle', '0.2.0'
+  spec.add_runtime_dependency 'metasploit_payloads-mettle', '0.2.2'
   # Needed by msfgui and other rpc components
   spec.add_runtime_dependency 'msgpack'
   # get list of network interfaces, like eth* from OS.
diff --git a/modules/payloads/singles/cmd/unix/bind_r.rb b/modules/payloads/singles/cmd/unix/bind_r.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 516
+  CachedSize = 132
 
   include Msf::Payload::Single
   include Msf::Payload::R
diff --git a/modules/payloads/singles/cmd/unix/reverse_r.rb b/modules/payloads/singles/cmd/unix/reverse_r.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 516
+  CachedSize = 157
 
   include Msf::Payload::Single
   include Msf::Payload::R
diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 675048
+  CachedSize = 675112
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 675048
+  CachedSize = 675112
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 675048
+  CachedSize = 675112
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 668360
+  CachedSize = 668392
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 668360
+  CachedSize = 668392
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 668360
+  CachedSize = 668392
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 666552
+  CachedSize = 666984
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 666552
+  CachedSize = 666984
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 666552
+  CachedSize = 666984
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1059224
+  CachedSize = 1059368
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1059224
+  CachedSize = 1059368
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1059224
+  CachedSize = 1059368
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1036772
+  CachedSize = 1037512
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1036772
+  CachedSize = 1037512
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1036772
+  CachedSize = 1037512
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1036084
+  CachedSize = 1036808
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1036084
+  CachedSize = 1036808
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 1036084
+  CachedSize = 1036808
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 789164
+  CachedSize = 789196
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 789164
+  CachedSize = 789196
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 789164
+  CachedSize = 789196
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 855864
+  CachedSize = 855928
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 855864
+  CachedSize = 855928
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 855864
+  CachedSize = 855928
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 725024
+  CachedSize = 729184
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 725024
+  CachedSize = 729184
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 725024
+  CachedSize = 729184
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 772796
+  CachedSize = 772828
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 772796
+  CachedSize = 772828
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 772796
+  CachedSize = 772828
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 893496
+  CachedSize = 893560
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 893496
+  CachedSize = 893560
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 893496
+  CachedSize = 893560
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 618300
+  CachedSize = 618412
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 618300
+  CachedSize = 618412
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 618300
+  CachedSize = 618412
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
diff --git a/modules/payloads/singles/r/shell_bind_tcp.rb b/modules/payloads/singles/r/shell_bind_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 516
+  CachedSize = 125
 
   include Msf::Payload::Single
   include Msf::Payload::R
diff --git a/modules/payloads/singles/r/shell_reverse_tcp.rb b/modules/payloads/singles/r/shell_reverse_tcp.rb
@@ -10,7 +10,7 @@
 
 module MetasploitModule
 
-  CachedSize = 516
+  CachedSize = 150
 
   include Msf::Payload::Single
   include Msf::Payload::R
diff --git a/modules/payloads/stagers/linux/aarch64/reverse_tcp.rb b/modules/payloads/stagers/linux/aarch64/reverse_tcp.rb
diff --git a/spec/modules/payloads_spec.rb b/spec/modules/payloads_spec.rb
