Merge pull request #390 from trumpetx/add_bcrypt_support

JDBCAuthProvider: adding support for bcrypt and more

.gitignore

@@ -16,3 +16,7 @@ out/
 
 # Ignore MacOSX files
 .DS_Store
+
+# Ignore Netbeans project files
+nbproject/
+nbbuild/

src/java/org/jivesoftware/openfire/auth/JDBCAuthProvider.java

@@ -19,11 +19,20 @@
 
 package org.jivesoftware.openfire.auth;
 
+import java.security.SecureRandom;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import org.bouncycastle.crypto.generators.OpenBSDBCrypt;
 
 import org.jivesoftware.database.DbConnectionManager;
 import org.jivesoftware.openfire.XMPPServer;
@@ -31,6 +40,8 @@ import org.jivesoftware.openfire.user.UserAlreadyExistsException;
 import org.jivesoftware.openfire.user.UserManager;
 import org.jivesoftware.openfire.user.UserNotFoundException;
 import org.jivesoftware.util.JiveGlobals;
+import org.jivesoftware.util.PropertyEventDispatcher;
+import org.jivesoftware.util.PropertyEventListener;
 import org.jivesoftware.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,6 +66,22 @@ import org.slf4j.LoggerFactory;
  * <li><tt>jdbcAuthProvider.passwordType = plain</tt></li>
  * <li><tt>jdbcAuthProvider.allowUpdate = true</tt></li>
  * <li><tt>jdbcAuthProvider.setPasswordSQL = UPDATE user_account SET password=? WHERE username=?</tt></li>
+ * <li><tt>jdbcAuthProvider.bcrypt.cost = 12</tt></li>
+ * </ul>
+ * 
+ * <p>jdbcAuthProvider.passwordType can accept a comma separated string of password types.  This can be useful in 
+ * situations where legacy (ex/md5) password hashes were stored and then "upgraded" to a stronger hash algorithm.
+ * Hashes are executed left to right.</p>
+ * <p>Example Setting: "md5,sha1"<br>  
+ * Usage: password -&gt;<br>
+ * (md5)&nbsp;286755fad04869ca523320acce0dc6a4&nbsp;-&gt;<br>
+ * (sha1)&nbsp;0524b1fc84d315b08db890413e65260040b08caa&nbsp;-&gt;</p>
+ * 
+ * <p>Bcrypt is supported as a passwordType; however, when chaining password types it MUST be the last type given. (bcrypt hashes are different 
+ * every time they are generated)</p>
+ * <p>Optional bcrypt configuration:</p>
+ * <ul>
+ * <li><b>jdbcAuthProvider.bcrypt.cost</b>: The BCrypt cost.  Default: BCrypt.GENSALT_DEFAULT_LOG2_ROUNDS  (currently: 10)</li>
  * </ul>
  *
  * In order to use the configured JDBC connection provider do not use a JDBC
@@ -71,21 +98,24 @@ import org.slf4j.LoggerFactory;
  *      <li>{@link PasswordType#sha1 sha1}
  *      <li>{@link PasswordType#sha256 sha256}
  *      <li>{@link PasswordType#sha512 sha512}
+ *      <li>{@link PasswordType#bcrypt bcrypt}
  *  </ul>
  *
  * @author David Snopek
  */
-public class JDBCAuthProvider implements AuthProvider {
+public class JDBCAuthProvider implements AuthProvider, PropertyEventListener {
 
     private static final Logger Log = LoggerFactory.getLogger(JDBCAuthProvider.class);
+    private static final int DEFAULT_BCRYPT_COST = 10; // Current (2015) value provided by Mindrot's BCrypt.GENSALT_DEFAULT_LOG2_ROUNDS value
 
     private String connectionString;
 
     private String passwordSQL;
     private String setPasswordSQL;
-    private PasswordType passwordType;
+    private List<PasswordType> passwordTypes;
     private boolean allowUpdate;
     private boolean useConnectionProvider;
+    private int bcryptCost;
 
     /**
      * Constructs a new JDBC authentication provider.
@@ -98,6 +128,9 @@ public class JDBCAuthProvider implements AuthProvider {
         JiveGlobals.migrateProperty("jdbcAuthProvider.passwordType");
         JiveGlobals.migrateProperty("jdbcAuthProvider.setPasswordSQL");
         JiveGlobals.migrateProperty("jdbcAuthProvider.allowUpdate");
+        JiveGlobals.migrateProperty("jdbcAuthProvider.bcrypt.cost");
+        JiveGlobals.migrateProperty("jdbcAuthProvider.useConnectionProvider");
+        JiveGlobals.migrateProperty("jdbcAuthProvider.acceptPreHashedPassword");
         
         useConnectionProvider = JiveGlobals.getBooleanProperty("jdbcAuthProvider.useConnectionProvider");
         
@@ -120,14 +153,34 @@ public class JDBCAuthProvider implements AuthProvider {
 
         allowUpdate = JiveGlobals.getBooleanProperty("jdbcAuthProvider.allowUpdate",false);
 
-        passwordType = PasswordType.plain;
+        setPasswordTypes(JiveGlobals.getProperty("jdbcAuthProvider.passwordType", "plain"));
+        bcryptCost = JiveGlobals.getIntProperty("jdbcAuthProvider.bcrypt.cost", -1);
+        PropertyEventDispatcher.addListener(this);
+    }
+    
+    private void setPasswordTypes(String passwordTypeProperty){
+        Collection<String> passwordTypeStringList = StringUtils.stringToCollection(passwordTypeProperty);
+        List<PasswordType> passwordTypeList = new ArrayList<>(passwordTypeStringList.size());
+        Iterator<String> it = passwordTypeStringList.iterator();
+        while(it.hasNext()){
             try {
-            passwordType = PasswordType.valueOf(
-                    JiveGlobals.getProperty("jdbcAuthProvider.passwordType", "plain"));
+                PasswordType type = PasswordType.valueOf(it.next().toLowerCase());
+                passwordTypeList.add(type);
+                if(type == PasswordType.bcrypt){
+                    // Do not support chained hashes beyond bcrypt
+                    if(it.hasNext()){
+                        Log.warn("The jdbcAuthProvider.passwordType setting in invalid.  Bcrypt must be the final hashType if a series is given.  Ignoring all hash types beyond bcrypt: {}", passwordTypeProperty);
+                    }
+                    break;
                 }
-        catch (IllegalArgumentException iae) {
-            Log.error(iae.getMessage(), iae);
             }
+            catch (IllegalArgumentException iae) { }
+        }
+        if(passwordTypeList.isEmpty()){
+            Log.warn("The jdbcAuthProvider.passwordType setting is not set or contains invalid values.  Setting the type to 'plain'");
+            passwordTypeList.add(PasswordType.plain);
+        }
+        passwordTypes = passwordTypeList;
     }    
 
     @Override
@@ -154,35 +207,64 @@ public class JDBCAuthProvider implements AuthProvider {
         catch (UserNotFoundException unfe) {
             throw new UnauthorizedException();
         }
-        // If the user's password doesn't match the password passed in, authentication
-        // should fail.
-        if (passwordType == PasswordType.md5) {
-            password = StringUtils.hash(password, "MD5");
+        
+        if (comparePasswords(password, userPassword)) {
+            // Got this far, so the user must be authorized.
+            createUser(username);
+        } else {
+            throw new UnauthorizedException();
         }
-        else if (passwordType == PasswordType.sha1) {
-            password = StringUtils.hash(password, "SHA-1");
     }
-        else if (passwordType == PasswordType.sha256) {
-            password = StringUtils.hash(password, "SHA-256");
+    
+    // @VisibleForTesting
+    protected boolean comparePasswords(String plainText, String hashed) {
+        int lastIndex = passwordTypes.size() - 1;
+        if (passwordTypes.get(lastIndex) == PasswordType.bcrypt) {
+            for (int i = 0; i < lastIndex; i++) {
+                plainText = hashPassword(plainText, passwordTypes.get(i));
             }
-        else if (passwordType == PasswordType.sha512) {
-            password = StringUtils.hash(password, "SHA-512");
+            return OpenBSDBCrypt.checkPassword(hashed, plainText.toCharArray());
         }
-        if (!password.equals(userPassword)) {
-            throw new UnauthorizedException();
+
+        return hashPassword(plainText).equals(hashed);
     }
 
-        // Got this far, so the user must be authorized.
-        createUser(username);
+    private String hashPassword(String password) {
+        for (PasswordType type : passwordTypes) {
+            password = hashPassword(password, type);
+        }
+        return password;
+    }
+
+    // @VisibleForTesting
+    protected String hashPassword(String password, PasswordType type) {
+        switch (type) {
+            case md5:
+                return StringUtils.hash(password, "MD5");
+            case sha1:
+                return StringUtils.hash(password, "SHA-1");
+            case sha256:
+                return StringUtils.hash(password, "SHA-256");
+            case sha512:
+                return StringUtils.hash(password, "SHA-512");
+            case bcrypt:
+                byte[] salt = new byte[16];
+                new SecureRandom().nextBytes(salt);
+                int cost = (bcryptCost < 4 || bcryptCost > 31) ? DEFAULT_BCRYPT_COST : bcryptCost;
+                return OpenBSDBCrypt.generate(password.toCharArray(), salt, cost);
+            case plain:
+            default:
+                return password;
+        }
     }
         
     @Override
     public void authenticate(String username, String token, String digest)
             throws UnauthorizedException
     {
-        if (passwordType != PasswordType.plain) {
+        if (passwordTypes.size() != 1 || passwordTypes.get(0) != PasswordType.plain) {
             throw new UnsupportedOperationException("Digest authentication not supported for "
-                    + "password type " + passwordType);
+                    + "password type " + passwordTypes.get(0));
         }
         if (username == null || token == null || digest == null) {
             throw new UnauthorizedException();
@@ -224,7 +306,7 @@ public class JDBCAuthProvider implements AuthProvider {
     @Override
     public boolean isDigestSupported() {
         // The auth SQL must be defined and the password type is supported.
-        return (passwordSQL != null && passwordType == PasswordType.plain);
+        return (passwordSQL != null && passwordTypes.size() == 1 && passwordTypes.get(0) == PasswordType.plain);
     }
 
     @Override
@@ -262,7 +344,7 @@ public class JDBCAuthProvider implements AuthProvider {
 
     @Override
     public boolean supportsPasswordRetrieval() {
-        return (passwordSQL != null && passwordType == PasswordType.plain);
+        return (passwordSQL != null && passwordTypes.size() == 1 && passwordTypes.get(0) == PasswordType.plain);
     }
 
     private Connection getConnection() throws SQLException {
@@ -337,18 +419,7 @@ public class JDBCAuthProvider implements AuthProvider {
             con = getConnection();
             pstmt = con.prepareStatement(setPasswordSQL);
             pstmt.setString(2, username);
-            if (passwordType == PasswordType.md5) {
-                password = StringUtils.hash(password, "MD5");
-            }
-            else if (passwordType == PasswordType.sha1) {
-                password = StringUtils.hash(password, "SHA-1");
-            }
-            else if (passwordType == PasswordType.sha256) {
-                password = StringUtils.hash(password, "SHA-256");
-            }
-            else if (passwordType == PasswordType.sha512) {
-                password = StringUtils.hash(password, "SHA-512");
-            }
+            password = hashPassword(password);
             pstmt.setString(1, password);
             pstmt.executeQuery();
         }
@@ -391,7 +462,12 @@ public class JDBCAuthProvider implements AuthProvider {
         /**
           * The password is stored as a hex-encoded SHA-512 hash.
           */
-        sha512;
+        sha512,
+              
+        /**
+          * The password is stored as a bcrypt hash.
+          */
+        bcrypt;
    }
 
     /**
@@ -399,7 +475,8 @@ public class JDBCAuthProvider implements AuthProvider {
      *
      * @param username the username.
      */
-    private static void createUser(String username) {
+    // @VisibleForTesting
+    protected void createUser(String username) {
         // See if the user exists in the database. If not, automatically create them.
         UserManager userManager = UserManager.getInstance();
         try {
@@ -422,4 +499,56 @@ public class JDBCAuthProvider implements AuthProvider {
         // TODO Auto-generated method stub
         return false;
     }
+    
+    /**
+     * Support a subset of JDBCAuthProvider properties when updated via REST,
+     * web GUI, or other sources. Provider strings (and related settings) must
+     * be set via XML.
+     *
+     * @param property the name of the property.
+     * @param params event parameters.
+     */
+    @Override
+    public void propertySet(String property, Map<String, Object> params) {
+        String value = (String) params.get("value");
+        switch (property) {
+            case "jdbcAuthProvider.passwordSQL":
+                passwordSQL = value;
+                Log.debug("jdbcAuthProvider.passwordSQL configured to: {}", passwordSQL);
+                break;
+            case "jdbcAuthProvider.setPasswordSQL":
+                setPasswordSQL = value;
+                Log.debug("jdbcAuthProvider.setPasswordSQL configured to: {}", setPasswordSQL);
+                break;
+            case "jdbcAuthProvider.allowUpdate":
+                allowUpdate = Boolean.parseBoolean(value);
+                Log.debug("jdbcAuthProvider.allowUpdate configured to: {}", allowUpdate);
+                break;
+            case "jdbcAuthProvider.passwordType":
+                setPasswordTypes(value);
+                Log.debug("jdbcAuthProvider.passwordType configured to: {}", Arrays.toString(passwordTypes.toArray()));
+                break;
+            case "jdbcAuthProvider.bcrypt.cost":
+                try {
+                    bcryptCost = Integer.parseInt(value);
+                } catch (NumberFormatException e) {
+                    bcryptCost = -1;
+                }
+                Log.debug("jdbcAuthProvider.bcrypt.cost configured to: {}", bcryptCost);
+                break;
+        }
+    }
+
+    @Override
+    public void propertyDeleted(String property, Map<String, Object> params) {
+        propertySet(property, Collections.<String, Object>emptyMap());
+    }
+
+    @Override
+    public void xmlPropertySet(String property, Map<String, Object> params) {
+    }
+
+    @Override
+    public void xmlPropertyDeleted(String property, Map<String, Object> params) {
+    }                            
 }

src/test/java/org/jivesoftware/openfire/auth/JDBCAuthProviderTest.java

+package org.jivesoftware.openfire.auth;
+
+import java.util.HashMap;
+import org.bouncycastle.crypto.generators.OpenBSDBCrypt;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class JDBCAuthProviderTest {
+
+    private static final String PASSWORD = "password";
+    private static final String MD5_SHA1_PASSWORD = "55c3b5386c486feb662a0785f340938f518d547f";
+    private static final String MD5_SHA512_PASSWORD = "85ec0898f0998c95a023f18f1123cbc77ba51f2632137b61999655d59817d942ecef3012762604e442d395a194c53e94e9fb5bb8fe74d61900eb05cb0c078bb6";
+    private static final String MD5_PASSWORD = "5f4dcc3b5aa765d61d8327deb882cf99";
+    private static final String SHA1_PASSWORD = "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8";
+    private static final String SHA256_PASSWORD = "5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8";
+    private static final String SHA512_PASSWORD = "b109f3bbbc244eb82441917ed06d618b9008dd09b3befd1b5e07394c706a8bb980b1d7785e5976ec049b46df5f1326af5a2ea6d103fd07c95385ffab0cacbc86";
+    private static final String BCRYPTED_PASSWORD = "$2a$10$TS9mWNnHbTU.ukLUlrOopuGooirFR3IltqgRFcyM.iSPQuoPDAafG";
+    private final JDBCAuthProvider jdbcAuthProvider = new JDBCAuthProvider();
+
+    private void setPasswordTypes(final String passwordTypes) {
+        jdbcAuthProvider.propertySet("jdbcAuthProvider.passwordType", new HashMap<String, Object>() {
+            {
+                put("value", passwordTypes);
+            }
+        });
+    }
+
+    @Test
+    public void hashPassword() throws Exception {
+        assertTrue(MD5_PASSWORD.equals(jdbcAuthProvider.hashPassword(PASSWORD, JDBCAuthProvider.PasswordType.md5)));
+        assertTrue(SHA1_PASSWORD.equals(jdbcAuthProvider.hashPassword(PASSWORD, JDBCAuthProvider.PasswordType.sha1)));
+        assertTrue(SHA256_PASSWORD.equals(jdbcAuthProvider.hashPassword(PASSWORD, JDBCAuthProvider.PasswordType.sha256)));
+        assertTrue(SHA512_PASSWORD.equals(jdbcAuthProvider.hashPassword(PASSWORD, JDBCAuthProvider.PasswordType.sha512)));
+        assertFalse(BCRYPTED_PASSWORD.equals(jdbcAuthProvider.hashPassword(PASSWORD, JDBCAuthProvider.PasswordType.bcrypt)));
+        assertTrue(OpenBSDBCrypt.checkPassword(BCRYPTED_PASSWORD, PASSWORD.toCharArray()));
+    }
+
+    @Test
+    public void comparePasswords_sha256() throws Exception {
+        setPasswordTypes("sha256");
+        assertTrue("password should be sha256", jdbcAuthProvider.comparePasswords(PASSWORD, SHA256_PASSWORD));
+    }
+
+    @Test
+    public void comparePasswords_bcrypt() throws Exception {
+        setPasswordTypes("bcrypt");
+        assertTrue("password should be bcrypted", jdbcAuthProvider.comparePasswords(PASSWORD, BCRYPTED_PASSWORD));
+    }
+
+    @Test
+    public void comparePasswords_bcryptLast() throws Exception {
+        setPasswordTypes("bcrypt,md5,plain");
+        assertTrue("should ignore everything beyond bcrypt", jdbcAuthProvider.comparePasswords(PASSWORD, BCRYPTED_PASSWORD));
+    }
+
+    @Test
+    public void comparePasswords_ignoreUnknownDefaultPlain() throws Exception {
+        setPasswordTypes("blowfish,puckerfish,rainbowtrout");
+        assertTrue("should passively ignore unknown, add plain if empty", jdbcAuthProvider.comparePasswords(PASSWORD, PASSWORD));
+    }
+
+    @Test
+    public void comparePasswords_md5_sha1() throws Exception {
+        setPasswordTypes("md5,sha1");
+        assertTrue("password should be md5 -> sha1", jdbcAuthProvider.comparePasswords(PASSWORD, MD5_SHA1_PASSWORD));
+    }
+
+    @Test
+    public void comparePasswords_md5_sha512() throws Exception {
+        setPasswordTypes("md5,sha512");
+        assertTrue("password should be md5 -> sha512", jdbcAuthProvider.comparePasswords(PASSWORD, MD5_SHA512_PASSWORD));
+    }
+    
+    @Test
+    public void comparePasswords_plain_md5_plain_plain() throws Exception {
+        setPasswordTypes("plain,md5,plain,plain");
+        assertTrue("weird password chains are fine", jdbcAuthProvider.comparePasswords(PASSWORD, MD5_PASSWORD));
+    }    
+}