Merge pull request #396 from kit-data-manager/dependabot/gradle/devel…

…opment/org.springframework.boot-3.2.0
kit-data-manager · Dec 12, 2023 · 4fc22a3 · 4fc22a3
2 parents 6375b24 + e28ec49
commit 4fc22a3
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins { 
-    id 'org.springframework.boot' version '3.1.5'
+    id 'org.springframework.boot' version '3.2.0'
     id 'io.spring.dependency-management' version '1.1.4'
     id 'io.freefair.lombok' version '8.4'
     id 'io.freefair.maven-publish-java' version '8.4'
@@ -49,8 +49,8 @@ if (System.getProperty('profile') == 'minimal') {
 
 dependencies {
     // Spring
-    implementation 'org.springframework:spring-messaging:6.0.2'
-    implementation 'org.springframework.cloud:spring-cloud-gateway-mvc:4.0.6'
+    implementation 'org.springframework:spring-messaging:6.1.1'
+    implementation 'org.springframework.cloud:spring-cloud-gateway-mvc:4.1.0'
 
     // Spring Boot
     implementation "org.springframework.boot:spring-boot-starter-data-rest"
@@ -69,8 +69,8 @@ dependencies {
 
 
     // cloud support
-    implementation "org.springframework.cloud:spring-cloud-starter-config:4.0.3"
-    implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.0.2"
+    implementation "org.springframework.cloud:spring-cloud-starter-config:4.1.0"
+    implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.1.0"
 
     // springdoc
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${springDocVersion}"
@@ -210,7 +210,7 @@ bootJar {
 
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
-        attributes 'Main-Class': 'org.springframework.boot.loader.PropertiesLauncher'
+        attributes 'Main-Class': 'org.springframework.boot.loader.launch.PropertiesLauncher'
     }
     dependsOn asciidoctor
     from ("${asciidoctor.outputDir}") {

diff --git a/settings/application-default.properties b/settings/application-default.properties
@@ -188,3 +188,9 @@ spring.autoconfigure.exclude=org.keycloak.adapters.springboot.KeycloakAutoConfig
 #keycloak.realm = myrealm
 #keycloak.auth-server-url = http://localhost:8080/auth
 #keycloak.resource = keycloak-angular
+
+###############################################################################
+# Due to bug in spring cloud gateway
+# https://github.com/spring-cloud/spring-cloud-gateway/issues/3154
+###############################################################################
+spring.cloud.gateway.proxy.sensitive=content-length
diff --git a/settings/application-docker.properties b/settings/application-docker.properties
@@ -187,3 +187,9 @@ spring.autoconfigure.exclude=org.keycloak.adapters.springboot.KeycloakAutoConfig
 #keycloak.realm = myrealm
 #keycloak.auth-server-url = http://localhost:8080/auth
 #keycloak.resource = keycloak-angular
+
+###############################################################################
+# Due to bug in spring cloud gateway
+# https://github.com/spring-cloud/spring-cloud-gateway/issues/3154
+###############################################################################
+spring.cloud.gateway.proxy.sensitive=content-length
diff --git a/settings/application-postgres.properties b/settings/application-postgres.properties
@@ -193,3 +193,9 @@ spring.autoconfigure.exclude=org.keycloak.adapters.springboot.KeycloakAutoConfig
 #keycloak.realm = myrealm
 #keycloak.auth-server-url = http://localhost:8080/auth
 #keycloak.resource = keycloak-angular
+
+###############################################################################
+# Due to bug in spring cloud gateway
+# https://github.com/spring-cloud/spring-cloud-gateway/issues/3154
+###############################################################################
+spring.cloud.gateway.proxy.sensitive=content-length
diff --git a/src/main/java/edu/kit/datamanager/metastore2/configuration/WebSecurityConfig.java b/src/main/java/edu/kit/datamanager/metastore2/configuration/WebSecurityConfig.java
@@ -140,7 +140,7 @@ public HttpFirewall allowUrlEncodedSlashHttpFirewall() {
 
   @Bean
   @SuppressWarnings("StringSplitter")
-  public FilterRegistrationBean corsFilter() {
+  public CorsFilter corsFilter() {
     final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
     CorsConfiguration config = new CorsConfiguration();
     config.setAllowCredentials(true);
@@ -155,9 +155,8 @@ public FilterRegistrationBean corsFilter() {
     config.addExposedHeader("ETag");
 
     source.registerCorsConfiguration("/**", config);
-    FilterRegistrationBean<Filter> bean;
-    bean = new FilterRegistrationBean<>(new CorsFilter(source));
-    bean.setOrder(0);
+    CorsFilter bean;
+    bean = new CorsFilter(source);
     return bean;
   }
 

diff --git a/src/main/java/edu/kit/datamanager/metastore2/web/impl/MetadataSearchController.java b/src/main/java/edu/kit/datamanager/metastore2/web/impl/MetadataSearchController.java
@@ -92,7 +92,7 @@ public ResponseEntity<?> proxy(@RequestBody JsonNode body,
                   + "to which the records refer as comma-separated values. "
                   + "Regular expressions are also allowed. "
                   + "See https://www.elastic.co/guide/en/elasticsearch/reference/7.17/multi-index.html", required = true) @PathVariable(value = "schemaId") String schemaIds,
-          ProxyExchange<byte[]> proxy,
+          ProxyExchange<JsonNode> proxy,
           @Parameter(hidden = true) final Pageable pgbl) throws Exception {
 
     // Prepare query with authorization
@@ -123,7 +123,7 @@ public ResponseEntity<?> proxy(@RequestBody JsonNode body,
   @ResponseBody
   @PageableAsQueryParam
   public ResponseEntity<?> proxy(@RequestBody JsonNode body,
-          ProxyExchange<byte[]> proxy,
+          ProxyExchange<JsonNode> proxy,
           @Parameter(hidden = true) final Pageable pgbl) throws Exception {
 
     // Prepare query with authorization

diff --git a/src/test/java/edu/kit/datamanager/metastore2/test/MetadataControllerTest.java b/src/test/java/edu/kit/datamanager/metastore2/test/MetadataControllerTest.java
@@ -1701,7 +1701,7 @@ public void testSearchProxy() throws Exception {
             .contentType(MediaType.APPLICATION_JSON)
             .content("{}"))
             .andDo(print())
-            .andExpect(status().isForbidden());
+            .andExpect(status().isNotFound());
   }
 
   @Test
@@ -1712,7 +1712,7 @@ public void testSearchWithSchemaProxy() throws Exception {
             .contentType(MediaType.APPLICATION_JSON)
             .content("{}"))
             .andDo(print())
-            .andExpect(status().isForbidden());
+            .andExpect(status().isNotFound());
   }
 
   @Test

diff --git a/src/test/resources/test-config/application-test.properties b/src/test/resources/test-config/application-test.properties
@@ -129,4 +129,10 @@ spring.autoconfigure.exclude=org.keycloak.adapters.springboot.KeycloakAutoConfig
 #
 #keycloak.realm = myrealm
 #keycloak.auth-server-url = http://localhost:8080/auth
-#keycloak.resource = keycloak-angular
+#keycloak.resource = keycloak-angular
+
+###############################################################################
+# Due to bug in spring cloud gateway
+# https://github.com/spring-cloud/spring-cloud-gateway/issues/3154
+###############################################################################
+spring.cloud.gateway.proxy.sensitive=content-length