Use constants for JMX serial version uids

Author: jvazquez-r7

lib/msf/java/rmi/client/jmx.rb

@@ -4,12 +4,18 @@ module Msf
   module Java
     module Rmi
       module Client
-        module Registry
+        module Jmx
           require 'msf/java/rmi/client/jmx/server'
           require 'msf/java/rmi/client/jmx/connection'
 
           include Msf::Java::Rmi::Client::Jmx::Server
           include Msf::Java::Rmi::Client::Jmx::Connection
+
+          OBJECT_NAME_UID = 1081892073854801359
+          BYTE_ARRAY_UID = -5984413125824719648
+          MARSHALLED_OBJECT_UID = 8988374069173025854
+          STRING_ARRAY_UID = -5921575005990323385
+          OBJECT_ARRAY_UID = -8012369246846506644
         end
       end
     end

lib/msf/java/rmi/client/jmx/connection/builder.rb

@@ -7,7 +7,6 @@ module Client
         module Jmx
           module Connection
             module Builder
-
               # Builds an RMI call to javax/management/remote/rmi/RMIConnectionImpl_Stub#getObjectInstance()
               # used to retrieve an MBean instance
               #
@@ -50,7 +49,7 @@ def build_jmx_get_object_instance_args(name = '')
 
                 new_object = builder.new_object(
                   name: 'javax.management.ObjectName',
-                  serial: 0xf03a71beb6d15cf, # serialVersionUID
+                  serial: Msf::Java::Rmi::Client::Jmx::OBJECT_NAME_UID, # serialVersionUID
                   flags: 3
                 )
 
@@ -161,20 +160,20 @@ def build_jmx_invoke_args(opts = {})
 
               new_object = builder.new_object(
                 name: 'javax.management.ObjectName',
-                serial: 0xf03a71beb6d15cf, # serialVersionUID
+                serial: Msf::Java::Rmi::Client::Jmx::OBJECT_NAME_UID, # serialVersionUID
                 flags: 3
               )
 
               data_binary = builder.new_array(
                 name: '[B',
-                serial: 0xacf317f8060854e0, # serialVersionUID
+                serial: Msf::Java::Rmi::Client::Jmx::BYTE_ARRAY_UID, # serialVersionUID
                 values_type: 'byte',
                 values: build_invoke_arguments_obj_bytes(args).encode.unpack('C*')
               )
 
               marshall_object = builder.new_object(
                 name: 'java.rmi.MarshalledObject',
-                serial: 0x7cbd1e97ed63fc3e, # serialVersionUID
+                serial: Msf::Java::Rmi::Client::Jmx::MARSHALLED_OBJECT_UID, # serialVersionUID
                 fields: [
                   ['int', 'hash'],
                   ['array', 'locBytes', '[B'],
@@ -189,7 +188,7 @@ def build_jmx_invoke_args(opts = {})
 
               new_array = builder.new_array(
                 name: '[Ljava.lang.String;',
-                serial: 0xadd256e7e91d7b47, # serialVersionUID
+                serial: Msf::Java::Rmi::Client::Jmx::STRING_ARRAY_UID, # serialVersionUID
                 values_type: 'java.lang.String;',
                 values: args.keys.collect { |k| Rex::Java::Serialization::Model::Utf.new(nil, k) }
               )
@@ -218,7 +217,7 @@ def build_invoke_arguments_obj_bytes(args = {})
 
               new_array = builder.new_array(
                 name: '[Ljava.lang.Object;',
-                serial: 0x90ce589f1073296c, # serialVersionUID
+                serial: Msf::Java::Rmi::Client::Jmx::OBJECT_ARRAY_UID, # serialVersionUID
                 annotations: [Rex::Java::Serialization::Model::EndBlockData.new],
                 values_type: 'java.lang.Object;',
                 values: args.values.collect { |arg| Rex::Java::Serialization::Model::Utf.new(nil, arg) }

lib/msf/java/rmi/client/jmx/server/builder.rb

@@ -54,7 +54,7 @@ def build_jmx_new_client_args(username = '', password = '')
 
                 auth_array = builder.new_array(
                   name: '[Ljava.lang.String;',
-                  serial: 0xadd256e7e91d7b47, # serialVersionUID
+                  serial: Msf::Java::Rmi::Client::Jmx::STRING_ARRAY_UID, # serialVersionUID
                   values_type: 'java.lang.String;',
                   values: [
                     Rex::Java::Serialization::Model::Utf.new(nil, username),

lib/rex/java/serialization/model/new_class_desc.rb

@@ -73,7 +73,7 @@ def encode
             end
             encoded = ''
             encoded << class_name.encode
-            encoded << [serial_version].pack('Q>')
+            encoded << [serial_version].pack('q>')
             encoded << [flags].pack('C')
             encoded << [fields.length].pack('n')
             fields.each do |field|