Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests for #5600

Browse Source
This commit is contained in:
barisusakli
2017-04-16 14:46:02 -04:00
parent 185b6e5c8e
commit 65a65b19c0
5 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/database/mongo.js
View File

@@ -116,9 +116,7 @@
var meta = require('../meta'); var meta = require('../meta');
var sessionStore; var sessionStore;
var ttlDays = 60 * 60 * 24 * (parseInt(meta.config.loginDays, 10) || 0); var ttl = meta.getSessionTTLSeconds();
var ttlSeconds = (parseInt(meta.config.loginSeconds, 10) || 0);
var ttl = ttlSeconds || ttlDays || 1209600; // Default to 14 days in seconds
if (nconf.get('redis')) { if (nconf.get('redis')) {
sessionStore = require('connect-redis')(session); sessionStore = require('connect-redis')(session);

6
src/database/redis.js
View File

@@ -60,13 +60,9 @@
var meta = require('../meta'); var meta = require('../meta');
var sessionStore = require('connect-redis')(session); var sessionStore = require('connect-redis')(session);
var ttlDays = 60 * 60 * 24 * (parseInt(meta.config.loginDays, 10) || 0);
var ttlSeconds = (parseInt(meta.config.loginSeconds, 10) || 0);
var ttl = ttlSeconds || ttlDays || 1209600; // Default to 14 days
module.sessionStore = new sessionStore({ module.sessionStore = new sessionStore({
client: module.client, client: module.client,
ttl: ttl, ttl: meta.getSessionTTLSeconds(),
}); });
if (typeof callback === 'function') { if (typeof callback === 'function') {

7
src/meta.js
View File

@@ -51,6 +51,13 @@ var utils = require('./utils');
restart(); restart();
}; };
Meta.getSessionTTLSeconds = function () {
var ttlDays = 60 * 60 * 24 * (parseInt(Meta.config.loginDays, 10) || 0);
var ttlSeconds = (parseInt(Meta.config.loginSeconds, 10) || 0);
var ttl = ttlSeconds || ttlDays || 1209600; // Default to 14 days
return ttl;
};
if (nconf.get('isPrimary') === 'true') { if (nconf.get('isPrimary') === 'true') {
pubsub.on('meta:restart', function (data) { pubsub.on('meta:restart', function (data) {
if (data.hostname !== os.hostname()) { if (data.hostname !== os.hostname()) {

4
src/webserver.js
View File

@@ -166,9 +166,7 @@ function setupFavicon(app) {
} }
function setupCookie() { function setupCookie() {
var ttlDays = 1000 * 60 * 60 * 24 * (parseInt(meta.config.loginDays, 10) || 0); var ttl = meta.getSessionTTLSeconds() * 1000;
var ttlSeconds = 1000 * (parseInt(meta.config.loginSeconds, 10) || 0);
var ttl = ttlSeconds || ttlDays || 1209600000; // Default to 14 days
var cookie = { var cookie = {
maxAge: ttl, maxAge: ttl,

20
test/meta.js
View File

@@ -192,6 +192,26 @@ describe('meta', function () {
}); });
describe('session TTL', function () {
it('should return 14 days in seconds', function (done) {
assert(meta.getSessionTTLSeconds(), 1209600);
done();
});
it('should return 7 days in seconds', function (done) {
meta.config.loginDays = 7;
assert(meta.getSessionTTLSeconds(), 604800);
done();
});
it('should return 2 days in seconds', function (done) {
meta.config.loginSeconds = 172800;
assert(meta.getSessionTTLSeconds(), 172800);
done();
});
});
after(function (done) { after(function (done) {
db.emptydb(done); db.emptydb(done);
}); });