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

Remove uses of the org.apache.geode.management.internal.security.ResourceConstants class to refer to Security constants and properties.

Browse Source 
Resolves gh-70.
This commit is contained in:
John Blum
2020-02-21 18:51:35 -08:00
parent 49d5e65a9f
commit d266c1c660
7 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/HttpBasicAuthenticationSecurityConfiguration.java
View File

@@ -23,8 +23,6 @@ import java.net.PasswordAuthentication;
import java.util.Optional;
import java.util.function.Function;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.annotation.Bean;
@@ -33,6 +31,7 @@ import org.springframework.core.env.Environment;
import org.springframework.data.gemfire.config.admin.remote.RestHttpGemfireAdminTemplate;
import org.springframework.data.gemfire.config.annotation.ClusterConfigurationConfiguration;
import org.springframework.geode.core.util.ObjectUtils;
import org.springframework.geode.util.GeodeConstants;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
@@ -179,8 +178,8 @@ public class HttpBasicAuthenticationSecurityConfiguration {
HttpHeaders requestHeaders = request.getHeaders();
requestHeaders.add(ResourceConstants.USER_NAME, getUsername());
requestHeaders.add(ResourceConstants.PASSWORD, getPassword());
requestHeaders.add(GeodeConstants.USERNAME, getUsername());
requestHeaders.add(GeodeConstants.PASSWORD, getPassword());
}
return execution.execute(request, body);

15
spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/http/HttpBasicAuthenticationSecurityConfigurationUnitTests.java
View File

@@ -24,7 +24,7 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import java.io.IOException;
@@ -38,13 +38,13 @@ import org.junit.Test;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.core.env.Environment;
import org.springframework.data.gemfire.config.admin.remote.RestHttpGemfireAdminTemplate;
import org.springframework.data.gemfire.config.annotation.ClusterConfigurationConfiguration;
import org.springframework.geode.boot.autoconfigure.support.HttpBasicAuthenticationSecurityConfiguration;
import org.springframework.geode.util.GeodeConstants;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
@@ -124,11 +124,10 @@ public class HttpBasicAuthenticationSecurityConfigurationUnitTests {
assertThat(beanPostProcessor.postProcessBeforeInitialization(bean, "testBean")).isEqualTo(bean);
assertThat(beanPostProcessor.postProcessAfterInitialization(bean, "testBean")).isEqualTo(bean);
verifyZeroInteractions(mockEnvironment);
verifyNoMoreInteractions(mockEnvironment);
}
@Test
@SuppressWarnings("all")
public void schemaObjectInitializerPostProcessorProcessesClusterSchemaObjectInitializerBeans() throws Exception {
Environment mockEnvironment = mock(Environment.class);
@@ -233,8 +232,8 @@ public class HttpBasicAuthenticationSecurityConfigurationUnitTests {
interceptor.intercept(mockHttpRequest, body, mockExecution);
assertThat(httpHeaders.getFirst(ResourceConstants.USER_NAME)).isEqualTo("master");
assertThat(httpHeaders.getFirst(ResourceConstants.PASSWORD)).isEqualTo("s3cr3t");
assertThat(httpHeaders.getFirst(GeodeConstants.USERNAME)).isEqualTo("master");
assertThat(httpHeaders.getFirst(GeodeConstants.PASSWORD)).isEqualTo("s3cr3t");
verify(mockHttpRequest, times(1)).getHeaders();
verify(mockExecution, times(1)).execute(eq(mockHttpRequest), eq(body));
@@ -263,8 +262,8 @@ public class HttpBasicAuthenticationSecurityConfigurationUnitTests {
interceptor.intercept(mockHttpRequest, body, mockExecution);
assertThat(httpHeaders.containsKey(ResourceConstants.USER_NAME)).isFalse();
assertThat(httpHeaders.containsKey(ResourceConstants.PASSWORD)).isFalse();
assertThat(httpHeaders.containsKey(GeodeConstants.USERNAME)).isFalse();
assertThat(httpHeaders.containsKey(GeodeConstants.PASSWORD)).isFalse();
verify(mockHttpRequest, never()).getHeaders();
verify(mockExecution, times(1)).execute(eq(mockHttpRequest), eq(body));