Skip to content

Commit

Permalink
Merge pull request #16 from sscpac/bugfix/chat-locker-14
Browse files Browse the repository at this point in the history 
Fix #14.  user search not returning users.
  • Loading branch information
@rwakida
rwakida committed Jul 29, 2015
2 parents 7b5e7c3 + ae3df35 commit 8f87101
Showing 1 changed file with 65 additions and 108 deletions.
173 changes: 65 additions & 108 deletions server/lib/directoryService.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,67 @@ Future = Npm.require('fibers/future');
// },
// };
this.options = {
userLDAPMap : {
"profile" : {
"phone" : "phone",
"rank" : "rank",
"location" : "location",
"givenName" : "first_name",
"sn" : "last_name",
"access" : [["access"]]
},
"uid" : ["_id", "username"],
"emails" : [{
"mail" : "address"
}]
// Convert LDAP entry to User object
// { dn: 'cn=wcleaver,ou=Users,dc=jedis,dc=spawar,dc=navy,dc=mil',
// controls: [],
// mail: '[email protected]',
// givenName: 'Wallace',
// rank: '13',
// phone: '202-555-1212',
// location: 'Mayfield',
// sn: 'Cleaver',
// cn: [ 'Wally Cleaver', 'wcleaver' ],
// access: '300',
// objectClass:
// [ 'top',
// 'inetOrgPerson',
// 'person',
// 'organizationalPerson',
// 'jedis-user' ],
// userPassword: '{SSHA}0aGyWnPVXr7SgZvgJDoeyZQzwflHdUto',
// uid: 'wcleaver'
// }
// to
// { profile:
// { phone: '202-555-1212',
// rank: '8',
// location: 'Mayfield',
// first_name: 'Theodore',
// last_name: 'Cleaver',
// access: '300'
// },
// _id: 'bcleaver',
// username: 'bcleaver',
// emails: [{address:'bcleaver@jedis.mil'}]
// }
//
userLDAPMap : function( source ) {
return {
_id : source.uid,
username : source.uid,
name : source.givenName + ' ' + source.sn,
emails : [
{
address : source.mail
}
],
profile : {
phone : source.phone,
rank : source.rank,
location : source.location,
first_name : source.givenName,
last_name : source.sn,
access : _.isArray(source.access) ? source.access : [source.access],
}
}
},
accessPermissionLDAPMap : {
"id":"_id",
"trigraph":"trigraph",
"description":"label",
"type":"type"
accessPermissionLDAPMap : function(source) {
return {
_id : source.id,
trigraph : source.trigraph,
label: source.description,
type : source.type
};
}
};

Expand Down Expand Up @@ -123,7 +165,7 @@ DirectoryService.prototype.AuthenticateUser = function(authArgs) {
var retObject = { user: null };
self.userClient.search(bindDn, {}, function(err, res) {
res.on('searchEntry', function(entry) {
retObject.user = self._convert(entry.object, self.options.userLDAPMap);
retObject.user = self.options.userLDAPMap(entry.object);
});
res.on('end', function() {
ldapAsyncFut.return(retObject);
Expand Down Expand Up @@ -153,43 +195,10 @@ DirectoryService.prototype.getUsers = function( ) {
console.error(err);
throw new Meteor.Error(err);
} else {
// Convert array of LDAP entry to User objects
// { dn: 'cn=wcleaver,ou=Users,dc=jedis,dc=spawar,dc=navy,dc=mil',
// controls: [],
// mail: '[email protected]',
// givenName: 'Wallace',
// rank: '13',
// phone: '202-555-1212',
// location: 'Mayfield',
// sn: 'Cleaver',
// cn: [ 'Wally Cleaver', 'wcleaver' ],
// access: '300',
// objectClass:
// [ 'top',
// 'inetOrgPerson',
// 'person',
// 'organizationalPerson',
// 'jedis-user' ],
// userPassword: '{SSHA}0aGyWnPVXr7SgZvgJDoeyZQzwflHdUto',
// uid: 'wcleaver'
// }
// to
// { profile:
// { phone: '202-555-1212',
// rank: '8',
// location: 'Mayfield',
// first_name: 'Theodore',
// last_name: 'Cleaver',
// access: '300'
// },
// _id: 'bcleaver',
// username: 'bcleaver',
// emails: [{address:'bcleaver@jedis.mil'}]
// }
//

users = result.map( function(entry) {
// convert ldap entry to AccessPermission
user = self._convert( entry, self.options.userLDAPMap);
// convert ldap entry to User
user = self.options.userLDAPMap(entry);
return user;

});
Expand Down Expand Up @@ -228,67 +237,15 @@ DirectoryService.prototype.getAccessPermissions = function( ) {
// { _id:'206', trigraph:'PK', label:'Private key', type:'SCI'}
permissions = result.map( function(entry) {
// convert ldap entry to AccessPermission
return self._convert( entry, self.options.accessPermissionLDAPMap);
return self.options.accessPermissionLDAPMap(entry);
});
ldapAsyncFut.return( permissions );
}
})

return ldapAsyncFut.wait();
}
/**
* Copy properties defined in keyMap from obj to new object.
* @param {[object]} obj the object whose properties will be copied
* @param {[object]} keyMap defines mapping between obj key and returned object's key
* @return {[object]} resulting object that contains properties specified in the keyMap
* and defined in obj
*/
DirectoryService.prototype._convert = function(obj, keyMap) {
var result = {},
resultKey,
objKey,
//value,
self=this;

for( objKey in keyMap ) {
resultKey = keyMap[objKey];
// test for array first because an array is an object
if( _.isArray(resultKey) ) {
// resulting object either:
// 1. multiple properties mapped to the same LDAP value
// 2. property mapped to an array
// 3. property containing an object with its own properties
resultKey.forEach(function( key ) {
var value,
array;
if( _.isArray(key) ) {
value = obj[objKey];
result[key] = _.isArray(value) ? value : [value];

} else if(_.isObject(key)) {
array = [];
result[objKey] = array;
for( objKey in key ) {
value = self._convert( obj, key);
array.push( value );
}
} else {
value = obj[objKey];
result[key] = value;
}
});

} else if( _.isObject(resultKey )) {
// resulting object property is another object
result[objKey] = self._convert( obj, resultKey);

} else {
// map resulting object proeprty to LDAP value
result[resultKey] = obj[objKey];
}
}
return result;
}
/**
* Ensure that `this._adminClient` is bound.
*/
Expand Down

0 comments on commit 8f87101

Please sign in to comment.