Spring/spring-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAGEODE-311 - Allow Security configuration applied by Annotations to be used in LocatorApplications.

Browse Source
This commit is contained in:
John Blum
2020-03-19 13:37:25 -07:00
parent ce4a6aa2e3
commit a97c3a78d3
2 changed files with 148 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2020 the original author or authors.
* Copyright 2012-2020 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.
@@ -12,6 +12,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.springframework.data.gemfire.config.annotation.support;
@@ -35,9 +36,11 @@ import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.data.gemfire.CacheFactoryBean;
import org.springframework.data.gemfire.LocatorFactoryBean;
import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
import org.springframework.data.gemfire.config.annotation.AbstractCacheConfiguration;
import org.springframework.data.gemfire.config.annotation.ClientCacheConfigurer;
import org.springframework.data.gemfire.config.annotation.LocatorConfigurer;
import org.springframework.data.gemfire.config.annotation.PeerCacheConfigurer;
import org.springframework.data.gemfire.util.CollectionUtils;
import org.springframework.util.Assert;
@@ -104,7 +107,7 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
}
@SuppressWarnings("unused")
protected void registerBeanDefinitions(AnnotationMetadata importingClassMetaData,
protected void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
Map<String, Object> annotationAttributes, BeanDefinitionRegistry registry) {
}
@@ -133,42 +136,45 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
}
protected void registerGemFirePropertiesBeanPostProcessor(BeanDefinitionRegistry registry,
Properties customGemFireProperties) {
Properties gemFireProperties) {
BeanDefinitionBuilder builder =
BeanDefinitionBuilder.genericBeanDefinition(GemFirePropertiesBeanPostProcessor.class);
builder.addConstructorArgValue(customGemFireProperties);
BeanDefinitionReaderUtils.registerBeanDefinition(newBeanDefinitionHolder(builder), registry);
registerBeanDefinition(registry, GemFirePropertiesBeanPostProcessor.class, gemFireProperties);
}
protected void registerGemFirePropertiesConfigurer(BeanDefinitionRegistry registry, Properties gemfireProperties) {
registerClientGemFirePropertiesConfigurer(registry, gemfireProperties);
registerLocatorGemFirePropertiesConfigurer(registry, gemfireProperties);
registerPeerGemFirePropertiesConfigurer(registry, gemfireProperties);
}
private void registerBeanDefinition(BeanDefinitionRegistry registry, Class<?> beanType,
Properties gemfireProperties) {
BeanDefinitionBuilder builder =
BeanDefinitionBuilder.genericBeanDefinition(beanType);
builder.addConstructorArgValue(gemfireProperties);
BeanDefinitionReaderUtils.registerBeanDefinition(newBeanDefinitionHolder(builder), registry);
}
protected void registerClientGemFirePropertiesConfigurer(BeanDefinitionRegistry registry,
Properties gemfireProperties) {
BeanDefinitionBuilder builder =
BeanDefinitionBuilder.genericBeanDefinition(ClientGemFirePropertiesConfigurer.class);
registerBeanDefinition(registry, ClientGemFirePropertiesConfigurer.class, gemfireProperties);
}
builder.addConstructorArgValue(gemfireProperties);
protected void registerLocatorGemFirePropertiesConfigurer(BeanDefinitionRegistry registry,
Properties gemfireProperties) {
BeanDefinitionReaderUtils.registerBeanDefinition(newBeanDefinitionHolder(builder), registry);
registerBeanDefinition(registry, LocatorGemFirePropertiesConfigurer.class, gemfireProperties);
}
protected void registerPeerGemFirePropertiesConfigurer(BeanDefinitionRegistry registry,
Properties gemfireProperties) {
BeanDefinitionBuilder builder =
BeanDefinitionBuilder.genericBeanDefinition(PeerGemFirePropertiesConfigurer.class);
builder.addConstructorArgValue(gemfireProperties);
BeanDefinitionReaderUtils.registerBeanDefinition(newBeanDefinitionHolder(builder), registry);
registerBeanDefinition(registry, PeerGemFirePropertiesConfigurer.class, gemfireProperties);
}
protected BeanDefinitionHolder newBeanDefinitionHolder(BeanDefinitionBuilder builder) {
@@ -275,6 +281,28 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota
}
}
protected static class LocatorGemFirePropertiesConfigurer implements LocatorConfigurer {
private final Properties gemfireProperties;
public LocatorGemFirePropertiesConfigurer(Properties gemfireProperties) {
Assert.notEmpty(gemfireProperties, "GemFire Properties are required");
this.gemfireProperties = gemfireProperties;
}
@Override
public void configure(String beanName, LocatorFactoryBean bean) {
Properties gemfireProperties = bean.getGemFireProperties();
gemfireProperties.putAll(this.gemfireProperties);
bean.setGemFireProperties(gemfireProperties);
}
}
protected static class PeerGemFirePropertiesConfigurer extends AbstractGemFirePropertiesConfigurer
implements PeerCacheConfigurer {

101
src/test/java/org/springframework/data/gemfire/config/annotation/SecureLocatorApplicationIntegrationTests.java Normal file
View File

@@ -0,0 +1,101 @@
/*
* Copyright 2020 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.gemfire.config.annotation;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Properties;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.Locator;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.ResourcePermission;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
/**
* Integration Tests testing the configuration of a "secure" Apache Geode Locator.
*
* @author John Blum
* @see java.util.Properties
* @see org.junit.Test
* @see org.apache.geode.distributed.ConfigurationProperties
* @see org.apache.geode.distributed.Locator
* @see org.apache.geode.distributed.DistributedSystem
* @see org.springframework.data.gemfire.config.annotation.LocatorApplication
* @see org.springframework.data.gemfire.config.annotation.EnableSecurity
* @see org.springframework.test.context.ContextConfiguration
* @see org.springframework.test.context.junit4.SpringRunner
* @since 2.3.0
*/
@RunWith(SpringRunner.class)
@ContextConfiguration
@SuppressWarnings("unused")
public class SecureLocatorApplicationIntegrationTests {
@Autowired
private Locator locator;
@BeforeClass
public static void setup() {
System.setProperty(ApacheShiroSecurityConfiguration.ApacheShiroPresentCondition.SPRING_DATA_GEMFIRE_SECURITY_SHIRO_ENABLED,
Boolean.FALSE.toString());
}
@AfterClass
public static void tearDown() {
System.clearProperty(ApacheShiroSecurityConfiguration.ApacheShiroPresentCondition.SPRING_DATA_GEMFIRE_SECURITY_SHIRO_ENABLED);
}
@Test
public void locatorIsSecure() {
assertThat(this.locator).isNotNull();
DistributedSystem distributedSystem = this.locator.getDistributedSystem();
assertThat(distributedSystem).isNotNull();
assertThat(distributedSystem.getProperties()).isNotNull();
assertThat(distributedSystem.getProperties().getProperty(ConfigurationProperties.SECURITY_MANAGER))
.isEqualTo(TestSecurityManager.class.getName());
}
@LocatorApplication(port = 0)
//@EnableSecurity(securityManagerClass = TestSecurityManager.class)
@EnableSecurity(securityManagerClassName = "org.springframework.data.gemfire.config.annotation.TestSecurityManager")
static class TestConfiguration { }
static final class MockSecurityManager implements org.apache.geode.security.SecurityManager {
@Override
public Object authenticate(Properties credentials) throws AuthenticationFailedException {
throw new AuthenticationFailedException("Identity could not be verified");
}
@Override
public boolean authorize(Object principal, ResourcePermission permission) {
return false;
}
}
}