Add Stream specs

lib/rex/java/serialization/model.rb

@@ -12,3 +12,4 @@ require 'rex/java/serialization/model/new_class_desc'
 require 'rex/java/serialization/model/new_array'
 require 'rex/java/serialization/model/new_enum'
 require 'rex/java/serialization/model/new_object'
+require 'rex/java/serialization/model/stream'

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

@@ -8,7 +8,7 @@ module Rex
           include Rex::Java::Serialization
 
           # @!attribute magic
-          #   @return [String] The stream signature
+          #   @return [Fixnum] The stream signature
           attr_accessor :magic
           # @!attribute version
           #   @return [Fixnum] The stream version
@@ -30,7 +30,7 @@ module Rex
           # @raise [RuntimeError] if deserialization doesn't succeed
           def decode(io)
             self.magic = decode_magic(io)
-            self.constant_name = decode_version(io)
+            self.version = decode_version(io)
 
             self.contents << decode_content(io) until io.eof?
 
@@ -43,7 +43,7 @@ module Rex
           # @raise [RuntimeError] if serialization doesn't succeed
           def encode
             encoded = ''
-            encoded << magic
+            encoded << [magic].pack('n')
             encoded << [version].pack('n')
             contents.each do |content|
               encoded << encode_content(content)
@@ -60,11 +60,12 @@ module Rex
           # @raise [RuntimeError] if deserialization doesn't succed
           def decode_magic(io)
             magic = io.read(2)
-            unless magic && magic == STREAM_MAGIC
+
+            unless magic && magic.length == 2 && magic.unpack('n')[0] == STREAM_MAGIC
               raise ::RuntimeError, 'Failed to unserialize Stream'
             end
 
-            magic
+            STREAM_MAGIC
           end
 
           # Deserializes the version stream
@@ -78,7 +79,7 @@ module Rex
               raise ::RuntimeError, 'Failed to unserialize Stream'
             end
 
-            version
+            STREAM_VERSION
           end
 
           # Deserializes a content

spec/lib/rex/java/serialization/model/stream_spec.rb

@@ -0,0 +1,82 @@
+require 'rex/java'
+require 'stringio'
+
+describe Rex::Java::Serialization::Model::Stream do
+
+  subject(:stream) do
+    described_class.new
+  end
+
+  let(:easy_object_stream) do
+    "\xac\xed\x00\x05\x73\x72\x00\x04" +
+    "\x45\x61\x73\x79\x74\x1d\xe1\xbc" +
+    "\xbb\x2f\xcb\xaa\x02\x00\x01\x49" +
+    "\x00\x03\x53\x53\x4e\x78\x70\x41" +
+    "\x42\x43\x44"
+  end
+  let(:easy_object_stream_io) { StringIO.new(easy_object_stream) }
+
+  describe ".new" do
+    it "Rex::Java::Serialization::Model::Stream" do
+      expect(stream).to be_a(Rex::Java::Serialization::Model::Stream)
+    end
+
+    it "initializes magic with java serialized stream signature" do
+      expect(stream.magic).to eq(Rex::Java::Serialization::STREAM_MAGIC)
+    end
+
+    it "initializes version with java serialized stream default version " do
+      expect(stream.version).to eq(Rex::Java::Serialization::STREAM_VERSION)
+    end
+  end
+
+  describe "#decode" do
+    context "when deserializing a simple Object stream" do
+      it "deserializes an Stream" do
+        expect(stream.decode(easy_object_stream_io)).to be_a(Rex::Java::Serialization::Model::Stream)
+      end
+
+      it "deserializes the signature correctly" do
+        stream.decode(easy_object_stream_io)
+        expect(stream.magic).to eq(Rex::Java::Serialization::STREAM_MAGIC)
+      end
+
+      it "deserializes all the contents" do
+        stream.decode(easy_object_stream_io)
+        expect(stream.contents.length).to eq(1)
+      end
+
+      it "deserializes a simple object correctly" do
+        stream.decode(easy_object_stream_io)
+        expect(stream.contents[0]).to be_an(Rex::Java::Serialization::Model::NewObject)
+      end
+    end
+  end
+
+  describe "#encode" do
+    context "when serializing a simple Object stream" do
+      it "serializes the Stream" do
+        new_class_desc = Rex::Java::Serialization::Model::NewClassDesc.new
+        new_class_desc.class_name = Rex::Java::Serialization::Model::Utf.new('Easy')
+        new_class_desc.serial_version = 0x741de1bcbb2fcbaa
+        new_class_desc.flags = 2
+        field = Rex::Java::Serialization::Model::Field.new
+        field.type = 'int'
+        field.name = Rex::Java::Serialization::Model::Utf.new('SSN')
+        new_class_desc.fields << field
+        new_class_desc.class_annotation = Rex::Java::Serialization::Model::Annotation.new
+        new_class_desc.super_class = Rex::Java::Serialization::Model::ClassDesc.new
+        new_class_desc.super_class.description = Rex::Java::Serialization::Model::NullReference.new
+
+        new_object = Rex::Java::Serialization::Model::NewObject.new
+        new_object.class_desc = Rex::Java::Serialization::Model::ClassDesc.new
+        new_object.class_desc.description = new_class_desc
+        new_object.class_data = [['int', 0x41424344]]
+
+        stream.contents << new_object
+        expect(stream.encode.unpack("C*")).to eq(easy_object_stream.unpack("C*"))
+      end
+    end
+  end
+
+end