X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.lib.jetty%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjetty%2FJettyHttpServer.java;h=74f0aaed3d8ddeb3154585386f15a5968d8c54eb;hb=1a65fa72abac6a458139240efa281138aac9ef2b;hp=363bbaebe498362973675995c4c63e7c18e20ab6;hpb=55870eba50d8b28e72a3102fd18a17a6f23f7bad;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java
index 363bbaebe..74f0aaed3 100644
--- a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java
+++ b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java
@@ -2,11 +2,13 @@ package org.argeo.cms.jetty;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.security.NoSuchAlgorithmException;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import javax.net.ssl.SSLContext;
 import javax.servlet.ServletException;
 import javax.websocket.server.ServerContainer;
 
@@ -14,6 +16,7 @@ import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsState;
 import org.argeo.cms.CmsDeployProperty;
 import org.argeo.cms.http.server.HttpServerUtils;
+import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
 import org.eclipse.jetty.http.UriCompliance;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -22,7 +25,6 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
-import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.ExecutorThreadPool;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
@@ -30,6 +32,7 @@ import org.eclipse.jetty.util.thread.ThreadPool;
 
 import com.sun.net.httpserver.HttpContext;
 import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
 
@@ -37,7 +40,8 @@ import com.sun.net.httpserver.HttpsServer;
 public class JettyHttpServer extends HttpsServer {
 	private final static CmsLog log = CmsLog.getLog(JettyHttpServer.class);
 
-	private static final int DEFAULT_IDLE_TIMEOUT = 30000;
+	/** Long timeout since our users may have poor connections. */
+	private static final int DEFAULT_IDLE_TIMEOUT = 120 * 1000;
 
 	private Server server;
 
@@ -67,6 +71,17 @@ public class JettyHttpServer extends HttpsServer {
 
 	@Override
 	public void start() {
+		String httpPortStr = getDeployProperty(CmsDeployProperty.HTTP_PORT);
+		String httpsPortStr = getDeployProperty(CmsDeployProperty.HTTPS_PORT);
+		if (httpPortStr != null && httpsPortStr != null)
+			throw new IllegalArgumentException("Either an HTTP or an HTTPS port should be configured, not both");
+		if (httpPortStr == null && httpsPortStr == null) {
+			log.warn("Neither an HTTP or an HTTPS port was configured, not starting Jetty");
+		}
+
+		/// TODO make it more generic
+		String httpHost = getDeployProperty(CmsDeployProperty.HOST);
+
 		try {
 
 			ThreadPool threadPool = null;
@@ -79,7 +94,7 @@ public class JettyHttpServer extends HttpsServer {
 
 			server = new Server(threadPool);
 
-			configureConnectors();
+			configureConnectors(httpPortStr, httpsPortStr, httpHost);
 
 			if (httpConnector != null) {
 				httpConnector.open();
@@ -110,7 +125,6 @@ public class JettyHttpServer extends HttpsServer {
 			//
 
 			// Addresses
-			String httpHost = getDeployProperty(CmsDeployProperty.HOST);
 			String fallBackHostname = cmsState != null ? cmsState.getHostname() : "::1";
 			if (httpConnector != null) {
 				httpAddress = new InetSocketAddress(httpHost != null ? httpHost : fallBackHostname,
@@ -130,16 +144,7 @@ public class JettyHttpServer extends HttpsServer {
 		}
 	}
 
-	protected void configureConnectors() {
-		String httpPortStr = getDeployProperty(CmsDeployProperty.HTTP_PORT);
-		String httpsPortStr = getDeployProperty(CmsDeployProperty.HTTPS_PORT);
-		if (httpPortStr != null && httpsPortStr != null)
-			throw new IllegalArgumentException("Either an HTTP or an HTTPS port should be configured, not both");
-		if (httpPortStr == null && httpsPortStr == null)
-			throw new IllegalArgumentException("Neither an HTTP or HTTPS port was configured");
-
-		/// TODO make it more generic
-		String httpHost = getDeployProperty(CmsDeployProperty.HOST);
+	protected void configureConnectors(String httpPortStr, String httpsPortStr, String httpHost) {
 
 		// try {
 		if (httpPortStr != null || httpsPortStr != null) {
@@ -167,6 +172,16 @@ public class JettyHttpServer extends HttpsServer {
 			}
 
 			if (httpsEnabled) {
+				if (httpsConfigurator == null) {
+					// we make sure that an HttpSConfigurator is set, so that clients can detect
+					// whether this server is HTTP or HTTPS
+					try {
+						httpsConfigurator = new HttpsConfigurator(SSLContext.getDefault());
+					} catch (NoSuchAlgorithmException e) {
+						throw new IllegalStateException("Cannot initalise SSL Context", e);
+					}
+				}
+
 				SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
 				// sslContextFactory.setKeyStore(KeyS)
 
@@ -198,6 +213,7 @@ public class JettyHttpServer extends HttpsServer {
 				int httpsPort = Integer.parseInt(httpsPortStr);
 				httpsConnector.setPort(httpsPort);
 				httpsConnector.setHost(httpHost);
+				httpsConnector.setIdleTimeout(DEFAULT_IDLE_TIMEOUT);
 			}
 		}
 	}
@@ -255,12 +271,18 @@ public class JettyHttpServer extends HttpsServer {
 
 	@Override
 	public synchronized void removeContext(String path) throws IllegalArgumentException {
+		if (!path.endsWith("/"))
+			path = path + "/";
 		if (!contexts.containsKey(path))
 			throw new IllegalArgumentException("Context " + path + " does not exist");
 		JettyHttpContext httpContext = contexts.remove(path);
 		if (httpContext instanceof ContextHandlerHttpContext contextHandlerHttpContext) {
 			// TODO stop handler first?
-			contextHandlerCollection.removeHandler(contextHandlerHttpContext.getServletContextHandler());
+			// FIXME understand compatibility with Jetty 12
+			//contextHandlerCollection.removeHandler(contextHandlerHttpContext.getServletContextHandler());
+		} else {
+			// FIXME apparently servlets cannot be removed in Jetty, we should replace the
+			// handler
 		}
 	}