Disable strictDN on cli utilities

This commit is contained in:
Patrick Mooney 2014-09-30 19:00:35 -05:00
parent 408e7c9f99
commit 5683bf036e
5 changed files with 17 additions and 55 deletions

View File

@ -14,16 +14,6 @@ var Logger = require('bunyan');
///--- Globals ///--- Globals
dashdash.addOptionType({
name: 'ldap.DN',
takesArg: true,
helpArg: 'LDAP_DN',
parseArg: function (option, optstr, arg) {
return ldap.parseDN(arg);
}
});
var opts = [ var opts = [
{ {
names: ['file', 'f'], names: ['file', 'f'],
@ -53,8 +43,9 @@ var opts = [
}, },
{ {
names: ['binddn', 'D'], names: ['binddn', 'D'],
type: 'ldap.DN', type: 'string',
help: 'Bind DN', help: 'Bind DN',
helpArg: 'BIND_DN',
default: '' default: ''
}, },
{ {
@ -149,6 +140,7 @@ var log = new Logger({
var client = ldap.createClient({ var client = ldap.createClient({
url: parsed.url, url: parsed.url,
log: log, log: log,
strictDN: false,
tlsOptions: { tlsOptions: {
rejectUnauthorized: !parsed.insecure rejectUnauthorized: !parsed.insecure
} }

View File

@ -13,16 +13,6 @@ var Logger = require('bunyan');
///--- Globals ///--- Globals
dashdash.addOptionType({
name: 'ldap.DN',
takesArg: true,
helpArg: 'LDAP_DN',
parseArg: function (option, optstr, arg) {
return ldap.parseDN(arg);
}
});
var opts = [ var opts = [
{ {
names: ['attribute', 'a'], names: ['attribute', 'a'],
@ -58,8 +48,9 @@ var opts = [
}, },
{ {
names: ['binddn', 'D'], names: ['binddn', 'D'],
type: 'ldap.DN', type: 'string',
help: 'Bind DN', help: 'Bind DN',
helpArg: 'BIND_DN',
default: '' default: ''
}, },
{ {
@ -144,6 +135,7 @@ var log = new Logger({
var client = ldap.createClient({ var client = ldap.createClient({
url: parsed.url, url: parsed.url,
log: log, log: log,
strictDN: false,
tlsOptions: { tlsOptions: {
rejectUnauthorized: !parsed.insecure rejectUnauthorized: !parsed.insecure
} }

View File

@ -13,16 +13,6 @@ var Logger = require('bunyan');
///--- Globals ///--- Globals
dashdash.addOptionType({
name: 'ldap.DN',
takesArg: true,
helpArg: 'LDAP_DN',
parseArg: function (option, optstr, arg) {
return ldap.parseDN(arg);
}
});
var opts = [ var opts = [
{ group: 'General Options' }, { group: 'General Options' },
{ {
@ -46,8 +36,9 @@ var opts = [
}, },
{ {
names: ['binddn', 'D'], names: ['binddn', 'D'],
type: 'ldap.DN', type: 'string',
help: 'Bind DN', help: 'Bind DN',
helpArg: 'bind_DN',
default: '' default: ''
}, },
{ {
@ -128,6 +119,7 @@ var log = new Logger({
var client = ldap.createClient({ var client = ldap.createClient({
url: parsed.url, url: parsed.url,
log: log, log: log,
strictDN: false,
tlsOptions: { tlsOptions: {
rejectUnauthorized: !parsed.insecure rejectUnauthorized: !parsed.insecure
} }

View File

@ -13,16 +13,6 @@ var Logger = require('bunyan');
///--- Globals ///--- Globals
dashdash.addOptionType({
name: 'ldap.DN',
takesArg: true,
helpArg: 'LDAP_DN',
parseArg: function (option, optstr, arg) {
return ldap.parseDN(arg);
}
});
var opts = [ var opts = [
{ {
names: ['attribute', 'a'], names: ['attribute', 'a'],
@ -64,8 +54,9 @@ var opts = [
}, },
{ {
names: ['binddn', 'D'], names: ['binddn', 'D'],
type: 'ldap.DN', type: 'string',
help: 'Bind DN', help: 'Bind DN',
helpArg: 'BIND_DN',
default: '' default: ''
}, },
{ {
@ -152,6 +143,7 @@ var log = new Logger({
var client = ldap.createClient({ var client = ldap.createClient({
url: parsed.url, url: parsed.url,
log: log, log: log,
strictDN: false,
tlsOptions: { tlsOptions: {
rejectUnauthorized: !parsed.insecure rejectUnauthorized: !parsed.insecure
} }

View File

@ -12,15 +12,6 @@ var Logger = require('bunyan');
///--- Globals ///--- Globals
dashdash.addOptionType({
name: 'ldap.DN',
takesArg: true,
helpArg: 'LDAP_DN',
parseArg: function (option, optstr, arg) {
return ldap.parseDN(arg);
}
});
dashdash.addOptionType({ dashdash.addOptionType({
name: 'ldap.Filter', name: 'ldap.Filter',
takesArg: true, takesArg: true,
@ -59,8 +50,9 @@ dashdash.addOptionType({
var opts = [ var opts = [
{ {
names: ['base', 'b'], names: ['base', 'b'],
type: 'ldap.DN', type: 'string',
help: 'Base DN of search', help: 'Base DN of search',
helpArg: 'BASE_DN',
default: '' default: ''
}, },
{ {
@ -128,8 +120,9 @@ var opts = [
}, },
{ {
names: ['binddn', 'D'], names: ['binddn', 'D'],
type: 'ldap.DN', type: 'string',
help: 'Bind DN', help: 'Bind DN',
helpArg: 'BIND_DN',
default: '' default: ''
}, },
{ {
@ -253,6 +246,7 @@ var log = new Logger({
var client = ldap.createClient({ var client = ldap.createClient({
url: parsed.url, url: parsed.url,
log: log, log: log,
strictDN: false,
timeout: parsed.timeout || false, timeout: parsed.timeout || false,
tlsOptions: { tlsOptions: {
rejectUnauthorized: !parsed.insecure rejectUnauthorized: !parsed.insecure