From 27b52f0e1d5a5c55cc01269d7a98be7d768967a0 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 3 May 2019 19:17:09 -0700 Subject: [PATCH] Refactor Apache Geode/Pivotal GemFire (PCC) peer Security (Auth) auto-configuration. Switch from using the GemfireBeanFactoryLocator with the security-manager property set to the SecurityManagerProxy to using the @EnableSecurityManager Annotation with the CacheFactory API. --- .../autoconfigure/PeerSecurityAutoConfiguration.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java index e932fa38..23051ba8 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -23,9 +22,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.client.ClientCacheFactoryBean; import org.springframework.data.gemfire.config.annotation.ApacheShiroSecurityConfiguration; -import org.springframework.data.gemfire.config.annotation.EnableBeanFactoryLocator; -import org.springframework.data.gemfire.config.annotation.EnableSecurity; import org.springframework.data.gemfire.config.annotation.GeodeIntegratedSecurityConfiguration; +import org.springframework.geode.config.annotation.EnableSecurityManager; /** * Spring Boot {@link EnableAutoConfiguration auto-configuration} enabling Apache Geode's Security functionality, @@ -39,11 +37,9 @@ import org.springframework.data.gemfire.config.annotation.GeodeIntegratedSecurit * @see org.springframework.data.gemfire.CacheFactoryBean * @see org.springframework.data.gemfire.client.ClientCacheFactoryBean * @see org.springframework.data.gemfire.config.annotation.ApacheShiroSecurityConfiguration - * @see org.springframework.data.gemfire.config.annotation.EnableBeanFactoryLocator - * @see org.springframework.data.gemfire.config.annotation.EnableSecurity * @see org.springframework.data.gemfire.config.annotation.GeodeIntegratedSecurityConfiguration * @see org.springframework.geode.boot.autoconfigure.HttpBasicAuthenticationSecurityConfiguration - * @see org.springframework.geode.security.support.SecurityManagerProxy + * @see org.springframework.geode.config.annotation.EnableSecurityManager * @since 1.0.0 */ @Configuration @@ -53,8 +49,7 @@ import org.springframework.data.gemfire.config.annotation.GeodeIntegratedSecurit ApacheShiroSecurityConfiguration.class, GeodeIntegratedSecurityConfiguration.class }) -@EnableBeanFactoryLocator -@EnableSecurity(securityManagerClassName = "org.springframework.geode.security.support.SecurityManagerProxy") +@EnableSecurityManager @Import(HttpBasicAuthenticationSecurityConfiguration.class) @SuppressWarnings("unused") public class PeerSecurityAutoConfiguration {