Merge pull request #1609 from sharelatex/sk-upgrade-bcrypt-3

Upgrade bcrypt to version 3, and specify minor-version of hash function

GitOrigin-RevId: 9282664a628e4b50839a1bb6f7ee895f3f9f15ca

services/web/app/coffee/Features/Authentication/AuthenticationManager.coffee

@@ -96,8 +96,8 @@ module.exports = AuthenticationManager =
 	setUserPasswordInV2: (user_id, password, callback) ->
 		validation = @validatePassword(password)
 		return callback(validation.message) if validation?
-
-		bcrypt.genSalt BCRYPT_ROUNDS, (error, salt) ->
+		minorVersion = 'a'
+		bcrypt.genSalt BCRYPT_ROUNDS, minorVersion, (error, salt) ->
 			return callback(error) if error?
 			bcrypt.hash password, salt, (error, hash) ->
 				return callback(error) if error?

services/web/package.json

@@ -32,7 +32,7 @@
     "backbone": "^1.3.3",
     "base64-stream": "^0.1.2",
     "basic-auth-connect": "^1.0.0",
-    "bcrypt": "1.0.1",
+    "bcrypt": "^3.0.4",
     "body-parser": "^1.13.1",
     "bufferedstream": "1.6.0",
     "codemirror": "^5.33.0",

services/web/test/unit/coffee/Authentication/AuthenticationManagerTests.coffee

@@ -258,7 +258,7 @@ describe "AuthenticationManager", ->
 			@password = "banana"
 			@hashedPassword = "asdkjfa;osiuvandf"
 			@salt = "saltaasdfasdfasdf"
-			@bcrypt.genSalt = sinon.stub().callsArgWith(1, null, @salt)
+			@bcrypt.genSalt = sinon.stub().callsArgWith(2, null, @salt)
 			@bcrypt.hash = sinon.stub().callsArgWith(2, null, @hashedPassword)
 			@db.users.update = sinon.stub().callsArg(2)