diff --git a/deserialize/src/main/java/com/reajason/javaweb/deserialize/DeserializeGenerator.java b/deserialize/src/main/java/com/reajason/javaweb/deserialize/JavaDeserializeGenerator.java similarity index 94% rename from deserialize/src/main/java/com/reajason/javaweb/deserialize/DeserializeGenerator.java rename to deserialize/src/main/java/com/reajason/javaweb/deserialize/JavaDeserializeGenerator.java index 46e0656e..346eb41d 100644 --- a/deserialize/src/main/java/com/reajason/javaweb/deserialize/DeserializeGenerator.java +++ b/deserialize/src/main/java/com/reajason/javaweb/deserialize/JavaDeserializeGenerator.java @@ -9,7 +9,7 @@ import java.io.ObjectOutputStream; * @author ReaJason * @since 2024/12/13 */ -public class DeserializeGenerator { +public class JavaDeserializeGenerator { @SneakyThrows public static byte[] generate(byte[] bytes, DeserializeConfig config) { diff --git a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils110.java b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/java/CommonsBeanutils110.java similarity index 93% rename from deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils110.java rename to deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/java/CommonsBeanutils110.java index 74f159cd..493411d8 100644 --- a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils110.java +++ b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/java/CommonsBeanutils110.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.deserialize.payload; +package com.reajason.javaweb.deserialize.payload.java; import com.reajason.javaweb.deserialize.Payload; import com.reajason.javaweb.deserialize.TemplateUtils; @@ -16,8 +16,6 @@ import java.net.URLClassLoader; import java.util.Comparator; import java.util.PriorityQueue; -import static net.bytebuddy.matcher.ElementMatchers.named; - /** * @author ReaJason * @since 2024/12/3 diff --git a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils16.java b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/java/CommonsBeanutils16.java similarity index 96% rename from deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils16.java rename to deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/java/CommonsBeanutils16.java index cacb74b2..c0bce62f 100644 --- a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils16.java +++ b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/java/CommonsBeanutils16.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.deserialize.payload; +package com.reajason.javaweb.deserialize.payload.java; import com.reajason.javaweb.deserialize.Payload; import com.reajason.javaweb.deserialize.TemplateUtils; diff --git a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils18.java b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/java/CommonsBeanutils18.java similarity index 96% rename from deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils18.java rename to deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/java/CommonsBeanutils18.java index 7daaa811..648a52fb 100644 --- a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils18.java +++ b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/java/CommonsBeanutils18.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.deserialize.payload; +package com.reajason.javaweb.deserialize.payload.java; import com.reajason.javaweb.deserialize.Payload; import com.reajason.javaweb.deserialize.TemplateUtils; diff --git a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils19.java b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/java/CommonsBeanutils19.java similarity index 96% rename from deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils19.java rename to deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/java/CommonsBeanutils19.java index c182504e..98d1b247 100644 --- a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils19.java +++ b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/java/CommonsBeanutils19.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.deserialize.payload; +package com.reajason.javaweb.deserialize.payload.java; import com.reajason.javaweb.deserialize.Payload; import com.reajason.javaweb.deserialize.TemplateUtils; diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils110Packer.java b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils110Packer.java index 23a46768..8739b485 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils110Packer.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils110Packer.java @@ -1,7 +1,7 @@ package com.reajason.javaweb.memshell.packer.deserialize.java; import com.reajason.javaweb.deserialize.DeserializeConfig; -import com.reajason.javaweb.deserialize.DeserializeGenerator; +import com.reajason.javaweb.deserialize.JavaDeserializeGenerator; import com.reajason.javaweb.deserialize.PayloadType; import com.reajason.javaweb.memshell.config.GenerateResult; import com.reajason.javaweb.memshell.packer.Packer; @@ -19,6 +19,6 @@ public class CommonsBeanutils110Packer implements Packer { public String pack(GenerateResult generateResult) { DeserializeConfig deserializeConfig = new DeserializeConfig(); deserializeConfig.setPayloadType(PayloadType.CommonsBeanutils110); - return Base64.encodeBase64String(DeserializeGenerator.generate(generateResult.getInjectorBytes(), deserializeConfig)); + return Base64.encodeBase64String(JavaDeserializeGenerator.generate(generateResult.getInjectorBytes(), deserializeConfig)); } } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils16Packer.java b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils16Packer.java index cb62d5aa..31cf6043 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils16Packer.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils16Packer.java @@ -1,7 +1,7 @@ package com.reajason.javaweb.memshell.packer.deserialize.java; import com.reajason.javaweb.deserialize.DeserializeConfig; -import com.reajason.javaweb.deserialize.DeserializeGenerator; +import com.reajason.javaweb.deserialize.JavaDeserializeGenerator; import com.reajason.javaweb.deserialize.PayloadType; import com.reajason.javaweb.memshell.config.GenerateResult; import com.reajason.javaweb.memshell.packer.Packer; @@ -19,6 +19,6 @@ public class CommonsBeanutils16Packer implements Packer { public String pack(GenerateResult generateResult) { DeserializeConfig deserializeConfig = new DeserializeConfig(); deserializeConfig.setPayloadType(PayloadType.CommonsBeanutils16); - return Base64.encodeBase64String(DeserializeGenerator.generate(generateResult.getInjectorBytes(), deserializeConfig)); + return Base64.encodeBase64String(JavaDeserializeGenerator.generate(generateResult.getInjectorBytes(), deserializeConfig)); } } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils18Packer.java b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils18Packer.java index 55f68f5d..e14e8069 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils18Packer.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils18Packer.java @@ -1,7 +1,7 @@ package com.reajason.javaweb.memshell.packer.deserialize.java; import com.reajason.javaweb.deserialize.DeserializeConfig; -import com.reajason.javaweb.deserialize.DeserializeGenerator; +import com.reajason.javaweb.deserialize.JavaDeserializeGenerator; import com.reajason.javaweb.deserialize.PayloadType; import com.reajason.javaweb.memshell.config.GenerateResult; import com.reajason.javaweb.memshell.packer.Packer; @@ -19,6 +19,6 @@ public class CommonsBeanutils18Packer implements Packer { public String pack(GenerateResult generateResult) { DeserializeConfig deserializeConfig = new DeserializeConfig(); deserializeConfig.setPayloadType(PayloadType.CommonsBeanutils18); - return Base64.encodeBase64String(DeserializeGenerator.generate(generateResult.getInjectorBytes(), deserializeConfig)); + return Base64.encodeBase64String(JavaDeserializeGenerator.generate(generateResult.getInjectorBytes(), deserializeConfig)); } } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils19Packer.java b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils19Packer.java index 3246187e..cbb6f7e0 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils19Packer.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils19Packer.java @@ -1,7 +1,7 @@ package com.reajason.javaweb.memshell.packer.deserialize.java; import com.reajason.javaweb.deserialize.DeserializeConfig; -import com.reajason.javaweb.deserialize.DeserializeGenerator; +import com.reajason.javaweb.deserialize.JavaDeserializeGenerator; import com.reajason.javaweb.deserialize.PayloadType; import com.reajason.javaweb.memshell.config.GenerateResult; import com.reajason.javaweb.memshell.packer.Packer; @@ -19,6 +19,6 @@ public class CommonsBeanutils19Packer implements Packer { public String pack(GenerateResult generateResult) { DeserializeConfig deserializeConfig = new DeserializeConfig(); deserializeConfig.setPayloadType(PayloadType.CommonsBeanutils19); - return Base64.encodeBase64String(DeserializeGenerator.generate(generateResult.getInjectorBytes(), deserializeConfig)); + return Base64.encodeBase64String(JavaDeserializeGenerator.generate(generateResult.getInjectorBytes(), deserializeConfig)); } } diff --git a/vul/vul-webapp-deserialize/src/main/java/JavaReadObCB110jServlet.java b/vul/vul-webapp-deserialize/src/main/java/JavaReadObjCB110jServlet.java similarity index 83% rename from vul/vul-webapp-deserialize/src/main/java/JavaReadObCB110jServlet.java rename to vul/vul-webapp-deserialize/src/main/java/JavaReadObjCB110jServlet.java index cf2af80c..17974496 100644 --- a/vul/vul-webapp-deserialize/src/main/java/JavaReadObCB110jServlet.java +++ b/vul/vul-webapp-deserialize/src/main/java/JavaReadObjCB110jServlet.java @@ -7,7 +7,7 @@ import java.util.List; * @since 2024/12/10 */ @WebServlet("/java_deserialize/cb110") -public class JavaReadObCB110jServlet extends BaseDeserializeServlet { +public class JavaReadObjCB110jServlet extends BaseDeserializeServlet { @Override List getDependentPaths() { diff --git a/vul/vul-webapp-deserialize/src/main/java/JavaReadObCB161jServlet.java b/vul/vul-webapp-deserialize/src/main/java/JavaReadObjCB161jServlet.java similarity index 83% rename from vul/vul-webapp-deserialize/src/main/java/JavaReadObCB161jServlet.java rename to vul/vul-webapp-deserialize/src/main/java/JavaReadObjCB161jServlet.java index 97958213..9c707030 100644 --- a/vul/vul-webapp-deserialize/src/main/java/JavaReadObCB161jServlet.java +++ b/vul/vul-webapp-deserialize/src/main/java/JavaReadObjCB161jServlet.java @@ -7,7 +7,7 @@ import java.util.List; * @since 2024/12/10 */ @WebServlet("/java_deserialize/cb161") -public class JavaReadObCB161jServlet extends BaseDeserializeServlet { +public class JavaReadObjCB161jServlet extends BaseDeserializeServlet { @Override List getDependentPaths() { diff --git a/vul/vul-webapp-deserialize/src/main/java/JavaReadObCB170jServlet.java b/vul/vul-webapp-deserialize/src/main/java/JavaReadObjCB170jServlet.java similarity index 82% rename from vul/vul-webapp-deserialize/src/main/java/JavaReadObCB170jServlet.java rename to vul/vul-webapp-deserialize/src/main/java/JavaReadObjCB170jServlet.java index f798928f..7ce57006 100644 --- a/vul/vul-webapp-deserialize/src/main/java/JavaReadObCB170jServlet.java +++ b/vul/vul-webapp-deserialize/src/main/java/JavaReadObjCB170jServlet.java @@ -7,7 +7,7 @@ import java.util.List; * @since 2024/12/10 */ @WebServlet("/java_deserialize/cb170") -public class JavaReadObCB170jServlet extends BaseDeserializeServlet { +public class JavaReadObjCB170jServlet extends BaseDeserializeServlet { @Override List getDependentPaths() { diff --git a/vul/vul-webapp-deserialize/src/main/java/JavaReadObCB183jServlet.java b/vul/vul-webapp-deserialize/src/main/java/JavaReadObjCB183jServlet.java similarity index 82% rename from vul/vul-webapp-deserialize/src/main/java/JavaReadObCB183jServlet.java rename to vul/vul-webapp-deserialize/src/main/java/JavaReadObjCB183jServlet.java index 1bf9308b..11e0b9cf 100644 --- a/vul/vul-webapp-deserialize/src/main/java/JavaReadObCB183jServlet.java +++ b/vul/vul-webapp-deserialize/src/main/java/JavaReadObjCB183jServlet.java @@ -7,7 +7,7 @@ import java.util.List; * @since 2024/12/10 */ @WebServlet("/java_deserialize/cb183") -public class JavaReadObCB183jServlet extends BaseDeserializeServlet { +public class JavaReadObjCB183jServlet extends BaseDeserializeServlet { @Override List getDependentPaths() {