[java-identity-provider] branch maint-3.4 updated: IDP-1628 Add warning on java.naming.ldap.attributes.binary property

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch maint-3.4
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5f13cc3d217c289ebe51d40d575ae1bcdc14dffa

The following commit(s) were added to refs/heads/maint-3.4 by this push:
       new  5f13cc3d2 IDP-1628 Add warning on java.naming.ldap.attributes.binary property
5f13cc3d2 is described below

commit 5f13cc3d217c289ebe51d40d575ae1bcdc14dffa
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jun 27 13:51:42 2020 +0100

    IDP-1628 Add warning on java.naming.ldap.attributes.binary property
    
    https://issues.shibboleth.net/jira/browse/IDP-1628
---
 .../spring/dc/ldap/impl/LDAPDataConnectorParser.java        | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index 6e8d7db3a..2c48807f2 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -28,7 +28,6 @@ import org.ldaptive.BindConnectionInitializer;
 import org.ldaptive.ConnectionConfig;
 import org.ldaptive.Credential;
 import org.ldaptive.DefaultConnectionFactory;
-import org.ldaptive.DerefAliases;
 import org.ldaptive.SearchExecutor;
 import org.ldaptive.SearchFilter;
 import org.ldaptive.SearchRequest;
@@ -170,8 +169,16 @@ public class LDAPDataConnectorParser extends AbstractWarningDataConnectorParser
         propertyElements.addAll(ElementSupport.getChildElements(config,
                         new QName(AttributeResolverNamespaceHandler.NAMESPACE, "LDAPProperty")));
         for (final Element e : propertyElements) {
-            props.put(AttributeSupport.getAttributeValue(e, new QName("name")),
-                    AttributeSupport.getAttributeValue(e, new QName("value")));
+            final String value = AttributeSupport.getAttributeValue(e, new QName("value"));
+            final String name = AttributeSupport.getAttributeValue(e, new QName("name"));
+            if ("java.naming.ldap.attributes.binary".equalsIgnoreCase(name)) {
+                DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, 
+                        "<LDAPPrpperty name=\"java.naming.ldap.attributes.binary\" ..>", 
+                        parserContext.getReaderContext().getResource().getDescription(), 
+                        "(none), will be ignored");
+            }
+            
+            props.put(name, value);
         }
         providerConfig.addPropertyValue("properties", props);
         provider.addPropertyValue("providerConfig", providerConfig.getBeanDefinition());

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.