- * This method parses the input JSON string into a tree structure using the {@link ObjectMapper} - * and then converts it back to a compact string representation. - * If an exception occurs during parsing, an empty string is returned. + * This method performs the following steps: + *
+ * This class provides methods for masking fields within a {@link JsonNode} or individual string values. + * It is designed to handle common sensitive fields such as tokens, passwords, email addresses, and more. + *
+ * + *Unmasked JSON:
+ *
+ * {
+ * "emailAddress": "test@example.com",
+ * "password": "123456789",
+ * "lineNumber": "1234567890",
+ * "address": "123 Main Street, Springfield",
+ * "firstName": "John",
+ * "lastName": "Doe"
+ * }
+ *
+ *
+ * Masked JSON:
+ *
+ * {
+ * "emailAddress": "tes******com",
+ * "password": "******",
+ * "lineNumber": "******7890",
+ * "address": "123 Main ******field",
+ * "firstName": "Joh******ohn",
+ * "lastName": "Doe******oe"
+ * }
+ *
+ */
+@UtilityClass
+public class AysMaskUtil {
+
+ private static final String MASKED_VALUE = "******";
+
+ /**
+ * Masks sensitive fields in the given {@link JsonNode}.
+ * + * This method recursively iterates through the fields in the JSON object or array, + * and applies masking to fields identified as sensitive. + *
+ * + * @param jsonNode the JSON node to process for masking + */ + public static void mask(final JsonNode jsonNode) { + + if (jsonNode.isObject()) { + + ObjectNode objectNode = (ObjectNode) jsonNode; + Iterator+ * This method identifies sensitive fields by their names and applies the appropriate + * masking strategy. Fields not recognized as sensitive are returned without modification. + *
+ * + * @param field the name of the field + * @param value the value to mask + * @return the masked value + */ + public static String mask(final String field, final String value) { + + if ("null".equalsIgnoreCase(value) || StringUtils.isBlank(value)) { + return value; + } + + return switch (field) { + case "Authorization", "accessToken", "refreshToken" -> maskToken(value); + case "password" -> maskPassword(); + case "emailAddress" -> maskEmailAddress(value); + case "lineNumber" -> maskLineNumber(value); + case "address" -> maskAddress(value); + case "firstName", "lastName", "applicantFirstName", "applicantLastName" -> maskName(value); + default -> value; + }; + } + + /** + * Masks token fields such as "Authorization", "accessToken", or "refreshToken". + * + * @param value the token value to mask + * @return the masked token + */ + private static String maskToken(String value) { + + if (value.length() <= 20) { + return value; + } + + return value.substring(0, 20) + MASKED_VALUE; + } + + /** + * Masks password fields, replacing their values with a fixed placeholder. + * + * @return the masked password placeholder + */ + private static String maskPassword() { + return MASKED_VALUE; + } + + /** + * Masks email addresses by revealing the first three and last three characters, + * replacing the rest with asterisks. + * + * @param value the email address to mask + * @return the masked email address + */ + private static String maskEmailAddress(String value) { + + if (value.length() <= 3) { + return value; + } + + int length = value.length(); + String firstThree = value.substring(0, 3); + String lastThree = value.substring(length - 3); + return firstThree + MASKED_VALUE + lastThree; + } + + /** + * Masks address fields by revealing the first ten and last ten characters, + * replacing the middle part with asterisks. + * + * @param value the address to mask + * @return the masked address + */ + private static String maskAddress(String value) { + + if (value.length() <= 10) { + return value; + } + + return value.substring(0, 10) + MASKED_VALUE + value.substring(value.length() - 10); + } + + /** + * Masks line numbers by revealing the last four digits, replacing the preceding digits with asterisks. + * + * @param value the line number to mask + * @return the masked line number + */ + private static String maskLineNumber(String value) { + + if (value.length() <= 4) { + return value; + } + + return MASKED_VALUE + value.substring(value.length() - 4); + } + + /** + * Masks name fields such as "firstName", "lastName", or similar by revealing the first three + * and last three characters, replacing the middle part with asterisks. + * + * @param value the name to mask + * @return the masked name + */ + private static String maskName(String value) { + + if (value.length() <= 3) { + return value; + } + + return value.substring(0, 3) + MASKED_VALUE + value.substring(value.length() - 3); + } + +} diff --git a/src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationRequest.java b/src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationRequest.java index 35471d1c8..7545a7a0a 100644 --- a/src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationRequest.java +++ b/src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationRequest.java @@ -86,9 +86,12 @@ private boolean isAllApplicantFieldsFilled() { return true; } + return !StringUtils.isBlank(this.applicantFirstName) && !StringUtils.isBlank(this.applicantLastName) && - this.applicantPhoneNumber != null && !this.applicantPhoneNumber.isBlank(); + this.applicantPhoneNumber != null + && + !(StringUtils.isBlank(this.applicantPhoneNumber.getCountryCode()) && StringUtils.isBlank(this.applicantPhoneNumber.getLineNumber())); } @JsonIgnore @@ -111,7 +114,7 @@ private boolean isPhoneNumberMustNotBeSameOne() { @AssertTrue(message = "source city/district and target city/district must be different") @SuppressWarnings("This method is unused by the application directly but Spring is using it in the background.") private boolean isSourceCityAndDistrictDifferentFromTargetCityAndDistrict() { - + if (this.sourceCity == null || this.sourceDistrict == null || this.targetCity == null || this.targetDistrict == null) { return true; } @@ -119,7 +122,7 @@ private boolean isSourceCityAndDistrictDifferentFromTargetCityAndDistrict() { if (!this.sourceCity.equalsIgnoreCase(this.targetCity)){ return true; } - + return !this.sourceDistrict.equalsIgnoreCase(this.targetDistrict); }