feat: proxy class parsing (messy!)

Author: DexrnZacAttack

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION VERSION 3.30)
-project(JavaObjectStreams VERSION 1.3.9)
+project(JavaObjectStreams VERSION 1.3.10)
 
 set(CMAKE_CXX_STANDARD 20)
 
@@ -147,6 +147,14 @@ set(FILES
         src/type/object/parsers/ExceptionObjectParser.cpp
         include/JavaObject/type/object/parsers/ClassObjectParser.h
         src/type/object/parsers/ClassObjectParser.cpp
+        include/JavaObject/type/object/types/descriptor/ProxyClassDescriptorObject.cpp
+        include/JavaObject/type/object/types/descriptor/ProxyClassDescriptorObject.h
+        include/JavaObject/type/object/types/descriptor/ProxyClassDescriptorInfoObject.cpp
+        include/JavaObject/type/object/types/descriptor/ProxyClassDescriptorInfoObject.h
+        include/JavaObject/type/object/parsers/descriptor/NewProxyClassDescriptorParser.cpp
+        include/JavaObject/type/object/parsers/descriptor/NewProxyClassDescriptorParser.h
+        include/JavaObject/type/object/parsers/descriptor/ProxyClassDescriptorInfoParser.cpp
+        include/JavaObject/type/object/parsers/descriptor/ProxyClassDescriptorInfoParser.h
 )
 
 add_library(JavaObjectStreams SHARED ${FILES})

README.md

@@ -18,6 +18,14 @@ A C++ library to provide serialization and deserialization of Java objects (ala
 | **Deserialization** |                                                   ✅                                                    |                                                   ✅                                                    |
 |  **Serialization**  |                                                   ❌                                                    |                                                   ❌                                                    |
 
+#### TODO
+- Fix up API (probably in the style of the Java Reflection API)
+- Add and implement common interfaces between similar objects (looking at you ProxyClass and NewClass)
+- Properly validate expected types, use std::variant (or actually it would be nicer to make a custom holder) in place of IObject when available.
+  - For object types like TC_ENDBLOCKDATA, we can ignore it and store nullptr.
 ## Contributing
 Unless otherwise stated, contributions are licensed under the terms of the
-MIT license.
+MIT license.
+
+## Credits
+https://docs.oracle.com/javase/9/docs/specs/serialization/protocol.html#grammar-for-the-stream-format

include/JavaObject/type/object/parsers/descriptor/NewProxyClassDescriptorParser.h

@@ -0,0 +1,18 @@
+/** @file NewProxyClassDescriptorParser.h
+ *
+ * @author DexrnZacAttack
+ * @date 3/29/26
+ * 
+ * @device zPc-i2
+ */
+#ifndef JAVAOBJECTSTREAMS_NEWPROXYCLASSDESCRIPTORPARSER_H
+#define JAVAOBJECTSTREAMS_NEWPROXYCLASSDESCRIPTORPARSER_H
+#include "JavaObject/type/object/parsers/IObjectParser.h"
+
+namespace javaobject::type::object::parsers::descriptor {
+    struct NewProxyClassDescriptorParser : IObjectParser {
+        std::shared_ptr<object::IObject> operator()(type::object::ObjectTypeCodeParser &parser) const override;
+    };
+}
+
+#endif // JAVAOBJECTSTREAMS_NEWPROXYCLASSDESCRIPTORPARSER_H

include/JavaObject/type/object/parsers/descriptor/ProxyClassDescriptorInfoParser.h

@@ -0,0 +1,18 @@
+/** @file ProxyClassDescriptorInfoParser.h
+ *
+ * @author DexrnZacAttack
+ * @date 3/29/26
+ * 
+ * @device zPc-i2
+ */
+#ifndef JAVAOBJECTSTREAMS_PROXYCLASSDESCRIPTORINFOPARSER_H
+#define JAVAOBJECTSTREAMS_PROXYCLASSDESCRIPTORINFOPARSER_H
+#include "JavaObject/type/object/parsers/IObjectParser.h"
+
+namespace javaobject::type::object::parsers::descriptor {
+    struct ProxyClassDescriptorInfoParser : IObjectParser {
+        std::shared_ptr<object::IObject> operator()(type::object::ObjectTypeCodeParser &parser) const override;
+    };
+}
+
+#endif // JAVAOBJECTSTREAMS_PROXYCLASSDESCRIPTORINFOPARSER_H

include/JavaObject/type/object/types/descriptor/NewClassDescriptorObject.h

@@ -22,10 +22,6 @@
 #include <vector>
 
 namespace javaobject::type::object::descriptor {
-    class NewProxyClassDescriptorObject : public IObject {
-        // TODO
-    };
-
     struct NewClassDescriptorObject : IObject {
       public:
         NewClassDescriptorObject(const std::string &name, const std::uint64_t serialVersionUid, std::shared_ptr<ClassDescriptorInfoObject> info)

include/JavaObject/type/object/types/descriptor/ProxyClassDescriptorInfoObject.h

@@ -0,0 +1,27 @@
+/** @file ProxyClassDescriptorInfoObject.h
+ *
+ * @author DexrnZacAttack
+ * @date 3/29/26
+ * 
+ * @device zPc-i2
+ */
+#ifndef JAVAOBJECTSTREAMS_PROXYCLASSDESCRIPTORINFOOBJECT_H
+#define JAVAOBJECTSTREAMS_PROXYCLASSDESCRIPTORINFOOBJECT_H
+#include "JavaObject/type/object/types/AnnotationObject.h"
+#include "JavaObject/type/object/types/IObject.h"
+
+#include <vector>
+
+namespace javaobject::type::object::types::descriptor {
+    class ProxyClassDescriptorInfoObject : public IObject {
+    public:
+        std::string toString() override;
+
+        std::vector<std::string> m_interfaces;
+        /** if nullptr, endblockdata was hit instead */
+        std::shared_ptr<AnnotationObject> m_annotation;
+        std::shared_ptr<IObject> m_superClassDesc;
+    };
+}
+
+#endif // JAVAOBJECTSTREAMS_PROXYCLASSDESCRIPTORINFOOBJECT_H

include/JavaObject/type/object/types/descriptor/ProxyClassDescriptorObject.h

@@ -0,0 +1,26 @@
+/** @file ProxyClassDescriptorObject.h
+ *
+ * @author DexrnZacAttack
+ * @date 3/29/26
+ * 
+ * @device zPc-i2
+ */
+#ifndef JAVAOBJECTSTREAMS_PROXYCLASSDESCRIPTOROBJECT_H
+#define JAVAOBJECTSTREAMS_PROXYCLASSDESCRIPTOROBJECT_H
+#include "JavaObject/type/object/types/IObject.h"
+#include "JavaObject/type/object/types/descriptor/ProxyClassDescriptorInfoObject.h"
+
+namespace javaobject::type::object::types::descriptor {
+    class ProxyClassDescriptorObject : public IObject {
+    public:
+        explicit ProxyClassDescriptorObject(const std::shared_ptr<ProxyClassDescriptorInfoObject> &info)
+            : info(info) {
+        }
+
+        std::string toString() override;
+
+        std::shared_ptr<ProxyClassDescriptorInfoObject> info;
+    };
+}
+
+#endif // JAVAOBJECTSTREAMS_PROXYCLASSDESCRIPTOROBJECT_H

src/type/object/ObjectTypeCodeParser.cpp

@@ -29,6 +29,7 @@
 #include "JavaObject/type/object/parsers/NullObjectParser.h"
 #include "JavaObject/type/object/parsers/ResetObjectParser.h"
 #include "JavaObject/type/object/parsers/ShortBlockDataObjectParser.h"
+#include "JavaObject/type/object/parsers/descriptor/NewProxyClassDescriptorParser.h"
 
 namespace javaobject::type::object {
     ObjectTypeCodeParser::ObjectTypeCodeParser(std::istream &input, HandleContainer &handleContainer, TypeCodeParserStorage &parserStorage) : ITypeCodeParser(input, handleContainer), ITypeCodeParserStorageHolder(parserStorage) {
@@ -44,6 +45,7 @@ namespace javaobject::type::object {
         this->m_parsers[EObjectTypeCode::TC_ARRAY] = std::make_unique<parsers::ArrayObjectParser>();
         this->m_parsers[EObjectTypeCode::TC_RESET] = std::make_unique<parsers::ResetObjectParser>();
         this->m_parsers[EObjectTypeCode::TC_EXCEPTION] = std::make_unique<parsers::ExceptionObjectParser>();
+        this->m_parsers[EObjectTypeCode::TC_PROXYCLASSDESC] = std::make_unique<parsers::descriptor::NewProxyClassDescriptorParser>();
     }
 
     std::shared_ptr<IObject> ObjectTypeCodeParser::readUsingTypeCode(const EObjectTypeCode &typecode) {

src/type/object/parsers/ObjectParser.cpp

@@ -16,6 +16,7 @@
 #include "JavaObject/type/object/types/NullObject.h"
 #include "JavaObject/type/object/types/Object.h"
 #include "JavaObject/type/object/types/descriptor/NewClassDescriptorObject.h"
+#include "JavaObject/type/object/types/descriptor/ProxyClassDescriptorObject.h"
 
 namespace javaobject::type::object::parsers {
     std::shared_ptr<object::IObject> ObjectParser::operator()(type::object::ObjectTypeCodeParser &parser) const {
@@ -24,7 +25,14 @@ namespace javaobject::type::object::parsers {
         obj->clazz = parser.readNext();
         parser.handleContainer().registerHandle(obj);
 
-        obj->classData = ClassDataParser(std::static_pointer_cast<descriptor::NewClassDescriptorObject>(obj->clazz)->info)(parser);
+        // TODO we can implement common interface between proxy and non proxy class object with getters
+        // TODO this really needs a cleanup
+        if (auto c = std::dynamic_pointer_cast<descriptor::NewClassDescriptorObject>(obj->clazz)) {
+            obj->classData = ClassDataParser(c->info)(parser);
+        } else if (auto c = std::dynamic_pointer_cast<types::descriptor::ProxyClassDescriptorObject>(obj->clazz)) {
+            if (auto ci = std::dynamic_pointer_cast<descriptor::NewClassDescriptorObject>(c->info->m_superClassDesc))
+                obj->classData = ClassDataParser(ci->info)(parser);
+        }
 
         return obj;
     }

src/type/object/parsers/descriptor/NewProxyClassDescriptorParser.cpp

@@ -0,0 +1,26 @@
+/** @file NewProxyClassDescriptorParser.cpp
+ *
+ * @author DexrnZacAttack
+ * @date 3/29/26
+ * 
+ * @device zPc-i2
+ */
+#include "JavaObject/type/object/parsers/descriptor/NewProxyClassDescriptorParser.h"
+
+#include "JavaObject/type/object/ObjectTypeCodeParser.h"
+#include "JavaObject/type/object/parsers/descriptor/ProxyClassDescriptorInfoParser.h"
+#include "JavaObject/type/object/types/descriptor/ProxyClassDescriptorObject.h"
+
+#include <format>
+
+namespace javaobject::type::object::parsers::descriptor {
+    std::shared_ptr<object::IObject> NewProxyClassDescriptorParser::operator()(type::object::ObjectTypeCodeParser &parser) const {
+        std::shared_ptr<types::descriptor::ProxyClassDescriptorObject> dc = std::make_shared<types::descriptor::ProxyClassDescriptorObject>(nullptr);
+
+        parser.handleContainer().registerHandle(dc);
+
+        dc->info = parser.readAsUsingParser<types::descriptor::ProxyClassDescriptorInfoObject>(ProxyClassDescriptorInfoParser());
+
+        return dc;
+    }
+}