diff options
Diffstat (limited to 'rest-services/dmaap-client')
5 files changed, 112 insertions, 29 deletions
diff --git a/rest-services/dmaap-client/pom.xml b/rest-services/dmaap-client/pom.xml index c465cef4..be293a2f 100644 --- a/rest-services/dmaap-client/pom.xml +++ b/rest-services/dmaap-client/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-rest-services</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.6-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId> diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtil.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtil.java index 7ee06e9c..d487e19b 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtil.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtil.java @@ -20,8 +20,6 @@ package org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.utlis; -import io.vavr.control.Try; -import java.nio.file.Path; import java.nio.file.Paths; import org.jetbrains.annotations.NotNull; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapCustomConfig; @@ -32,20 +30,17 @@ import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys; public final class SecurityKeysUtil { - private SecurityKeysUtil(){ + private SecurityKeysUtil() { } @NotNull - public static SecurityKeys fromDmappCustomConfig(DmaapCustomConfig configuration){ + public static SecurityKeys fromDmappCustomConfig(DmaapCustomConfig configuration) { return ImmutableSecurityKeys.builder() - .keyStore(ImmutableSecurityKeysStore.of(resource(configuration.keyStorePath()).get())) - .keyStorePassword(Passwords.fromResource(configuration.keyStorePasswordPath())) - .trustStore(ImmutableSecurityKeysStore.of(resource(configuration.trustStorePath()).get())) - .trustStorePassword(Passwords.fromResource(configuration.trustStorePasswordPath())) + .keyStore(ImmutableSecurityKeysStore.of(Paths.get(configuration.keyStorePath()))) + .keyStorePassword(Passwords.fromPath(Paths.get(configuration.keyStorePasswordPath()))) + .trustStore(ImmutableSecurityKeysStore.of(Paths.get(configuration.trustStorePath()))) + .trustStorePassword(Passwords.fromPath(Paths.get(configuration.trustStorePasswordPath()))) .build(); } - - private static Try<Path> resource(String resource) { - return Try.of(() -> Paths.get(Passwords.class.getResource(resource).toURI())); - }} +}
\ No newline at end of file diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPReactiveWebClientFactoryTest.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPReactiveWebClientFactoryTest.java index 9d670c65..e6d96a7e 100644 --- a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPReactiveWebClientFactoryTest.java +++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPReactiveWebClientFactoryTest.java @@ -36,16 +36,19 @@ import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.utlis.SecurityK import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys; import org.onap.dcaegen2.services.sdk.security.ssl.SslFactory; +import java.net.URISyntaxException; +import java.nio.file.Paths; + /** * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 7/5/18 */ class DMaaPReactiveWebClientFactoryTest { - private static final String KEY_STORE_RESOURCE_PATH = "/org.onap.dcae.jks"; - private static final String KEY_STORE_PASS_RESOURCE_PATH = "/keystore.password"; - private static final String TRUST_STORE_RESOURCE_PATH = "/org.onap.dcae.trust.jks"; - private static final String TRUST_STORE_PASS_RESOURCE_PATH = "/truststore.password"; + private static final String KEY_STORE_FILE_PATH = testResourceToPath("/org.onap.dcae.jks"); + private static final String KEY_STORE_PASS_FILE_PATH = testResourceToPath("/keystore.password"); + private static final String TRUST_STORE_FILE_PATH = testResourceToPath("/org.onap.dcae.trust.jks"); + private static final String TRUST_STORE_PASS_FILE_PATH = testResourceToPath("/truststore.password"); private SslFactory sslFactory = mock(SslFactory.class); private SslContext dummySslContext = mock(SslContext.class); private DMaaPReactiveWebClientFactory webClientFactory = new DMaaPReactiveWebClientFactory(sslFactory); @@ -98,13 +101,21 @@ class DMaaPReactiveWebClientFactoryTest { DmaapConsumerConfiguration dmaapConsumerConfiguration = mock(DmaapConsumerConfiguration.class); when(dmaapConsumerConfiguration.enableDmaapCertAuth()).thenReturn(true); - when(dmaapConsumerConfiguration.keyStorePath()).thenReturn(KEY_STORE_RESOURCE_PATH); - when(dmaapConsumerConfiguration.keyStorePasswordPath()).thenReturn(KEY_STORE_PASS_RESOURCE_PATH); - when(dmaapConsumerConfiguration.trustStorePath()).thenReturn(TRUST_STORE_RESOURCE_PATH); - when(dmaapConsumerConfiguration.trustStorePasswordPath()).thenReturn(TRUST_STORE_PASS_RESOURCE_PATH); + when(dmaapConsumerConfiguration.keyStorePath()).thenReturn(KEY_STORE_FILE_PATH); + when(dmaapConsumerConfiguration.keyStorePasswordPath()).thenReturn(KEY_STORE_PASS_FILE_PATH); + when(dmaapConsumerConfiguration.trustStorePath()).thenReturn(TRUST_STORE_FILE_PATH); + when(dmaapConsumerConfiguration.trustStorePasswordPath()).thenReturn(TRUST_STORE_PASS_FILE_PATH); when(sslFactory.createSecureClientContext(any(SecurityKeys.class))).thenReturn(dummySslContext); return dmaapConsumerConfiguration; } + + private static String testResourceToPath(String resource) { + try { + return Paths.get(DMaaPReactiveWebClientFactoryTest.class.getResource(resource).toURI()).toString(); + } catch (URISyntaxException e) { + throw new RuntimeException("Failed resolving test resource path", e); + } + } }
\ No newline at end of file diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DmaaPRestTemplateFactoryTest.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DmaaPRestTemplateFactoryTest.java index 80cf2243..2a891dcd 100644 --- a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DmaaPRestTemplateFactoryTest.java +++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DmaaPRestTemplateFactoryTest.java @@ -26,13 +26,16 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapPublisherConfiguration; +import java.net.URISyntaxException; +import java.nio.file.Paths; + class DmaaPRestTemplateFactoryTest { - private static final String KEY_STORE_RESOURCE_PATH = "/org.onap.dcae.jks"; - private static final String KEYSTORE_PASSWORD_RESOURCE_PATH = "/keystore.password"; - private static final String TRUSTSTORE_PASSWORD_RESOURCE_PATH = "/truststore.password"; - private static final String TRUST_STORE_RESOURCE_PATH = "/org.onap.dcae.trust.jks"; + private static final String KEY_STORE_FILE_PATH = testResourceToPath("/org.onap.dcae.jks"); + private static final String KEYSTORE_PASSWORD_FILE_PATH = testResourceToPath("/keystore.password"); + private static final String TRUSTSTORE_PASSWORD_FILE_PATH = testResourceToPath("/truststore.password"); + private static final String TRUST_STORE_FILE_PATH = testResourceToPath("/org.onap.dcae.trust.jks"); private DmaapPublisherConfiguration publisherConfiguration = mock(DmaapPublisherConfiguration.class); private DmaaPRestTemplateFactory factory = new DmaaPRestTemplateFactory(); @@ -46,13 +49,21 @@ class DmaaPRestTemplateFactoryTest { @Test void build_shouldCreateRestTemplateWithSslConfiguration() { when(publisherConfiguration.enableDmaapCertAuth()).thenReturn(true); - when(publisherConfiguration.keyStorePath()).thenReturn(KEY_STORE_RESOURCE_PATH); + when(publisherConfiguration.keyStorePath()).thenReturn(KEY_STORE_FILE_PATH); when(publisherConfiguration.keyStorePasswordPath()).thenReturn( - KEYSTORE_PASSWORD_RESOURCE_PATH); - when(publisherConfiguration.trustStorePath()).thenReturn(TRUST_STORE_RESOURCE_PATH); + KEYSTORE_PASSWORD_FILE_PATH); + when(publisherConfiguration.trustStorePath()).thenReturn(TRUST_STORE_FILE_PATH); when(publisherConfiguration.trustStorePasswordPath()).thenReturn( - TRUSTSTORE_PASSWORD_RESOURCE_PATH); + TRUSTSTORE_PASSWORD_FILE_PATH); Assertions.assertNotNull(factory.build(publisherConfiguration)); } + + private static String testResourceToPath(String resource) { + try { + return Paths.get(DmaaPRestTemplateFactoryTest.class.getResource(resource).toURI()).toString(); + } catch (URISyntaxException e) { + throw new RuntimeException("Failed resolving test resource path", e); + } + } }
\ No newline at end of file diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtilTest.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtilTest.java new file mode 100644 index 00000000..09c6de2b --- /dev/null +++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtilTest.java @@ -0,0 +1,66 @@ +/* + * ============LICENSE_START======================================================= + * DCAEGEN2-SERVICES-SDK + * ================================================================================ + * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved. + * ================================================================================ + * 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 + * + * http://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. + * ============LICENSE_END========================================================= + */ + +package org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.utlis; + +import org.junit.jupiter.api.Test; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapCustomConfig; +import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys; + +import java.net.URISyntaxException; +import java.nio.file.Paths; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + + +class SecurityKeysUtilTest { + + private static final String KEY_STORE_FILE_PATH = testResourceToPath("/org.onap.dcae.jks"); + private static final String KEY_STORE_PASSWORD_FILE_PATH = testResourceToPath("/keystore.password"); + private static final String TRUST_STORE_FILE_PATH = testResourceToPath("/org.onap.dcae.trust.jks"); + private static final String TRUST_STORE_PASSWORD_FILE_PATH = testResourceToPath("/truststore.password"); + + private DmaapCustomConfig dmaapConfig = mock(DmaapCustomConfig.class); + + @Test + void shouldLoadSecurityKeysUsingSpecifiedFilePaths() { + when(dmaapConfig.keyStorePath()).thenReturn(KEY_STORE_FILE_PATH); + when(dmaapConfig.keyStorePasswordPath()).thenReturn(KEY_STORE_PASSWORD_FILE_PATH); + when(dmaapConfig.trustStorePath()).thenReturn(TRUST_STORE_FILE_PATH); + when(dmaapConfig.trustStorePasswordPath()).thenReturn(TRUST_STORE_PASSWORD_FILE_PATH); + + SecurityKeys securityKeys = SecurityKeysUtil.fromDmappCustomConfig(dmaapConfig); + + assertEquals("mYHC98!qX}7h?W}jRv}MIXTJ", securityKeys.keyStorePassword().use(String::new)); + assertEquals(Paths.get(KEY_STORE_FILE_PATH), securityKeys.keyStore().path()); + assertEquals("*TQH?Lnszprs4LmlAj38yds(", securityKeys.trustStorePassword().use(String::new)); + assertEquals(Paths.get(TRUST_STORE_FILE_PATH), securityKeys.trustStore().path()); + } + + private static String testResourceToPath(String resource) { + try { + return Paths.get(SecurityKeysUtilTest.class.getResource(resource).toURI()).toString(); + } catch (URISyntaxException e) { + throw new RuntimeException("Failed resolving test resource path", e); + } + } +}
\ No newline at end of file |