moved bcrpyt rounds to config file

v1.18.x
Baris Usakli 12 years ago
parent 93653e88df
commit d66aef7812

@ -114,12 +114,14 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
ask('... the host port of your Redis instance? (6379)', function(redis_port) { ask('... the host port of your Redis instance? (6379)', function(redis_port) {
ask('... the password of your Redis database? (no password)', function(redis_password) { ask('... the password of your Redis database? (no password)', function(redis_password) {
ask('... your NodeBB secret? (keyboard mash for a bit here)', function(secret) { ask('... your NodeBB secret? (keyboard mash for a bit here)', function(secret) {
ask('... the number of rounds to use for bcrypt.genSalt? (10)', function(bcrypt_rounds) {
if (!base_url) base_url = 'http://localhost'; if (!base_url) base_url = 'http://localhost';
if (!port) port = 4567; if (!port) port = 4567;
if (!use_port) use_port = true; else use_port = (use_port === 'y' ? true : false); if (!use_port) use_port = true; else use_port = (use_port === 'y' ? true : false);
if (!redis_host) redis_host = '127.0.0.1'; if (!redis_host) redis_host = '127.0.0.1';
if (!redis_port) redis_port = 6379; if (!redis_port) redis_port = 6379;
if (!secret) secret = utils.generateUUID(); if (!secret) secret = utils.generateUUID();
if (!bcrypt_rounds) bcrypt_rounds = 10;
var fs = require('fs'), var fs = require('fs'),
path = require('path'), path = require('path'),
@ -129,6 +131,7 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
port: port, port: port,
use_port: use_port, use_port: use_port,
upload_path: '/public/uploads/', upload_path: '/public/uploads/',
bcrypt_rounds: bcrypt_rounds,
redis: { redis: {
host: redis_host, host: redis_host,
port: redis_port, port: redis_port,
@ -163,7 +166,8 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
port: port port: port
}, },
api_url: base_url + (use_port ? ':' + port : '') + '/api/' api_url: base_url + (use_port ? ':' + port : '') + '/api/'
}, null, 4)) }, null, 4));
});
}); });
}); });
}); });

@ -357,10 +357,7 @@ var utils = require('./../public/src/utils.js'),
return; return;
} }
// round count should be variable somewhere instead of hardcoded here bcrypt.genSalt(config.bcrypt_rounds, function(err, salt) {
// if an admin has the resources to up the round count, then making it easy for them to do so
// can't hurt
bcrypt.genSalt(10, function(err, salt) {
bcrypt.hash(password, salt, function(err, hash) { bcrypt.hash(password, salt, function(err, hash) {
callback(hash); callback(hash);
}); });
@ -391,7 +388,7 @@ var utils = require('./../public/src/utils.js'),
} }
User.onNewPostMade = function(uid, tid, pid, timestamp) { User.onNewPostMade = function(uid, tid, pid, timestamp) {
User.addPostIdToUser(uid, pid) User.addPostIdToUser(uid, pid);
User.incrementUserFieldBy(uid, 'postcount', 1); User.incrementUserFieldBy(uid, 'postcount', 1);
User.setUserField(uid, 'lastposttime', timestamp); User.setUserField(uid, 'lastposttime', timestamp);

Loading…
Cancel
Save