From a6ffdd5cb52d61792dfe8e233620b34098a5fb37 Mon Sep 17 00:00:00 2001 From: Zlatko Murgoski Date: Tue, 9 Apr 2019 15:32:52 +0200 Subject: Collector authentication enhancement Add cert subject verifier Change-Id: If2c3c0984e9eec63e2884ca17db953fff2719888 Issue-ID: DCAEGEN2-1101 Signed-off-by: Zlatko Murgoski --- src/test/java/org/onap/dcae/TLSTest.java | 1 + src/test/java/org/onap/dcae/TLSTestBase.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/test/java/org/onap') diff --git a/src/test/java/org/onap/dcae/TLSTest.java b/src/test/java/org/onap/dcae/TLSTest.java index b1f90371..3cf0a162 100644 --- a/src/test/java/org/onap/dcae/TLSTest.java +++ b/src/test/java/org/onap/dcae/TLSTest.java @@ -125,6 +125,7 @@ public class TLSTest extends TLSTestBase { when(settings.authMethod()).thenReturn(AuthMethodType.CERT_ONLY.value()); when(settings.truststoreFileLocation()).thenReturn(TRUSTSTORE.toString()); when(settings.truststorePasswordFileLocation()).thenReturn(TRUSTSTORE_PASSWORD_FILE.toString()); + when(settings.certSubjectMatcher()).thenReturn(CERT_SUBJECT_MATCHER.toString()); } } diff --git a/src/test/java/org/onap/dcae/TLSTestBase.java b/src/test/java/org/onap/dcae/TLSTestBase.java index 8b486ec7..4dada129 100644 --- a/src/test/java/org/onap/dcae/TLSTestBase.java +++ b/src/test/java/org/onap/dcae/TLSTestBase.java @@ -45,12 +45,12 @@ import static org.onap.dcae.TestingUtilities.*; @Configuration @ExtendWith(SpringExtension.class) public class TLSTestBase { - protected static final String KEYSTORE_ALIAS = "localhost"; protected static final Path RESOURCES = Paths.get("src", "test", "resources"); protected static final Path KEYSTORE = Paths.get(RESOURCES.toString(), "keystore"); protected static final Path KEYSTORE_PASSWORD_FILE = Paths.get(RESOURCES.toString(), "passwordfile"); protected static final Path TRUSTSTORE = Paths.get(RESOURCES.toString(), "truststore"); protected static final Path TRUSTSTORE_PASSWORD_FILE = Paths.get(RESOURCES.toString(), "trustpasswordfile"); + protected static final Path CERT_SUBJECT_MATCHER = Paths.get(RESOURCES.toString(), "certSubjectMatcher"); protected static abstract class ConfigurationBase { protected final ApplicationSettings settings = Mockito.mock(ApplicationSettings.class); @@ -67,6 +67,7 @@ public class TLSTestBase { @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) protected abstract class TestClassBase { + @MockBean @Qualifier("inputQueue") protected LinkedBlockingQueue queue; -- cgit 1.2.3-korg