Avoid roster leak, avoid remote resources, LDAP tweaks

clientapp/helpers/avatarHandler.js

@@ -3,6 +3,10 @@
 var crypto = require('crypto');
 
 module.exports.getGravatar = function (jid) {
+    if (!SERVER_CONFIG.gravatarEnabled)
+        return {
+            uri: '/images/user.jpg'
+        };
     var gID = crypto.createHash('md5').update(jid).digest('hex');
     return {
         uri: 'https://gravatar.com/avatar/' + gID + '?s=80&d=mm'

clientapp/models/ldapUsers.js

@@ -24,6 +24,7 @@ module.exports = BaseCollection.extend({
     fetch: function (cb) {
         var self = this;
 
+        if(SERVER_CONFIG.ldapEnabled)
         $.post('/ldap/users', ldapUser.ldapData(), function(users) {
             var toRemove = [];
             for ( var i = 0; i < self.models.length; i++) {
@@ -52,6 +53,7 @@ module.exports = BaseCollection.extend({
     addUser: function (id) {
         var self = this;
 
+        if(SERVER_CONFIG.ldapEnabled)
         $.post('/ldap/users/add', ldapUser.ldapData({newUid: id}), function(result) {
             result = JSON.parse(result);
             if (result) {
@@ -62,6 +64,7 @@ module.exports = BaseCollection.extend({
     deleteUser: function (id) {
         var self = this;
 
+        if(SERVER_CONFIG.ldapEnabled)
         $.post('/ldap/users/delete', ldapUser.ldapData({removeUid: id}), function(result) {
             result = JSON.parse(result);
             if (result) {

clientapp/templates.js

@@ -22,7 +22,7 @@ exports.body = function anonymous(locals) {
 exports.head = function anonymous(locals) {
     var buf = [];
     with (locals || {}) {
-        buf.push('<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0"/><meta name="apple-mobile-web-app-capable" content="yes"/><link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Lato:400,700"/><link rel="stylesheet" type="text/css" href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css"/>');
+        buf.push('<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0"/><meta name="apple-mobile-web-app-capable" content="yes"/><link rel="stylesheet" type="text/css" href="/css/lato.css"/><link rel="stylesheet" type="text/css" href="/css/font-awesome.min.css"/>');
     }
     return buf.join("");
 };

clientapp/templates/head.jade

@@ -1,4 +1,4 @@
 meta(name="viewport", content="width=device-width,initial-scale=1.0,maximum-scale=1.0")
 meta(name="apple-mobile-web-app-capable", content="yes")
-link(rel="stylesheet", type="text/css", href="//fonts.googleapis.com/css?family=Lato:400,700")
-link(rel="stylesheet", type="text/css", href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css")
+link(rel="stylesheet", type="text/css", href="/css/lato.css")
+link(rel="stylesheet", type="text/css", href="/css/font-awesome.min.css")

dev_config.example.json

@@ -10,6 +10,7 @@
     "server": {
         "name": "Kaiwa",
         "domain": "example.com",
+        "gravatarEnabled": false,
         "wss": "wss://example.com:5281/xmpp-websocket/",
         "muc": "chat.example.com",
         "startup": "groupchat/room%40chat.example.com",

dev_config_ldap.example.json

@@ -10,6 +10,7 @@
     "server": {
         "name": "Kaiwa",
         "domain": "example.com",
+        "gravatarEnabled": false,
         "wss": "wss://example.com:5281/xmpp-websocket/",
         "muc": "chat.example.com",
         "startup": "groupchat/room%40chat.example.com",

public/css/lato.css

@@ -0,0 +1,12 @@
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Lato Regular'), local('Lato-Regular'), url('../fonts/latoregular.ttf') format('truetype');
+}
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Lato Bold'), local('Lato-Bold'), url('../fonts/latobold.ttf') format('truetype');
+}

server.js

@@ -8,6 +8,8 @@ var templatizer = require('templatizer');
 var async = require('async');
 var LDAP = require('ldapjs');
 
+config.ldapEnabled = !(!config.ldap || !config.ldap.address || !config.ldap.base);
+
 String.prototype.capitalize = function() {
     return this.charAt(0).toUpperCase() + this.slice(1);
 };
@@ -50,9 +52,11 @@ app.get('/sounds/*', function (req, res) {
     res.redirect("./public" + req.baseUrl);
 });
 
+if (config.ldapEnabled) {
+
 function connectLDAP(req, cb) {
 
-    if (!config.ldap || !config.ldap.address || !config.ldap.base) {
+    if (!config.ldapEnabled) {
         cb(true);
         return;
     }
@@ -298,6 +302,8 @@ app.post('/ldap/users/delete', function (req, res) {
 
 });
 
+}
+
 app.get('/oauth/login', function (req, res) {
     res.redirect('https://apps.andyet.com/oauth/authorize?client_id=' + config.andyetAuth.id + '&response_type=token');
 });