Broker Security Plugin enhancements

assembly/broker/configurations/activemq.xml

@@ -172,6 +172,8 @@
         <transportConnectors>
             <transportConnector name="mqtt"
                                 uri="mqtt+nio://0.0.0.0:1883?transport.defaultKeepAlive=60000&amp;transport.maximumConnections=1000&amp;transport.socketBufferSize=131072&amp;transport.ioBufferSize=16384&amp;transport.activeMQSubscriptionPrefetch=32766&amp;transport.publishDollarTopics=true&amp;transport.subscriptionStrategy=mqtt-virtual-topic-subscriptions"/>
+            <transportConnector name="internalMqtt"
+                                uri="mqtt+nio://0.0.0.0:1893?transport.defaultKeepAlive=60000&amp;transport.maximumConnections=1000&amp;transport.socketBufferSize=131072&amp;transport.ioBufferSize=16384&amp;transport.activeMQSubscriptionPrefetch=32766&amp;transport.publishDollarTopics=true&amp;transport.subscriptionStrategy=mqtt-virtual-topic-subscriptions"/>
             <transportConnector name="mqtts"
                                 uri="mqtt+nio+ssl://0.0.0.0:8883?transport.defaultKeepAlive=60000&amp;transport.maximumConnections=1000&amp;transport.socketBufferSize=131072&amp;transport.ioBufferSize=16384&amp;transport.activeMQSubscriptionPrefetch=32766&amp;transport.publishDollarTopics=true&amp;transport.subscriptionStrategy=mqtt-virtual-topic-subscriptions"/>
             <transportConnector name="tcp"

assembly/broker/docker/Dockerfile

@@ -41,7 +41,7 @@ ENV ACTIVEMQ_OPTS "-Dcommons.db.schema.update=true \
                    -Dcertificate.jwt.certificate=file:///var/opt/activemq/cert.pem \
                    -Dbroker.ip=broker"
 
-EXPOSE 1883 8883 61614 61615 8161
+EXPOSE 1883 1893 8883 61614 61615 8161
 
 VOLUME /opt/activemq/data
 

broker/core/src/main/java/org/eclipse/kapua/broker/core/message/system/DefaultSystemMessageCreator.java

@@ -13,7 +13,7 @@
 
 import java.util.Map;
 
-import org.eclipse.kapua.broker.core.plugin.KapuaConnectionContext;
+import org.eclipse.kapua.broker.core.plugin.KapuaSecurityContext;
 
 import com.google.common.base.Splitter;
 
@@ -31,11 +31,11 @@ public class DefaultSystemMessageCreator implements SystemMessageCreator {
     private static final String USERNAME_KEY = "Username";
 
     @Override
-    public String createMessage(SystemMessageType systemMessageType, KapuaConnectionContext kbc) {
+    public String createMessage(SystemMessageType systemMessageType, KapuaSecurityContext kapuaSecurityContext) {
         StringBuilder builder = new StringBuilder();
         builder.append(EVENT_KEY).append(PAIR_SEPARATOR).append(systemMessageType.name());
-        builder.append(FIELD_SEPARATOR).append(DEVICE_ID_KEY).append(PAIR_SEPARATOR).append(kbc.getClientId());
-        builder.append(FIELD_SEPARATOR).append(USERNAME_KEY).append(PAIR_SEPARATOR).append(kbc.getUserName());
+        builder.append(FIELD_SEPARATOR).append(DEVICE_ID_KEY).append(PAIR_SEPARATOR).append(kapuaSecurityContext.getClientId());
+        builder.append(FIELD_SEPARATOR).append(USERNAME_KEY).append(PAIR_SEPARATOR).append(kapuaSecurityContext.getUserName());
         return builder.toString();
     }
 

broker/core/src/main/java/org/eclipse/kapua/broker/core/message/system/SystemMessageCreator.java

@@ -11,7 +11,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.broker.core.message.system;
 
-import org.eclipse.kapua.broker.core.plugin.KapuaConnectionContext;
+import org.eclipse.kapua.broker.core.plugin.KapuaSecurityContext;
 
 /**
  * System message creator (i.e message sent by the broker on device connect)
@@ -29,9 +29,9 @@ enum SystemMessageType {
      * Create a system message
      * 
      * @param systemMessageType
-     * @param kbc
+     * @param kapuaSecurityContext
      * @return
      */
-    String createMessage(SystemMessageType systemMessageType, KapuaConnectionContext kbc);
+    String createMessage(SystemMessageType systemMessageType, KapuaSecurityContext kapuaSecurityContext);
 
 }

broker/core/src/main/java/org/eclipse/kapua/broker/core/plugin/KapuaSecurityAclChecker.java

@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Eurotech and/or its affiliates and others
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.broker.core.plugin;
+
+import org.apache.activemq.security.AuthorizationMap;
+
+public class KapuaSecurityAclChecker {
+
+    private AuthorizationMap authMap;
+    private boolean hasDataView;
+    private boolean hasDataManage;
+    private boolean hasDeviceView;
+    private boolean hasDeviceManage;
+
+}