40n8.me/Prototyper
1
0
Fork 0
mirror of /repos/Prototyper.git synced 2025-12-30 06:31:32 +01:00
Code Issues Releases Wiki Activity

in progress, adding of passport and connect-roles

Browse Source
This commit is contained in:
Aiko Mastboom 2014-12-31 18:09:26 +01:00
parent 2076e471ac
commit 5829d98c14
3 changed files with 89 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -18,7 +18,10 @@
"less": "~1.3.3",
"when": "~2.1.0",
"markdown": "~0.4.0",
"async": "~0.2.8"
"async": "~0.2.8",
"passport": "~0.2.1",
"passport-local": "~1.0.0",
"connect-roles": "~3.1.0"
},
"devDependencies": {
"sockjs": "~0.3.7",

24
public/login.html Normal file
View File

@ -0,0 +1,24 @@
<!DOCTYPE html>
<html>
<head lang="en">
<meta charset="UTF-8">
<title></title>
</head>
<body>
<form action="/login" method="post">
<div>
<label>Username:</label>
<input type="text" name="username"/>
</div>
<div>
<label>Password:</label>
<input type="password" name="password"/>
</div>
<div>
<input type="submit" value="Log In"/>
</div>
</form>
</body>
</html>

64
server.js
View File

@ -3,6 +3,9 @@ process.title = "Prototyper";
var connect = require('connect');
var express = require('express');
var passport = require('passport');
var LocalStrategy = require('passport-local').Strategy;
var ConnectRoles = require('connect-roles');
var MongoClient = require('mongodb').MongoClient;
var addRoutes = require('./lib/routes.js');
var shareServer = require('./lib/share.js');
@ -18,8 +21,8 @@ var config = {
debug: function () {
if (process.env.DEBUG) {
var error = arguments[0] && arguments[0].message ||
arguments[1] && arguments[1].message ||
arguments[2] && arguments[2].message;
arguments[1] && arguments[1].message ||
arguments[2] && arguments[2].message;
var args = Array.prototype.slice.call(arguments);
var log = { level: 'debug', message: args, timestamp: Date.now(), error: error};
console.log(JSON.stringify(log));
@ -98,6 +101,12 @@ var config = {
preview: '/page',
importer: '/importer'
},
users: {
admin: {
password: 'admin',
roles: 'admin'
}
},
statics: {
dev_favicon_path: __dirname + '/public/favicon_dev.ico',
importer_path: __dirname + '/public',
@ -112,6 +121,7 @@ var config = {
config.debug && config.debug('config loaded');
var app = express();
var roles = new ConnectRoles();
express.static.mime.define({
'text/css': ['css', 'less']
@ -127,6 +137,27 @@ if (process.env.DEBUG) {
//noinspection JSUnresolvedFunction
app.use(express.compress());
//noinspection JSUnresolvedFunction
app.use(express.cookieParser());
//noinspection JSUnresolvedFunction
app.use(express.bodyParser());
//noinspection JSUnresolvedFunction
// app.use(express.session({ secret: 'keyboard cat' }));
//noinspection JSUnresolvedFunction
app.use(passport.initialize());
//noinspection JSUnresolvedFunction
//app.use(passport.session());
//noinspection JSUnresolvedFunction
app.use(roles.middleware());
app.post('/login',
passport.authenticate('local', {
session: false,
successRedirect: '/editor.html',
failureRedirect: '/login.html',
failureFlash: false })
);
if (!process.env.NODE_ENV) {
app.get('/favicon.ico', function (req, res) {
res.sendfile(config.statics.dev_favicon_path, null, null);
@ -155,6 +186,33 @@ MongoClient.connect(config.mongo.server, config.mongo.options, function connecti
}
config.debug && config.debug('database connected');
passport.use(new LocalStrategy(
function(username, password, done) {
config.error('check user',username, password);
if (config.users[username]) {
var user = config.users[username];
config.error(user);
if (user.password === password) {
return done(null, user);
}
return done(null, false, {message: 'Incorrect password.'});
} else {
User.findOne({username: username}, function (err, user) {
if (err) {
return done(err);
}
if (!user) {
return done(null, false, {message: 'Incorrect username.'});
}
if (!user.validPassword(password)) {
return done(null, false, {message: 'Incorrect password.'});
}
return done(null, user);
});
}
}
));
var share = shareServer(config, app, db);
var model = share.model;
var server = share.server;
@ -163,7 +221,7 @@ MongoClient.connect(config.mongo.server, config.mongo.options, function connecti
var mongoDataInstance = mongoData(config, db, model);
config.debug && config.debug('mongodata initialized');
config.debug && config.debug('mongoData initialized');
shareHandlers(config, model, mongoDataInstance);