Add support for anonymousReadOnly in LdapProperties

See spring-projectsgh-11722

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,6 +58,7 @@ public ContextSource ldapContextSource() {
 		source.setUrls(this.properties.determineUrls(this.environment));
 		source.setBaseEnvironmentProperties(
 				Collections.unmodifiableMap(this.properties.getBaseEnvironment()));
+		source.setAnonymousReadOnly(this.properties.getAnonymousReadOnly());
 		return source;
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,6 +60,11 @@ public class LdapProperties {
 	 */
 	private Map<String, String> baseEnvironment = new HashMap<>();
 
+	/**
+	 * Whether read-only operations should use an anonymous environment.
+	 */
+	private boolean anonymousReadOnly;
+
 	public String[] getUrls() {
 		return this.urls;
 	}
@@ -100,6 +105,14 @@ public void setBaseEnvironment(Map<String, String> baseEnvironment) {
 		this.baseEnvironment = baseEnvironment;
 	}
 
+	public boolean getAnonymousReadOnly() {
+		return this.anonymousReadOnly;
+	}
+
+	public void setAnonymousReadOnly(boolean anonymousReadOnly) {
+		this.anonymousReadOnly = anonymousReadOnly;
+	}
+
 	public String[] determineUrls(Environment environment) {
 		if (ObjectUtils.isEmpty(this.urls)) {
 			return new String[] { "ldap://localhost:" + determinePort(environment) };

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.ldap.core.ContextSource;
+import org.springframework.ldap.core.support.LdapContextSource;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -80,6 +81,21 @@ public void testContextSourceWithMoreProperties() {
 				.containsEntry("java.naming.security.authentication", "DIGEST-MD5");
 	}
 
+	@Test
+	public void testContextSourceWithDefaultAnonymousReadOnly() {
+		load("spring.ldap.urls:ldap://localhost:123,ldap://mycompany:123");
+		LdapContextSource contextSource = context.getBean(LdapContextSource.class);
+		assertThat(contextSource.isAnonymousReadOnly()).isFalse();
+	}
+
+	@Test
+	public void testContextSourceWithAnonymousReadOnly() {
+		load("spring.ldap.urls:ldap://localhost:123,ldap://mycompany:123",
+				"spring.ldap.anonymousReadOnly:true");
+		LdapContextSource contextSource = context.getBean(LdapContextSource.class);
+		assertThat(contextSource.isAnonymousReadOnly()).isTrue();
+	}
+
 	private void load(String... properties) {
 		this.context = new AnnotationConfigApplicationContext();
 		TestPropertyValues.of(properties).applyTo(this.context);