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

Merge pull request #431 from coheigea/AMQ-7142 

AMQ-7142 - Inserting Bouncy Castle Provider Early in Java Security Pr…
This commit is contained in:
Jean-Baptiste Onofré 2020-01-27 13:42:05 +01:00 committed by GitHub
parent dc69083fab 127852d2e7
commit b589b61f2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -277,9 +277,14 @@ public class BrokerService implements Service {
ClassLoader loader = BrokerService.class.getClassLoader();
Class<?> clazz = loader.loadClass("org.bouncycastle.jce.provider.BouncyCastleProvider");
Provider bouncycastle = (Provider) clazz.newInstance();
Security.insertProviderAt(bouncycastle,
Integer.getInteger("org.apache.activemq.broker.BouncyCastlePosition", 2));
LOG.info("Loaded the Bouncy Castle security provider.");
Integer bouncyCastlePosition = Integer.getInteger("org.apache.activemq.broker.BouncyCastlePosition");
int ret = 0;
if (bouncyCastlePosition != null) {
ret = Security.insertProviderAt(bouncycastle, bouncyCastlePosition);
} else {
ret = Security.addProvider(bouncycastle);
}
LOG.info("Loaded the Bouncy Castle security provider at position: " + ret);
} catch(Throwable e) {
// No BouncyCastle found so we use the default Java Security Provider
}

2
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2902Test.java
View File

@ -55,7 +55,7 @@ public class AMQ2902Test extends TestCase {
LOG.error("got event: " + event + ", ex:" + event.getThrowableInformation().getThrowable(), event.getThrowableInformation().getThrowable());
LOG.error("Event source: ", new Throwable("Here"));
}
if( !"Loaded the Bouncy Castle security provider.".equals(event.getMessage()) ) {
if( !((String) event.getMessage()).startsWith("Loaded the Bouncy Castle security provider at position") ) {
if (event.getMDC("activemq.broker") == null) {
failedToFindMDC.set(Boolean.TRUE);
}