bugfix: readSubjects were not added to SendClaimMessage, thus it coul…

…d not be routed to subscribers with read permissions

Signed-off-by: Daniel Fesenmeyer <daniel.fesenmeyer@bosch-si.com>

services/concierge/enforcement/src/main/java/org/eclipse/ditto/services/concierge/enforcement/MessageCommandEnforcement.java

@@ -53,12 +53,15 @@ private MessageCommandEnforcement(final Context context, final Cache<EntityId, E
     @Override
     public void enforce(final MessageCommand signal, final ActorRef sender) {
         enforcerRetriever.retrieve(entityId(), (idEntry, enforcerEntry) -> {
-            if (idEntry.exists() && signal instanceof SendClaimMessage) {
-                publishMessageCommand(signal, sender);
-            } else if (enforcerEntry.exists()) {
-                enforceMessageCommand(signal, enforcerEntry.getValue(), sender);
-            } else {
+            if (!enforcerEntry.exists()) {
                 reportNonexistentEnforcer(signal, sender);
+            } else {
+                final Enforcer enforcer = enforcerEntry.getValue();
+                if (signal instanceof SendClaimMessage) {
+                    publishMessageCommand(signal, enforcer, sender);
+                } else {
+                    enforceMessageCommand(signal, enforcer, sender);
+                }
             }
         });
     }
@@ -111,18 +114,27 @@ private void reportNonexistentEnforcer(final MessageCommand command, final Actor
 
     private void enforceMessageCommand(final MessageCommand command, final Enforcer enforcer, final ActorRef sender) {
         if (isAuthorized(command, enforcer)) {
-            final DittoHeaders headersWithReadSubjects = command.getDittoHeaders()
-                    .toBuilder()
-                    .readSubjects(getThingsReadSubjects(command, enforcer))
-                    .build();
-
-            final MessageCommand commandWithReadSubjects = command.setDittoHeaders(headersWithReadSubjects);
-            publishMessageCommand(commandWithReadSubjects, sender);
+            publishMessageCommand(command, enforcer, sender);
         } else {
             rejectMessageCommand(command, sender);
         }
     }
 
+    private void publishMessageCommand(final MessageCommand command, final Enforcer enforcer, final ActorRef sender) {
+        final DittoHeaders headersWithReadSubjects = command.getDittoHeaders()
+                .toBuilder()
+                .readSubjects(getThingsReadSubjects(command, enforcer))
+                .build();
+
+        final MessageCommand commandWithReadSubjects = command.setDittoHeaders(headersWithReadSubjects);
+
+        publishToMediator(commandWithReadSubjects, sender);
+
+        // answer the sender immediately for fire-and-forget message commands.
+        getResponseForFireAndForgetMessage(commandWithReadSubjects)
+                .ifPresent(response -> replyToSender(response, sender));
+    }
+
     private void rejectMessageCommand(final MessageCommand command, final ActorRef sender) {
         final MessageSendNotAllowedException error =
                 MessageSendNotAllowedException.newBuilder(command.getThingId())
@@ -135,16 +147,10 @@ private void rejectMessageCommand(final MessageCommand command, final ActorRef s
         replyToSender(error, sender);
     }
 
-    private void publishMessageCommand(final MessageCommand command, final ActorRef sender) {
-        publishToMediator(command, sender);
-
-        // answer the sender immediately for fire-and-forget message commands.
-        getResponseForFireAndForgetMessage(command)
-                .ifPresent(response -> replyToSender(response, sender));
-    }
-
     private void publishToMediator(final MessageCommand command, final ActorRef sender) {
         // using pub/sub to publish the command to any interested parties (e.g. a Websocket):
+        log().debug("Publish message to pub-sub: <{}>", command.getTypePrefix());
+
         final DistributedPubSubMediator.Publish publishMessage =
                 new DistributedPubSubMediator.Publish(command.getTypePrefix(), command, true);
         pubSubMediator().tell(publishMessage, sender);