From 2e83d0d6384b0706ca398a8d31b912233d125cef Mon Sep 17 00:00:00 2001 From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu> Date: Wed, 11 Sep 2024 06:18:43 +0200 Subject: [PATCH] [EDELIVERY-13860] Fix DNS tool identifier validation to use default identifier settings. --- .../europa/ec/edelivery/smp/services/CredentialService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialService.java index cb02726b6..38791f459 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialService.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialService.java @@ -373,6 +373,12 @@ public class CredentialService { Pattern pattern = configurationService.getPasswordPolicyRexExp(); if (pattern != null && !pattern.matcher(newPassword).matches()) { + LOG.info(SMPLogger.SECURITY_MARKER, "Change/set password failed because it does not match password policy!: [{}]", username); + throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, "PasswordChange", configurationService.getPasswordPolicyValidationMessage()); + } + + if (StringUtils.isNotBlank(dbCredential.getValue()) && BCrypt.checkpw(newPassword, dbCredential.getValue())) { + LOG.info(SMPLogger.SECURITY_MARKER, "Change/set password failed because 'new' password match the old password for user: [{}]", username); throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, "PasswordChange", configurationService.getPasswordPolicyValidationMessage()); } -- GitLab