jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ldap: Make alias return fully qualified alias

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-01-19 12:10:24 -08:00
parent 2015e7bce9
commit af25485fa0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ldap.js
+3 -2
View File
@@ -305,13 +305,14 @@ function mailAliasSearch(req, res, next) {
// https://wiki.debian.org/LDAP/MigrationTools/Examples
// https://docs.oracle.com/cd/E19455-01/806-5580/6jej518pp/index.html
// member is fully qualified - https://docs.oracle.com/cd/E19957-01/816-6082-10/chap4.doc.html#43314
var obj = {
dn: req.dn.toString(),
attributes: {
objectclass: ['nisMailAlias'],
objectcategory: 'nisMailAlias',
cn: alias.name,
rfc822MailMember: alias.aliasTarget
cn: `${alias.name}@${alias.domain}`,
rfc822MailMember: `${alias.aliasTarget}@${alias.domain}`
}
};
src/test/ldap-test.js
+4 -4
View File
@@ -765,8 +765,8 @@ describe('Ldap', function () {
ldapSearch('cn=' + USER_0_ALIAS + '@example.com,ou=mailaliases,dc=cloudron', 'objectclass=nismailalias', function (error, entries) {
if (error) return done(error);
expect(entries.length).to.equal(1);
expect(entries[0].cn).to.equal('asterix');
expect(entries[0].rfc822MailMember).to.equal(USER_0.username.toLowerCase());
expect(entries[0].cn).to.equal('asterix@example.com');
expect(entries[0].rfc822MailMember).to.equal(USER_0.username.toLowerCase() + '@example.com');
done();
});
});
@@ -791,8 +791,8 @@ describe('Ldap', function () {
ldapSearch('cn=' + USER_0_ALIAS + '@example.com,ou=mailaliases,dc=cloudron', 'objectclass=nismailalias', function (error, entries) {
if (error) return done(error);
expect(entries.length).to.equal(1);
expect(entries[0].cn).to.equal('asterix');
expect(entries[0].rfc822MailMember).to.equal(USER_0.username.toLowerCase());
expect(entries[0].cn).to.equal('asterix@example.com');
expect(entries[0].rfc822MailMember).to.equal(USER_0.username.toLowerCase() + '@example.com');
done();
});
});