yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 10:39:25 +02:00
Code Issues Releases Wiki Activity

support search filter

Browse source
This commit is contained in:
Takashi Hasegawa 2017-06-14 12:51:31 +09:00
parent 0b071a1f5c
commit 9e8a8e4b97
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/cli/auth-ldap/index.js
View file

@ -44,6 +44,11 @@ module.exports.builder = function(yargs) {
, type: 'string'
, default: process.env.LDAP_SEARCH_SCOPE || 'sub'
})
.option('ldap-search-filter', {
describe: 'LDAP search filter.'
, type: 'string'
, default: process.env.LDAP_SEARCH_FILTER
})
.option('ldap-timeout', {
alias: 't'
, describe: 'LDAP timeout.'

10
lib/util/ldaputil.js
View file

@ -60,6 +60,16 @@ module.exports.login = function(options, username, password) {
})
}
if (options.search.filter !== 'undefined') {
var parsedFilter = ldap.parseFilter(options.search.filter)
if (f instanceof ldap.EqualityFilter) {
query.filter.filters.push(parsedFilter)
}
else {
Array.prototype.push.apply(query.filter.filters, parsedFilter.filters)
}
}
client.search(options.search.dn, query, function(err, search) {
if (err) {
return resolver.reject(err)