Merge branch 'master' into geostore-382

src/core/persistence/src/main/java/it/geosolutions/geostore/core/dao/impl/SecurityDAOImpl.java

@@ -185,7 +185,7 @@ public void addAdvertisedSecurityConstraints(Search searchCriteria, User user) {
         Filter userFiltering = Filter.equal("user.name", user.getName());
 
         // Combine owner and advertisedFilter using OR
-        /** The user is the owner of the resource or the resource is advertised. */
+        /* The user is the owner of the resource or the resource is advertised. */
         Filter advertisedFiltering =
                 Filter.or(
                         Filter.equal("user.name", user.getName()),

src/core/services-api/src/main/java/it/geosolutions/geostore/services/ResourcePermissionService.java

@@ -4,35 +4,6 @@
 import it.geosolutions.geostore.core.model.User;
 
 public interface ResourcePermissionService {
-    /**
-     * This method allows us to know if we filter out "unadvertised" resources for
-     * non-admin/non-owners, keeping only owned resources.
-     *
-     * <p>Be aware to fetch the user security rules prior to call this method.
-     *
-     * @param resource
-     * @param user
-     * @return <code>true</code> if the resource should be visible to the user, <code>false</code>
-     *     otherwise
-     * @throws IllegalArgumentException if the user security rules have not been initialized
-     *     properly
-     */
-    boolean isResourceAvailableForUser(Resource resource, User user);
-
-    /**
-     * Check if the user has at least one {@link it.geosolutions.geostore.core.model.SecurityRule}
-     * associated in which he is the user.
-     *
-     * <p>Be aware to fetch the user security rules prior to call this method.
-     *
-     * @param user
-     * @param resource
-     * @return @return <code>true</code> if the user is the owner of the resource, <code>false
-     * </code> otherwise
-     * @throws IllegalArgumentException if the user security rules have not been initialized
-     *     properly
-     */
-    boolean isUserOwner(User user, Resource resource);
 
     /**
      * Verifies whether the user or any of their groups is the owner of the resource and has read

src/core/services-impl/src/main/java/it/geosolutions/geostore/services/ResourcePermissionServiceImpl.java

@@ -21,20 +21,6 @@ public class ResourcePermissionServiceImpl implements ResourcePermissionService
                             resourceOwnershipWithWritePermission.apply(rule, resource)
                                     && resourceOwnershipWithReadPermission.apply(rule, resource);
 
-    @Override
-    public boolean isResourceAvailableForUser(Resource resource, User user) {
-        return resource.isAdvertised()
-                || user.getRole().equals(Role.ADMIN)
-                || isUserOwner(user, resource);
-    }
-
-    @Override
-    public boolean isUserOwner(User user, Resource resource) {
-        checkUserSecurityRules(user);
-        return user.getSecurity().stream()
-                .anyMatch(rule -> resourceOwnership.apply(rule, resource));
-    }
-
     @Override
     public boolean canUserReadResource(User user, Long resourceId) {
         Resource resource = new Resource();

src/core/services-impl/src/main/java/it/geosolutions/geostore/services/ResourceServiceImpl.java

@@ -688,7 +688,7 @@ private List<Resource> searchResources(ResourceSearchParameters parameters)
         searchCriteria.addFetch("security");
         searchCriteria.setDistinct(true);
 
-        securityDAO.addReadSecurityConstraints(searchCriteria, parameters.getAuthUser());
+        securityDAO.addAdvertisedSecurityConstraints(searchCriteria, parameters.getAuthUser());
         return this.search(searchCriteria);
     }
 
@@ -702,7 +702,6 @@ private List<ShortResource> convertToShortResourceList(List<Resource> resources,
         userService.fetchSecurityRules(user);
 
         return resources.stream()
-                .filter(r -> resourcePermissionService.isResourceAvailableForUser(r, user))
                 .map(r -> createShortResource(user, r))
                 .collect(Collectors.toList());
     }

src/modules/rest/extjs/src/main/java/it/geosolutions/geostore/services/rest/impl/RESTExtJsServiceImpl.java

@@ -283,17 +283,15 @@ public String getResourcesByCategory(
             boolean shouldIncludeAttributes =
                     includeAttributes || (extraAttributes != null && !extraAttributes.isEmpty());
             List<Resource> resources =
-                    filterOutUnavailableResources(
-                            resourceService.getResources(
-                                    ResourceSearchParameters.builder()
-                                            .filter(filter)
-                                            .page(page)
-                                            .entries(limit)
-                                            .includeAttributes(shouldIncludeAttributes)
-                                            .includeData(includeData)
-                                            .authUser(authUser)
-                                            .build()),
-                            authUser);
+                    resourceService.getResources(
+                            ResourceSearchParameters.builder()
+                                    .filter(filter)
+                                    .page(page)
+                                    .entries(limit)
+                                    .includeAttributes(shouldIncludeAttributes)
+                                    .includeData(includeData)
+                                    .authUser(authUser)
+                                    .build());
 
             long count = 0;
             if (!resources.isEmpty()) {
@@ -367,20 +365,18 @@ public ExtResourceList getExtResourcesList(
 
         try {
             List<Resource> resources =
-                    filterOutUnavailableResources(
-                            resourceService.getResources(
-                                    ResourceSearchParameters.builder()
-                                            .filter(filter)
-                                            .page(page)
-                                            .entries(limit)
-                                            .sortBy(sort.getSortBy())
-                                            .sortOrder(sort.getSortOrder())
-                                            .includeAttributes(includeAttributes)
-                                            .includeData(includeData)
-                                            .includeTags(includeTags)
-                                            .authUser(authUser)
-                                            .build()),
-                            authUser);
+                    resourceService.getResources(
+                            ResourceSearchParameters.builder()
+                                    .filter(filter)
+                                    .page(page)
+                                    .entries(limit)
+                                    .sortBy(sort.getSortBy())
+                                    .sortOrder(sort.getSortOrder())
+                                    .includeAttributes(includeAttributes)
+                                    .includeData(includeData)
+                                    .includeTags(includeTags)
+                                    .authUser(authUser)
+                                    .build());
 
             long count = 0;
             if (!resources.isEmpty()) {
@@ -396,15 +392,6 @@ public ExtResourceList getExtResourcesList(
         }
     }
 
-    private List<Resource> filterOutUnavailableResources(List<Resource> resources, User user) {
-
-        userService.fetchSecurityRules(user);
-
-        return resources.stream()
-                .filter(r -> resourcePermissionService.isResourceAvailableForUser(r, user))
-                .collect(Collectors.toList());
-    }
-
     /**
      * Filters out unadvertised resources and adds permission information to the resources.
      *
@@ -774,6 +761,9 @@ private void readSecurity() {
                 canEdit = sr.isCanEdit();
                 return;
             }
+
+            userService.fetchSecurityRules(authUser);
+
             if (authUser != null && resourcePermissionService.canUserWriteResource(authUser, r)) {
                 canEdit = true;
                 canDelete = true;