honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete logging test 

This commit removes a logging test that is now obsolete. This test was
added when we included a forked version of some Log4j 2 classes to
workaround a bug in Log4j 2. This bug was fixed and a version of Log4j 2
incorporating this fix was previously integrated into Elaticsearch. At
that time, the forked versions were removed, and this test should have
been removed with it.
This commit is contained in:
Jason Tedor 2017-01-14 12:51:43 -05:00
parent d67514606e
commit 4f89455a3a
1 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
qa/evil-tests/src/test/java/org/elasticsearch/common/logging/EvilLoggerTests.java
View File

@ -141,46 +141,6 @@ public class EvilLoggerTests extends ESTestCase {
}
}
public void testLog4jShutdownHack() {
final AtomicBoolean denied = new AtomicBoolean();
final SecurityManager sm = System.getSecurityManager();
try {
System.setSecurityManager(new SecurityManager() {
@Override
public void checkPermission(Permission perm) {
// just grant all permissions to Log4j, except we deny MBeanServerPermission
// "createMBeanServer" as this will trigger the Log4j bug
if (perm instanceof MBeanServerPermission && "createMBeanServer".equals(perm.getName())) {
// without the hack in place, Log4j will try to get an MBean server which we will deny
// with the hack in place, this permission should never be requested by Log4j
denied.set(true);
throw new AccessControlException("denied");
}
}
@Override
public void checkPropertyAccess(String key) {
/*
* grant access to all properties; this is so that Log4j can check if its usage
* of JMX is disabled or not by reading log4j2.disable.jmx but there are other
* properties that Log4j will try to read as well and its simpler to just grant
* them all
*/
}
});
// this will trigger the bug without the hack
LoggerContext context = (LoggerContext) LogManager.getContext(false);
Configurator.shutdown(context);
// Log4j should have never requested permissions to create an MBean server
assertFalse(denied.get());
} finally {
System.setSecurityManager(sm);
}
}
private void setupLogging(final String config) throws IOException, UserException {
final Path configDir = getDataPath(config);
// need to set custom path.conf so we can use a custom log4j2.properties file for the test