From 6a5157270d28600356bec8ed1117e19dd56be389 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Tue, 10 Nov 2015 01:31:56 +0300 Subject: [PATCH] [SECURITY-218] - Refactor the test package to address comments from @jglick --- .../java/jenkins/security/Security218BlackBoxTest.java | 2 +- .../java/jenkins/security/security218}/Payload.java | 8 +++++++- .../ysoserial/ExecBlockingSecurityManager.java | 2 +- .../ysoserial/payloads/CommonsCollections1.java | 8 ++++---- .../ysoserial/payloads/CommonsCollections2.java | 8 ++++---- .../security218}/ysoserial/payloads/Groovy1.java | 6 +++--- .../security218}/ysoserial/payloads/ObjectPayload.java | 2 +- .../security218}/ysoserial/payloads/Spring1.java | 8 ++++---- .../security218}/ysoserial/util/ClassFiles.java | 2 +- .../security/security218}/ysoserial/util/Gadgets.java | 2 +- .../security218}/ysoserial/util/PayloadRunner.java | 10 +++++----- .../security218}/ysoserial/util/Reflections.java | 2 +- .../security218}/ysoserial/util/Serializables.java | 2 +- 13 files changed, 34 insertions(+), 28 deletions(-) rename test/src/{main/java/jenkins/security/ysoserial/payloads => test/java/jenkins/security/security218}/Payload.java (81%) rename test/src/{main/java/jenkins/security => test/java/jenkins/security/security218}/ysoserial/ExecBlockingSecurityManager.java (97%) rename test/src/{main/java/jenkins/security => test/java/jenkins/security/security218}/ysoserial/payloads/CommonsCollections1.java (93%) rename test/src/{main/java/jenkins/security => test/java/jenkins/security/security218}/ysoserial/payloads/CommonsCollections2.java (91%) rename test/src/{main/java/jenkins/security => test/java/jenkins/security/security218}/ysoserial/payloads/Groovy1.java (92%) rename test/src/{main/java/jenkins/security => test/java/jenkins/security/security218}/ysoserial/payloads/ObjectPayload.java (95%) rename test/src/{main/java/jenkins/security => test/java/jenkins/security/security218}/ysoserial/payloads/Spring1.java (93%) rename test/src/{main/java/jenkins/security => test/java/jenkins/security/security218}/ysoserial/util/ClassFiles.java (97%) rename test/src/{main/java/jenkins/security => test/java/jenkins/security/security218}/ysoserial/util/Gadgets.java (98%) rename test/src/{main/java/jenkins/security => test/java/jenkins/security/security218}/ysoserial/util/PayloadRunner.java (85%) rename test/src/{main/java/jenkins/security => test/java/jenkins/security/security218}/ysoserial/util/Reflections.java (97%) rename test/src/{main/java/jenkins/security => test/java/jenkins/security/security218}/ysoserial/util/Serializables.java (97%) diff --git a/test/src/test/java/jenkins/security/Security218BlackBoxTest.java b/test/src/test/java/jenkins/security/Security218BlackBoxTest.java index 731830548d..3a7320160c 100644 --- a/test/src/test/java/jenkins/security/Security218BlackBoxTest.java +++ b/test/src/test/java/jenkins/security/Security218BlackBoxTest.java @@ -30,7 +30,7 @@ import hudson.remoting.Callable; import hudson.remoting.Channel; import java.io.File; import java.io.PrintStream; -import jenkins.security.ysoserial.payloads.Payload; +import jenkins.security.security218.Payload; import org.jenkinsci.remoting.RoleChecker; import org.junit.Test; import static org.junit.Assert.*; diff --git a/test/src/main/java/jenkins/security/ysoserial/payloads/Payload.java b/test/src/test/java/jenkins/security/security218/Payload.java similarity index 81% rename from test/src/main/java/jenkins/security/ysoserial/payloads/Payload.java rename to test/src/test/java/jenkins/security/security218/Payload.java index 5d05611b6a..43dc97a995 100644 --- a/test/src/main/java/jenkins/security/ysoserial/payloads/Payload.java +++ b/test/src/test/java/jenkins/security/security218/Payload.java @@ -21,7 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package jenkins.security.ysoserial.payloads; +package jenkins.security.security218; + +import jenkins.security.security218.ysoserial.payloads.CommonsCollections1; +import jenkins.security.security218.ysoserial.payloads.CommonsCollections2; +import jenkins.security.security218.ysoserial.payloads.Groovy1; +import jenkins.security.security218.ysoserial.payloads.ObjectPayload; +import jenkins.security.security218.ysoserial.payloads.Spring1; /** diff --git a/test/src/main/java/jenkins/security/ysoserial/ExecBlockingSecurityManager.java b/test/src/test/java/jenkins/security/security218/ysoserial/ExecBlockingSecurityManager.java similarity index 97% rename from test/src/main/java/jenkins/security/ysoserial/ExecBlockingSecurityManager.java rename to test/src/test/java/jenkins/security/security218/ysoserial/ExecBlockingSecurityManager.java index 6c7d891acc..7c6a40be7d 100644 --- a/test/src/main/java/jenkins/security/ysoserial/ExecBlockingSecurityManager.java +++ b/test/src/test/java/jenkins/security/security218/ysoserial/ExecBlockingSecurityManager.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package jenkins.security.ysoserial; +package jenkins.security.security218.ysoserial; import java.security.Permission; import java.util.concurrent.Callable; diff --git a/test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections1.java b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections1.java similarity index 93% rename from test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections1.java rename to test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections1.java index 31bc5821e1..e4436c8752 100644 --- a/test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections1.java +++ b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections1.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package jenkins.security.ysoserial.payloads; +package jenkins.security.security218.ysoserial.payloads; import java.lang.reflect.InvocationHandler; import java.util.HashMap; import java.util.Map; -import jenkins.security.ysoserial.util.Gadgets; -import jenkins.security.ysoserial.util.PayloadRunner; -import jenkins.security.ysoserial.util.Reflections; +import jenkins.security.security218.ysoserial.util.Gadgets; +import jenkins.security.security218.ysoserial.util.PayloadRunner; +import jenkins.security.security218.ysoserial.util.Reflections; import org.apache.commons.collections.Transformer; import org.apache.commons.collections.functors.ChainedTransformer; diff --git a/test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections2.java b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections2.java similarity index 91% rename from test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections2.java rename to test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections2.java index 59a78a6d00..94b9afa3ee 100644 --- a/test/src/main/java/jenkins/security/ysoserial/payloads/CommonsCollections2.java +++ b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections2.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package jenkins.security.ysoserial.payloads; +package jenkins.security.security218.ysoserial.payloads; import java.util.PriorityQueue; import java.util.Queue; @@ -29,9 +29,9 @@ import java.util.Queue; import org.apache.commons.collections4.comparators.TransformingComparator; import org.apache.commons.collections4.functors.InvokerTransformer; -import jenkins.security.ysoserial.util.Gadgets; -import jenkins.security.ysoserial.util.PayloadRunner; -import jenkins.security.ysoserial.util.Reflections; +import jenkins.security.security218.ysoserial.util.Gadgets; +import jenkins.security.security218.ysoserial.util.PayloadRunner; +import jenkins.security.security218.ysoserial.util.Reflections; import org.apache.xalan.xsltc.trax.TemplatesImpl; /* diff --git a/test/src/main/java/jenkins/security/ysoserial/payloads/Groovy1.java b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/Groovy1.java similarity index 92% rename from test/src/main/java/jenkins/security/ysoserial/payloads/Groovy1.java rename to test/src/test/java/jenkins/security/security218/ysoserial/payloads/Groovy1.java index 201251fff6..3e332495d6 100644 --- a/test/src/main/java/jenkins/security/ysoserial/payloads/Groovy1.java +++ b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/Groovy1.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package jenkins.security.ysoserial.payloads; +package jenkins.security.security218.ysoserial.payloads; import java.lang.reflect.InvocationHandler; import java.util.Map; -import jenkins.security.ysoserial.util.Gadgets; -import jenkins.security.ysoserial.util.PayloadRunner; +import jenkins.security.security218.ysoserial.util.Gadgets; +import jenkins.security.security218.ysoserial.util.PayloadRunner; import org.codehaus.groovy.runtime.ConvertedClosure; import org.codehaus.groovy.runtime.MethodClosure; diff --git a/test/src/main/java/jenkins/security/ysoserial/payloads/ObjectPayload.java b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/ObjectPayload.java similarity index 95% rename from test/src/main/java/jenkins/security/ysoserial/payloads/ObjectPayload.java rename to test/src/test/java/jenkins/security/security218/ysoserial/payloads/ObjectPayload.java index cf291b9213..22c656b8f6 100644 --- a/test/src/main/java/jenkins/security/ysoserial/payloads/ObjectPayload.java +++ b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/ObjectPayload.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package jenkins.security.ysoserial.payloads; +package jenkins.security.security218.ysoserial.payloads; public interface ObjectPayload { /* diff --git a/test/src/main/java/jenkins/security/ysoserial/payloads/Spring1.java b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/Spring1.java similarity index 93% rename from test/src/main/java/jenkins/security/ysoserial/payloads/Spring1.java rename to test/src/test/java/jenkins/security/security218/ysoserial/payloads/Spring1.java index 4f60ede4bf..103f01f2cb 100644 --- a/test/src/main/java/jenkins/security/ysoserial/payloads/Spring1.java +++ b/test/src/test/java/jenkins/security/security218/ysoserial/payloads/Spring1.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package jenkins.security.ysoserial.payloads; +package jenkins.security.security218.ysoserial.payloads; import static java.lang.Class.forName; @@ -34,9 +34,9 @@ import javax.xml.transform.Templates; import org.springframework.beans.factory.ObjectFactory; -import jenkins.security.ysoserial.util.Gadgets; -import jenkins.security.ysoserial.util.PayloadRunner; -import jenkins.security.ysoserial.util.Reflections; +import jenkins.security.security218.ysoserial.util.Gadgets; +import jenkins.security.security218.ysoserial.util.PayloadRunner; +import jenkins.security.security218.ysoserial.util.Reflections; import org.apache.xalan.xsltc.trax.TemplatesImpl; /* diff --git a/test/src/main/java/jenkins/security/ysoserial/util/ClassFiles.java b/test/src/test/java/jenkins/security/security218/ysoserial/util/ClassFiles.java similarity index 97% rename from test/src/main/java/jenkins/security/ysoserial/util/ClassFiles.java rename to test/src/test/java/jenkins/security/security218/ysoserial/util/ClassFiles.java index 2d1e6da972..fe2ed52cbd 100644 --- a/test/src/main/java/jenkins/security/ysoserial/util/ClassFiles.java +++ b/test/src/test/java/jenkins/security/security218/ysoserial/util/ClassFiles.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package jenkins.security.ysoserial.util; +package jenkins.security.security218.ysoserial.util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/test/src/main/java/jenkins/security/ysoserial/util/Gadgets.java b/test/src/test/java/jenkins/security/security218/ysoserial/util/Gadgets.java similarity index 98% rename from test/src/main/java/jenkins/security/ysoserial/util/Gadgets.java rename to test/src/test/java/jenkins/security/security218/ysoserial/util/Gadgets.java index 2369c542a2..676cdf8ed6 100644 --- a/test/src/main/java/jenkins/security/ysoserial/util/Gadgets.java +++ b/test/src/test/java/jenkins/security/security218/ysoserial/util/Gadgets.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package jenkins.security.ysoserial.util; +package jenkins.security.security218.ysoserial.util; import java.io.Serializable; import java.lang.reflect.Array; diff --git a/test/src/main/java/jenkins/security/ysoserial/util/PayloadRunner.java b/test/src/test/java/jenkins/security/security218/ysoserial/util/PayloadRunner.java similarity index 85% rename from test/src/main/java/jenkins/security/ysoserial/util/PayloadRunner.java rename to test/src/test/java/jenkins/security/security218/ysoserial/util/PayloadRunner.java index 82d6eb25ff..0097e7ed96 100644 --- a/test/src/main/java/jenkins/security/ysoserial/util/PayloadRunner.java +++ b/test/src/test/java/jenkins/security/security218/ysoserial/util/PayloadRunner.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package jenkins.security.ysoserial.util; +package jenkins.security.security218.ysoserial.util; import java.util.concurrent.Callable; -import jenkins.security.ysoserial.ExecBlockingSecurityManager; -import jenkins.security.ysoserial.payloads.ObjectPayload; -import static jenkins.security.ysoserial.util.Serializables.deserialize; -import static jenkins.security.ysoserial.util.Serializables.serialize; +import jenkins.security.security218.ysoserial.ExecBlockingSecurityManager; +import jenkins.security.security218.ysoserial.payloads.ObjectPayload; +import static jenkins.security.security218.ysoserial.util.Serializables.deserialize; +import static jenkins.security.security218.ysoserial.util.Serializables.serialize; /* * utility class for running exploits locally from command line diff --git a/test/src/main/java/jenkins/security/ysoserial/util/Reflections.java b/test/src/test/java/jenkins/security/security218/ysoserial/util/Reflections.java similarity index 97% rename from test/src/main/java/jenkins/security/ysoserial/util/Reflections.java rename to test/src/test/java/jenkins/security/security218/ysoserial/util/Reflections.java index 6869055512..f542a0e606 100644 --- a/test/src/main/java/jenkins/security/ysoserial/util/Reflections.java +++ b/test/src/test/java/jenkins/security/security218/ysoserial/util/Reflections.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package jenkins.security.ysoserial.util; +package jenkins.security.security218.ysoserial.util; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/test/src/main/java/jenkins/security/ysoserial/util/Serializables.java b/test/src/test/java/jenkins/security/security218/ysoserial/util/Serializables.java similarity index 97% rename from test/src/main/java/jenkins/security/ysoserial/util/Serializables.java rename to test/src/test/java/jenkins/security/security218/ysoserial/util/Serializables.java index 242acf050f..b5e73c9777 100644 --- a/test/src/main/java/jenkins/security/ysoserial/util/Serializables.java +++ b/test/src/test/java/jenkins/security/security218/ysoserial/util/Serializables.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package jenkins.security.ysoserial.util; +package jenkins.security.security218.ysoserial.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -- GitLab