Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-02 02:21:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

moved bcrpyt rounds to config file

Browse Source
This commit is contained in:
Baris Usakli
2013-07-10 11:51:15 -04:00
parent 93653e88df
commit d66aef7812
2 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
app.js
View File

@@ -114,56 +114,60 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
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('... your NodeBB secret? (keyboard mash for a bit here)', function(secret) {
if (!base_url) base_url = 'http://localhost';
if (!port) port = 4567;
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_port) redis_port = 6379;
if (!secret) secret = utils.generateUUID();
ask('... the number of rounds to use for bcrypt.genSalt? (10)', function(bcrypt_rounds) {
if (!base_url) base_url = 'http://localhost';
if (!port) port = 4567;
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_port) redis_port = 6379;
if (!secret) secret = utils.generateUUID();
if (!bcrypt_rounds) bcrypt_rounds = 10;
var fs = require('fs'),
path = require('path'),
config = {
secret: secret,
base_url: base_url,
port: port,
use_port: use_port,
upload_path: '/public/uploads/',
redis: {
host: redis_host,
port: redis_port,
password: redis_password
var fs = require('fs'),
path = require('path'),
config = {
secret: secret,
base_url: base_url,
port: port,
use_port: use_port,
upload_path: '/public/uploads/',
bcrypt_rounds: bcrypt_rounds,
redis: {
host: redis_host,
port: redis_port,
password: redis_password
}
}
}
// Server-side config
fs.writeFile(path.join(__dirname, 'config.json'), JSON.stringify(config, null, 4), function(err) {
if (err) throw err;
else {
process.stdout.write(
"\n\nConfiguration Saved OK\n\n"
);
if (!args.setup) {
// Server-side config
fs.writeFile(path.join(__dirname, 'config.json'), JSON.stringify(config, null, 4), function(err) {
if (err) throw err;
else {
process.stdout.write(
"Please start NodeBB again and register a new user at " +
base_url + (use_port ? ':' + port : '') + "/register. This user will automatically become an administrator.\n\n"
"\n\nConfiguration Saved OK\n\n"
);
if (!args.setup) {
process.stdout.write(
"Please start NodeBB again and register a new user at " +
base_url + (use_port ? ':' + port : '') + "/register. This user will automatically become an administrator.\n\n"
);
}
process.stdout.write(
"If at any time you'd like to run this setup again, run the app with the \"--setup\" flag\n\n"
);
process.exit();
}
process.stdout.write(
"If at any time you'd like to run this setup again, run the app with the \"--setup\" flag\n\n"
);
process.exit();
}
});
});
// Client-side config
fs.writeFile(path.join(__dirname, 'public', 'config.json'), JSON.stringify({
socket: {
address: base_url,
port: port
},
api_url: base_url + (use_port ? ':' + port : '') + '/api/'
}, null, 4))
// Client-side config
fs.writeFile(path.join(__dirname, 'public', 'config.json'), JSON.stringify({
socket: {
address: base_url,
port: port
},
api_url: base_url + (use_port ? ':' + port : '') + '/api/'
}, null, 4));
});
});
});
});

7
src/user.js
View File

@@ -357,10 +357,7 @@ var utils = require('./../public/src/utils.js'),
return;
}
// round count should be variable somewhere instead of hardcoded here
// 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.genSalt(config.bcrypt_rounds, function(err, salt) {
bcrypt.hash(password, salt, function(err, hash) {
callback(hash);
});
@@ -391,7 +388,7 @@ var utils = require('./../public/src/utils.js'),
}
User.onNewPostMade = function(uid, tid, pid, timestamp) {
User.addPostIdToUser(uid, pid)
User.addPostIdToUser(uid, pid);
User.incrementUserFieldBy(uid, 'postcount', 1);
User.setUserField(uid, 'lastposttime', timestamp);