Deactivated removal of ACL information for non-administrator access

Author: ThomasJejkal

src/main/java/edu/kit/datamanager/repo/util/DataResourceUtils.java

@@ -119,9 +119,11 @@ public static ResponseEntity<DataResource> readResource(RepoBaseConfiguration ap
 
         if (currentVersion > 0) {
             //trigger response creation and set etag...the response body is set automatically
-            return ResponseEntity.ok().eTag("\"" + resource.getEtag() + "\"").header("Resource-Version", Long.toString((version != null) ? version : currentVersion)).body(filterResource(resource));
+            //return ResponseEntity.ok().eTag("\"" + resource.getEtag() + "\"").header("Resource-Version", Long.toString((version != null) ? version : currentVersion)).body(filterResource(resource));
+            return ResponseEntity.ok().eTag("\"" + resource.getEtag() + "\"").header("Resource-Version", Long.toString((version != null) ? version : currentVersion)).body(resource);
         } else {
-            return ResponseEntity.ok().eTag("\"" + resource.getEtag() + "\"").body(filterResource(resource));
+            //return ResponseEntity.ok().eTag("\"" + resource.getEtag() + "\"").body(filterResource(resource));
+            return ResponseEntity.ok().eTag("\"" + resource.getEtag() + "\"").body(resource);
         }
     }
 
@@ -371,7 +373,7 @@ public static Optional<String> getAuditInformation(RepoBaseConfiguration applica
      * @param resource data resource.
      * @return data resource without acls.
      */
-    public static DataResource filterResource(DataResource resource) {
+    /*public static DataResource filterResource(DataResource resource) {
         if (!AuthenticationHelper.isAuthenticatedAsService() && !DataResourceUtils.hasPermission(resource, PERMISSION.ADMINISTRATE) && !AuthenticationHelper.hasAuthority(RepoUserRole.ADMINISTRATOR.toString())) {
             LOGGER.debug("Removing ACL information from resources due to non-administrator access.");
             //exclude ACLs if not administrate or administrator permissions are set
@@ -381,15 +383,15 @@ public static DataResource filterResource(DataResource resource) {
         }
 
         return resource;
-    }
+    }*/
 
     /**
      * Remove ACLs from a list of data resources.
      *
      * @param resources list of data resources.
      * @return list of data resources without acls.
      */
-    public static List<DataResource> filterResources(List<DataResource> resources) {
+    /*public static List<DataResource> filterResources(List<DataResource> resources) {
 
         if (!AuthenticationHelper.isAuthenticatedAsService() && !AuthenticationHelper.hasAuthority(RepoUserRole.ADMINISTRATOR.toString())) {
             LOGGER.debug("Removing ACL information from resources due to non-administrator access.");
@@ -403,7 +405,7 @@ public static List<DataResource> filterResources(List<DataResource> resources) {
         }
 
         return resources;
-    }
+    }*/
 
     public static Collection<? extends GrantedAuthority> getUserAuthorities(DataResource resource) {
         LOGGER.trace("Determining user grants from authorization context.");

src/test/java/edu/kit/datamanager/repo/web/DataResourceController.java

@@ -166,8 +166,8 @@ public ResponseEntity<List<DataResource>> findByExample(@RequestBody DataResourc
     //set content-range header for react-admin (index_start-index_end/total
     PageRequest request = ControllerUtils.checkPaginationInformation(pgbl);
     response.addHeader(CONTENT_RANGE_HEADER, ControllerUtils.getContentRangeHeader(page.getNumber(), request.getPageSize(), page.getTotalElements()));
-    return ResponseEntity.ok().body(DataResourceUtils.filterResources(page.getContent()));
-
+    //return ResponseEntity.ok().body(DataResourceUtils.filterResources(page.getContent()));
+    return ResponseEntity.ok().body(page.getContent());
   }
 
   @Override
@@ -205,9 +205,11 @@ public ResponseEntity put(@PathVariable("id") final String identifier,
 
     if (currentVersion > 0) {
       //trigger response creation and set etag...the response body is set automatically
-      return ResponseEntity.ok().eTag("\"" + result.getEtag() + "\"").header(VERSION_HEADER, Long.toString(currentVersion)).body(DataResourceUtils.filterResource(result));
+      //return ResponseEntity.ok().eTag("\"" + result.getEtag() + "\"").header(VERSION_HEADER, Long.toString(currentVersion)).body(DataResourceUtils.filterResource(result));
+      return ResponseEntity.ok().eTag("\"" + result.getEtag() + "\"").header(VERSION_HEADER, Long.toString(currentVersion)).body(result);
     } else {
-      return ResponseEntity.ok().eTag("\"" + result.getEtag() + "\"").body(DataResourceUtils.filterResource(result));
+      //return ResponseEntity.ok().eTag("\"" + result.getEtag() + "\"").body(DataResourceUtils.filterResource(result));
+      return ResponseEntity.ok().eTag("\"" + result.getEtag() + "\"").body(result);
     }
 
   }