(sling-org-apache-sling-engine) branch master updated: SLING-12640 : Setting Sling filter service property sling.filter.scope to an invalid value does not disable the filter.

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git


The following commit(s) were added to refs/heads/master by this push:
     new f4ef9ee  SLING-12640 : Setting Sling filter service property 
sling.filter.scope to an invalid value does not disable the filter.
f4ef9ee is described below

commit f4ef9ee2d5c55bdcc68a76341adf5d5d2a62fdef
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Jan 30 17:03:31 2025 +0100

    SLING-12640 : Setting Sling filter service property sling.filter.scope to 
an invalid value does not disable the filter.
---
 .../sling/engine/impl/filter/ServletFilterManager.java     |  3 +--
 .../sling/engine/impl/filter/ServletFilterManagerTest.java | 14 ++------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java 
b/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
index f314137..d8f8a2c 100644
--- 
a/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
+++ 
b/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
@@ -275,6 +275,7 @@ public class ServletFilterManager {
         boolean used = false;
         for (String scope : scopes) {
             scope = scope.toUpperCase();
+            used = true;
             try {
                 FilterChainType type = 
FilterChainType.valueOf(scope.toString());
                 getFilterChain(type).addFilter(filter, predicate, serviceId, 
order, orderSource, mbean);
@@ -285,8 +286,6 @@ public class ServletFilterManager {
                     getFilterChain(FilterChainType.FORWARD)
                             .addFilter(filter, predicate, serviceId, order, 
orderSource, mbean);
                 }
-
-                used = true;
             } catch (final IllegalArgumentException iae) {
                 log.warn("Filter service {} has invalid value {} for scope. 
Value is ignored", reference, scope);
             }
diff --git 
a/src/test/java/org/apache/sling/engine/impl/filter/ServletFilterManagerTest.java
 
b/src/test/java/org/apache/sling/engine/impl/filter/ServletFilterManagerTest.java
index ede3abf..9172e40 100644
--- 
a/src/test/java/org/apache/sling/engine/impl/filter/ServletFilterManagerTest.java
+++ 
b/src/test/java/org/apache/sling/engine/impl/filter/ServletFilterManagerTest.java
@@ -102,28 +102,18 @@ public class ServletFilterManagerTest {
         assertFilterInScopes(servletFilterManager, testFilter, allScopes);
     }
 
-    @Test
-    public void registerFilterWithNoScope() throws Exception {
-        TestFilter testFilter = 
registerFilterForScopes(osgiContext.bundleContext());
-
-        // TODO - should not be registered in any scope
-        assertFilterInScopes(servletFilterManager, testFilter, 
FilterChainType.REQUEST);
-    }
-
     @Test
     public void registerFilterWithInvalidScope() throws Exception {
         TestFilter testFilter = 
registerFilterForValues(osgiContext.bundleContext(), "disabled");
 
-        // TODO - should not be registered in any scope
-        assertFilterInScopes(servletFilterManager, testFilter, 
FilterChainType.REQUEST);
+        assertFilterInScopes(servletFilterManager, testFilter);
     }
 
     @Test
     public void registerFilterWithInvalidScopes() throws Exception {
         TestFilter testFilter = 
registerFilterForValues(osgiContext.bundleContext(), "disabled1", "disabled2");
 
-        // TODO - should not be registered in any scope
-        assertFilterInScopes(servletFilterManager, testFilter, 
FilterChainType.REQUEST);
+        assertFilterInScopes(servletFilterManager, testFilter);
     }
 
     @Test