lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merged in latest from master

Browse source
This commit is contained in:
Josh Harvey 2014-08-07 18:50:01 -04:00
commit 142dbe7f8b
6 changed files with 85 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

37
lib/app.js
View file

@ -8,7 +8,7 @@ var routes = require('./routes');
var Trader = require('./trader');
var PostgresqlInterface = require('./postgresql_interface');
var logger = require('./logger');
module.exports = function (options) {
var app = express();
var connectionString;
@ -47,10 +47,9 @@ module.exports = function (options) {
app.use(express.bodyParser());
if (!options.https) {
server = http.createServer(app);
}
else {
var authMiddleware;
if (options.https) {
var serverOptions = {
key: options.https.key,
cert: options.https.cert,
@ -61,30 +60,28 @@ module.exports = function (options) {
};
server = https.createServer(serverOptions, app);
}
var authMiddleware = function (req, res, next) {
req.device = {};
return next();
};
if (options.https) {
authMiddleware = function(req, res, next) {
var fingerprint = req.connection.getPeerCertificate().fingerprint;
config.isAuthorized(fingerprint, function (err, device) {
if (err) {
config.isAuthorized(routes.getFingerprint(req), function (err, device) {
if (err) {
res.json({err: 'Internal Server Error'});
return next(err);
return next(err);
}
if (!device) {
res.statusCode = 404;
res.json({err: 'Not Found'});
return next(new Error('Device is unpaired'));
res.json(404, {err: 'Not Found'});
return next(new Error('Device is unpaired'));
}
next();
});
};
} else {
server = http.createServer(app);
authMiddleware = function (req, res, next) {
req.device = {};
return next();
};
}
routes.init({