Land rapid7#5352, display domain and user info in sysinfo if available

Author: Brent Cook

lib/rex/post/meterpreter/extensions/stdapi/sys/config.rb

@@ -94,6 +94,8 @@ def sysinfo
       'OS'              => response.get_tlv_value(TLV_TYPE_OS_NAME),
       'Architecture'    => response.get_tlv_value(TLV_TYPE_ARCHITECTURE),
       'System Language' => response.get_tlv_value(TLV_TYPE_LANG_SYSTEM),
+      'Domain'          => response.get_tlv_value(TLV_TYPE_DOMAIN),
+      'Logged On Users' => response.get_tlv_value(TLV_TYPE_LOGGED_ON_USER_COUNT)
     }
   end
 

lib/rex/post/meterpreter/extensions/stdapi/tlv.rb

@@ -113,12 +113,14 @@ module Stdapi
 TLV_TYPE_TARGET_HOST        = TLV_META_TYPE_STRING  | 1013
 
 # Config
-TLV_TYPE_COMPUTER_NAME      = TLV_META_TYPE_STRING  | 1040
-TLV_TYPE_OS_NAME            = TLV_META_TYPE_STRING  | 1041
-TLV_TYPE_USER_NAME          = TLV_META_TYPE_STRING  | 1042
-TLV_TYPE_ARCHITECTURE       = TLV_META_TYPE_STRING  | 1043
-TLV_TYPE_LANG_SYSTEM        = TLV_META_TYPE_STRING  | 1044
-TLV_TYPE_SID                = TLV_META_TYPE_STRING  | 1045
+TLV_TYPE_COMPUTER_NAME          = TLV_META_TYPE_STRING  | 1040
+TLV_TYPE_OS_NAME                = TLV_META_TYPE_STRING  | 1041
+TLV_TYPE_USER_NAME              = TLV_META_TYPE_STRING  | 1042
+TLV_TYPE_ARCHITECTURE           = TLV_META_TYPE_STRING  | 1043
+TLV_TYPE_LANG_SYSTEM            = TLV_META_TYPE_STRING  | 1044
+TLV_TYPE_SID                    = TLV_META_TYPE_STRING  | 1045
+TLV_TYPE_DOMAIN                 = TLV_META_TYPE_STRING  | 1046
+TLV_TYPE_LOGGED_ON_USER_COUNT   = TLV_META_TYPE_UINT    | 1047
 
 # Environment
 TLV_TYPE_ENV_VARIABLE       = TLV_META_TYPE_STRING  | 1100