From 3621a9a608b750e4d8095386cb7dec1b2daeb34c Mon Sep 17 00:00:00 2001 From: Jacopo Carlini Date: Mon, 30 Sep 2024 16:27:29 +0200 Subject: [PATCH] [PAGOPA-2178] revert(sensitive annotation): remove the annotation because we need to define an common area strategy --- .../it/gov/pagopa/payments/config/LoggingAspect.java | 5 ----- .../controller/receipt/IPaymentsController.java | 2 -- .../pagopa/payments/endpoints/PartnerEndpoint.java | 5 ++--- .../it/gov/pagopa/payments/entity/ReceiptEntity.java | 2 -- .../pagopa/payments/model/PaymentsModelResponse.java | 2 -- .../pagopa/payments/model/ReceiptModelResponse.java | 2 -- .../payments/model/spontaneous/DebtorModel.java | 2 -- .../model/spontaneous/PaymentPositionModel.java | 2 -- .../java/it/gov/pagopa/payments/utils/Sensitive.java | 11 ----------- 9 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 src/main/java/it/gov/pagopa/payments/utils/Sensitive.java diff --git a/src/main/java/it/gov/pagopa/payments/config/LoggingAspect.java b/src/main/java/it/gov/pagopa/payments/config/LoggingAspect.java index ca775d94..646e4b88 100644 --- a/src/main/java/it/gov/pagopa/payments/config/LoggingAspect.java +++ b/src/main/java/it/gov/pagopa/payments/config/LoggingAspect.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import it.gov.pagopa.payments.exception.AppError; import it.gov.pagopa.payments.model.ProblemJson; -import it.gov.pagopa.payments.utils.Sensitive; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; @@ -91,7 +90,6 @@ private static Map getParams(ProceedingJoinPoint joinPoint) { int i = 0; for (var parameter : method.getParameters()) { var paramName = parameter.getName(); - boolean isSensitive = parameter.isAnnotationPresent(Sensitive.class); var arg = joinPoint.getArgs()[i++]; if (arg instanceof JAXBElement) { try { @@ -100,9 +98,6 @@ private static Map getParams(ProceedingJoinPoint joinPoint) { arg = "unreadable!"; } } - if (isSensitive && arg != null) { - arg = "obfuscated-" + arg.hashCode(); - } params.put(paramName, deNull(arg)); } return params; diff --git a/src/main/java/it/gov/pagopa/payments/controller/receipt/IPaymentsController.java b/src/main/java/it/gov/pagopa/payments/controller/receipt/IPaymentsController.java index 4443087c..d5f657b6 100644 --- a/src/main/java/it/gov/pagopa/payments/controller/receipt/IPaymentsController.java +++ b/src/main/java/it/gov/pagopa/payments/controller/receipt/IPaymentsController.java @@ -11,7 +11,6 @@ import it.gov.pagopa.payments.model.PaymentsResult; import it.gov.pagopa.payments.model.ProblemJson; import it.gov.pagopa.payments.model.ReceiptModelResponse; -import it.gov.pagopa.payments.utils.Sensitive; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -82,7 +81,6 @@ ResponseEntity getReceiptByIUV( + " and identifies three key elements of a payment: reason, payer, amount", required = true, example = "ABC123") @PathVariable("iuv") - @Sensitive String iuv, @Valid @Parameter(description = "Segregation codes for which broker is authorized") @Pattern(regexp = "\\d{2}(,\\d{2})*") @RequestParam(required = false) String segregationCodes); diff --git a/src/main/java/it/gov/pagopa/payments/endpoints/PartnerEndpoint.java b/src/main/java/it/gov/pagopa/payments/endpoints/PartnerEndpoint.java index eb96e51e..6b239b7b 100644 --- a/src/main/java/it/gov/pagopa/payments/endpoints/PartnerEndpoint.java +++ b/src/main/java/it/gov/pagopa/payments/endpoints/PartnerEndpoint.java @@ -21,7 +21,6 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLStreamException; -import it.gov.pagopa.payments.utils.Sensitive; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ws.server.endpoint.annotation.Endpoint; @@ -43,7 +42,7 @@ public class PartnerEndpoint { @PayloadRoot(localPart = "paVerifyPaymentNoticeReq") @ResponsePayload public JAXBElement paVerifyPaymentNotice( - @RequestPayload @Sensitive JAXBElement request) + @RequestPayload JAXBElement request) throws DatatypeConfigurationException, PartnerValidationException { log.debug(" paVerifyPaymentNotice START "); @@ -66,7 +65,7 @@ public JAXBElement paGetPayment( @PayloadRoot(localPart = "paGetPaymentV2Request") @ResponsePayload public JAXBElement paGetPaymentV2( - @RequestPayload @Sensitive JAXBElement request) + @RequestPayload JAXBElement request) throws PartnerValidationException, DatatypeConfigurationException { log.debug(" paGetPaymentV2 START "); diff --git a/src/main/java/it/gov/pagopa/payments/entity/ReceiptEntity.java b/src/main/java/it/gov/pagopa/payments/entity/ReceiptEntity.java index 364a183d..cda021af 100644 --- a/src/main/java/it/gov/pagopa/payments/entity/ReceiptEntity.java +++ b/src/main/java/it/gov/pagopa/payments/entity/ReceiptEntity.java @@ -1,6 +1,5 @@ package it.gov.pagopa.payments.entity; -import it.gov.pagopa.payments.utils.Sensitive; import lombok.*; @Data @@ -11,7 +10,6 @@ public class ReceiptEntity { private String organizationFiscalCode; private String iuv; - @Sensitive private String debtor; private String paymentDateTime; private String status = Status.PAID.name(); diff --git a/src/main/java/it/gov/pagopa/payments/model/PaymentsModelResponse.java b/src/main/java/it/gov/pagopa/payments/model/PaymentsModelResponse.java index 202ef1ce..eed7956d 100644 --- a/src/main/java/it/gov/pagopa/payments/model/PaymentsModelResponse.java +++ b/src/main/java/it/gov/pagopa/payments/model/PaymentsModelResponse.java @@ -4,7 +4,6 @@ import java.time.LocalDateTime; import java.util.List; -import it.gov.pagopa.payments.utils.Sensitive; import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; @@ -34,7 +33,6 @@ public class PaymentsModelResponse implements Serializable { private String idFlowReporting; private PaymentOptionStatus status; private Type type; - @Sensitive private String fiscalCode; @ToString.Exclude private String fullName; diff --git a/src/main/java/it/gov/pagopa/payments/model/ReceiptModelResponse.java b/src/main/java/it/gov/pagopa/payments/model/ReceiptModelResponse.java index d91719cd..c03f5931 100644 --- a/src/main/java/it/gov/pagopa/payments/model/ReceiptModelResponse.java +++ b/src/main/java/it/gov/pagopa/payments/model/ReceiptModelResponse.java @@ -1,6 +1,5 @@ package it.gov.pagopa.payments.model; -import it.gov.pagopa.payments.utils.Sensitive; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -15,7 +14,6 @@ public class ReceiptModelResponse { private String organizationFiscalCode; private String iuv; - @Sensitive private String debtor; private String paymentDateTime; private String status; diff --git a/src/main/java/it/gov/pagopa/payments/model/spontaneous/DebtorModel.java b/src/main/java/it/gov/pagopa/payments/model/spontaneous/DebtorModel.java index 19c94535..1d5cb739 100644 --- a/src/main/java/it/gov/pagopa/payments/model/spontaneous/DebtorModel.java +++ b/src/main/java/it/gov/pagopa/payments/model/spontaneous/DebtorModel.java @@ -6,7 +6,6 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import it.gov.pagopa.payments.utils.Sensitive; import lombok.*; @Data @@ -19,7 +18,6 @@ public class DebtorModel implements Serializable { private Type type; @NotBlank(message = "fiscal code is required") - @Sensitive private String fiscalCode; @NotBlank(message = "full name is required") diff --git a/src/main/java/it/gov/pagopa/payments/model/spontaneous/PaymentPositionModel.java b/src/main/java/it/gov/pagopa/payments/model/spontaneous/PaymentPositionModel.java index 02093800..766f95cd 100644 --- a/src/main/java/it/gov/pagopa/payments/model/spontaneous/PaymentPositionModel.java +++ b/src/main/java/it/gov/pagopa/payments/model/spontaneous/PaymentPositionModel.java @@ -12,7 +12,6 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import it.gov.pagopa.payments.utils.Sensitive; import lombok.*; @Builder @@ -28,7 +27,6 @@ public class PaymentPositionModel implements Serializable { private Type type; @NotBlank(message = "fiscal code is required") - @Sensitive private String fiscalCode; @NotBlank(message = "full name is required") diff --git a/src/main/java/it/gov/pagopa/payments/utils/Sensitive.java b/src/main/java/it/gov/pagopa/payments/utils/Sensitive.java deleted file mode 100644 index dd5a2c8e..00000000 --- a/src/main/java/it/gov/pagopa/payments/utils/Sensitive.java +++ /dev/null @@ -1,11 +0,0 @@ -package it.gov.pagopa.payments.utils; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -/** - * Annotation to obfuscate the data during the toString() - */ -@Retention(RetentionPolicy.RUNTIME) -public @interface Sensitive { -}