LPD-43475 Throw exception if the PBKDF2EncryptionConfiguration#configure fail

Author: rafaprax

modules/apps/portal-security/portal-security-password-encryptor-impl/build.gradle

@@ -8,5 +8,6 @@ dependencies {
 	compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
 	compileOnly project(":core:osgi-service-tracker-collections")
 	compileOnly project(":core:petra:petra-lang")
+	compileOnly project(":core:petra:petra-reflect")
 	compileOnly project(":core:petra:petra-string")
 }

modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/PBKDF2PasswordEncryptor.java

@@ -5,13 +5,12 @@
 
 package com.liferay.portal.security.password.encryptor.internal;
 
+import com.liferay.petra.reflect.ReflectionUtil;
 import com.liferay.petra.string.CharPool;
 import com.liferay.petra.string.StringBundler;
 import com.liferay.petra.string.StringPool;
 import com.liferay.portal.kernel.exception.PwdEncryptorException;
 import com.liferay.portal.kernel.io.BigEndianCodec;
-import com.liferay.portal.kernel.log.Log;
-import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.security.SecureRandomUtil;
 import com.liferay.portal.kernel.security.pwd.PasswordEncryptor;
 import com.liferay.portal.kernel.util.Base64;
@@ -97,26 +96,26 @@ public String encrypt(
 	public String getEncryptionAlgorithmConfiguration(
 		String encryptedPassword) {
 
-		PBKDF2EncryptionConfiguration pbkdf2EncryptionConfiguration =
-			new PBKDF2EncryptionConfiguration();
+		try {
+			PBKDF2EncryptionConfiguration pbkdf2EncryptionConfiguration =
+				new PBKDF2EncryptionConfiguration();
 
-		int index = encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE);
+			int index = encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE);
 
-		try {
 			pbkdf2EncryptionConfiguration.configure(
 				StringPool.BLANK, encryptedPassword.substring(index + 1));
-		}
-		catch (Exception exception) {
-			_log.error(exception);
-		}
 
-		String algorithm = encryptedPassword.substring(1, index);
+			String algorithm = encryptedPassword.substring(1, index);
 
-		return StringBundler.concat(
-			algorithm, StringPool.FORWARD_SLASH,
-			pbkdf2EncryptionConfiguration.getKeySize(),
-			StringPool.FORWARD_SLASH,
-			pbkdf2EncryptionConfiguration.getRounds());
+			return StringBundler.concat(
+				algorithm, StringPool.FORWARD_SLASH,
+				pbkdf2EncryptionConfiguration.getKeySize(),
+				StringPool.FORWARD_SLASH,
+				pbkdf2EncryptionConfiguration.getRounds());
+		}
+		catch (PwdEncryptorException pwdEncryptorException) {
+			return ReflectionUtil.throwException(pwdEncryptorException);
+		}
 	}
 
 	private static final int _KEY_SIZE = 160;
@@ -125,9 +124,6 @@ public String getEncryptionAlgorithmConfiguration(
 
 	private static final int _SALT_BYTES_LENGTH = 16;
 
-	private static final Log _log = LogFactoryUtil.getLog(
-		PBKDF2PasswordEncryptor.class);
-
 	private static final Pattern _pattern = Pattern.compile(
 		"^.*/?([0-9]+)?/([0-9]+)$");