fix ssl for tomcat

kewangie · kewangie · commit 33f711e7af23 · 2016-10-29T17:28:39.000+01:00
diff --git a/micro-tomcat/src/main/java/com/aol/micro/server/servers/tomcat/SSLConfigurationBuilder.java b/micro-tomcat/src/main/java/com/aol/micro/server/servers/tomcat/SSLConfigurationBuilder.java
@@ -16,8 +16,9 @@ public void build(AbstractHttp11JsseProtocol<?> protocol,SSLProperties sslProper
         sslProperties.getKeyStoreType().peek(type->protocol.setKeystoreType(type));
         sslProperties.getKeyStoreProvider().peek(provider->protocol.setKeystoreProvider(provider));
 		
-        protocol.setTruststoreFile(sslProperties.getTrustStoreFile()); // contains client certificate
-        protocol.setTruststorePass(sslProperties.getTrustStorePass());
+        sslProperties.getTrustStoreFile().peek(file->protocol.setTruststoreFile(file)); // contains client certificate
+        sslProperties.getTrustStorePass().peek(pass->protocol.setTruststorePass(pass));
+        
         sslProperties.getTrustStoreType().peek(type->protocol.setTruststoreType(type));
         sslProperties.getTrustStoreProvider().peek(provider->protocol.setTruststoreProvider(provider));
 		sslProperties.getClientAuth().peek(auth->protocol.setClientAuth(auth));
diff --git a/micro-tomcat/src/main/java/com/aol/micro/server/servers/tomcat/TomcatApplication.java b/micro-tomcat/src/main/java/com/aol/micro/server/servers/tomcat/TomcatApplication.java
@@ -49,16 +49,13 @@ public class TomcatApplication implements ServerApplication {
 	private final PStack<ServletData> servletData;
 	private final PStack<ServletContextListener> servletContextListenerData;
 	private final PStack<ServletRequestListener> servletRequestListenerData;
-	@Wither
-	private final SSLProperties SSLProperties;
-
+	
 	public TomcatApplication(AllData serverData) {
 		this.serverData = serverData.getServerData();
 		this.filterData = serverData.getFilterDataList();
 		this.servletData = serverData.getServletDataList();
 		this.servletContextListenerData = serverData.getServletContextListeners();
-		this.servletRequestListenerData = serverData.getServletRequestListeners();
-		this.SSLProperties = null;
+		this.servletRequestListenerData = serverData.getServletRequestListeners();	
 	}
 
 	public void run(CompletableFuture start,  JaxRsServletConfigurer jaxRsConfigurer, CompletableFuture end) {
@@ -74,23 +71,19 @@ public void run(CompletableFuture start,  JaxRsServletConfigurer jaxRsConfigurer
 	
 		serverData.getModule().getServerConfigManager().accept(new WebServerProvider(tomcat));
 		
-		if(SSLProperties!=null){
-			addSSL(tomcat.getConnector(),SSLProperties);	
-		}
+		addSSL(tomcat.getConnector());	
 
-		startServer( tomcat, start, end);
+		startServer(tomcat, start, end);
 	}
 
-	private void addSSL(Connector connector,SSLProperties sslProperties) {
+	private void addSSL(Connector connector) {
+		SSLProperties sslProperties = serverData.getRootContext().getBean(SSLProperties.class);
 		ProtocolHandler handler = connector.getProtocolHandler();
-		if(handler instanceof AbstractHttp11JsseProtocol){
+		if(sslProperties!= null && handler instanceof AbstractHttp11JsseProtocol){
 			new SSLConfigurationBuilder().build((AbstractHttp11JsseProtocol)handler,sslProperties);
 			connector.setScheme("https");
-			connector.setSecure(true);
-			
-		}
-		
-		
+			connector.setSecure(true);		
+		}		
 	}
 
 	private void startServer( Tomcat httpServer, CompletableFuture start, CompletableFuture end) {
