Fix Jetty HTTP3 server

Author: Thierry Boileau

org.restlet.java/org.restlet.ext.jetty/src/main/java/org/restlet/ext/jetty/HttpsServerHelper.java

@@ -90,7 +90,7 @@ protected List<Connector> createConnectors(org.eclipse.jetty.server.Server serve
             ServerConnector connector = createServerConnector(server, configuration);
             result.add(connector);
         } else if (httpTransportProtocols.contains(HttpTransportProtocol.HTTP3)) {
-            ServerQuicConfiguration configuration = createQuicConfiguration(getServerSslContextFactory());
+            ServerQuicConfiguration configuration = createQuicConfiguration(getQuicServerSslContextFactory());
             QuicServerConnector connector = createQuicServerConnector(server, configuration);
             result.add(connector);
         }
@@ -175,6 +175,27 @@ private SslContextFactory.Server getServerSslContextFactory() {
         }
     }
 
+    private SslContextFactory.Server getQuicServerSslContextFactory() {
+        SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
+
+        sslContextFactory.setKeyStorePassword(getHelpedParameters().getFirstValue("keyStorePassword", true,
+                System.getProperty("javax.net.ssl.keyStorePassword", "")));
+        sslContextFactory.setKeyStorePath(
+                getHelpedParameters().getFirstValue("keyStorePath", true, System.getProperty("javax.net.ssl.keyStore")));
+        sslContextFactory.setKeyStoreType(
+                getHelpedParameters().getFirstValue("keyStoreType", true, System.getProperty("javax.net.ssl.keyStoreType")));
+        sslContextFactory.setProtocol(getHelpedParameters().getFirstValue("protocol", true, "TLS"));
+        sslContextFactory.setSecureRandomAlgorithm(getHelpedParameters().getFirstValue("secureRandomAlgorithm", true));
+        sslContextFactory.setTrustStorePassword(getHelpedParameters().getFirstValue("trustStorePassword", true,
+                System.getProperty("javax.net.ssl.trustStorePassword")));
+        sslContextFactory.setTrustStorePath(
+                getHelpedParameters().getFirstValue("trustStorePath", true, System.getProperty("javax.net.ssl.trustStore")));
+        sslContextFactory.setTrustStoreType(getHelpedParameters().getFirstValue("trustStoreType", true,
+                System.getProperty("javax.net.ssl.trustStoreType")));
+
+        return sslContextFactory;
+    }
+
     private ServerQuicConfiguration createQuicConfiguration(SslContextFactory.Server sslContextFactory) {
         Path pemWorkDirectory = getHttp3PemWorkDirectoryPath();
         ServerQuicConfiguration configuration = new ServerQuicConfiguration(sslContextFactory, pemWorkDirectory);

org.restlet.java/org.restlet.ext.jetty/src/main/java/org/restlet/ext/jetty/JettyServerHelper.java

@@ -724,7 +724,7 @@ protected void setWrappedServer(org.eclipse.jetty.server.Server wrappedServer) {
     public void start() throws Exception {
         super.start();
         org.eclipse.jetty.server.Server server = getWrappedServer();
-        ServerConnector connector = (ServerConnector) server.getConnectors()[0];
+        AbstractNetworkConnector connector = (AbstractNetworkConnector) server.getConnectors()[0];
 
         getLogger().info("Starting the Jetty " + getProtocols() + " server on port " + getHelped().getPort());
         try {

org.restlet.java/org.restlet.ext.jetty/src/main/java/org/restlet/ext/jetty/internal/JettyServerCall.java

@@ -20,6 +20,7 @@
 import org.restlet.Server;
 import org.restlet.data.Header;
 import org.restlet.engine.adapter.ServerCall;
+import org.restlet.engine.header.HeaderConstants;
 import org.restlet.util.Series;
 
 import java.io.IOException;
@@ -174,6 +175,16 @@ public InputStream getRequestEntityStream(long size) {
         return Request.asInputStream(getRequest());
     }
 
+    @Override
+    public String getHostDomain() {
+        return request.getHttpURI().getHost();
+    }
+
+    @Override
+    public int getHostPort() {
+        return request.getHttpURI().getPort();
+    }
+
     @Override
     public Series<Header> getRequestHeaders() {
         final Series<Header> result = super.getRequestHeaders();

org.restlet.java/org.restlet.ext.jetty/src/test/java/org/restlet/ext/jetty/connectors/SslBaseConnectorsTestCase.java

@@ -90,13 +90,13 @@ protected void configureSslClientParameters(final Client client) {
     protected void configureSslServerParameters(final Server server) {
         Series<Parameter> parameters = server.getContext().getParameters();
 
-        parameters.add("keystorePath", testKeystoreFile.getPath());
-        parameters.add("keystorePassword", KEYSTORE_PASSWORD);
+        parameters.add("keyStorePath", testKeystoreFile.getPath());
+        parameters.add("keyStorePassword", KEYSTORE_PASSWORD);
         parameters.add("keyStoreType", KEYSTORE_TYPE);
         parameters.add("keyPassword", KEYSTORE_PASSWORD);
 
-        parameters.add("truststorePath", testKeystoreFile.getPath());
-        parameters.add("truststorePassword", KEYSTORE_PASSWORD);
+        parameters.add("trustStorePath", testKeystoreFile.getPath());
+        parameters.add("trustStorePassword", KEYSTORE_PASSWORD);
         parameters.add("trustStoreType", KEYSTORE_TYPE);
 
         if (shouldDebug()) {

org.restlet.java/org.restlet/src/main/java/org/restlet/Request.java

@@ -417,7 +417,7 @@ public Series<Cookie> getCookies() {
 
 	/**
 	 * Returns the host reference. This may be different from the resourceRef's
-	 * host, for example for URNs and other URIs that don't contain host
+	 * host, for example, for URNs and other URIs that don't contain host
 	 * information.<br>
 	 * <br>
 	 * Note that when used with HTTP connectors, this property maps to the "Host"
@@ -738,7 +738,7 @@ public void setHostRef(Reference hostRef) {
 	}
 
 	/**
-	 * Sets the host reference using an URI string. Note that when used with HTTP
+	 * Sets the host reference using a URI string. Note that when used with HTTP
 	 * connectors, this property maps to the "Host" header.
 	 * 
 	 * @param hostUri The host URI.

org.restlet.java/org.restlet/src/main/java/org/restlet/engine/adapter/ServerCall.java

@@ -152,7 +152,7 @@ public Representation getRequestEntity() {
 		Representation result;
 		long contentLength = getContentLength();
 		boolean chunkedEncoding = HeaderUtils.isChunkedEncoding(getRequestHeaders());
-		// In some cases there is an entity without a content-length header
+		// In some cases, there is an entity without a content-length header
 		boolean connectionClosed = HeaderUtils.isConnectionClose(getRequestHeaders());
 
 		// Create the representation
@@ -177,13 +177,12 @@ public Representation getRequestEntity() {
 					}
 				} catch (IOException e) {
 					getLogger().fine("Unable to read request entity");
-					
-                    if(pbi != null)
-                        try {
-                            pbi.close();
-                        } catch (IOException e1) {
-                            getLogger().fine("Unable to close request entity");
-                        }
+
+                    try {
+                        pbi.close();
+                    } catch (IOException e1) {
+                        getLogger().fine("Unable to close request entity");
+                    }
                 }
 			}
 
@@ -306,7 +305,7 @@ private void parseHost() {
 
 			if (colonIndex != -1) {
 				super.setHostDomain(host.substring(0, colonIndex));
-				super.setHostPort(Integer.valueOf(host.substring(colonIndex + 1)));
+				super.setHostPort(Integer.parseInt(host.substring(colonIndex + 1)));
 			} else {
 				super.setHostDomain(host);
 				super.setHostPort(getProtocol().getDefaultPort());