From 0ba6a1f11d5d878326ad3c3eaa785dfddbe17d9f Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Wed, 6 May 2020 12:01:59 +0200 Subject: [PATCH] Merge pull request #2805 from overleaf/jpa-bg-bcrypt-rounds-env [misc] configure the bcrypt rounds via the env variable BCRYPT_ROUNDS GitOrigin-RevId: 68a2f5b491c7162e943edfbb7e05758114d2b3d8 --- services/web/config/settings.defaults.coffee | 2 +- services/web/docker-compose.ci.yml | 1 + services/web/docker-compose.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index b4af2c1208..0d64c03a0c 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -220,7 +220,7 @@ module.exports = settings = # -------- security: sessionSecret: sessionSecret - bcryptRounds: if process.env['NODE_ENV'] == 'test' then 1 else 12 # number of rounds used to hash user passwords (raised to power 2) + bcryptRounds: (parseInt(process.env['BCRYPT_ROUNDS'], 10) || 12) # number of rounds used to hash user passwords (raised to power 2) httpAuthUsers: httpAuthUsers diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml index 9c2f8f70b2..bdbdaa2731 100644 --- a/services/web/docker-compose.ci.yml +++ b/services/web/docker-compose.ci.yml @@ -16,6 +16,7 @@ services: image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER working_dir: /app environment: + BCRYPT_ROUNDS: 1 REDIS_HOST: redis MONGO_URL: "mongodb://mongo/sharelatex" SHARELATEX_ALLOW_PUBLIC_ACCESS: 'true' diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml index fcae072cea..952dacd6cc 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -21,6 +21,7 @@ services: - .:/app working_dir: /app environment: + BCRYPT_ROUNDS: 1 REDIS_HOST: redis MONGO_URL: "mongodb://mongo/sharelatex" SHARELATEX_ALLOW_PUBLIC_ACCESS: 'true'