3 files changed, 64 insertions, 16 deletions

diff --git a/cli/actions.js b/cli/actions.js
index b35b8da..2bc0d7d 100644
--- a/cli/actions.js
+++ b/cli/actions.js
@@ -6,7 +6,8 @@ exports.get = get;
 exports.del = del;
 
 var superagent = require('superagent'),
-    config = require('./config'),
+    config = require('./config.js'),
+    readlineSync = require('readline-sync'),
     async = require('async'),
     fs = require('fs'),
     path = require('path');
@@ -15,12 +16,16 @@ require('colors');
 
 var API = '/api/files/';
 
+var gQuery = {};
+
 function checkConfig() {
-    if (!config.server()) {
+    if (!config.server() || !config.username() || !config.password()) {
         console.log('You have run "login" first');
         process.exit(1);
     }
 
+    gQuery = { username: config.username(), password: config.password() };
+
     console.log('Using server %s', config.server().yellow);
 }
 
@@ -43,11 +48,40 @@ function collectFiles(filesOrFolders) {
     return tmp;
 }
 
+function checkResponse(error, result) {
+    if (error && error.status === 401) {
+        console.log('Login failed');
+        process.exit(1);
+    } else if (error) {
+        console.log('Error', result ? result.text : error);
+        process.exit(1);
+    }
+}
+
 function login(server) {
     if (server[server.length-1] === '/') server = server.slice(0, -1);
 
     console.log('Using server', server);
-    config.set('server', server);
+
+    var username = readlineSync.question('Username: ', { hideEchoBack: false });
+    var password = readlineSync.question('Password: ', { hideEchoBack: true });
+
+    superagent.get(server + API + '/').query({ username: username, password: password }).end(function (error, result) {
+        console.log(result.status);
+
+        if (result.status === 401) {
+            console.log('Login failed.');
+            process.exit(1);
+        }
+
+        config.set('server', server);
+        config.set('username', username);
+
+        // TODO this is clearly bad and needs fixing
+        config.set('password', password);
+
+        gQuery = { username: username, password: password };
+    });
 }
 
 function put(filePath, otherFilePaths, options) {
@@ -60,7 +94,7 @@ function put(filePath, otherFilePaths, options) {
 
         console.log('Uploading file %s -> %s', relativeFilePath.cyan, ((options.destination ? options.destination : '') + '/' + relativeFilePath).cyan);
 
-        superagent.put(config.server() + API + relativeFilePath).attach('file', file).end(callback);
+        superagent.put(config.server() + API + relativeFilePath).query(gQuery).attach('file', file).end(callback);
     }, function (error) {
         if (error) {
             console.log('Failed to put file.', error);
@@ -74,8 +108,9 @@ function put(filePath, otherFilePaths, options) {
 function get(filePath) {
     checkConfig();
 
-    var relativeFilePath = path.resolve(filePath).slice(process.cwd().length + 1);
-    superagent.get(config.server() + API + relativeFilePath).end(function (error, result) {
+    superagent.get(config.server() + API + filePath).query(gQuery).end(function (error, result) {
+        if (error && error.status === 401) return console.log('Login failed');
+        if (error && error.status === 404) return console.log('No such file or directory');
         if (error) return console.log('Failed', result ? result.body : error);
 
         if (result.body && result.body.entries) {
@@ -93,8 +128,9 @@ function del(filePath) {
     checkConfig();
 
     var relativeFilePath = path.resolve(filePath).slice(process.cwd().length + 1);
-    superagent.del(config.server() + API + relativeFilePath).end(function (error, result) {
-        if (error.status === 404) return console.log('No such file or directory');
+    superagent.del(config.server() + API + relativeFilePath).query(gQuery).end(function (error, result) {
+        if (error && error.status === 401) return console.log('Login failed');
+        if (error && error.status === 404) return console.log('No such file or directory');
         if (error) return console.log('Failed', result ? result.body : error);
         console.log('Success', result.body);
     });
diff --git a/cli/config.js b/cli/config.js
index a3708b8..68eae5f 100644
--- a/cli/config.js
+++ b/cli/config.js
@@ -15,7 +15,9 @@ exports = module.exports = {
     has: has,
 
     // convenience
-    server: function () { return get('server'); }
+    server: function () { return get('server'); },
+    username: function () { return get('username'); },
+    password: function () { return get('password'); }
 };
 
 var HOME = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
diff --git a/src/auth.js b/src/auth.js
index 3d2acce..83d0426 100644
--- a/src/auth.js
+++ b/src/auth.js
@@ -3,20 +3,30 @@
 var passport = require('passport'),
     LdapStrategy = require('passport-ldapjs').Strategy;
 
+passport.serializeUser(function (user, done) {
+    console.log('serializeUser', user);
+    done(null, user.id);
+});
+
+passport.deserializeUser(function (id, done) {
+    console.log('deserializeUser', id);
+    done(null, { id: id });
+});
+
 var LDAP_URL = process.env.LDAP_URL;
 var LDAP_USERS_BASE_DN = process.env.LDAP_USERS_BASE_DN;
 
 if (LDAP_URL && LDAP_USERS_BASE_DN) {
     console.log('Enable ldap auth');
 
-    exports.ldap = passport.authenticate('ldap', {
-        successReturnToOrRedirect: '/',
-        failureRedirect: '/login',
-        failureFlash: true
-    });
+    exports.ldap = passport.authenticate('ldap');
 } else {
     exports.ldap = function (req, res, next) {
-        console.log('ldap auth disabled');
+        console.log('Disable ldap auth, use developer credentials!');
+
+        if (req.query.username !== 'username') return res.send(401);
+        if (req.query.password !== 'password') return res.send(401);
+
         next();
     };
 }
@@ -31,7 +41,7 @@ var opts = {
         attributes: ['displayname', 'username', 'mail', 'uid'],
         scope: 'sub'
     },
-    uidTag: 'uid',
+    uidTag: 'cn',
     usernameField: 'username',
     passwordField: 'password',
 };