X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Fauth.js;h=d575d601d1c91c0a84ed3202e37cb30b87c6c66c;hb=HEAD;hp=25326889a78affd4173687869ff0765d4bd4582e;hpb=34adfa8518ba0b57d1837db1847a13215f31a83c;p=perso%2FImmae%2FProjets%2FNodejs%2FSurfer.git

diff --git a/src/auth.js b/src/auth.js
index 2532688..d575d60 100644
--- a/src/auth.js
+++ b/src/auth.js
@@ -15,13 +15,17 @@ const LDAP_USERS_BASE_DN = process.env.CLOUDRON_LDAP_USERS_BASE_DN;
 const LOCAL_AUTH_FILE = path.resolve(process.env.LOCAL_AUTH_FILE || './.users.json');
 const TOKENSTORE_FILE = path.resolve(process.env.TOKENSTORE_FILE || './.tokens.json');
 const AUTH_METHOD = (LDAP_URL && LDAP_USERS_BASE_DN) ? 'ldap' : 'local';
+const LOGIN_TOKEN_PREFIX = 'login-';
+const API_TOKEN_PREFIX = 'api-';
 
 if (AUTH_METHOD === 'ldap') {
-    console.log('Use ldap auth');
+    console.log('Using ldap auth');
 } else {
-    console.log(`Use local auth file ${LOCAL_AUTH_FILE}`);
+    console.log(`Using local auth file at: ${LOCAL_AUTH_FILE}`);
 }
 
+var gConfig = {};
+
 var tokenStore = {
     data: {},
     save: function () {
@@ -34,8 +38,11 @@ var tokenStore = {
     get: function (token, callback) {
         callback(tokenStore.data[token] ? null : 'not found', tokenStore.data[token]);
     },
-    set: function (token, data, callback) {
-        tokenStore.data[token] = data;
+    getApiTokens: function (callback) {
+        callback(null, Object.keys(tokenStore.data).filter(function (t) { return t.indexOf(API_TOKEN_PREFIX) === 0; }))
+    },
+    set: function (token, user, callback) {
+        tokenStore.data[token] = user;
         tokenStore.save();
         callback(null);
     },
@@ -48,7 +55,7 @@ var tokenStore = {
 
 // load token store data if any
 try {
-    console.log(`Using tokenstore file: ${TOKENSTORE_FILE}`);
+    console.log(`Using tokenstore file at: ${TOKENSTORE_FILE}`);
     tokenStore.data = JSON.parse(fs.readFileSync(TOKENSTORE_FILE, 'utf-8'));
 } catch (e) {
     // start with empty token store
@@ -64,8 +71,8 @@ function verifyUser(username, password, callback) {
         ldapClient.bind(process.env.CLOUDRON_LDAP_BIND_DN, process.env.CLOUDRON_LDAP_BIND_PASSWORD, function (error) {
             if (error) return callback(error);
 
-            var filter = `(|(uid=${username})(mail=${username})(username=${username})(sAMAccountName=${username}))`;
-            ldapClient.search(process.env.CLOUDRON_LDAP_USERS_BASE_DN, { filter: filter }, function (error, result) {
+            var filter = process.env.CLOUDRON_LDAP_FILTER.replace(/\{username\}/g, username);
+            ldapClient.search(process.env.CLOUDRON_LDAP_USERS_BASE_DN, { filter: filter, scope: "sub" }, function (error, result) {
                 if (error) return callback(error);
 
                 var items = [];
@@ -98,11 +105,15 @@ function verifyUser(username, password, callback) {
     }
 }
 
+exports.init = function (config) {
+    gConfig = config;
+};
+
 exports.login = function (req, res, next) {
     verifyUser(req.body.username, req.body.password, function (error, user) {
         if (error) return next(new HttpError(401, 'Invalid credentials'));
 
-        var accessToken = uuid();
+        var accessToken = LOGIN_TOKEN_PREFIX + uuid();
 
         tokenStore.set(accessToken, user, function (error) {
             if (error) return next(new HttpError(500, error));
@@ -125,6 +136,11 @@ exports.verify = function (req, res, next) {
 
 };
 
+exports.verifyIfNeeded = function (req, res, next) {
+    if (!gConfig.folderListingEnabled) return exports.verify(req, res, next);
+    next();
+};
+
 exports.logout = function (req, res, next) {
     var accessToken = req.query.access_token || req.body.accessToken;
 
@@ -139,6 +155,32 @@ exports.getProfile = function (req, res, next) {
     next(new HttpSuccess(200, { username: req.user.username }));
 };
 
+exports.getTokens = function (req, res, next) {
+    tokenStore.getApiTokens(function (error, result) {
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(200, { accessTokens: result }));
+    });
+};
+
+exports.createToken = function (req, res, next) {
+    var accessToken = API_TOKEN_PREFIX + uuid();
+
+    tokenStore.set(accessToken, req.user, function (error) {
+        if (error) return next(new HttpError(500, error));
+
+        next(new HttpSuccess(201, { accessToken: accessToken }));
+    });
+};
+
+exports.delToken = function (req, res, next) {
+    tokenStore.del(req.params.token, function (error) {
+        if (error) console.error(error);
+
+        next(new HttpSuccess(200, {}));
+    });
+};
+
 // webdav usermanager
 exports.WebdavUserManager = WebdavUserManager;