Make ACLResourceAccessManager.getSecurityFilter() return a proper in-…

…process filter For the sake of correctness, make ACLResoruceAccessManager.getSecurityFilter() resort to the in-process filter until we can provide a faster alternative
geoserver · Jun 1, 2024 · 782072c · 782072c
1 parent beb43bc
commit 782072c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docs/api/index.html b/docs/api/index.html
@@ -11920,7 +11920,7 @@ <h1>deleteAllAdminRules</h1>
                         <p class="marked">Atomically deletes all admin rules and return the number of rules removed</p>
                         <p></p>
                         <br />
-                        <pre class="prettyprint language-html prettyprinted" data-type="delete"><code><span class="pln">/adminrules/query/count</span></code></pre>
+                        <pre class="prettyprint language-html prettyprinted" data-type="delete"><code><span class="pln">/adminrules</span></code></pre>
                         <p>
                           <h3>Usage and SDK Samples</h3>
                         </p>
@@ -11945,7 +11945,7 @@ <h3>Usage and SDK Samples</h3>
                             <pre class="prettyprint"><code class="language-bsh">curl -X DELETE \
  -H "Authorization: Basic [[basicHash]]" \
  -H "Accept: application/json" \
- "/api/adminrules/query/count"
+ "/api/adminrules"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-WorkspaceAdminRules-deleteAllAdminRules-0-java">

diff --git a/...anager/src/main/java/org/geoserver/acl/plugin/accessmanager/ACLResourceAccessManager.java b/...anager/src/main/java/org/geoserver/acl/plugin/accessmanager/ACLResourceAccessManager.java
@@ -30,7 +30,6 @@
 import org.geoserver.catalog.LayerGroupInfo;
 import org.geoserver.catalog.LayerGroupInfo.Mode;
 import org.geoserver.catalog.LayerInfo;
-import org.geoserver.catalog.Predicates;
 import org.geoserver.catalog.ResourceInfo;
 import org.geoserver.catalog.StyleInfo;
 import org.geoserver.catalog.WMSLayerInfo;
@@ -690,7 +689,8 @@ private List<PropertyName> toPropertyNames(
 
     @Override
     public Filter getSecurityFilter(Authentication user, Class<? extends CatalogInfo> clazz) {
-        return Predicates.acceptAll();
+        // resort to the in-process filter until we can provide a faster alternative
+        return super.getSecurityFilter(user, clazz);
     }
 
     @Override