LPD-43475 Implement the new method in all encryptors

daiazius · brianchandotcom · commit 53e6dcaa31a7 · 2025-01-29T22:46:54.000+08:00
diff --git a/modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/BCryptPasswordEncryptor.java b/modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/BCryptPasswordEncryptor.java
@@ -5,6 +5,8 @@
 
 package com.liferay.portal.security.password.encryptor.internal;
 
+import com.liferay.petra.string.CharPool;
+import com.liferay.petra.string.StringBundler;
 import com.liferay.portal.kernel.security.pwd.PasswordEncryptor;
 import com.liferay.portal.kernel.util.GetterUtil;
 import com.liferay.portal.kernel.util.Validator;
@@ -55,8 +57,26 @@ public String encrypt(
 		return BCrypt.hashpw(plainTextPassword, salt);
 	}
 
+	@Override
+	public String getFullAlgorithmConfiguration(String encryptedPassword) {
+		String rounds = String.valueOf(_ROUNDS);
+
+		Matcher matcher = _encryptedPasswordPattern.matcher(encryptedPassword);
+
+		if (matcher.find()) {
+			rounds = matcher.group(1);
+		}
+
+		String algorithm = encryptedPassword.substring(
+			1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE));
+
+		return StringBundler.concat(algorithm, CharPool.FORWARD_SLASH, rounds);
+	}
+
 	private static final int _ROUNDS = 10;
 
+	private static final Pattern _encryptedPasswordPattern = Pattern.compile(
+		"\\{BCrypt}\\$2a\\$(\\d+)\\$", Pattern.CASE_INSENSITIVE);
 	private static final Pattern _pattern = Pattern.compile(
 		"^BCrypt/([0-9]+)$", Pattern.CASE_INSENSITIVE);
 
diff --git a/modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/CryptPasswordEncryptor.java b/modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/CryptPasswordEncryptor.java
@@ -5,6 +5,7 @@
 
 package com.liferay.portal.security.password.encryptor.internal;
 
+import com.liferay.petra.string.CharPool;
 import com.liferay.portal.kernel.exception.PwdEncryptorException;
 import com.liferay.portal.kernel.security.SecureRandom;
 import com.liferay.portal.kernel.security.pwd.PasswordEncryptor;
@@ -53,6 +54,12 @@ public String encrypt(
 		}
 	}
 
+	@Override
+	public String getFullAlgorithmConfiguration(String encryptedPassword) {
+		return encryptedPassword.substring(
+			1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE));
+	}
+
 	protected byte[] getSalt(String encryptedPassword)
 		throws PwdEncryptorException {
 
diff --git a/modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/DefaultPasswordEncryptor.java b/modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/DefaultPasswordEncryptor.java
@@ -5,6 +5,7 @@
 
 package com.liferay.portal.security.password.encryptor.internal;
 
+import com.liferay.petra.string.CharPool;
 import com.liferay.portal.kernel.security.pwd.PasswordEncryptor;
 import com.liferay.portal.kernel.util.DigesterUtil;
 
@@ -28,4 +29,10 @@ public String encrypt(
 		return DigesterUtil.digest(algorithm, plainTextPassword);
 	}
 
+	@Override
+	public String getFullAlgorithmConfiguration(String encryptedPassword) {
+		return encryptedPassword.substring(
+			1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE));
+	}
+
 }
diff --git a/modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/NullPasswordEncryptor.java b/modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/NullPasswordEncryptor.java
@@ -5,6 +5,7 @@
 
 package com.liferay.portal.security.password.encryptor.internal;
 
+import com.liferay.petra.string.CharPool;
 import com.liferay.portal.kernel.security.pwd.PasswordEncryptor;
 
 import org.osgi.service.component.annotations.Component;
@@ -27,4 +28,10 @@ public String encrypt(
 		return plainTextPassword;
 	}
 
+	@Override
+	public String getFullAlgorithmConfiguration(String encryptedPassword) {
+		return encryptedPassword.substring(
+			1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE));
+	}
+
 }
diff --git a/modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/PBKDF2PasswordEncryptor.java b/modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/PBKDF2PasswordEncryptor.java
@@ -5,9 +5,13 @@
 
 package com.liferay.portal.security.password.encryptor.internal;
 
+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;
@@ -89,12 +93,39 @@ public String encrypt(
 		}
 	}
 
+	@Override
+	public String getFullAlgorithmConfiguration(String encryptedPassword) {
+		PBKDF2EncryptionConfiguration pbkdf2EncryptionConfiguration =
+			new PBKDF2EncryptionConfiguration();
+
+		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);
+
+		return StringBundler.concat(
+			algorithm, StringPool.FORWARD_SLASH,
+			pbkdf2EncryptionConfiguration.getKeySize(),
+			StringPool.FORWARD_SLASH,
+			pbkdf2EncryptionConfiguration.getRounds());
+	}
+
 	private static final int _KEY_SIZE = 160;
 
 	private static final int _ROUNDS = 1300000;
 
 	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]+)$");
 
diff --git a/modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/SSHAPasswordEncryptor.java b/modules/apps/portal-security/portal-security-password-encryptor-impl/src/main/java/com/liferay/portal/security/password/encryptor/internal/SSHAPasswordEncryptor.java
@@ -5,6 +5,7 @@
 
 package com.liferay.portal.security.password.encryptor.internal;
 
+import com.liferay.petra.string.CharPool;
 import com.liferay.portal.kernel.exception.PwdEncryptorException;
 import com.liferay.portal.kernel.io.BigEndianCodec;
 import com.liferay.portal.kernel.security.SecureRandomUtil;
@@ -67,6 +68,12 @@ public String encrypt(
 		}
 	}
 
+	@Override
+	public String getFullAlgorithmConfiguration(String encryptedPassword) {
+		return encryptedPassword.substring(
+			1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE));
+	}
+
 	protected byte[] getSaltBytes(String encryptedPassword)
 		throws PwdEncryptorException {
 
diff --git a/modules/apps/portal-security/portal-security-password-encryptor-impl/src/test/java/com/liferay/portal/security/password/encryptor/internal/PasswordEncryptorUtilTest.java b/modules/apps/portal-security/portal-security-password-encryptor-impl/src/test/java/com/liferay/portal/security/password/encryptor/internal/PasswordEncryptorUtilTest.java
@@ -344,6 +344,11 @@ public String encrypt(
 				algorithm.substring(algorithm.indexOf('/') + 1);
 		}
 
+		@Override
+		public String getFullAlgorithmConfiguration(String encryptedPassword) {
+			return null;
+		}
+
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`package com.liferay.portal.security.password.encryptor.internal;`
`7`	`7`
	`8`	`+import com.liferay.petra.string.CharPool;`
`8`	`9`	`import com.liferay.portal.kernel.security.pwd.PasswordEncryptor;`
`9`	`10`	`import com.liferay.portal.kernel.util.DigesterUtil;`
`10`	`11`
`@@ -28,4 +29,10 @@ public String encrypt(`
`28`	`29`	`return DigesterUtil.digest(algorithm, plainTextPassword);`
`29`	`30`	`}`
`30`	`31`
	`32`	`+ @Override`
	`33`	`+ public String getFullAlgorithmConfiguration(String encryptedPassword) {`
	`34`	`+ return encryptedPassword.substring(`
	`35`	`+ 1, encryptedPassword.indexOf(CharPool.CLOSE_CURLY_BRACE));`
	`36`	`+ }`
	`37`	`+`
`31`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,11 @@ public String encrypt(`
`344`	`344`	`algorithm.substring(algorithm.indexOf('/') + 1);`
`345`	`345`	`}`
`346`	`346`
	`347`	`+ @Override`
	`348`	`+ public String getFullAlgorithmConfiguration(String encryptedPassword) {`
	`349`	`+ return null;`
	`350`	`+ }`
	`351`	`+`
`347`	`352`	`}`
`348`	`353`
`349`	`354`	`}`