Merge branch 'master' into fix/bump-xmlsec

Author: sgrampone

common/src/main/java/com/genexus/ApplicationContext.java

@@ -132,7 +132,7 @@ public boolean checkIfResourceExist(String path)
 		if (isSpringBootApp())
 			return new ClassPathResource(path).exists();
 		else
-			return new File(path).exists();
+			return new File(path).exists() || getClass().getClassLoader().getResource(path) != null;
 	}
 
 	public void setEJBEngine(boolean isEJBEngine)

common/src/main/java/com/genexus/xml/XMLReader.java

@@ -785,7 +785,11 @@ public void open(String url)
 			else
 			{
 				File xmlFile = new File(url);
-				fileInputStream = new FileInputStream(xmlFile);
+				if (xmlFile.exists())
+					fileInputStream = new FileInputStream(xmlFile);
+				else {
+					fileInputStream = getClass().getClassLoader().getResourceAsStream(url);
+				}
 			}
 			inputSource = new XMLInputSource(null, url, null, fileInputStream, null);
 			if (documentEncoding.length() > 0)

gxcloudstorage-awss3-v2/src/main/java/com/genexus/db/driver/ExternalProviderS3V2.java

@@ -119,7 +119,7 @@ private void initialize() throws Exception {
 			this.folder = folder;
 
 			this.client = buildS3Client(accessKey, secretKey, endpointValue, clientRegion);
-			this.presigner = buildS3Presinger(accessKey, secretKey, clientRegion);
+			this.presigner = buildS3Presigner(accessKey, secretKey, clientRegion);
 			bucketExists();
 		}
 	}
@@ -129,21 +129,20 @@ private S3Client buildS3Client(String accessKey, String secretKey, String endpoi
 
 		boolean bUseIAM = !getPropertyValue(USE_IAM, "", "").isEmpty() || (accessKey.equals("") && secretKey.equals(""));
 
-		S3ClientBuilder builder = bUseIAM ?
-			S3Client.builder() :
-			S3Client.builder().credentialsProvider(
-				StaticCredentialsProvider.create(
-					AwsBasicCredentials.create(accessKey, secretKey)
-				)
-			);
+		S3ClientBuilder builder = bUseIAM
+			? S3Client.builder().credentialsProvider(DefaultCredentialsProvider.create())
+			: S3Client.builder().credentialsProvider(
+			StaticCredentialsProvider.create(
+				AwsBasicCredentials.create(accessKey, secretKey)
+			)
+		);
 
 		if (bUseIAM) {
 			logger.debug("Using IAM Credentials");
 		}
 
 		if (!endpoint.isEmpty() && !endpoint.contains(".amazonaws.com")) {
 			pathStyleUrls = true;
-
 			s3Client = builder
 				.endpointOverride(URI.create(endpoint))
 				.region(Region.of(region))
@@ -179,11 +178,22 @@ private S3Client buildS3Client(String accessKey, String secretKey, String endpoi
 		return s3Client;
 	}
 
-	private S3Presigner buildS3Presinger(String accessKey, String secretKey, String region) {
-		return S3Presigner.builder()
+	private S3Presigner buildS3Presigner(String accessKey, String secretKey, String region) {
+		boolean bUseIAM = !getPropertyValue(USE_IAM, "", "").isEmpty() || (accessKey.equals("") && secretKey.equals(""));
+
+		S3Presigner.Builder builder = S3Presigner.builder()
 			.region(Region.of(region))
-			.credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey)))
-			.build();
+			.credentialsProvider(
+				bUseIAM
+					? DefaultCredentialsProvider.create()
+					: StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKey, secretKey))
+			);
+
+		if (bUseIAM) {
+			logger.debug("Using IAM Credentials for presigner");
+		}
+
+		return builder.build();
 	}
 
 	private void bucketExists() {

gxcloudstorage-googlecloudstorage/pom.xml

@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-storage</artifactId>
-            <version>1.118.1</version>
+            <version>2.58.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.code.findbugs</groupId>
@@ -67,15 +67,17 @@
                     <groupId>com.google.api.grpc</groupId>
                     <artifactId>proto-google-iam-v1</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>com.google.protobuf</groupId>
                     <artifactId>protobuf-java-util</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- overwrite  grpc-netty-shaded from google-cloud-storage because of CVEs-->
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-netty-shaded</artifactId>
+            <version>1.75.0</version>
+        </dependency>
 	</dependencies>
 </project>

gxspringboot/src/main/java/com/genexus/springboot/GXConfig.java

@@ -46,6 +46,9 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 			registry.addResourceHandler(webImageDir + "**")
 				.addResourceLocations("classpath:" + webImageDir);
 
+			registry.addResourceHandler("/_ng/**")
+				.addResourceLocations("classpath:/ng/");
+
 			registry.addResourceHandler("/" + blobPath + "/**")
 				.addResourceLocations("file:./" + blobPath + "/");
 		}
@@ -71,6 +74,7 @@ public FilterRegistrationBean<UrlRewriteFilter> urlRewriteFilter() {
 		if (new ClassPathResource(REWRITE_FILE).exists()) {
 			registrationBean.addInitParameter("modRewriteConf", "true");
 			registrationBean.addInitParameter("confPath", REWRITE_FILE);
+			registrationBean.setOrder(org.springframework.core.Ordered.HIGHEST_PRECEDENCE);
 		}
 		else {
 			registrationBean.setEnabled(false);

pom.xml

@@ -28,7 +28,7 @@
 		<software.azure.cosmos.version>4.42.0</software.azure.cosmos.version>
 		<log4j.version>2.21.1</log4j.version>
         <io.opentelemetry.version>1.28.0</io.opentelemetry.version>
-        <org.bouncycastle.version>1.78.1</org.bouncycastle.version>
+        <org.bouncycastle.version>1.82</org.bouncycastle.version>
         <commons-io.version>2.15.1</commons-io.version>
         <commons-codec.version>1.15</commons-codec.version>
         <xmlsec.version>3.0.3</xmlsec.version>

wrapperjakarta/src/main/java/com/genexus/ws/rs/core/Response.java

@@ -36,6 +36,10 @@ public static Response.ResponseBuilder unauthorized() {
 		return new Response.ResponseBuilder(jakarta.ws.rs.core.Response.status(Status.UNAUTHORIZED));
 	}
 
+	public static Response.ResponseBuilder badrequest() {
+		return new Response.ResponseBuilder(jakarta.ws.rs.core.Response.status(Status.BAD_REQUEST));
+	}
+
 	public static Response.ResponseBuilder noContentWrapped() {
 		return new Response.ResponseBuilder(jakarta.ws.rs.core.Response.noContent());
 	}

wrapperjavax/src/main/java/com/genexus/ws/rs/core/Response.java

@@ -36,6 +36,10 @@ public static Response.ResponseBuilder unauthorized() {
 		return new Response.ResponseBuilder(javax.ws.rs.core.Response.status(Status.UNAUTHORIZED));
 	}
 
+	public static Response.ResponseBuilder badrequest() {
+		return new Response.ResponseBuilder(javax.ws.rs.core.Response.status(Status.BAD_REQUEST));
+	}
+
 	public static Response.ResponseBuilder noContentWrapped() {
 		return new Response.ResponseBuilder(javax.ws.rs.core.Response.noContent());
 	}