ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-17 02:09:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

More tests

Browse Source
This commit is contained in:
rick.parker 2023-04-04 12:26:31 +01:00
parent e09c6473ad
commit 68e107be68
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/aegis4j/src/main/java/net/gredler/aegis4j/AegisAgent.java
View File

@ -7,15 +7,11 @@ import java.io.InputStream;
import java.lang.instrument.Instrumentation;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Collectors;
/**
@ -43,20 +39,29 @@ public final class AegisAgent {
Path path = null;
boolean started = false;
for(String arg: args.split(";")) {
if(started) throw new IllegalArgumentException("ERROR: argument ordering means patching already started");
if (started) throw new IllegalArgumentException("Aegis4j ERROR: parameter ordering means patching already started");
String normalisedaArg = arg.trim().toLowerCase();
if(normalisedaArg.isEmpty() || normalisedaArg.startsWith("block=") || normalisedaArg.startsWith("unblock=")) {
try {
Patcher.start(instr, toBlockList(normalisedaArg, path), getModificationsInputStream(path));
started = true;
} catch (IOException e) {
e.printStackTrace();
throw new IllegalArgumentException("Aegis4j ERROR: Unable to process mods file", e);
}
} else if(normalisedaArg.startsWith("path=")) {
path= Paths.get(arg.trim().substring(5));
} else if (normalisedaArg.startsWith("path=")) {
path = Paths.get(arg.trim().substring(5));
System.out.println("Aegis4j patching from " + path + " mods file");
} else {
throw new IllegalArgumentException("Aegis4j ERROR: unrecognised parameters " + arg);
}
}
if (!started) {
try {
Patcher.start(instr, toBlockList("", path), getModificationsInputStream(path));
} catch (IOException e) {
throw new IllegalArgumentException("Aegis4j ERROR: Unable to process mods file", e);
}
}
if(!started) throw new IllegalArgumentException("ERROR: patching not started");
}
/**
@ -91,7 +96,7 @@ public final class AegisAgent {
int eq = args.indexOf('=');
if (eq == -1) {
// incorrect argument format, we expect a single "name=value" parameter
throw new IllegalArgumentException("ERROR: Invalid agent configuration string");
throw new IllegalArgumentException("Aegis4j ERROR: Invalid agent configuration string");
}
String name = args.substring(0, eq).trim();
@ -108,7 +113,7 @@ public final class AegisAgent {
return Collections.unmodifiableSet(block);
} else {
// no idea what the user is doing...
throw new IllegalArgumentException("ERROR: Unrecognized parameter name (should be one of 'block' or 'unblock'): " + name);
throw new IllegalArgumentException("Aegis4j ERROR: Unrecognized parameter name (should be one of 'block' or 'unblock'): " + name);
}
}
@ -128,7 +133,7 @@ public final class AegisAgent {
for (String feature : features) {
if (!all.contains(feature)) {
throw new IllegalArgumentException("ERROR: Unrecognized feature name: " + feature);
throw new IllegalArgumentException("Aegis4j ERROR: Unrecognized feature name: " + feature);
}
}

34
tools/aegis4j/src/test/java/net/gredler/aegis4j/AegisAgentCommandLineTest.java
View File

@ -2,20 +2,19 @@
package net.gredler.aegis4j;
import org.junit.jupiter.api.Test;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.concurrent.TimeUnit;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.Test;
/**
* <p>Tests {@link AegisAgent} command line use (both static and dynamic attach).
*
@ -29,12 +28,19 @@ public class AegisAgentCommandLineTest {
@Test
public void testStaticAttach() throws Exception {
String jar = TestUtils.createAgentJar();
// CONFIG EXPECTED ERROR
testStaticAttach(jar, "block=jndi", "");
// CONFIG EXPECTED ERROR
testStaticAttach(jar, "block=jndi", "");
testStaticAttach(jar, "unblock=serialization", "");
testStaticAttach(jar, "block=serialization", "Java serialization blocked by aegis4j");
testStaticAttach(jar, "block=serialization;", "Java serialization blocked by aegis4j");
testStaticAttach(jar, ";block=serialization", "ERROR: argument ordering means patching already started");
testStaticAttach(jar, "block=serialization", "Java serialization blocked by aegis4j");
testStaticAttach(jar, "block=serialization;", "Java serialization blocked by aegis4j");
testStaticAttach(jar, ";block=serialization", "ERROR: parameter ordering means patching already started");
testStaticAttach(jar, "foo", "ERROR: unrecognised parameters foo");
testStaticAttach(jar, "dynamic", "");
Path path = Paths.get(AegisAgent.class.getResource("mods.properties").toURI());
testStaticAttach(jar, "path=" + path, "Java serialization blocked by aegis4j");
testStaticAttach(jar, "path=" + path + ";unblock=serialization", "");
testStaticAttach(jar, "path=/foo/bar", "java.io.FileNotFoundException: /foo/bar");
}
private static void testStaticAttach(String jar, String config, String expectedErr) throws Exception {