[
https://issues.apache.org/jira/browse/ARTEMIS-2704?focusedWorklogId=429209&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-429209
]
ASF GitHub Bot logged work on ARTEMIS-2704:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 30/Apr/20 19:27
Start Date: 30/Apr/20 19:27
Worklog Time Spent: 10m
Work Description: jbertram commented on a change in pull request #3073:
URL: https://github.com/apache/activemq-artemis/pull/3073#discussion_r418238684
##########
File path:
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultSSLContextFactory.java
##########
@@ -0,0 +1,68 @@
+/*
+ * 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.core.remoting.impl.ssl;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import javax.net.ssl.SSLContext;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.utils.ConfigurationHelper;
+
+/**
+ * Default SSLContextFactory providing a cache using the
SSL_CONTEXT_PROP_NAME value as key.
+ */
+public class DefaultSSLContextFactory extends BasicSSLContextFactory {
+
+ private static final Map<String, SSLContext> SSL_CONTEXTS =
Collections.synchronizedMap(new HashMap<>());
+
+ @Override
+ public void clearSSLContexts() {
+ SSL_CONTEXTS.clear();
+ }
+
+ @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 {
+ String sslContextName = getSSLContextName(configuration);
+ if (!SSL_CONTEXTS.containsKey(sslContextName)) {
+ SSL_CONTEXTS.put(sslContextName, createSSLContext(configuration,
+ keystoreProvider, keystorePath, keystorePassword,
+ truststoreProvider, truststorePath, truststorePassword,
+ crlPath, trustManagerFactoryPlugin, trustAll));
+ }
+ return SSL_CONTEXTS.get(sslContextName);
+ }
+
+ protected String getSSLContextName(Map<String, Object> configuration) {
Review comment:
Instead of passing the `configuration` map and then potentially
extracting the keystore and truststore path from it why not simply pass through
the `keystorePath` and `truststorePath` which were passed in to `getSSLContext`
(i.e. the caller)?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 429209)
Time Spent: 1h (was: 50m)
> Provide a SPI to manage and cache SSLContext
> ---------------------------------------------
>
> Key: ARTEMIS-2704
> URL: https://issues.apache.org/jira/browse/ARTEMIS-2704
> Project: ActiveMQ Artemis
> Issue Type: Improvement
> Components: Broker
> Affects Versions: 2.11.0
> Reporter: Emmanuel Hugonnet
> Priority: Major
> Time Spent: 1h
> Remaining Estimate: 0h
>
> Currently we recreate SSLContext for each connector / acceptor and we don't
> provide a way for an integrator to reuse its own SSLContext which leads to
> some duplication. This small enhancement provides a way to simplify this via
> the use of a SPI.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
