Undo java serialization and RMI fixes

Author: jvazquez-r7

lib/msf/java/jmx/handshake.rb

@@ -9,7 +9,7 @@ module Handshake
         # Builds a Rex::Java::Serialization::Model::Stream to make
         # a JMX handshake with an endpoint
         #
-        # @param obj_id [String] The endpoint UnicastRef ObjId
+        # @param id [String] The endpoint UnicastRef ObjId
         # @return [Rex::Java::Serialization::Model::Stream]
         def handshake_stream(obj_id)
           block_data = Rex::Java::Serialization::Model::BlockData.new(nil, "#{obj_id}\xff\xff\xff\xff\xf0\xe0\x74\xea\xad\x0c\xae\xa8")

lib/msf/java/rmi/client.rb

@@ -109,8 +109,8 @@ def recv_return(opts = {})
 
         # Helper method to read fragmented data from a ```Rex::Socket::Tcp```
         #
-        # @param nsock [Rex::Socket::Tcp,#get_once]
-        # @return [String]
+        # @param opts [Hash]
+        # @option opts [Rex::Socket::Tcp] :sock
         def safe_get_once(nsock = sock)
           data = ''
           begin

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

@@ -11,13 +11,13 @@ class Field < Element
           include Rex::Java::Serialization::Model::Contents
 
           # @!attribute type
-          # @return [String] The type of the field.
+          #   @return [String] The type of the field.
           attr_accessor :type
           # @!attribute name
-          # @return [Rex::Java::Serialization::Model::Utf] The name of the field.
+          #   @return [Rex::Java::Serialization::Model::Utf] The name of the field.
           attr_accessor :name
           # @!attribute field_type
-          # @return [Rex::Java::Serialization::Model::Utf] The type of the field on object types.
+          #   @return [Rex::Java::Serialization::Model::Utf] The type of the field on object types.
           attr_accessor :field_type
 
           # @param stream [Rex::Java::Serialization::Model::Stream] the stream where it belongs to
@@ -32,7 +32,7 @@ def initialize(stream = nil)
           #
           # @param io [IO] the io to read from
           # @return [self] if deserialization succeeds
-          # @raise [RuntimeError] if deserialization doesn't succeed
+          # @faise [RuntimeError] if deserialization doesn't succeed
           def decode(io)
             code = io.read(1)
 

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

@@ -190,7 +190,8 @@ def decode_value(io)
 
           # Serializes an NewArray value
           #
-          # @param value [Fixnum, Float] the value to serialize
+          # @param value [Fixnum] the value to serialize
+          # @param value [Float] the value to serialize
           # @return [String] the serialized value
           # @raise [RuntimeError] if serialization fails
           def encode_value(value)

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

@@ -63,7 +63,7 @@ def encode
 
           # Adds an element to the references array
           #
-          # @param ref [Rex::Java::Serialization::Model::Element] the object to save as reference dst
+          # @param io [Rex::Java::Serialization::Model::Element] the object to save as reference dst
           def add_reference(ref)
             self.references.push(ref)
           end
@@ -120,4 +120,4 @@ def decode_version(io)
       end
     end
   end
-end
+end