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

This closes #1423

This commit is contained in:
Clebert Suconic 2017-07-28 18:00:50 -04:00
parent abaccaab56 8c8ab0adc1
commit 4670980aa3
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRaUtils.java
View File

@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID;
import org.jgroups.JChannel; import org.jgroups.JChannel;
@ -190,7 +191,15 @@ public final class ActiveMQRaUtils {
public static List<Map<String, Object>> parseConfig(final String config) { public static List<Map<String, Object>> parseConfig(final String config) {
List<Map<String, Object>> result = new ArrayList<>(); List<Map<String, Object>> result = new ArrayList<>();
String[] topElements = config.split(","); /**
* Some configuration values can contain commas (e.g. enabledProtocols, enabledCipherSuites, etc.).
* To support config values with commas, the commas in the values must be escaped (e.g. "\\,") so that
* the commas used to separate configs for different connectors can still function as designed.
*/
String commaPlaceHolder = UUID.randomUUID().toString();
String replaced = config.replace("\\,", commaPlaceHolder);
String[] topElements = replaced.split(",");
for (String topElement : topElements) { for (String topElement : topElements) {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
@ -205,7 +214,8 @@ public final class ActiveMQRaUtils {
throw new IllegalArgumentException("Invalid expression " + element + " at " + config); throw new IllegalArgumentException("Invalid expression " + element + " at " + config);
} }
map.put(expression[0].trim(), expression[1].trim()); // put the commas back
map.put(expression[0].trim(), expression[1].trim().replace(commaPlaceHolder, ","));
} }
} }

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java
View File

@ -1605,7 +1605,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable {
* *
* @return The properties * @return The properties
*/ */
protected ActiveMQRAProperties getProperties() { public ActiveMQRAProperties getProperties() {
if (logger.isTraceEnabled()) { if (logger.isTraceEnabled()) {
logger.trace("getProperties()"); logger.trace("getProperties()");
} }

17
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ResourceAdapterTest.java
View File

@ -637,6 +637,23 @@ public class ResourceAdapterTest extends ActiveMQRATestBase {
assertTrue(endpoint.released); assertTrue(endpoint.released);
} }
@Test
public void testConnectionParameterStringParsing() throws Exception {
ActiveMQResourceAdapter resourceAdapter = new ActiveMQResourceAdapter();
resourceAdapter.setConnectionParameters("enabledProtocols=TLS1\\,TLS1.2;sslEnabled=true");
assertEquals(resourceAdapter.getProperties().getParsedConnectionParameters().get(0).get("enabledProtocols"), "TLS1,TLS1.2");
resourceAdapter.setConnectionParameters("enabledProtocols=TLS1\\,TLS1.2;sslEnabled=true,enabledProtocols=TLS1.3\\,TLS1.4\\,TLS1.5;sslEnabled=true");
assertEquals(resourceAdapter.getProperties().getParsedConnectionParameters().get(0).get("enabledProtocols"), "TLS1,TLS1.2");
assertEquals(resourceAdapter.getProperties().getParsedConnectionParameters().get(1).get("enabledProtocols"), "TLS1.3,TLS1.4,TLS1.5");
try {
resourceAdapter.setConnectionParameters("enabledProtocols=TLS1,TLS1.2;sslEnabled=true,enabledProtocols=TLS1,TLS1.2;sslEnabled=true");
fail("This should have failed");
} catch (Exception e) {
// ignore
}
}
@Override @Override
public boolean useSecurity() { public boolean useSecurity() {
return false; return false;