diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index c5beb084da..f970232a7b 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://:). +|`Url` | Space-separated list of URLs of the LDAP servers (i.e. ldap://:). |`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 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 fbfcfb4c56..652f593869 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://:). + 'Url' - Space-separated list of URLs of the LDAP servers (i.e. ldap://:). '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}'. 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 851cf0d1b3..58751cd425 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");