:fix: rebase issue

Signed-off-by: riccardomodanese <riccardo.modanese@eurotech.com>
eclipse-kapua · Feb 19, 2025 · 987e464 · 987e464
1 parent ef093cf
commit 987e464
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 23 deletions.
diff --git a/...plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/SecurityPlugin.java b/...plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/SecurityPlugin.java
@@ -97,29 +97,35 @@ public Subject authenticate(String username, String password, RemotingConnection
         String connectionId = pluginUtility.getConnectionId(remotingConnection);
         String clientIp = remotingConnection.getTransportConnection().getRemoteAddress();
         String clientId = extractAndValidateClientId(remotingConnection);
-        SessionContext sessionContext = serverContext.getSecurityContext().getSessionContextWithCacheFallback(connectionId);
-        if (sessionContext != null && sessionContext.getPrincipal() != null) {
-            logger.debug("### authenticate user (cache found): {} - clientId: {} - remoteIP: {} - connectionId: {}", username, clientId, remotingConnection.getTransportConnection().getRemoteAddress(), connectionId);
-            loginMetric.getAuthenticateFromCache().inc();
-            return serverContext.getSecurityContext().buildFromPrincipal(sessionContext.getPrincipal());
-        } else {
-            logger.debug("### authenticate user (no cache): {} - clientId: {} - remoteIP: {} - connectionId: {}", username, clientId, remotingConnection.getTransportConnection().getRemoteAddress(), connectionId);
-            if (!remotingConnection.getTransportConnection().isOpen()) {
-                logger.info("Connection (connectionId: {}) is closed (stealing link occurred?)", connectionId);
-                loginMetric.getLoginClosedConnectionFailure().inc();
-                return null;
+        try {
+            SessionContext sessionContext = serverContext.getSecurityContext().getSessionContextWithCacheFallback(connectionId);
+            if (sessionContext != null && sessionContext.getPrincipal() != null) {
+                logger.debug("### authenticate user (cache found): {} - clientId: {} - remoteIP: {} - connectionId: {}", username, clientId, remotingConnection.getTransportConnection().getRemoteAddress(), connectionId);
+                loginMetric.getAuthenticateFromCache().inc();
+                return serverContext.getSecurityContext().buildFromPrincipal(sessionContext.getPrincipal());
+            } else {
+                logger.debug("### authenticate user (no cache): {} - clientId: {} - remoteIP: {} - connectionId: {}", username, clientId, remotingConnection.getTransportConnection().getRemoteAddress(), connectionId);
+                if (!remotingConnection.getTransportConnection().isOpen()) {
+                    logger.info("Connection (connectionId: {}) is closed (stealing link occurred?)", connectionId);
+                    loginMetric.getLoginClosedConnectionFailure().inc();
+                    return null;
+                }
+                ConnectionInfo connectionInfo = new ConnectionInfo(
+                        pluginUtility.getConnectionId(remotingConnection),//connectionId
+                        clientId,//clientId
+                        clientIp,//clientIp
+                        remotingConnection.getTransportConnection().getConnectorConfig().getName(),//connectorName
+                        remotingConnection.getProtocolName(),//transportProtocol
+                        (String) remotingConnection.getTransportConnection().getConnectorConfig().getCombinedParams().get("sslEnabled"),//sslEnabled
+                        getPeerCertificates(remotingConnection));//clientsCertificates
+                return pluginUtility.isInternal(remotingConnection) ?
+                        authenticateInternalConn(connectionInfo, connectionId, username, password, remotingConnection) :
+                        authenticateExternalConn(connectionInfo, connectionId, username, password, remotingConnection);
             }
-            ConnectionInfo connectionInfo = new ConnectionInfo(
-                    pluginUtility.getConnectionId(remotingConnection),//connectionId
-                    clientId,//clientId
-                    clientIp,//clientIp
-                    remotingConnection.getTransportConnection().getConnectorConfig().getName(),//connectorName
-                    remotingConnection.getProtocolName(),//transportProtocol
-                    (String) remotingConnection.getTransportConnection().getConnectorConfig().getCombinedParams().get("sslEnabled"),//sslEnabled
-                    getPeerCertificates(remotingConnection));//clientsCertificates
-            return pluginUtility.isInternal(remotingConnection) ?
-                    authenticateInternalConn(connectionInfo, connectionId, username, password, remotingConnection) :
-                    authenticateExternalConn(connectionInfo, connectionId, username, password, remotingConnection);
+        } catch (Exception e) {
+            //internal error. do not disclose any info about the reason. just deny the login
+            logger.error("Internal error!", e);
+            return null;
         }
     }
 

diff --git a/...s/plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/ServerPlugin.java b/...s/plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/ServerPlugin.java
@@ -28,6 +28,7 @@
 import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.apache.activemq.artemis.utils.critical.CriticalComponent;
 import org.apache.commons.lang3.SerializationUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.kapua.KapuaRuntimeException;
 import org.eclipse.kapua.broker.artemis.plugin.security.connector.AcceptorHandler;
 import org.eclipse.kapua.broker.artemis.plugin.security.event.BrokerEvent;
@@ -235,7 +236,6 @@ public void afterCreateConsumer(ServerConsumer consumer) throws ActiveMQExceptio
     public void beforeSend(ServerSession session, Transaction tx, Message message, boolean direct,
             boolean noAutoCreateQueue) throws ActiveMQException {
         Context sendContext = publishMetric.getTime().time();
-        logger.info("======> {}", message.getAddress());
         try {
             String address = message.getAddress();
             int messageSize = message.getEncodeSize();