[
https://issues.apache.org/jira/browse/ARTEMIS-3873?focusedWorklogId=784575&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-784575
]
ASF GitHub Bot logged work on ARTEMIS-3873:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 24/Jun/22 12:20
Start Date: 24/Jun/22 12:20
Worklog Time Spent: 10m
Work Description: brusdev commented on code in PR #4121:
URL: https://github.com/apache/activemq-artemis/pull/4121#discussion_r906005241
##########
artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationBrokerConnectionEncryptedTest.java:
##########
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.config.impl;
+
+import java.util.List;
+
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.FileDeploymentManager;
+import
org.apache.activemq.artemis.core.config.amqpBrokerConnectivity.AMQPBrokerConnectConfiguration;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FileConfigurationBrokerConnectionEncryptedTest extends
ConfigurationImplTest {
+
+ protected String getConfigurationName() {
+ return "ConfigurationTest-broker-connection-encrypted-config.xml";
+ }
+
+ @Override
+ @Test
+ public void testDefaults() {
+ // empty
+ }
+
+ @Test
+ public void testAMQPBrokerConfigEncryptedUserAndPassword() {
+
+ List<AMQPBrokerConnectConfiguration> brokerConnections =
conf.getAMQPConnection();
+ Assert.assertNotNull("brokerConnections is not null", brokerConnections);
+ Assert.assertTrue("brokerConnections is not empty",
!brokerConnections.isEmpty());
Review Comment:
The assertion message should describe what's wrong if the condition isn't met
```suggestion
Assert.assertNotNull("brokerConnections is null", brokerConnections);
Assert.assertFalse("brokerConnections is empty",
brokerConnections.isEmpty());
```
##########
artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationBrokerConnectionEncryptedTest.java:
##########
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.config.impl;
+
+import java.util.List;
+
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.FileDeploymentManager;
+import
org.apache.activemq.artemis.core.config.amqpBrokerConnectivity.AMQPBrokerConnectConfiguration;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FileConfigurationBrokerConnectionEncryptedTest extends
ConfigurationImplTest {
+
+ protected String getConfigurationName() {
+ return "ConfigurationTest-broker-connection-encrypted-config.xml";
+ }
+
+ @Override
+ @Test
+ public void testDefaults() {
+ // empty
+ }
+
+ @Test
+ public void testAMQPBrokerConfigEncryptedUserAndPassword() {
+
+ List<AMQPBrokerConnectConfiguration> brokerConnections =
conf.getAMQPConnection();
+ Assert.assertNotNull("brokerConnections is not null", brokerConnections);
+ Assert.assertTrue("brokerConnections is not empty",
!brokerConnections.isEmpty());
+
+ boolean encTest = false;
+ boolean plainTest = false;
+ boolean emptyTest = false;
+
+ for (AMQPBrokerConnectConfiguration brokerConnection :
brokerConnections) {
+ // Check each expected configuration is present
+ encTest = encTest || "enc-test".equals(brokerConnection.getName());
+ plainTest = plainTest ||
"plain-test".equals(brokerConnection.getName());
+ emptyTest = emptyTest ||
"empty-test".equals(brokerConnection.getName());
+
+ if ("empty-test".equals(brokerConnection.getName())) {
+
+ // Empty configuration should have null user and password
+ Assert.assertNull(brokerConnection.getUser());
+ Assert.assertNull(brokerConnection.getPassword());
+
+ } else {
+
+ // Both the encrypted and plain user and password use the same
expected value
+ Assert.assertEquals("testuser", brokerConnection.getUser());
+ Assert.assertEquals("testpassword",
brokerConnection.getPassword());
+
+ }
+ }
+
+ Assert.assertTrue("enc-test configuration present", encTest);
+ Assert.assertTrue("plain-test configuration present", plainTest);
+ Assert.assertTrue("empty-test configuration present", emptyTest);
Review Comment:
The assertion message should describe what's wrong if the condition isn't met
```suggestion
Assert.assertTrue("enc-test configuration is not present", encTest);
Assert.assertTrue("plain-test configuration is not present",
plainTest);
Assert.assertTrue("empty-test configuration is not present",
emptyTest);
```
Issue Time Tracking
-------------------
Worklog Id: (was: 784575)
Time Spent: 20m (was: 10m)
> AMQP Broker Connection Encrypted Attributes
> -------------------------------------------
>
> Key: ARTEMIS-3873
> URL: https://issues.apache.org/jira/browse/ARTEMIS-3873
> Project: ActiveMQ Artemis
> Issue Type: New Feature
> Components: Configuration
> Reporter: Ryan Highley
> Priority: Minor
> Time Spent: 20m
> Remaining Estimate: 0h
>
> The {{amqp-connection}} configuration handler does not allow "ENC(...)"
> values for the {{user}} and {{password}} attributes. These values should be
> handled using the same approach as other security credentials when processing
> the {{broker.xml}} configuration.
>
--
This message was sent by Atlassian Jira
(v8.20.7#820007)
