Skip to content

Commit 8590c79

Browse files
committed
Add support for NewClass
1 parent 54f9a3b commit 8590c79

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

lib/rex/java/serialization/model.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ module Model
1919
autoload :NewClassDesc, 'rex/java/serialization/model/new_class_desc'
2020
autoload :NewEnum, 'rex/java/serialization/model/new_enum'
2121
autoload :NewObject, 'rex/java/serialization/model/new_object'
22+
autoload :NewClass, 'rex/java/serialization/model/new_class'
2223
autoload :NullReference, 'rex/java/serialization/model/null_reference'
2324
autoload :Reference, 'rex/java/serialization/model/reference'
2425
autoload :Reset, 'rex/java/serialization/model/reset'

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def decode_content(io, stream)
2828
when TC_OBJECT
2929
content = NewObject.decode(io, stream)
3030
when TC_CLASS
31-
content = ClassDesc.decode(io, stream)
31+
content = NewClass.decode(io, stream)
3232
when TC_ARRAY
3333
content = NewArray.decode(io, stream)
3434
when TC_STRING
@@ -75,7 +75,7 @@ def encode_content(content)
7575
encoded << [TC_ENDBLOCKDATA].pack('C')
7676
when NewObject
7777
encoded << [TC_OBJECT].pack('C')
78-
when ClassDesc
78+
when NewClass
7979
encoded << [TC_CLASS].pack('C')
8080
when NewArray
8181
encoded << [TC_ARRAY].pack('C')
@@ -122,6 +122,8 @@ def print_content(content)
122122
str << "#{print_class(content)} { #{content.to_s} }"
123123
when ClassDesc
124124
str << "#{print_class(content)} { #{content.to_s} }"
125+
when NewClass
126+
str << "#{print_class(content)} { #{content.to_s} }"
125127
when NewArray
126128
str << "#{print_class(content)} { #{content.to_s} }"
127129
when Utf

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ def encode
7171
# @return [String]
7272
def to_s
7373
str = ''
74+
7475
case class_desc.description
7576
when NewClassDesc
7677
str << class_desc.description.class_name.to_s
@@ -84,6 +85,8 @@ def to_s
8485
data_str = class_data.collect { |data| data.to_s }
8586
str << data_str.join(', ')
8687
str << ' }'
88+
89+
str
8790
end
8891

8992
private

0 commit comments

Comments
 (0)