TLS support in sdc-fe

[sdc.git] / catalog-fe / src / main / java / org / openecomp / sdc / fe / servlets / SSLProxyServlet.java

diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/SSLProxyServlet.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/SSLProxyServlet.java
index 4edcfe1..0923716 100644 (file)
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/SSLProxyServlet.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/SSLProxyServlet.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,19 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.fe.servlets;
 
-import java.util.Enumeration;
-
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
 
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.proxy.ProxyServlet;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.onap.config.api.JettySSLUtils;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.fe.config.Configuration;
 import org.openecomp.sdc.fe.config.ConfigurationManager;
@@ -39,60 +34,46 @@ import org.slf4j.LoggerFactory;
 
 public abstract class SSLProxyServlet extends ProxyServlet {
 
-       private static final long serialVersionUID = 1L;
-       private static Logger log = LoggerFactory.getLogger(SSLProxyServlet.class.getName());
-
-
-
-       @Override
-       public void customizeProxyRequest(Request proxyRequest, HttpServletRequest request) {
-               super.customizeProxyRequest(proxyRequest, request);
-               // Add Missing Headers to proxy request
-               @SuppressWarnings("unchecked")
-               Enumeration<String> headerNames = request.getHeaderNames();
-               while (headerNames.hasMoreElements()) {
-                       String headerName = headerNames.nextElement();
-                       if (!proxyRequest.getHeaders().containsKey(headerName)) {
-                               String headerVal = request.getHeader(headerName);
-                               log.debug("Adding missing header to request,  header name: {} , header value: {}", headerName,
-                                               headerVal);
-                               proxyRequest.header(headerName, headerVal);
-                       }
-               }
-               proxyRequest.getHeaders().remove(HttpHeader.HOST);
-
-       }
-
-       @Override
-       protected HttpClient createHttpClient() throws ServletException {
-               Configuration config = ((ConfigurationManager) getServletConfig().getServletContext()
-                               .getAttribute(Constants.CONFIGURATION_MANAGER_ATTR)).getConfiguration();
-               boolean isSecureClient = !config.getBeProtocol().equals(BeProtocol.HTTP.getProtocolName());
-               HttpClient client = (isSecureClient) ? getSecureHttpClient() : super.createHttpClient();
-               setTimeout(600000);
-               client.setIdleTimeout(600000);
-               client.setStopTimeout(600000);
-
-               return client;
-       }
-
-       private HttpClient getSecureHttpClient() throws ServletException {
-               // Instantiate and configure the SslContextFactory
-               SslContextFactory sslContextFactory = new SslContextFactory(true);
-
-               // Instantiate HttpClient with the SslContextFactory
-               HttpClient httpClient = new HttpClient(sslContextFactory);
-
-               // Configure HttpClient, for example:
-               httpClient.setFollowRedirects(false);
-
-               // Start HttpClient
-               try {
-                       httpClient.start();
-
-                       return httpClient;
-               } catch (Exception x) {
-                       throw new ServletException(x);
-               }
-       }
+    private static final long serialVersionUID = 1L;
+    private static final Logger log = LoggerFactory.getLogger(SSLProxyServlet.class);
+
+    @Override
+    protected HttpClient createHttpClient() throws ServletException {
+        Configuration config = ((ConfigurationManager) getServletConfig().getServletContext().getAttribute(Constants.CONFIGURATION_MANAGER_ATTR))
+            .getConfiguration();
+        boolean isSecureClient = !config.getBeProtocol().equals(BeProtocol.HTTP.getProtocolName());
+        HttpClient client = (isSecureClient) ? getSecureHttpClient() : super.createHttpClient();
+        int requestTimeout = config.getRequestTimeout() * 1000;
+        if (requestTimeout == 0) {
+            requestTimeout = 1200_000;
+        }
+        setTimeout(requestTimeout);
+        client.setIdleTimeout(requestTimeout);
+        client.setStopTimeout(requestTimeout);
+        return client;
+    }
+
+    private HttpClient getSecureHttpClient() throws ServletException {
+        final JettySSLUtils.JettySslConfig sslConfig = JettySSLUtils.getSSLConfig();
+        SslContextFactory sslContextFactory = new SslContextFactory.Client();
+        sslContextFactory.setKeyStorePath(sslConfig.getKeystorePath());
+        sslContextFactory.setKeyStorePassword(sslConfig.getKeystorePass());
+        sslContextFactory.setKeyManagerPassword(sslConfig.getKeystorePass());
+        sslContextFactory.setTrustStorePath(sslConfig.getTruststorePath());
+        sslContextFactory.setTrustStorePassword(sslConfig.getTruststorePass());
+        sslContextFactory.setKeyStorePath(sslConfig.getKeystorePath());
+        
+        // Instantiate HttpClient with the SslContextFactory
+        final var httpClient = new HttpClient(sslContextFactory);
+        // Configure HttpClient, for example:
+        httpClient.setFollowRedirects(false);
+        // Start HttpClient
+        try {
+            httpClient.start();
+        } catch (Exception x) {
+            log.error("Exception thrown while starting httpClient", x);
+            throw new ServletException(x);
+        }
+        return httpClient;
+    }
 }