Add machine_id support to windows php meterp

data/meterpreter/meterpreter.php

@@ -449,13 +449,10 @@ function core_machine_id($req, &$pkt) {
   $serial = "";
 
   if (is_windows()) {
-    # TODO: need help from real PHP folks who know how to do
-    # things via the Windows API. We need to:
-    # 1) get the system volume
-    # 2) get the volume information for that volume.
-    # 3) get the serial number from the extracted volume info.
-    # 4) create a serial in the format:
-    # "{0:04x}-{1:04x}".format((serial_num >> 16) & 0xFFFF, serial_num & 0xFFFF)
+    # It's dirty, but there's not really a nicer way of doing this on windows. Make sure
+    # it's lowercase as this is what the other meterpreters use.
+    $output = strtolower(shell_exec("vol %SYSTEMDRIVE%"));
+    $serial = preg_replace('/.*serial number is ([a-z0-9]{4}-[a-z0-9]{4}).*/s', '$1', $output);
   } else {
     $serial = get_hdd_label();
   }

lib/rex/post/meterpreter/client_core.rb

@@ -317,6 +317,11 @@ class ClientCore < Extension
     response = client.send_request(*args)
 
     mid = response.get_tlv_value(TLV_TYPE_MACHINE_ID)
+
+    # Normalise the format of the incoming machine id so that it's consistent
+    # regardless of case and leading/trailing spaces. This means that the
+    # individual meterpreters don't have to care
+    mid.downcase!.strip! if mid
     return Rex::Text.md5(mid)
   end
 

modules/payloads/singles/php/meterpreter_reverse_tcp.rb

@@ -12,7 +12,7 @@ require 'msf/base/sessions/meterpreter_options'
 
 module Metasploit4
 
-  CachedSize = 25532
+  CachedSize = 25679
 
   include Msf::Payload::Single
   include Msf::Payload::Php::ReverseTcp