Allow to check bcrypt $2b$ passwords

GluuFederation · Jun 20, 2018 · f7c6020 · f7c6020
1 parent b96d1e2
commit f7c6020
Show file tree

Hide file tree

Showing 3 changed files with 188 additions and 58 deletions.
diff --git a/oxPersist/src/main/java/org/gluu/persist/operation/auth/PasswordEncryptionHelper.java b/oxPersist/src/main/java/org/gluu/persist/operation/auth/PasswordEncryptionHelper.java
@@ -140,6 +140,7 @@ public static byte[] createStoragePassword(byte[] credentials, PasswordEncryptio
             break;
 
         case HASH_METHOD_CRYPT_BCRYPT:
+        case HASH_METHOD_CRYPT_BCRYPT_B:
             salt = StringHelper.getBytesUtf8(BCrypt.genSalt());
             break;
 
@@ -274,6 +275,7 @@ private static byte[] encryptPassword(byte[] credentials, PasswordEncryptionMeth
             return StringHelper.getBytesUtf8(crypted2);
 
         case HASH_METHOD_CRYPT_BCRYPT:
+        case HASH_METHOD_CRYPT_BCRYPT_B:
             String crypted3 = BCrypt.hashPw(StringHelper.utf8ToString(credentials), StringHelper.utf8ToString(salt));
             return StringHelper.getBytesUtf8(crypted3.substring(crypted3.length() - 31));
 
@@ -364,6 +366,7 @@ public static PasswordDetails splitCredentials(byte[] credentials) {
             return new PasswordDetails(algorithm, salt, password);
 
         case HASH_METHOD_CRYPT_BCRYPT:
+        case HASH_METHOD_CRYPT_BCRYPT_B:
             salt = Arrays.copyOfRange(credentials, algoLength, credentials.length - 31);
             password = Arrays.copyOfRange(credentials, credentials.length - 31, credentials.length);
 

diff --git a/oxPersist/src/main/java/org/gluu/persist/operation/auth/PasswordEncryptionMethod.java b/oxPersist/src/main/java/org/gluu/persist/operation/auth/PasswordEncryptionMethod.java
@@ -54,6 +54,9 @@ public enum PasswordEncryptionMethod {
     /** The BCrypt encryption method */
     HASH_METHOD_CRYPT_BCRYPT("CRYPT-BCRYPT", "BCRYPT", "crypt", "$2a$", 31),
 
+    /** The BCrypt encryption method */
+    HASH_METHOD_CRYPT_BCRYPT_B("CRYPT-BCRYPT", "BCRYPT", "bcrypt", "$2b$", 31),
+
     /** The PBKDF2-based encryption method */
     HASH_METHOD_PKCS5S2("PKCS5S2", "PBKDF2WithHmacSHA1", "PKCS5S2", 32);
 
@@ -143,6 +146,10 @@ public static PasswordEncryptionMethod getMethod(String algorithm) {
             return HASH_METHOD_CRYPT_BCRYPT;
         }
 
+        if (matches(algorithm, HASH_METHOD_CRYPT_BCRYPT_B)) {
+            return HASH_METHOD_CRYPT_BCRYPT_B;
+        }
+
         if (matches(algorithm, HASH_METHOD_SHA256)) {
             return HASH_METHOD_SHA256;
         }