Merge branch 'development' into fixAccessToDeletedResourcesForAdmins

Author: ThomasJejkal

build.gradle

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 plugins { 
-    id "io.freefair.lombok" version "8.11"
-    id "io.freefair.maven-publish-java" version "8.11"
+    id "io.freefair.lombok" version "8.12"
+    id "io.freefair.maven-publish-java" version "8.12"
     id "io.spring.dependency-management" version "1.1.7" 
     //id "com.github.kt3k.coveralls" version "2.8.1" 
-    id "org.owasp.dependencycheck" version "12.0.0"
+    id "org.owasp.dependencycheck" version "12.0.1"
     id "org.asciidoctor.jvm.convert" version "4.0.4"
     //id "org.ajoberstar.grgit" version "2.0.1"
     id "java"
@@ -32,7 +32,7 @@ plugins {
 
 ext {
     // versions of dependencies
-    springBootVersion = '3.4.1'
+    springBootVersion = '3.4.2'
     springDocVersion  = '2.8.3'
     javersVersion     = '7.7.0'
 }
@@ -77,7 +77,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
-    implementation 'org.springframework.data:spring-data-elasticsearch:5.4.1'
+    implementation 'org.springframework.data:spring-data-elasticsearch:5.4.2'
 
 
     // springdoc

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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);
     }
   }
 
@@ -370,7 +372,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
@@ -380,15 +382,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.");
@@ -402,7 +404,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.");
@@ -494,7 +496,6 @@ public static void performPermissionCheck(DataResource resource, PERMISSION requ
     } else {
       LOGGER.debug("{} permission to resource granted to principal with identifiers {}.", requiredPermission, AuthenticationHelper.getAuthorizationIdentities());
     }
-
   }
 
   /**

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);
     }
 
   }