Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-16 18:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4989

Browse Source
This commit is contained in:
barisusakli
2016-08-30 13:25:20 +03:00
parent 0eb3fb222f
commit 80c98e5ecf
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app.js
View File

@@ -117,6 +117,9 @@ function start() {
if (!nconf.get('upload_path')) { if (!nconf.get('upload_path')) {
nconf.set('upload_path', '/public/uploads'); nconf.set('upload_path', '/public/uploads');
} }
if (!nconf.get('sessionKey')) {
nconf.set('sessionKey', 'express.sid');
}
// Parse out the relative_url and other goodies from the configured URL // Parse out the relative_url and other goodies from the configured URL
var urlObject = url.parse(nconf.get('url')); var urlObject = url.parse(nconf.get('url'));
var relativePath = urlObject.pathname !== '/' ? urlObject.pathname : ''; var relativePath = urlObject.pathname !== '/' ? urlObject.pathname : '';

6
src/socket.io/index.js
View File

@@ -133,10 +133,10 @@ var ratelimit = require('../middleware/ratelimit');
function validateSession(socket, callback) { function validateSession(socket, callback) {
var req = socket.request; var req = socket.request;
if (!req.signedCookies || !req.signedCookies['express.sid']) { if (!req.signedCookies || !req.signedCookies[nconf.get('sessionKey')]) {
return callback(new Error('[[error:invalid-session]]')); return callback(new Error('[[error:invalid-session]]'));
} }
db.sessionStore.get(req.signedCookies['express.sid'], function (err, sessionData) { db.sessionStore.get(req.signedCookies[nconf.get('sessionKey')], function (err, sessionData) {
if (err || !sessionData) { if (err || !sessionData) {
return callback(err || new Error('[[error:invalid-session]]')); return callback(err || new Error('[[error:invalid-session]]'));
} }
@@ -157,7 +157,7 @@ var ratelimit = require('../middleware/ratelimit');
cookieParser(request, {}, next); cookieParser(request, {}, next);
}, },
function (next) { function (next) {
db.sessionStore.get(request.signedCookies['express.sid'], function (err, sessionData) { db.sessionStore.get(request.signedCookies[nconf.get('sessionKey')], function (err, sessionData) {
if (err) { if (err) {
return next(err); return next(err);
} }

2
src/webserver.js
View File

@@ -108,7 +108,7 @@ function setupExpressApp(app) {
app.use(session({ app.use(session({
store: db.sessionStore, store: db.sessionStore,
secret: nconf.get('secret'), secret: nconf.get('secret'),
key: 'express.sid', key: nconf.get('sessionKey'),
cookie: setupCookie(), cookie: setupCookie(),
resave: true, resave: true,
saveUninitialized: true saveUninitialized: true