Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 10:45:47 +00:00
Code Issues Projects Releases Wiki Activity

feature(auth) express -> auth

Browse source
This commit is contained in:
coderaiser 2014-09-19 07:09:47 -04:00
parent c745add934
commit 07ea970eed
3 changed files with 73 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/cloudcmd.js
View file

@ -7,6 +7,7 @@
Util = require(DIR + 'util'),
auth = require(DIR_SERVER + 'auth'),
config = require(DIR_SERVER + 'config'),
minify = require(DIR_SERVER + 'minify'),
rest = require(DIR_SERVER + 'rest'),
@ -74,6 +75,7 @@
}),
funcs = [
auth(),
rest,
route,

69
lib/server/auth.js Normal file
View file

@ -0,0 +1,69 @@
(function() {
'use strict';
var crypto = require('crypto'),
tryRequire = require('./tryRequire'),
oldPass,
oldName;
module.exports = function(config) {
var type, httpAuth,
middle = function(req, res, next) {
next();
};
if (!config)
config = {
auth: false
};
if (config.auth) {
httpAuth = tryRequire('http-auth');
if (httpAuth) {
type = init(httpAuth, config);
middle = httpAuth.connect(type);
}
}
return middle;
};
function init(httpAuth, config) {
var auth = httpAuth.basic({
realm: 'Cloud Commander'
}, function (username, password, callback) { // Custom authentication method.
var hash,
name = config.username,
passwd = config.password,
equal = username === name,
sha = crypto.createHash('sha1');
if (!oldPass)
oldPass = passwd;
if (!oldName)
oldName = name;
if (!equal)
username === oldName;
sha.update(password);
hash = sha.digest('hex');
equal = passwd === hash && equal;
if (!equal) {
sha = crypto.createHash('sha1');
sha.update(oldPass);
hash = sha.digest('hex');
equal = passwd === hash && equal;
}
callback(equal);
});
return auth;
}
})();

54
lib/server/express.js
View file

@ -5,36 +5,21 @@
DIR_LIB = DIR + 'lib/',
Util = require(DIR_LIB + 'util'),
crypto = require('crypto'),
tryRequire = require('./tryRequire'),
express = tryRequire('express'),
httpAuth = tryRequire('http-auth'),
logger = tryRequire('morgan'),
basic,
oldPass,
oldName,
app = express && express();
exports.getApp = function(middleware, config) {
exports.getApp = function(middleware) {
var isArray = Util.isArray(middleware);
if (!config)
config = {
auth: false
};
if (app) {
if (logger)
app.use(logger('dev'));
if (config.auth && httpAuth) {
initAuth(config);
app.use(httpAuth.connect(basic));
}
if (isArray)
middleware.forEach(function(middle) {
app.use(middle);
@ -45,39 +30,4 @@
return app;
};
function initAuth(config) {
basic = httpAuth.basic({
realm: 'Cloud Commander'
}, function (username, password, callback) { // Custom authentication method.
var hash,
name = config.username,
passwd = config.password,
equal = username === name,
sha = crypto.createHash('sha1');
if (!oldPass)
oldPass = passwd;
if (!oldName)
oldName = name;
if (!equal)
username === oldName;
sha.update(password);
hash = sha.digest('hex');
equal = passwd === hash && equal;
if (!equal) {
sha = crypto.createHash('sha1');
sha.update(oldPass);
hash = sha.digest('hex');
equal = passwd === hash && equal;
}
callback(equal);
});
}
})();