From 70f25a5052475e9ff24a799cccac95352b5c2ed7 Mon Sep 17 00:00:00 2001
From: chris-joys <53202104+chris-joys@users.noreply.github.com>
Date: Mon, 13 Sep 2021 10:05:32 +0800
Subject: [PATCH] Update JaasAuthenticationBroker.java

Allow user use encrypt password to check entry detail info via web console
---
 .../apache/activemq/security/JaasAuthenticationBroker.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/activemq-broker/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java b/activemq-broker/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
index 6756027361d..b182762b1ef 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
@@ -18,6 +18,7 @@
 
 import java.security.Principal;
 import java.security.cert.X509Certificate;
+import java.util.Properties;
 import java.util.Set;
 
 import javax.security.auth.Subject;
@@ -26,6 +27,7 @@
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.jaas.EncryptionSupport;
 import org.apache.activemq.jaas.JassCredentialCallbackHandler;
 
 /**
@@ -86,6 +88,10 @@ public void addConnection(ConnectionContext context, ConnectionInfo info) throws
     @Override
     public SecurityContext authenticate(String username, String password, X509Certificate[] certificates) throws SecurityException {
         SecurityContext result = null;
+        Properties prop = new Properties();
+    	prop.put(username, password);
+    	EncryptionSupport.decrypt(prop);
+    	password = prop.getProperty(username);
         JassCredentialCallbackHandler callback = new JassCredentialCallbackHandler(username, password);
         try {
             LoginContext lc = new LoginContext(jassConfiguration, callback);