diff options
| -rw-r--r-- | src/main/java/org/onap/aai/spike/SpikeApplication.java | 4 | ||||
| -rw-r--r-- | src/main/resources/application.properties | 1 | ||||
| -rw-r--r-- | src/test/java/org/onap/aai/spike/service/EchoServiceTest.java | 53 |
3 files changed, 57 insertions, 1 deletions
diff --git a/src/main/java/org/onap/aai/spike/SpikeApplication.java b/src/main/java/org/onap/aai/spike/SpikeApplication.java index fed74af..bbc29fe 100644 --- a/src/main/java/org/onap/aai/spike/SpikeApplication.java +++ b/src/main/java/org/onap/aai/spike/SpikeApplication.java @@ -61,6 +61,10 @@ public class SpikeApplication extends SpringBootServletInitializer { props.put("schema.service.ssl.key-store-password", Password.deobfuscate(keyStorePassword)); props.put("schema.service.ssl.trust-store-password", Password.deobfuscate(keyStorePassword)); + String requireClientAuth = System.getenv("REQUIRE_CLIENT_AUTH"); + props.put("server.ssl.client-auth", + Boolean.FALSE.toString().equalsIgnoreCase(requireClientAuth) ? "want" : "need"); + new SpikeApplication().configure(new SpringApplicationBuilder(SpikeApplication.class).properties(props)) .run(args); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2baa523..90cb740 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,7 +5,6 @@ SERVICE_BEANS=dynamic/conf server.ssl.key-store=${CONFIG_HOME}/auth/tomcat_keystore server.ssl.enabled=true -server.ssl.client-auth=need server.ssl.enabled-protocols=TLSv1.1,TLSv1.2 schema.ingest.file=${CONFIG_HOME}/schema-ingest.properties diff --git a/src/test/java/org/onap/aai/spike/service/EchoServiceTest.java b/src/test/java/org/onap/aai/spike/service/EchoServiceTest.java new file mode 100644 index 0000000..05fe1a6 --- /dev/null +++ b/src/test/java/org/onap/aai/spike/service/EchoServiceTest.java @@ -0,0 +1,53 @@ +/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
+ * ================================================================================
+ * 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.spike.service;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.http.HttpHeaders;
+
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class EchoServiceTest {
+
+ @InjectMocks
+ EchoService echoService;
+
+ @Mock
+ HttpHeaders headers;
+
+ @Mock
+ HttpServletRequest req;
+
+ @Test
+ public void pingTest() {
+ Mockito.when(req.getMethod()).thenReturn("GET");
+ Mockito.when(req.getRequestURL()).thenReturn(new StringBuffer("url"));
+ Mockito.when(req.getRemoteHost()).thenReturn("localhost");
+ Assert.assertNotNull(echoService.ping(headers, req));
+ }
+}
|