:feat: update artemis ACL and Principal fix

Signed-off-by: riccardomodanese <riccardo.modanese@eurotech.com>
eclipse · Nov 18, 2024 · faba0e8 · faba0e8
1 parent fa1a00e
commit faba0e8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 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
@@ -150,15 +150,15 @@ private Subject authenticateInternalConn(ConnectionInfo connectionInfo, String c
                     username, connectionInfo.getClientId(), connectionInfo.getClientIp(), remotingConnection.getID(),
                     remotingConnection.getTransportConnection().getRemoteAddress(), remotingConnection.getTransportConnection().isOpen());
             //TODO double check why the client id is null once coming from AMQP connection (the Kapua connection factory with custom client id generation is called)
-            KapuaPrincipal kapuaPrincipal = buildInternalKapuaPrincipal(getAdminAccountInfo().getId(), username, connectionInfo.getClientId());
-            //auto generate client id if null. It shouldn't be null but in some case the one from JMS connection is.
             String clientId = connectionInfo.getClientId();
             //set a random client id value if not set by the client
             //from JMS 2 specs "Although setting client ID remains mandatory when creating an unshared durable subscription, it is optional when creating a shared durable subscription."
             if (Strings.isNullOrEmpty(clientId)) {
                 clientId = clientIdPrefix + INDEX.getAndIncrement();
                 logger.info("Updated empty client id to: {}", clientId);
             }
+            KapuaPrincipal kapuaPrincipal = buildInternalKapuaPrincipal(getAdminAccountInfo().getId(), username, clientId);
+            //auto generate client id if null. It shouldn't be null but in some case the one from JMS connection is.
             //update client id with account|clientId (see pattern)
             String fullClientId = Utils.getFullClientId(getAdminAccountInfo().getId(), clientId);
             remotingConnection.setClientID(fullClientId);

diff --git a/...is/plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/context/Acl.java b/...is/plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/context/Acl.java
@@ -39,9 +39,10 @@ public class Acl {
     private final HierarchicalRepository<KapuaPrincipal> admin;
 
     public Acl(LoginMetric loginMetric, KapuaPrincipal principal, List<AuthAcl> authAcls) throws KapuaIllegalArgumentException {
-        wildcardConfiguration = new WildcardConfiguration().setSingleWord(SINGLE_WORD)
-            .setAnyWords(ANY_WORDS)
-            .setDelimiter(SEPARATOR);
+        wildcardConfiguration = new WildcardConfiguration().
+            setSingleWord(SINGLE_WORD).
+            setAnyWords(ANY_WORDS).
+            setDelimiter(SEPARATOR);
         if (principal == null) {
             throw new KapuaIllegalArgumentException("principal", null);
         }

diff --git a/consumer/lifecycle-app/src/main/resources/spring/applicationContext.xml b/consumer/lifecycle-app/src/main/resources/spring/applicationContext.xml
@@ -34,6 +34,7 @@
     </bean>
 
     <bean id="connectionFactory" class="org.eclipse.kapua.service.client.amqp.ServiceConnectionFactoryImpl">
+        <constructor-arg name="schema" type="java.lang.String" value="amqp"/>
         <constructor-arg name="host" type="java.lang.String" value="${BROKER_HOST}"/>
         <constructor-arg name="port" type="int" value="${BROKER_PORT}"/>
         <constructor-arg name="username" type="java.lang.String" value="${BROKER_INTERNAL_USERNAME}"/>

diff --git a/consumer/telemetry-app/src/main/resources/spring/applicationContext.xml b/consumer/telemetry-app/src/main/resources/spring/applicationContext.xml
@@ -34,6 +34,7 @@
     </bean>
 
     <bean id="connectionFactory" class="org.eclipse.kapua.service.client.amqp.ServiceConnectionFactoryImpl">
+        <constructor-arg name="schema" type="java.lang.String" value="amqp"/>
         <constructor-arg name="host" type="java.lang.String" value="${BROKER_HOST}"/>
         <constructor-arg name="port" type="int" value="${BROKER_PORT}"/>
         <constructor-arg name="username" type="java.lang.String" value="${BROKER_INTERNAL_USERNAME}"/>

diff --git a/service/authentication-app/src/main/resources/spring/applicationContext.xml b/service/authentication-app/src/main/resources/spring/applicationContext.xml
@@ -33,6 +33,7 @@
     </bean>
 
     <bean id="connectionFactory" class="org.eclipse.kapua.service.client.amqp.ServiceConnectionFactoryImpl">
+        <constructor-arg name="schema" type="java.lang.String" value="amqp"/>
         <constructor-arg name="host" type="java.lang.String" value="${SERVICE_BROKER_HOST}"/>
         <constructor-arg name="port" type="int" value="${SERVICE_BROKER_PORT}"/>
         <constructor-arg name="username" type="java.lang.String" value="${SERVICE_BROKER_USERNAME}"/>

diff --git a/...ion/src/main/java/org/eclipse/kapua/service/authentication/authentication/AclCreator.java b/...ion/src/main/java/org/eclipse/kapua/service/authentication/authentication/AclCreator.java
@@ -32,7 +32,6 @@ public class AclCreator {
     protected final static String HASH = "#";
 
     protected String addressClassifier;
-    protected String addressClassifierEscaped;
     protected String addressClassifierHash;
 
     protected String aclCtrlAccReply;
@@ -48,15 +47,14 @@ public class AclCreator {
     @Inject
     public AclCreator() {
         addressClassifier = SystemSetting.getInstance().getMessageClassifier();
-        addressClassifierEscaped = "\\" + SystemSetting.getInstance().getMessageClassifier();
-        addressClassifierHash = addressClassifierEscaped + "/" + HASH;
-        aclCtrlAccReply = addressClassifierEscaped + "/{0}/+/+/REPLY/#";
-        aclCtrlAccCliMqttLifeCycle = addressClassifierEscaped + "/{0}/{1}/MQTT/#";
-        aclCtrlAcc = addressClassifierEscaped + "/{0}/#";
-        aclCtrlAccCli = addressClassifierEscaped + "/{0}/{1}/#";
+        addressClassifierHash = addressClassifier + "/" + HASH;
+        aclCtrlAccReply = addressClassifier + "/{0}/+/+/REPLY/#";
+        aclCtrlAccCliMqttLifeCycle = addressClassifier + "/{0}/{1}/MQTT/#";
+        aclCtrlAcc = addressClassifier + "/{0}/#";
+        aclCtrlAccCli = addressClassifier + "/{0}/{1}/#";
         aclDataAcc = "{0}/#";
         aclDataAccCli = "{0}/{1}/#";
-        aclCtrlAccNotify = addressClassifierEscaped + "/{0}/+/+/NOTIFY/{1}/#";
+        aclCtrlAccNotify = addressClassifier + "/{0}/+/+/NOTIFY/{1}/#";
     }
 
     public List<AuthAcl> buildAcls(boolean[] permission, String accountName, String clientId, StringBuilder aclDestinationsLog) {