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

fixing issue with auth (removed session saving stuff by mistake)

Browse Source
This commit is contained in:
Julian Lam
2013-04-25 11:04:08 -04:00
parent 3eb4f0e1a2
commit eac3785b29
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/topics.js
View File

@@ -26,7 +26,7 @@ var RDB = require('./redis.js'),
Topics.get(function(data) { Topics.get(function(data) {
console.log({'topics': data}); // console.log({'topics': data});
forum_body = forum_body.parse({'topics': data}); forum_body = forum_body.parse({'topics': data});
callback(forum_body); callback(forum_body);
}, start, end); }, start, end);

8
src/user.js
View File

@@ -21,7 +21,13 @@ var config = require('../config.js'),
return global.socket.emit('user.login', {'status': 0, 'message': 'Incorrect username / password combination.'}); return global.socket.emit('user.login', {'status': 0, 'message': 'Incorrect username / password combination.'});
} else { } else {
// Start, replace, or extend a session // Start, replace, or extend a session
global.uid = uid; RDB.get('session:' + user.sessionID, function(session) {
if (session !== user.sessionID) {
RDB.set('session:' + user.sessionID, uid, 60*60*24*14); // Login valid for two weeks
} else {
RDB.expire('session:' + user.sessionID, 60*60*24*14); // Defer expiration to two weeks from now
}
});
return global.socket.emit('user.login', {'status': 1, 'message': 'Logged in!'}); return global.socket.emit('user.login', {'status': 1, 'message': 'Logged in!'});
} }

33
src/webserver.js
View File

@@ -17,17 +17,28 @@ var express = require('express'),
function hasAuth(req, res, next) { function hasAuth(req, res, next) {
// Include this middleware if the endpoint is publically accessible, but has elements that logged in users can see // Include this middleware if the endpoint is publically accessible, but has elements that logged in users can see
global.modules.user.get_uid_by_session(req.sessionID, function(uid) {
if (uid) {
global.uid = uid;
console.log('info: [Auth] User is logged in as uid: ' + uid);
} else {
console.log('info: [Auth] User is not logged in');
}
next();
});
} }
function requireAuth(req, res, next) { function requireAuth(req, res, next) {
// Include this middleware if the endpoint requires a logged in user to view // Include this middleware if the endpoint requires a logged in user to view
console.log('REQUIRE: ', global.uid, req.sessionID); hasAuth(req, res, function() {
if (!global.uid) { if (!global.uid) {
res.redirect('/403'); res.redirect('/403');
} else { } else {
next(); console.log('info: [Auth] User is logged in as uid: ' + uid);
} next();
}
});
} }
// Middlewares // Middlewares
@@ -35,18 +46,12 @@ var express = require('express'),
app.use(express.bodyParser()); // Puts POST vars in request.body app.use(express.bodyParser()); // Puts POST vars in request.body
app.use(express.cookieParser()); // If you want to parse cookies (res.cookies) app.use(express.cookieParser()); // If you want to parse cookies (res.cookies)
app.use(express.session({secret: 'nodebb', key: 'express.sid'})); app.use(express.session({secret: 'nodebb', key: 'express.sid'}));
app.use(function(req, res, next) {
global.modules.user.get_uid_by_session(req.sessionID, function(uid) {
if (uid) global.uid = uid;
next();
});
});
// Dunno wtf this does // Dunno wtf this does
// app.use(express.logger({ format: '\x1b[1m:method\x1b[0m \x1b[33m:url\x1b[0m :response-time ms' })); // app.use(express.logger({ format: '\x1b[1m:method\x1b[0m \x1b[33m:url\x1b[0m :response-time ms' }));
// Useful if you want to use app.put and app.delete (instead of app.post all the time) // Useful if you want to use app.put and app.delete (instead of app.post all the time)
// app.use(express.methodOverride()); // app.use(express.methodOverride());
app.get('/', function(req, res) { app.get('/', hasAuth, function(req, res) {
global.modules.topics.generate_forum_body(function(forum_body) { global.modules.topics.generate_forum_body(function(forum_body) {
res.send(templates['header'] + forum_body + templates['footer']); res.send(templates['header'] + forum_body + templates['footer']);
}) })
@@ -54,7 +59,7 @@ var express = require('express'),
//res.send(templates['header'] + templates['home'] + templates['footer']); //res.send(templates['header'] + templates['home'] + templates['footer']);
}); });
app.get('/login', function(req, res) { app.get('/login', hasAuth, function(req, res) {
res.send(templates['header'] + templates['login'] + templates['footer']); res.send(templates['header'] + templates['login'] + templates['footer']);
}); });