diff options
12 files changed, 279 insertions, 58 deletions
diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh index 3121c8e..8c4cdf5 100644 --- a/src/main/bin/start.sh +++ b/src/main/bin/start.sh @@ -35,6 +35,10 @@ PROPS="-DAPP_HOME=${APP_HOME}" PROPS="${PROPS} -DCONFIG_HOME=${CONFIG_HOME}" PROPS="${PROPS} -Dtosca.mappings.config=${CONFIG_HOME}/tosca-mappings.json" PROPS="${PROPS} -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}" +if [ ! -z "$REQUIRE_CLIENT_AUTH" ]; then + PROPS="$PROPS -Dserver.ssl.client-auth=${REQUIRE_CLIENT_AUTH}" +fi + JVM_MAX_HEAP=${MAX_HEAP:-1024} exec java -Xmx${JVM_MAX_HEAP}m ${PROPS} -jar ${APP_HOME}/babel.jar diff --git a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java index 0eec7e1..eae1a24 100644 --- a/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java +++ b/src/main/java/org/onap/aai/auth/AAIMicroServiceAuthCore.java @@ -89,21 +89,10 @@ public class AAIMicroServiceAuthCore { if (policyAuthFileName == null) { throw new AAIAuthException("Auth policy file could not be found"); } + AAIMicroServiceAuthCore.reloadUsers(); - TimerTask task = new FileWatcher(new File(policyAuthFileName)) { - @Override - protected void onChange(File file) { - // here we implement the onChange - applicationLogger.debug("File " + file.getName() + " has been changed!"); - try { - AAIMicroServiceAuthCore.reloadUsers(); - } catch (AAIAuthException e) { - applicationLogger.error(ApplicationMsgs.PROCESS_REQUEST_ERROR, e); - } - applicationLogger.debug("File " + file.getName() + " has been reloaded!"); - } - }; + TimerTask task = new AuthFileWatcher(new File(policyAuthFileName)); if (!timerSet) { timerSet = true; @@ -130,7 +119,7 @@ public class AAIMicroServiceAuthCore { * <li>If this fails, try resolving the path relative to the configuration home location (either * <code>$CONFIG_HOME</code> or <code>$APP_HOME/appconfig</code>).</li> * <li>If this fails try resolving relative to the <code>auth</code> folder under configuration home.</li> - * + * * @param authPolicyFile * filename or path * @return the Optional canonical path to the located policy file diff --git a/src/main/java/org/onap/aai/auth/AuthFileWatcher.java b/src/main/java/org/onap/aai/auth/AuthFileWatcher.java new file mode 100644 index 0000000..cb5b8ca --- /dev/null +++ b/src/main/java/org/onap/aai/auth/AuthFileWatcher.java @@ -0,0 +1,46 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.aai + * ================================================================================ + * Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (c) 2017-2019 European Software Marketing Ltd. + * ================================================================================ + * 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.aai.auth; + +import java.io.File; +import org.onap.aai.babel.logging.ApplicationMsgs; +import org.onap.aai.babel.logging.LogHelper; + +public class AuthFileWatcher extends FileWatcher { + + private static LogHelper applicationLogger = LogHelper.INSTANCE; + + public AuthFileWatcher(File file) { + super(file); + } + + @Override + protected void onChange(File file) { + applicationLogger.debug("File " + file.getName() + " has been changed!"); + try { + AAIMicroServiceAuthCore.reloadUsers(); + } catch (AAIAuthException e) { + applicationLogger.error(ApplicationMsgs.PROCESS_REQUEST_ERROR, e); + } + applicationLogger.debug("File " + file.getName() + " has been reloaded!"); + } +} diff --git a/src/main/java/org/onap/aai/babel/BabelApplication.java b/src/main/java/org/onap/aai/babel/BabelApplication.java index 9eaa0ce..e524e6e 100644 --- a/src/main/java/org/onap/aai/babel/BabelApplication.java +++ b/src/main/java/org/onap/aai/babel/BabelApplication.java @@ -21,7 +21,7 @@ package org.onap.aai.babel; -import java.util.HashMap; +import com.google.common.collect.ImmutableMap; import org.eclipse.jetty.util.security.Password; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -38,26 +38,21 @@ public class BabelApplication extends SpringBootServletInitializer { /** * Spring Boot Initialization. - * + * * @param args - * main args + * main args (expected to be null) */ public static void main(String[] args) { String keyStorePassword = System.getProperty("KEY_STORE_PASSWORD"); if (keyStorePassword == null || keyStorePassword.isEmpty()) { - throw new IllegalArgumentException("Env property KEY_STORE_PASSWORD not set"); + throw new IllegalArgumentException("Mandatory property KEY_STORE_PASSWORD not set"); } - HashMap<String, Object> props = new HashMap<>(); - String decryptedValue = keyStorePassword.startsWith(Password.__OBFUSCATE) ? // - Password.deobfuscate(keyStorePassword) : keyStorePassword; - props.put("server.ssl.key-store-password", decryptedValue); + ImmutableMap<String, Object> defaults = + ImmutableMap.of("server.ssl.key-store-password", new Password(keyStorePassword).toString()); - String requireClientAuth = System.getenv("REQUIRE_CLIENT_AUTH"); - props.put("server.ssl.client-auth", - Boolean.FALSE.toString().equalsIgnoreCase(requireClientAuth) ? "want" : "need"); - - context = new BabelApplication() - .configure(new SpringApplicationBuilder(BabelApplication.class).properties(props)).run(args); + context = new BabelApplication() // + .configure(new SpringApplicationBuilder(BabelApplication.class).properties(defaults)) // + .run(args); } public static void exit() { diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java index d5ba793..870c8c3 100644 --- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java +++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java @@ -221,6 +221,7 @@ public class VnfVendorImageExtractor { try { return createVendorImageConfigurations(serviceVfList, vnfConfigurationNode); } catch (IllegalArgumentException e) { + applicationLogger.error(ApplicationMsgs.INVALID_CSAR_FILE, e); throw new ToscaToCatalogException(e.getMessage()); } } diff --git a/src/main/java/org/onap/aai/babel/request/RequestHeaders.java b/src/main/java/org/onap/aai/babel/request/RequestHeaders.java index f0d960c..1850d62 100644 --- a/src/main/java/org/onap/aai/babel/request/RequestHeaders.java +++ b/src/main/java/org/onap/aai/babel/request/RequestHeaders.java @@ -2,8 +2,8 @@ * ============LICENSE_START======================================================= * org.onap.aai * ================================================================================ - * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017-2018 European Software Marketing Ltd. + * Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (c) 2017-2019 European Software Marketing Ltd. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.aai.babel.request; import java.util.Optional; @@ -62,7 +63,7 @@ public class RequestHeaders { * If the correlation ID contains the symbol : then this character and any trailing characters are removed. This * allows for an incrementing numeric sequence where there are multiple HTTP requests for a single transaction. * - * @return the normalsed UUID used for correlating transactions across components, or else null (if no ID is set) + * @return the normalized UUID used for correlating transactions across components, or else null (if no ID is set) */ public String getCorrelationId() { // If the request ID is missing, use the transaction ID (if present) diff --git a/src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java b/src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java index 8d89db9..6655170 100644 --- a/src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java +++ b/src/main/java/org/onap/aai/babel/service/GenerateArtifactsServiceImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START======================================================= * org.onap.aai * ================================================================================ - * Copyright © 2017-2019 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017-2019 European Software Marketing Ltd. + * Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (c) 2017-2019 European Software Marketing Ltd. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,6 +36,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; import org.apache.commons.lang3.time.StopWatch; +import org.onap.aai.auth.AAIAuthException; import org.onap.aai.auth.AAIMicroServiceAuth; import org.onap.aai.auth.AAIMicroServiceAuthCore; import org.onap.aai.babel.csar.CsarConverterException; @@ -53,7 +54,10 @@ import org.onap.aai.babel.util.RequestValidationException; import org.onap.aai.babel.util.RequestValidator; import org.springframework.stereotype.Service; -/** Generate SDC Artifacts by passing in a CSAR payload, Artifact Name and Artifact version */ +/** + * Generate SDC Artifacts by passing in a CSAR payload, Artifact Name and Artifact version. + * + */ @Service public class GenerateArtifactsServiceImpl implements GenerateArtifactsService { private static final LogHelper applicationLogger = LogHelper.INSTANCE; @@ -62,6 +66,7 @@ public class GenerateArtifactsServiceImpl implements GenerateArtifactsService { /** * @param authorization + * the auth module */ @Inject public GenerateArtifactsServiceImpl(final AAIMicroServiceAuth authorization) { @@ -111,11 +116,11 @@ public class GenerateArtifactsServiceImpl implements GenerateArtifactsService { response = authorized ? generateArtifacts(requestBody) : buildResponse(Status.UNAUTHORIZED, "User not authorized to perform the operation."); - } catch (Exception e) { + } catch (AAIAuthException e) { applicationLogger.error(ApplicationMsgs.PROCESS_REQUEST_ERROR, e); applicationLogger.logAuditError(e); return buildResponse(Status.INTERNAL_SERVER_ERROR, - "Error while processing request. Please check the babel service logs for more details.\n"); + "Error while processing request. Please check the Babel service logs for more details.\n"); } StatusCode statusDescription; @@ -134,7 +139,8 @@ public class GenerateArtifactsServiceImpl implements GenerateArtifactsService { /** * Generate XML model artifacts from request body. * - * @param requestBody the request body in JSON format + * @param requestBody + * the request body in JSON format * @return response object containing the generated XML models */ protected Response generateArtifacts(String requestBody) { @@ -168,11 +174,8 @@ public class GenerateArtifactsServiceImpl implements GenerateArtifactsService { response = processError(ApplicationMsgs.PROCESSING_VNF_CATALOG_ERROR, Status.INTERNAL_SERVER_ERROR, e, "Error converting CSAR artifact to VNF catalog."); } catch (RequestValidationException e) { - response = - processError(ApplicationMsgs.PROCESS_REQUEST_ERROR, Status.BAD_REQUEST, e, e.getLocalizedMessage()); - } catch (Exception e) { - response = processError(ApplicationMsgs.PROCESS_REQUEST_ERROR, Status.INTERNAL_SERVER_ERROR, e, - "Error while processing request. Please check the babel service logs for more details.\n"); + response = processError(ApplicationMsgs.PROCESS_REQUEST_ERROR, Status.BAD_REQUEST, // + e, e.getLocalizedMessage()); } finally { applicationLogger.logMetrics(stopwatch, LogHelper.getCallerMethodName(0)); } @@ -189,13 +192,13 @@ public class GenerateArtifactsServiceImpl implements GenerateArtifactsService { /** * Helper method to create a REST response object. * - * @param status response status code - * @param entity response payload + * @param status + * response status code + * @param entity + * response payload * @return */ private Response buildResponse(Status status, String entity) { - // @formatter:off - return Response.status(status).entity(entity).type(MediaType.TEXT_PLAIN).build(); - // @formatter:on + return Response.status(status).entity(entity).type(MediaType.TEXT_PLAIN).build(); } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b845b8f..187826a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,6 @@ server.port=9516 server.ssl.key-store=${CONFIG_HOME}/auth/tomcat_keystore +server.ssl.client-auth=need server.contextPath=/services/babel-service diff --git a/src/test/java/org/onap/aai/babel/TestApplication.java b/src/test/java/org/onap/aai/babel/TestApplication.java index 8c9ca5e..bb43b40 100644 --- a/src/test/java/org/onap/aai/babel/TestApplication.java +++ b/src/test/java/org/onap/aai/babel/TestApplication.java @@ -93,6 +93,20 @@ public class TestApplication { BabelApplication.main(new String[] {}); } + /** + * This test asserts that if the KEY_STORE_PASSWORD System Property is set (and is not empty) then the value is + * passed to Jetty, debobfuscated, and used to open the key store, even if the resulting password value is actually + * an empty string. + */ + @Test + public void testApplicationWithBlankObfuscatedKeyStorePassword() { + // Note that "OBF:" is correctly deobfuscated and results in an empty string. + System.setProperty("KEY_STORE_PASSWORD", "OBF:"); + final CauseMatcher expectedCause = new CauseMatcher(IOException.class, "password was incorrect"); + expectedEx.expectCause(expectedCause); + BabelApplication.main(new String[] {}); + } + private static class CauseMatcher extends TypeSafeMatcher<Throwable> { private final Class<? extends Throwable> type; diff --git a/src/test/java/org/onap/aai/babel/TestAuthFileWatcher.java b/src/test/java/org/onap/aai/babel/TestAuthFileWatcher.java new file mode 100644 index 0000000..4efb03e --- /dev/null +++ b/src/test/java/org/onap/aai/babel/TestAuthFileWatcher.java @@ -0,0 +1,82 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.aai + * ================================================================================ + * Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (c) 2017-2019 European Software Marketing Ltd. + * ================================================================================ + * 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.aai.babel; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.junit.Assert.assertThat; + +import java.io.File; +import java.io.IOException; +import java.util.TimerTask; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mockito; +import org.onap.aai.auth.AAIAuthException; +import org.onap.aai.auth.AAIMicroServiceAuth; +import org.onap.aai.auth.AAIMicroServiceAuthCore; +import org.onap.aai.auth.AuthFileWatcher; +import org.onap.aai.babel.config.BabelAuthConfig; + +/** + * Tests {@link AuthFileWatcher}. + */ + +public class TestAuthFileWatcher { + + private TimerTask task; + private File mockFile = Mockito.mock(File.class); + + @Before + public void createTask() { + task = new AuthFileWatcher(mockFile); + } + + @Test + public void testOnChangeDoesNotRun() { + task.run(); + } + + @Test + public void testOnChangeDoesRun() throws IOException, AAIAuthException { + System.setProperty("CONFIG_HOME", "src/test/resources"); + BabelAuthConfig babelServiceAuthConfig = new BabelAuthConfig(); + babelServiceAuthConfig.setAuthPolicyFile("auth_policy.json"); + new AAIMicroServiceAuth(babelServiceAuthConfig); + + Mockito.when(mockFile.lastModified()).thenReturn(1000L); + task.run(); + } + + @Test + public void testOnChangeRunAfterFailure() throws IOException { + File file = File.createTempFile("auth-policy", "json"); + try { + AAIMicroServiceAuthCore.init(file.getAbsolutePath()); + } catch (AAIAuthException e) { + assertThat(e.getMessage(), containsString("Error processing Auth policy file")); + } + file.deleteOnExit(); + Mockito.when(mockFile.lastModified()).thenReturn(1000L); + task.run(); + } + +} diff --git a/src/test/java/org/onap/aai/babel/csar/vnfcatalog/TestVnfVendorImageExtractor.java b/src/test/java/org/onap/aai/babel/csar/vnfcatalog/TestVnfVendorImageExtractor.java index d76551a..7ab8ecd 100644 --- a/src/test/java/org/onap/aai/babel/csar/vnfcatalog/TestVnfVendorImageExtractor.java +++ b/src/test/java/org/onap/aai/babel/csar/vnfcatalog/TestVnfVendorImageExtractor.java @@ -109,8 +109,7 @@ public class TestVnfVendorImageExtractor { VnfVendorImageExtractor extractor = new VnfVendorImageExtractor(); SdcToscaHelper helper = new SdcToscaHelper(); - List<String> versions; - versions = extractor.extractSoftwareVersions(helper.buildMappings().getNodeTemplates()); + List<String> versions = extractor.extractSoftwareVersions(helper.buildMappings().getNodeTemplates()); assertThat(versions.size(), is(0)); helper.addNodeTemplate(); diff --git a/src/test/java/org/onap/aai/babel/service/TestGenerateArtifactsServiceImpl.java b/src/test/java/org/onap/aai/babel/service/TestGenerateArtifactsServiceImpl.java index 55311a6..d011ba6 100644 --- a/src/test/java/org/onap/aai/babel/service/TestGenerateArtifactsServiceImpl.java +++ b/src/test/java/org/onap/aai/babel/service/TestGenerateArtifactsServiceImpl.java @@ -21,6 +21,7 @@ package org.onap.aai.babel.service; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; @@ -32,6 +33,7 @@ import java.security.cert.X509Certificate; import java.util.Collections; import java.util.List; import java.util.Map.Entry; +import java.util.Optional; import javax.inject.Inject; import javax.security.auth.x500.X500Principal; import javax.ws.rs.core.HttpHeaders; @@ -42,6 +44,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; +import org.onap.aai.auth.AAIAuthException; import org.onap.aai.auth.AAIMicroServiceAuth; import org.onap.aai.babel.service.data.BabelRequest; import org.onap.aai.babel.testdata.CsarTest; @@ -70,16 +73,40 @@ public class TestGenerateArtifactsServiceImpl { new ArtifactTestUtils().setGeneratorSystemProperties(); } + /** + * Test with a valid request (and valid CSAR content) by calling the Service implementation directly using a mocked + * HTTPS request. + * + * @throws URISyntaxException + * if the URI cannot be created + * @throws IOException + * if the resource cannot be loaded + */ @Test - public void testGenerateArtifacts() throws Exception { - Response response = processJsonRequest(CsarTest.VNF_VENDOR_CSAR); + public void testGenerateArtifacts() throws URISyntaxException, IOException { + Response response = processJsonRequest(CsarTest.VNF_VENDOR_CSAR, auth); assertThat(response.toString(), response.getStatus(), is(Response.Status.OK.getStatusCode())); assertThat(response.getEntity(), is(getResponseJson("response.json"))); } /** - * No VNF Configuration exists. - * + * Test with a valid request that has no Transaction ID header value. + * + * @throws URISyntaxException + * if the URI cannot be created + * @throws IOException + * if the resource cannot be loaded + */ + @Test + public void testGenerateArtifactsWithoutRequestId() throws URISyntaxException, IOException { + Response response = invokeService(CsarTest.VNF_VENDOR_CSAR.getJsonRequest(), Optional.empty(), auth); + assertThat(response.toString(), response.getStatus(), is(Response.Status.OK.getStatusCode())); + assertThat(response.getEntity(), is(getResponseJson("response.json"))); + } + + /** + * Test with a valid request, using a CSAR file that has no VNF configuration present. + * * @throws URISyntaxException * if the URI cannot be created * @throws IOException @@ -87,11 +114,46 @@ public class TestGenerateArtifactsServiceImpl { */ @Test public void testGenerateArtifactsWithoutVnfConfiguration() throws IOException, URISyntaxException { - Response response = processJsonRequest(CsarTest.NO_VNF_CONFIG_CSAR); + Response response = processJsonRequest(CsarTest.NO_VNF_CONFIG_CSAR, auth); assertThat(response.getStatus(), is(Response.Status.OK.getStatusCode())); assertThat(response.getEntity(), is(getResponseJson("validNoVnfConfigurationResponse.json"))); } + /** + * Test for a valid request with invalid CSAR file content. + * + * @throws URISyntaxException + * if the URI cannot be created + * @throws IOException + * if the resource cannot be loaded + */ + @Test + public void testGenerateArtifactsInvalidCsar() throws IOException, URISyntaxException { + Response response = processJsonRequest(CsarTest.MULTIPLE_VNF_CSAR, auth); + assertThat(response.getStatus(), is(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode())); + assertThat(response.getEntity().toString(), containsString("VNF catalog")); + } + + @Test + public void testUninitializedService() throws IOException, URISyntaxException, AAIAuthException { + AAIMicroServiceAuth uninitializedAuth = Mockito.mock(AAIMicroServiceAuth.class); + Mockito.when(uninitializedAuth.validateRequest(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any())) + .thenThrow(new AAIAuthException("test")); + Response response = processJsonRequest(CsarTest.NO_VNF_CONFIG_CSAR, uninitializedAuth); + assertThat(response.getStatus(), is(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode())); + assertThat(response.getEntity().toString(), containsString("check the Babel service logs")); + } + + @Test + public void testUnauthorizedRequest() throws IOException, URISyntaxException, AAIAuthException { + AAIMicroServiceAuth uninitializedAuth = Mockito.mock(AAIMicroServiceAuth.class); + Mockito.when(uninitializedAuth.validateRequest(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any())) + .thenReturn(false); + Response response = processJsonRequest(CsarTest.NO_VNF_CONFIG_CSAR, uninitializedAuth); + assertThat(response.getStatus(), is(Response.Status.UNAUTHORIZED.getStatusCode())); + assertThat(response.getEntity().toString(), containsString("User not authorized")); + } + @Test public void testInvalidCsarFile() throws URISyntaxException, IOException { BabelRequest request = new BabelRequest(); @@ -145,14 +207,17 @@ public class TestGenerateArtifactsServiceImpl { * * @param csar * test CSAR file + * @param auth + * the auth module * @return the Response from the HTTP API * @throws URISyntaxException * if the URI cannot be created * @throws IOException * if the resource cannot be loaded */ - private Response processJsonRequest(CsarTest csar) throws IOException, URISyntaxException { - return invokeService(csar.getJsonRequest()); + private Response processJsonRequest(CsarTest csar, AAIMicroServiceAuth auth) + throws URISyntaxException, IOException { + return invokeService(csar.getJsonRequest(), Optional.of("transaction-id"), auth); } /** @@ -164,7 +229,25 @@ public class TestGenerateArtifactsServiceImpl { * @throws URISyntaxException * if the URI cannot be created */ - private Response invokeService(String jsonString) throws URISyntaxException { + private Response invokeService(String jsonRequest) throws URISyntaxException { + return invokeService(jsonRequest, Optional.of("transaction-id"), auth); + } + + /** + * Create a (mocked) HTTPS request and invoke the Babel generate artifacts API. + * + * @param jsonString + * the JSON request + * @param transactionId + * optional X-TransactionId value for the HTTP request + * @param auth + * the auth module + * @return the Response from the HTTP API + * @throws URISyntaxException + * if the URI cannot be created + */ + private Response invokeService(String jsonString, Optional<String> transactionId, AAIMicroServiceAuth auth) + throws URISyntaxException { UriInfo mockUriInfo = Mockito.mock(UriInfo.class); Mockito.when(mockUriInfo.getRequestUri()).thenReturn(new URI("/validate")); // NOSONAR (mocked) Mockito.when(mockUriInfo.getPath(false)).thenReturn("validate"); // URI prefix is stripped by AJSC routing @@ -172,13 +255,16 @@ public class TestGenerateArtifactsServiceImpl { // Create mocked request headers map MultivaluedHashMap<String, String> headersMap = new MultivaluedHashMap<>(); - headersMap.put("X-TransactionId", createSingletonList("transaction-id")); + if (transactionId.isPresent()) { + headersMap.put("X-TransactionId", createSingletonList(transactionId.get())); + } headersMap.put("X-FromAppId", createSingletonList("app-id")); headersMap.put("Host", createSingletonList("hostname")); HttpHeaders headers = Mockito.mock(HttpHeaders.class); for (Entry<String, List<String>> entry : headersMap.entrySet()) { Mockito.when(headers.getRequestHeader(entry.getKey())).thenReturn(entry.getValue()); + Mockito.when(headers.getHeaderString(entry.getKey())).thenReturn(entry.getValue().get(0)); } Mockito.when(headers.getRequestHeaders()).thenReturn(headersMap); |