fix command response filtering for non query commands

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · May 4, 2022 · 84d4148 · 84d4148
1 parent 288deb6
commit 84d4148
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/...va/org/eclipse/ditto/connectivity/service/enforcement/ConnectivityCommandEnforcement.java b/...va/org/eclipse/ditto/connectivity/service/enforcement/ConnectivityCommandEnforcement.java
@@ -57,7 +57,7 @@ public CompletionStage<ConnectivityCommand<?>> authorizeSignalWithMissingEnforce
     }
 
     @Override
-    public boolean shouldFilterCommandResponses() {
+    public boolean shouldFilterCommandResponse(final ConnectivityCommandResponse<?> commandResponse) {
         return false;
     }
 

diff --git a/...rc/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractEnforcerActor.java b/...rc/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractEnforcerActor.java
@@ -351,7 +351,7 @@ private void filterResponse(final R commandResponse) {
         final ActorRef sender = getSender();
         final ActorRef parent = getContext().getParent();
 
-        if (enforcement.shouldFilterCommandResponses()) {
+        if (enforcement.shouldFilterCommandResponse(commandResponse)) {
             if (null != policyEnforcer) {
                 try {
                     final CompletionStage<R> filteredResponseStage =

diff --git a/...enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/EnforcementReloaded.java b/...enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/EnforcementReloaded.java
@@ -46,9 +46,10 @@ public interface EnforcementReloaded<S extends Signal<?>, R extends CommandRespo
 
     /**
      * TODO TJ doc
+     * @param commandResponse
      * @return
      */
-    boolean shouldFilterCommandResponses();
+    boolean shouldFilterCommandResponse(R commandResponse);
 
     /**
      * Filters the given {@code commandResponse} by using the given {@code enforcer}.

diff --git a/...rc/main/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcement.java b/...rc/main/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcement.java
@@ -137,8 +137,8 @@ public CompletionStage<PolicyCommand<?>> authorizeSignalWithMissingEnforcer(fina
     }
 
     @Override
-    public boolean shouldFilterCommandResponses() {
-        return true;
+    public boolean shouldFilterCommandResponse(final PolicyCommandResponse<?> commandResponse) {
+        return commandResponse instanceof PolicyQueryCommandResponse<?>;
     }
 
     @Override

diff --git a/...e/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java b/...e/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java
@@ -265,9 +265,10 @@ public CompletionStage<ThingCommand<?>> authorizeSignalWithMissingEnforcer(final
     }
 
     @Override
-    public boolean shouldFilterCommandResponses() {
-        return true;
+    public boolean shouldFilterCommandResponse(final ThingCommandResponse<?> commandResponse) {
+        return commandResponse instanceof ThingQueryCommandResponse<?>;
     }
+
     @Override
     public CompletionStage<ThingCommandResponse<?>> filterResponse(final ThingCommandResponse<?> commandResponse,
             final PolicyEnforcer policyEnforcer) {

diff --git a/things/service/src/test/resources/test.conf b/things/service/src/test/resources/test.conf
@@ -73,7 +73,9 @@ akka {
       "things",
       "thing-event-aware",
       "live-signal-aware",
-      "acks-aware"
+      "acks-aware",
+      "ddata-aware",
+      "blocked-namespaces-aware"
     ]
   }