You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2017/01/26 13:59:58 UTC
nifi git commit: NIFI-3390 Added support for multiple LDAP servers.
This closes #1441
Repository: nifi
Updated Branches:
refs/heads/master a1ecea360 -> c15111d98
NIFI-3390 Added support for multiple LDAP servers. This closes #1441
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c15111d9
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c15111d9
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c15111d9
Branch: refs/heads/master
Commit: c15111d98511bcbb9f6076e00441e7ec58bc79a1
Parents: a1ecea3
Author: Pierre Villard <pi...@gmail.com>
Authored: Tue Jan 24 19:18:42 2017 +0100
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Jan 26 08:59:18 2017 -0500
----------------------------------------------------------------------
nifi-docs/src/main/asciidoc/administration-guide.adoc | 2 +-
.../src/main/resources/conf/login-identity-providers.xml | 2 +-
.../src/main/java/org/apache/nifi/ldap/LdapProvider.java | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/c15111d9/nifi-docs/src/main/asciidoc/administration-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index c5beb08..f970232 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -322,7 +322,7 @@ nifi.security.user.login.identity.provider=ldap-provider
|`Referral Strategy` | Strategy for handling referrals. Possible values are FOLLOW, IGNORE, THROW.
|`Connect Timeout` | Duration of connect timeout. (i.e. 10 secs).
|`Read Timeout` | Duration of read timeout. (i.e. 10 secs).
-|`Url` | Url of the LDAP servier (i.e. ldap://<hostname>:<port>).
+|`Url` | Space-separated list of URLs of the LDAP servers (i.e. ldap://<hostname>:<port>).
|`User Search Base` | Base DN for searching for users (i.e. CN=Users,DC=example,DC=com).
|`User Search Filter` | Filter for searching for users against the 'User Search Base'. (i.e. sAMAccountName={0}). The user specified name is inserted into '{0}'.
|`Identity Strategy` | Strategy to identify users. Possible values are USE_DN and USE_USERNAME. The default functionality if this property is missing is USE_DN in order to retain backward
http://git-wip-us.apache.org/repos/asf/nifi/blob/c15111d9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/login-identity-providers.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/login-identity-providers.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/login-identity-providers.xml
index fbfcfb4..652f593 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/login-identity-providers.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/login-identity-providers.xml
@@ -50,7 +50,7 @@
'Connect Timeout' - Duration of connect timeout. (i.e. 10 secs).
'Read Timeout' - Duration of read timeout. (i.e. 10 secs).
- 'Url' - Url of the LDAP servier (i.e. ldap://<hostname>:<port>).
+ 'Url' - Space-separated list of URLs of the LDAP servers (i.e. ldap://<hostname>:<port>).
'User Search Base' - Base DN for searching for users (i.e. CN=Users,DC=example,DC=com).
'User Search Filter' - Filter for searching for users against the 'User Search Base'.
(i.e. sAMAccountName={0}). The user specified name is inserted into '{0}'.
http://git-wip-us.apache.org/repos/asf/nifi/blob/c15111d9/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java
index 851cf0d..58751cd 100644
--- a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java
+++ b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java
@@ -174,14 +174,14 @@ public class LdapProvider implements LoginIdentityProvider {
context.setReferral(referralStrategy.getValue());
// url
- final String url = configurationContext.getProperty("Url");
+ final String urls = configurationContext.getProperty("Url");
- if (StringUtils.isBlank(url)) {
+ if (StringUtils.isBlank(urls)) {
throw new ProviderCreationException("LDAP identity provider 'Url' must be specified.");
}
// connection
- context.setUrl(url);
+ context.setUrls(StringUtils.split(urls));
// search criteria
final String userSearchBase = configurationContext.getProperty("User Search Base");