Add dynamic ports for HTTP/HTTPS

The ports can now be configured in the application.properties and
the both protocols can run at the same time (HTTP+HTTPS)

Change-Id: I57d1b5643df33da45af2f6798923d94bff1d560d
Issue-Id: CLAMP-43
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

2 files changed, 121 insertions, 2 deletions

diff --git a/src/main/java/org/onap/clamp/clds/Application.java b/src/main/java/org/onap/clamp/clds/Application.java
index 037935175..bebb07844 100644
--- a/src/main/java/org/onap/clamp/clds/Application.java
+++ b/src/main/java/org/onap/clamp/clds/Application.java
@@ -30,7 +30,10 @@ import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 
 import org.apache.camel.component.servlet.CamelHttpTransportServlet;
+import org.apache.catalina.connector.Connector;
 import org.camunda.bpm.spring.boot.starter.webapp.CamundaBpmWebappAutoConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.autoconfigure.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -39,13 +42,18 @@ import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfig
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 import com.att.ajsc.common.utility.SystemPropertiesLoader;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 
 @SpringBootApplication
 @ComponentScan(basePackages = { "org.onap.clamp.clds", "com.att.ajsc" })
@@ -55,8 +63,29 @@ import com.att.ajsc.common.utility.SystemPropertiesLoader;
 @EnableAsync
 public class Application extends SpringBootServletInitializer {
 
-    private static final String CAMEL_SERVLET_NAME = "CamelServlet";
-    private static final String CAMEL_URL_MAPPING  = "/restservices/clds/v1/*";
+    protected static final EELFLogger logger             = EELFManager.getInstance().getLogger(Application.class);
+
+    @Autowired
+    protected ApplicationContext      appContext;
+
+    private static final String       CAMEL_SERVLET_NAME = "CamelServlet";
+    private static final String       CAMEL_URL_MAPPING  = "/restservices/clds/v1/*";
+
+    // This settings is an additional one to Spring config,
+    // only if we want to have an additional port automatically redirected to
+    // HTTPS
+    @Value("${server.http-to-https-redirection.port:none}")
+    private String                    httpRedirectedPort;
+
+    /**
+     * This 8080 is the default port used by spring if this parameter is not
+     * specified in application.properties.
+     */
+    @Value("${server.port:8080}")
+    private String                    springServerPort;
+
+    @Value("${server.ssl.key-store:none}")
+    private String                    sslKeystoreFile;
 
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
@@ -84,4 +113,39 @@ public class Application extends SpringBootServletInitializer {
         return ClientBuilder.newClient();
     }
 
+    /**
+     * This method is used by Spring to create the servlet container factory.
+     * 
+     * @return The TomcatEmbeddedServletContainerFactory just created
+     */
+    @Bean
+    public EmbeddedServletContainerFactory getEmbeddedServletContainerFactory() {
+        TomcatEmbeddedServletContainerFactory tomcat = new TomcatEmbeddedServletContainerFactory();
+        if (!"none".equals(httpRedirectedPort) && !"none".equals(sslKeystoreFile)) {
+            // Automatically redirect to HTTPS
+            tomcat = new TomcatEmbeddedServletContainerFactoryRedirection();
+            Connector newConnector = createRedirectConnector(Integer.parseInt(springServerPort));
+            if (newConnector != null) {
+                tomcat.addAdditionalTomcatConnectors(newConnector);
+            }
+
+        }
+        return tomcat;
+
+    }
+
+    private Connector createRedirectConnector(int redirectSecuredPort) {
+        if (redirectSecuredPort <= 0) {
+            logger.warn(
+                    "HTTP port redirection to HTTPS is disabled because the HTTPS port is 0 (random port) or -1 (Connector disabled)");
+            return null;
+        }
+        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+        connector.setScheme("http");
+        connector.setSecure(false);
+        connector.setPort(Integer.parseInt(httpRedirectedPort));
+        connector.setRedirectPort(redirectSecuredPort);
+        return connector;
+    }
+
 }
diff --git a/src/main/java/org/onap/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java b/src/main/java/org/onap/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java
new file mode 100644
index 000000000..2878140f9
--- /dev/null
+++ b/src/main/java/org/onap/clamp/clds/TomcatEmbeddedServletContainerFactoryRedirection.java
@@ -0,0 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2017 AT&T 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============================================
+ * ===================================================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.clamp.clds;
+
+import org.apache.catalina.Context;
+import org.apache.tomcat.util.descriptor.web.SecurityCollection;
+import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+
+/**
+ * This class is a factory that redirects by default all HTTP to HTTPS
+ * connector. It is used by the Application.java class and defined in a Spring
+ * Bean.
+ * 
+ * In order to do this, the method postProcessContext has been overridden to
+ * provide another behavior.
+ * 
+ */
+public class TomcatEmbeddedServletContainerFactoryRedirection extends TomcatEmbeddedServletContainerFactory {
+
+    /**
+     * This method is there to force the automatic redirection of all calls done
+     * on the tomcat server to a Secure connection.
+     */
+    @Override
+    protected void postProcessContext(Context context) {
+        SecurityConstraint securityConstraint = new SecurityConstraint();
+        securityConstraint.setUserConstraint("CONFIDENTIAL");
+        SecurityCollection collection = new SecurityCollection();
+        collection.addPattern("/*");
+        securityConstraint.addCollection(collection);
+        context.addConstraint(securityConstraint);
+    }
+}