Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add host/port

This commit is contained in:
Andreas Streichardt 2017-05-12 14:48:52 +02:00
parent 7e4f4aa358
commit 086f6a26c5
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/client/modules/@arangodb/testsuites/ldap.js
View File

@ -30,7 +30,8 @@ const functionsDocumentation = {
}; };
const optionsDocumentation = [ const optionsDocumentation = [
' - `skipLdap` : if set to true the LDAP tests are skipped', ' - `skipLdap` : if set to true the LDAP tests are skipped',
' - `ldapUrl : testing authentication and authentication_paramaters will be skipped.' ' - `ldapHost : Host/IP of the ldap server',
' - `ldapPort : Port of the ldap server',
]; ];
const pu = require('@arangodb/process-utils'); const pu = require('@arangodb/process-utils');
@ -48,7 +49,7 @@ const RESET = require('internal').COLORS.COLOR_RESET;
// ////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////
function ldap (options) { function ldap (options) {
print(`DAP FQDN is: ${options.ldapUrl} ${options.caCertFilePath}`); print(`DAP FQDN is: ${options.ldapHost}:${options.ldapPort} ${options.caCertFilePath}`);
const results = { failed: 0 }; const results = { failed: 0 };
const tests = [ const tests = [
{ {
@ -57,8 +58,8 @@ function ldap (options) {
'server.authentication': true, 'server.authentication': true,
'server.authentication-system-only': false, 'server.authentication-system-only': false,
'ldap.enabled': true, 'ldap.enabled': true,
'ldap.server': options.ldapUrl, 'ldap.server': options.ldapHost,
'ldap.port': 3890, 'ldap.port': options.ldapPort,
'ldap.prefix': 'uid=', 'ldap.prefix': 'uid=',
'ldap.suffix': ',dc=example,dc=com', 'ldap.suffix': ',dc=example,dc=com',
'ldap.search-filter': 'objectClass=simpleSecurityObject', 'ldap.search-filter': 'objectClass=simpleSecurityObject',
@ -79,8 +80,8 @@ function ldap (options) {
'server.authentication': true, 'server.authentication': true,
'server.authentication-system-only': false, 'server.authentication-system-only': false,
'ldap.enabled': true, 'ldap.enabled': true,
'ldap.server': options.ldapUrl, 'ldap.server': options.ldapHost,
'ldap.port': 3890, 'ldap.port': options.ldapPort,
'ldap.basedn': 'dc=example,dc=com', 'ldap.basedn': 'dc=example,dc=com',
'ldap.search-filter': 'objectClass=simpleSecurityObject', 'ldap.search-filter': 'objectClass=simpleSecurityObject',
'ldap.search-attribute': 'uid', 'ldap.search-attribute': 'uid',
@ -102,8 +103,8 @@ function ldap (options) {
'server.authentication': true, 'server.authentication': true,
'server.authentication-system-only': false, 'server.authentication-system-only': false,
'ldap.enabled': true, 'ldap.enabled': true,
'ldap.server': options.ldapUrl, 'ldap.server': options.ldapHost,
'ldap.port': 3890, 'ldap.port': options.ldapPort,
'ldap.basedn': 'dc=example,dc=com', 'ldap.basedn': 'dc=example,dc=com',
'ldap.search-filter': 'objectClass=simpleSecurityObject', 'ldap.search-filter': 'objectClass=simpleSecurityObject',
'ldap.search-attribute': 'uid', 'ldap.search-attribute': 'uid',
@ -125,7 +126,7 @@ function ldap (options) {
'server.authentication': true, 'server.authentication': true,
'server.authentication-system-only': false, 'server.authentication-system-only': false,
'ldap.enabled': true, 'ldap.enabled': true,
'ldap.url': `ldap://${options.ldapUrl}:3890/dc=example,dc=com?uid?sub`, 'ldap.url': `ldap://${options.ldapHost}:${options.ldapPort}/dc=example,dc=com?uid?sub`,
'ldap.search-filter': 'objectClass=simpleSecurityObject', 'ldap.search-filter': 'objectClass=simpleSecurityObject',
'ldap.binddn': 'cn=admin,dc=example,dc=com', 'ldap.binddn': 'cn=admin,dc=example,dc=com',
'ldap.bindpasswd': 'hallo', 'ldap.bindpasswd': 'hallo',
@ -145,7 +146,7 @@ function ldap (options) {
'server.authentication': true, 'server.authentication': true,
'server.authentication-system-only': false, 'server.authentication-system-only': false,
'ldap.enabled': true, 'ldap.enabled': true,
'ldap.url': `ldap://${options.ldapUrl}:3890/dc=example,dc=com?uid?sub`, 'ldap.url': `ldap://${options.ldapHost}:${options.ldapPort}/dc=example,dc=com?uid?sub`,
'ldap.search-filter': 'objectClass=simpleSecurityObject', 'ldap.search-filter': 'objectClass=simpleSecurityObject',
'ldap.binddn': 'cn=admin,dc=example,dc=com', 'ldap.binddn': 'cn=admin,dc=example,dc=com',
'ldap.bindpasswd': 'hallo', 'ldap.bindpasswd': 'hallo',
@ -233,7 +234,8 @@ function ldap (options) {
exports.setup = function (testFns, defaultFns, opts, fnDocs, optionsDoc) { exports.setup = function (testFns, defaultFns, opts, fnDocs, optionsDoc) {
testFns['ldap'] = ldap; testFns['ldap'] = ldap;
// defaultFns.push('ldap'); // turn off ldap tests by default // defaultFns.push('ldap'); // turn off ldap tests by default
opts['ldapUrl'] = '127.0.0.1'; opts['ldapHost'] = '127.0.0.1';
opts['ldapPort'] = 3890;
opts['caCertFilePath'] = '~/ca_cert.pem'; opts['caCertFilePath'] = '~/ca_cert.pem';
// turn off ldap tests by default. only enable them in enterprise version // turn off ldap tests by default. only enable them in enterprise version