ARTEMIS-4273 mask command not using codec props

apache · May 11, 2023 · 5320bd0 · 5320bd0
1 parent c9c819a
commit 5320bd0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Mask.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Mask.java
@@ -65,8 +65,8 @@ public Object execute(ActionContext context) throws Exception {
          codec = PasswordMaskingUtil.getCodec(brokerConfiguration.getPasswordCodec());
       } else {
          codec = PasswordMaskingUtil.getDefaultCodec();
+         codec.init(params);
       }
-      codec.init(params);
 
       String masked = codec.encode(password);
       context.out.println("result: " + masked);

diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
@@ -1259,7 +1259,9 @@ public void testMaskCommandWithPasswordCodec() throws Exception {
       mask.setPasswordCodec(true);
       result = (String) mask.execute(context);
       assertEquals(TestPasswordCodec.class, mask.getCodec().getClass());
-      assertEquals(result, result);
+      assertEquals(((TestPasswordCodec) mask.getCodec()).getPropertyOne(), "1234");
+      assertEquals(((TestPasswordCodec) mask.getCodec()).getPropertyTwo(), "9876");
+      assertEquals(password, result);
    }
 
    @Test
@@ -2285,6 +2287,19 @@ private void contains(JsonArray users, String username, String role, boolean con
    }
 
    public static class TestPasswordCodec implements SensitiveDataCodec<String> {
+      public String PROP_NAME_ONE = "propertyNameOne";
+      public String PROP_NAME_TWO = "propertyNameTwo";
+
+      private String propertyOne;
+      private String propertyTwo;
+
+      @Override
+      public void init(Map<String, String> params) throws Exception {
+         if (params != null) {
+            propertyOne = params.get(PROP_NAME_ONE);
+            propertyTwo = params.get(PROP_NAME_TWO);
+         }
+      }
 
       @Override
       public String decode(Object mask) throws Exception {
@@ -2295,6 +2310,14 @@ public String decode(Object mask) throws Exception {
       public String encode(Object secret) throws Exception {
          return secret.toString();
       }
+
+      public String getPropertyOne() {
+         return propertyOne;
+      }
+
+      public String getPropertyTwo() {
+         return propertyTwo;
+      }
    }
 
 }
diff --git a/artemis-cli/src/test/resources/broker-with-password-codec.xml b/artemis-cli/src/test/resources/broker-with-password-codec.xml
@@ -34,7 +34,7 @@ under the License.
 
       <large-messages-directory>./target/large-messages</large-messages-directory>
 
-      <password-codec>org.apache.activemq.cli.test.ArtemisTest$TestPasswordCodec</password-codec>
+      <password-codec>org.apache.activemq.cli.test.ArtemisTest$TestPasswordCodec;propertyNameOne=1234;propertyNameTwo=9876</password-codec>
 
       <connectors>
          <!-- Default Connector.  Returned to clients during broadcast and distributed around cluster.  See broadcast and discovery-groups -->