ryan-highley commented on code in PR #4135:
URL: https://github.com/apache/activemq-artemis/pull/4135#discussion_r913085469
##########
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java:
##########
@@ -171,6 +173,70 @@ public void bufferReceived(final Object connectionID,
final ActiveMQBuffer buffe
}
+ /**
+ * that encrypted java system properties are read
+ */
+ @Test
+ public void testEncryptedJavaSystemProperty() throws Exception {
+ BufferHandler handler = new BufferHandler() {
+ @Override
+ public void bufferReceived(final Object connectionID, final
ActiveMQBuffer buffer) {
+ }
+ };
+
+ DefaultSensitiveStringCodec codec = new DefaultSensitiveStringCodec();
+
+ System.setProperty(NettyConnector.JAVAX_KEYSTORE_PATH_PROP_NAME,
"client-keystore.jks");
+ System.setProperty(NettyConnector.JAVAX_KEYSTORE_PASSWORD_PROP_NAME,
PasswordMaskingUtil.wrap(codec.encode("securepass")));
+ System.setProperty(NettyConnector.JAVAX_TRUSTSTORE_PATH_PROP_NAME,
"server-ca-truststore.jks");
+ System.setProperty(NettyConnector.JAVAX_TRUSTSTORE_PASSWORD_PROP_NAME,
PasswordMaskingUtil.wrap(codec.encode("securepass")));
+
+ Map<String, Object> params = new HashMap<>();
+ params.put(TransportConstants.SSL_ENABLED_PROP_NAME, true);
+
+ NettyConnector connector = new NettyConnector(params, handler, listener,
executorService,
Executors.newCachedThreadPool(ActiveMQThreadFactory.defaultThreadFactory()),
Executors.newScheduledThreadPool(5,
ActiveMQThreadFactory.defaultThreadFactory()));
+
+ connector.start();
+ Assert.assertTrue(connector.isStarted());
+ Connection c = connector.createConnection();
+ assertNotNull(c);
+ c.close();
+ connector.close();
+ Assert.assertFalse(connector.isStarted());
+
+ }
+
+ /**
+ * that bad value encrypted java system properties are read but fail
+ */
+ @Test
+ public void testEncryptedJavaSystemPropertyFail() throws Exception {
+ BufferHandler handler = new BufferHandler() {
+ @Override
+ public void bufferReceived(final Object connectionID, final
ActiveMQBuffer buffer) {
+ }
+ };
+
+ DefaultSensitiveStringCodec codec = new DefaultSensitiveStringCodec();
+
+ System.setProperty(NettyConnector.JAVAX_KEYSTORE_PATH_PROP_NAME,
"client-keystore.jks");
+ System.setProperty(NettyConnector.JAVAX_KEYSTORE_PASSWORD_PROP_NAME,
PasswordMaskingUtil.wrap(codec.encode("bad password")));
+ System.setProperty(NettyConnector.JAVAX_TRUSTSTORE_PATH_PROP_NAME,
"server-ca-truststore.jks");
+ System.setProperty(NettyConnector.JAVAX_TRUSTSTORE_PASSWORD_PROP_NAME,
PasswordMaskingUtil.wrap(codec.encode("bad password")));
Review Comment:
The very helpful CleanupSystemPropertiesRule inherited from ActiveMQTestBase
takes care of this between every test.
##########
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java:
##########
@@ -334,6 +400,59 @@ public void bufferReceived(final Object connectionID,
final ActiveMQBuffer buffe
Assert.assertFalse(connector.isStarted());
}
+ @Test
+ public void testEncryptedActiveMQSystemProperties() throws Exception {
+ BufferHandler handler = new BufferHandler() {
+ @Override
+ public void bufferReceived(final Object connectionID, final
ActiveMQBuffer buffer) {
+ }
+ };
+ Map<String, Object> params = new HashMap<>();
+ params.put(TransportConstants.SSL_ENABLED_PROP_NAME, true);
+
+ NettyConnector connector = new NettyConnector(params, handler, listener,
executorService,
Executors.newCachedThreadPool(ActiveMQThreadFactory.defaultThreadFactory()),
Executors.newScheduledThreadPool(5,
ActiveMQThreadFactory.defaultThreadFactory()));
+
+ DefaultSensitiveStringCodec codec = new DefaultSensitiveStringCodec();
+
+ System.setProperty(NettyConnector.ACTIVEMQ_KEYSTORE_PATH_PROP_NAME,
"client-keystore.jks");
+ System.setProperty(NettyConnector.ACTIVEMQ_KEYSTORE_PASSWORD_PROP_NAME,
PasswordMaskingUtil.wrap(codec.encode("securepass")));
+ System.setProperty(NettyConnector.ACTIVEMQ_TRUSTSTORE_PATH_PROP_NAME,
"server-ca-truststore.jks");
+
System.setProperty(NettyConnector.ACTIVEMQ_TRUSTSTORE_PASSWORD_PROP_NAME,
PasswordMaskingUtil.wrap(codec.encode("securepass")));
Review Comment:
The very helpful CleanupSystemPropertiesRule inherited from ActiveMQTestBase
takes care of this between every test.
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
