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

ARTEMIS-2791 array out of bounds in SSLContextFactoryProvider 

Making the SSLContextFactoryProvider work even without any
SSLContextFactory service.

Iusse: https://issues.apache.org/jira/browse/ARTEMIS-2791
This commit is contained in:
Emmanuel Hugonnet 2020-06-10 18:32:51 +02:00 committed by Justin Bertram
parent f848feab66
commit 8509356e4c
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextFactoryProvider.java
View File

@ -18,7 +18,9 @@ package org.apache.activemq.artemis.spi.core.remoting.ssl;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
import javax.net.ssl.SSLContext;
/**
* Provider that loads the SSLContextFactory services and return the one with the highest priority.
@ -30,8 +32,25 @@ public class SSLContextFactoryProvider {
ServiceLoader<SSLContextFactory> loader = ServiceLoader.load(SSLContextFactory.class, Thread.currentThread().getContextClassLoader());
final List<SSLContextFactory> factories = new ArrayList<>();
loader.forEach(factories::add);
Collections.sort(factories);
factory = factories.get(factories.size() - 1);
if (factories.isEmpty()) {
factory = new SSLContextFactory() {
@Override
public SSLContext getSSLContext(Map<String, Object> configuration,
String keystoreProvider, String keystorePath, String keystorePassword,
String truststoreProvider, String truststorePath, String truststorePassword,
String crlPath, String trustManagerFactoryPlugin, boolean trustAll) throws Exception {
return SSLContext.getDefault();
}
@Override
public int getPriority() {
return -1;
}
};
} else {
Collections.sort(factories);
factory = factories.get(factories.size() - 1);
}
}
/**
* @return the SSLContextFactory with the higher priority.

25
artemis-core-client/src/test/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextFactoryProviderTest.java Normal file
View File

@ -0,0 +1,25 @@
/*
* Copyright 2020 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.artemis.spi.core.remoting.ssl;
public class SSLContextFactoryProviderTest {
/**
* Test to access a SSLContextfactory without providing any implmentation via ServiceLaoder
*/
public void testLoadSSLContextFactoryProviderWithoutAnyServices() {
SSLContextFactoryProvider.getSSLContextFactory().clearSSLContexts();
}
}