Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for NewClass elements on Rex::Java::Serialization #6026

Merged
merged 2 commits into from
Oct 8, 2015

Conversation

jvazquez-r7
Copy link
Contributor

While working with some complex java serialized streams I noticed some issues because of the lack of "NewClass" objects. This pull request adds support.

Unfortunately I can not share the test cases I'm working with atm.

  • With these changes
 tools/java_deserializer.rb request.raw
[*] Deserializing...

@magic: 0xaced
@version: 5
@contents: [
blah
 ]
@references: [
  [7e0000] NewClassDesc { com.util.proxy....
  [7e004c] Utf { blahblah }
]
  • From master
$ tools/java_deserializer.rb request.raw
[*] Deserializing...

[-] undefined method `class_name' for #<Rex::Java::Serialization::Model::NewArray:0x007feb209096e8>
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_array.rb:117:in `array_type'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_array.rb:38:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/element.rb:18:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/contents.rb:33:in `decode_content'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:127:in `block in decode_class_fields'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:123:in `each'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:123:in `decode_class_fields'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:109:in `decode_class_data'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:40:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/element.rb:18:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/contents.rb:29:in `decode_content'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:127:in `block in decode_class_fields'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:123:in `each'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:123:in `decode_class_fields'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:109:in `decode_class_data'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:40:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/element.rb:18:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/contents.rb:29:in `decode_content'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:127:in `block in decode_class_fields'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:123:in `each'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:123:in `decode_class_fields'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:109:in `decode_class_data'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:105:in `decode_class_data'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:37:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/element.rb:18:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/contents.rb:29:in `decode_content'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:127:in `block in decode_class_fields'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:123:in `each'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:123:in `decode_class_fields'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:109:in `decode_class_data'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:105:in `decode_class_data'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:37:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/element.rb:18:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/contents.rb:29:in `decode_content'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_array.rb:185:in `decode_value'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_array.rb:43:in `block in decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_array.rb:42:in `times'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_array.rb:42:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/element.rb:18:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/contents.rb:33:in `decode_content'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:127:in `block in decode_class_fields'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:123:in `each'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:123:in `decode_class_fields'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:109:in `decode_class_data'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/new_object.rb:37:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/element.rb:18:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/contents.rb:29:in `decode_content'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/stream.rb:43:in `decode'
    /Users/jvazquez/Projects/Code/metasploit-framework/lib/rex/java/serialization/model/element.rb:18:in `decode'
    tools/java_deserializer.rb:46:in `run'
    tools/java_deserializer.rb:167:in `<main>'

Verification

  • specs should be green

@wchen-r7 wchen-r7 merged commit bfbd6ad into rapid7:master Oct 8, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants