Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-9109: Backport some changes from master (except StackWalker) to improve TestSecurityManager

This commit is contained in:
Uwe Schindler 2019-12-25 12:45:05 +01:00
parent cb32489873
commit 982797e23f
2 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -20,6 +20,9 @@ Improvements
* LUCENE-9091: UnifiedHighlighter HTML escaping should only escape essentials (Nándor Mátravölgyi) * LUCENE-9091: UnifiedHighlighter HTML escaping should only escape essentials (Nándor Mátravölgyi)
* LUCENE-9109: Backport some changes from master (except StackWalker) to improve
TestSecurityManager (Uwe Schindler)
Optimizations Optimizations
--------------------- ---------------------
(No changes) (No changes)

76
lucene/test-framework/src/java/org/apache/lucene/util/TestSecurityManager.java
View File

@ -16,9 +16,6 @@
*/ */
package org.apache.lucene.util; package org.apache.lucene.util;
import java.security.AccessController;
import java.security.PrivilegedAction;
/** /**
* A {@link SecurityManager} that prevents tests calling {@link System#exit(int)}. * A {@link SecurityManager} that prevents tests calling {@link System#exit(int)}.
* Only the test runner itself is allowed to exit the JVM. * Only the test runner itself is allowed to exit the JVM.
@ -28,9 +25,9 @@ import java.security.PrivilegedAction;
*/ */
public final class TestSecurityManager extends SecurityManager { public final class TestSecurityManager extends SecurityManager {
static final String JUNIT4_TEST_RUNNER_PACKAGE = "com.carrotsearch.ant.tasks.junit4."; private static final String JUNIT4_TEST_RUNNER_PACKAGE = "com.carrotsearch.ant.tasks.junit4.";
static final String ECLIPSE_TEST_RUNNER_PACKAGE = "org.eclipse.jdt.internal.junit.runner."; private static final String ECLIPSE_TEST_RUNNER_PACKAGE = "org.eclipse.jdt.internal.junit.runner.";
static final String IDEA_TEST_RUNNER_PACKAGE = "com.intellij.rt.execution.junit."; private static final String IDEA_TEST_RUNNER_PACKAGE = "com.intellij.rt.execution.junit.";
/** /**
* Creates a new TestSecurityManager. This ctor is called on JVM startup, * Creates a new TestSecurityManager. This ctor is called on JVM startup,
@ -49,45 +46,38 @@ public final class TestSecurityManager extends SecurityManager {
*/ */
@Override @Override
public void checkExit(final int status) { public void checkExit(final int status) {
AccessController.doPrivileged(new PrivilegedAction<Void>() { final String systemClassName = System.class.getName(),
@Override runtimeClassName = Runtime.class.getName();
public Void run() { String exitMethodHit = null;
final String systemClassName = System.class.getName(), for (final StackTraceElement se : (new Exception()).getStackTrace()) {
runtimeClassName = Runtime.class.getName(); final String className = se.getClassName(), methodName = se.getMethodName();
String exitMethodHit = null; if (
for (final StackTraceElement se : Thread.currentThread().getStackTrace()) { ("exit".equals(methodName) || "halt".equals(methodName)) &&
final String className = se.getClassName(), methodName = se.getMethodName(); (systemClassName.equals(className) || runtimeClassName.equals(className))
if ( ) {
("exit".equals(methodName) || "halt".equals(methodName)) && exitMethodHit = className + '#' + methodName + '(' + status + ')';
(systemClassName.equals(className) || runtimeClassName.equals(className)) continue;
) {
exitMethodHit = className + '#' + methodName + '(' + status + ')';
continue;
}
if (exitMethodHit != null) {
if (className.startsWith(JUNIT4_TEST_RUNNER_PACKAGE) ||
className.startsWith(ECLIPSE_TEST_RUNNER_PACKAGE) ||
className.startsWith(IDEA_TEST_RUNNER_PACKAGE)) {
// this exit point is allowed, we return normally from closure:
return /*void*/ null;
} else {
// anything else in stack trace is not allowed, break and throw SecurityException below:
break;
}
}
}
if (exitMethodHit == null) {
// should never happen, only if JVM hides stack trace - replace by generic:
exitMethodHit = "JVM exit method";
}
throw new SecurityException(exitMethodHit + " calls are not allowed because they terminate the test runner's JVM.");
} }
});
if (exitMethodHit != null) {
if (className.startsWith(JUNIT4_TEST_RUNNER_PACKAGE) ||
className.startsWith(ECLIPSE_TEST_RUNNER_PACKAGE) ||
className.startsWith(IDEA_TEST_RUNNER_PACKAGE)) {
// we passed the stack check, delegate to super, so default policy can still deny permission:
super.checkExit(status);
return;
} else {
// anything else in stack trace is not allowed, break and throw SecurityException below:
break;
}
}
}
// we passed the stack check, delegate to super, so default policy can still deny permission: if (exitMethodHit == null) {
super.checkExit(status); // should never happen, only if JVM hides stack trace - replace by generic:
exitMethodHit = "JVM exit method";
}
throw new SecurityException(exitMethodHit + " calls are not allowed because they terminate the test runner's JVM.");
} }
} }