archive/ysoserial
1
0
Fork 0
mirror of https://github.com/frohoff/ysoserial.git synced 2026-09-21 22:50:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove serialization-stage secmgr to avoid spurious errors due to extra surefire thread

Browse Source
This commit is contained in:
Chris Frohoff
2018-11-15 13:17:25 -08:00
parent a1a40d239f
commit 4088b8cda2
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ysoserial/secmgr/ExecCheckingSecurityManager.java
+1 -1
View File
@@ -6,6 +6,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
// TODO per-thread secmgr
public class ExecCheckingSecurityManager extends SecurityManager { public class ExecCheckingSecurityManager extends SecurityManager {
public ExecCheckingSecurityManager() { public ExecCheckingSecurityManager() {
this(true); this(true);
@@ -41,7 +42,6 @@ public class ExecCheckingSecurityManager extends SecurityManager {
} }
}; };
@SuppressWarnings("serial") @SuppressWarnings("serial")
public static class ExecException extends RuntimeException { public static class ExecException extends RuntimeException {
private final String threadName = Thread.currentThread().getName(); private final String threadName = Thread.currentThread().getName();
src/test/java/ysoserial/payloads/CommandExecTest.java
-1
View File
@@ -16,7 +16,6 @@ public class CommandExecTest implements CustomTest {
@Override @Override
public void run(Callable<Object> payload) throws Exception { public void run(Callable<Object> payload) throws Exception {
Assert.assertFalse("test file should not exist", testFile.exists()); Assert.assertFalse("test file should not exist", testFile.exists());
Exception err;
try { try {
payload.call(); payload.call();
} catch (Exception e) { } catch (Exception e) {
src/test/java/ysoserial/payloads/PayloadsTest.java
+2 -2
View File
@@ -107,8 +107,8 @@ public class PayloadsTest {
customDeserializer = ((CustomDeserializer)testHarness).getCustomDeserializer(); customDeserializer = ((CustomDeserializer)testHarness).getCustomDeserializer();
} }
ExecCheckingSecurityManager sm = new ExecCheckingSecurityManager(); // TODO per-thread secmgr to enforce no detonation during deserialization
final byte[] serialized = sm.callWrapped(makeSerializeCallable(payloadClass, payloadCommand)); final byte[] serialized = makeSerializeCallable(payloadClass, payloadCommand).call();
Callable<Object> callable = makeDeserializeCallable(t, addlClassesForClassLoader, deps, serialized, customDeserializer); Callable<Object> callable = makeDeserializeCallable(t, addlClassesForClassLoader, deps, serialized, customDeserializer);
if ( testHarness instanceof WrappedTest ) { if ( testHarness instanceof WrappedTest ) {
callable = ( (WrappedTest) testHarness ).createCallable(callable); callable = ( (WrappedTest) testHarness ).createCallable(callable);