fix: [RTD-1655] reduce log severity on ack confirm failure (#358)

* fix: [RTD-540] use nio library to create temp file (#356) * fix: [RTD-540] solve bomb zip security hotspot (#357) * [RTD-540] solve zip bomb by checking uncompressed file size * [RTD-540] solve zip bomb by checking uncompressed file size * [RTD-540] solve zip slip vulnerability * [RTD-540] add compression ratio check * [RTD-540] typo * [RTD-540] utilize copyLarge of apache common * [RTD-540] remove common io library usage * [RTD-540] reduce cognitive complexity * [RTD-540] remove codeql action * [RTD-1655] reduce log severity on ack confirm failure * [RTD-1655] bump pom version to 2.0.3
pagopa · May 11, 2023 · e431c27 · e431c27
1 parent ad6d0a3
commit e431c27
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 26 deletions.
diff --git a/api/batch/pom.xml b/api/batch/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter-api</artifactId>
         <groupId>it.gov.pagopa.rtd.ms.transaction_filter.api</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <artifactId>rtd-ms-transaction-filter-api-batch</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
 
     <dependencies>
         <dependency>

diff --git a/api/pom.xml b/api/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter</artifactId>
         <groupId>it.gov.pagopa.rtd.ms</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter.api</groupId>
     <artifactId>rtd-ms-transaction-filter-api</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
 
     <packaging>pom</packaging>
 

diff --git a/app/pom.xml b/app/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter</artifactId>
         <groupId>it.gov.pagopa.rtd.ms</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
     <artifactId>transaction-filter-app</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
 
     <dependencies>
         <dependency>

diff --git a/app/src/main/resources/config/application.yml b/app/src/main/resources/config/application.yml
@@ -116,7 +116,7 @@ batchConfiguration:
 rest-client:
   user-agent:
     prefix: BatchService
-    version: 2.0.2
+    version: 2.0.3
   hpan:
     serviceCode: hpan-service
     base-url: ${HPAN_SERVICE_URL:https://bpd-dev.azure-api.net:${HPAN_SERVICE_PORT:443}}

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter</artifactId>
         <groupId>it.gov.pagopa.rtd.ms</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
      </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
     <artifactId>rtd-ms-transaction-filter-core</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
 
     <dependencies>
         <dependency>

diff --git a/integration/jpa/pom.xml b/integration/jpa/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter-integration</artifactId>
         <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter.integration</groupId>
     <artifactId>rtd-ms-transaction-filter-integration-jpa</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
 
     <dependencies>
         <dependency>

diff --git a/integration/pom.xml b/integration/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>rtd-ms-transaction-filter</artifactId>
         <groupId>it.gov.pagopa.rtd.ms</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
     <artifactId>rtd-ms-transaction-filter-integration</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
 
     <packaging>pom</packaging>
 

diff --git a/integration/rest/pom.xml b/integration/rest/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>it.gov.pagopa.rtd.ms.transaction_filter</groupId>
         <artifactId>rtd-ms-transaction-filter-integration</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
     </parent>
 
     <groupId>it.gov.pagopa.rtd.ms.transaction_filter.integration</groupId>
     <artifactId>rtd-ms-transaction-filter-integration-rest</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
 
     <dependencies>
         <dependency>

diff --git a/.../main/java/it/gov/pagopa/rtd/transaction_filter/connector/SenderAdeAckRestClientImpl.java b/.../main/java/it/gov/pagopa/rtd/transaction_filter/connector/SenderAdeAckRestClientImpl.java
@@ -108,7 +108,7 @@ private boolean sendAckReceivedConfirmation(String fileName) {
       ResponseEntity<Void> responseEntity = hpanRestConnector.putAckReceived(apiKey, fileName, "");
       resourceValidator.validateStatus(responseEntity.getStatusCode());
     } catch (FeignException | ResponseStatusException ex) {
-      log.error("Cannot confirm {} file download! It will be downloaded on the next run.", fileName);
+      log.warn("Cannot confirm {} file download! It will be downloaded on the next run.", fileName);
       return false;
     }
     return true;

diff --git a/...t/src/test/java/it/gov/pagopa/rtd/transaction_filter/logger/MaskingPatternLayoutTest.java b/...t/src/test/java/it/gov/pagopa/rtd/transaction_filter/logger/MaskingPatternLayoutTest.java
@@ -38,7 +38,7 @@ void whenLogContainsSaltThenAnonymizeIt(CapturedOutput output) {
     String stringWithSalt =
         "[HpanRestConnector#getSalt] ---> GET https://api.dev.cstar.pagopa.it/rtd/payment-instrument-manager/v2/salt HTTP/1.1\n"
             + "[HpanRestConnector#getSalt] Ocp-Apim-Subscription-Key: ciao\n"
-            + "[HpanRestConnector#getSalt] User-Agent: BatchService/2.0.2\n"
+            + "[HpanRestConnector#getSalt] User-Agent: BatchService/2.0.3\n"
             + "[HpanRestConnector#getSalt] ---> END HTTP (0-byte body)\n"
             + "[HpanRestConnector#getSalt] <--- HTTP/1.1 200 OK (57ms)\n"
             + "[HpanRestConnector#getSalt] connection: keep-alive\n"

diff --git a/ops_resources/example_config/application.yml b/ops_resources/example_config/application.yml
@@ -115,7 +115,7 @@ batchConfiguration:
 rest-client:
   user-agent:
     prefix: BatchService
-    version: 2.0.2
+    version: 2.0.3
   hpan:
     serviceCode: hpan-service
     base-url: ${HPAN_SERVICE_URL:https://bpd-dev.azure-api.net:${HPAN_SERVICE_PORT:443}}

diff --git a/ops_resources/example_config/application_hbsql.yml b/ops_resources/example_config/application_hbsql.yml
@@ -93,7 +93,7 @@ batchConfiguration:
 rest-client:
   user-agent:
     prefix: BatchService
-    version: 2.0.2
+    version: 2.0.3
   hpan:
     serviceCode: hpan-service
     base-url: ${HPAN_SERVICE_URL:https://bpd-dev.azure-api.net:${HPAN_SERVICE_PORT:443}}

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>it.gov.pagopa.rtd.ms</groupId>
     <artifactId>rtd-ms-transaction-filter</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
 
     <packaging>pom</packaging>
 
@@ -33,7 +33,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sonar.exclusions>**/enums/**,**/model/**,**/Constants*.java,**/*Config.java,**/*Application.java
         </sonar.exclusions>
-        <transaction-filter.version>2.0.2</transaction-filter.version>
+        <transaction-filter.version>2.0.3</transaction-filter.version>
     </properties>
 
     <dependencyManagement>
@@ -55,11 +55,6 @@
                 <artifactId>spring-cloud-starter-openfeign</artifactId>
                 <version>${springframework-cloud.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>${snakeyaml.version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>