Support for undertow-handlers.conf file

Author: adrienlauer

CHANGELOG.md

@@ -1,4 +1,4 @@
-# Version 3.11.0 (2020-08-06)
+# Version 3.11.0 (2020-10-28)
 
 * [brk] Config functions that find available ports now take a port name as argument so they can return the same port for each evaluation (example: `$availableTcpPort()` becomes `$availableTcpPort('web')`).
 * [new] Support for configuration of Undertow handlers using `undertow-handlers.conf` file (at the root of the classpath by default).

web/specs/src/main/java/org/seedstack/seed/web/WebConfig.java

@@ -254,7 +254,7 @@ public static class ServerConfig {
         private static final String DEFAULT_HOST = "0.0.0.0";
         private static final int DEFAULT_PORT = 8080;
         private static final int DEFAULT_SECURE_PORT = 8443;
-        private static final String DEFAULT_CONTEXT_PATH = "/";
+        private static final String ROOT_CONTEXT_PATH = "/";
         private static final boolean DEFAULT_HTTP_ACTIVATION = true;
         private static final boolean DEFAULT_HTTPS_ACTIVATION = false;
         private static final boolean DEFAULT_HTTP2_ACTIVATION = true;
@@ -272,7 +272,7 @@ public static class ServerConfig {
         @Max(65535)
         private int securePort = DEFAULT_SECURE_PORT;
         @NotBlank
-        private String contextPath = DEFAULT_CONTEXT_PATH;
+        private String contextPath = ROOT_CONTEXT_PATH;
         private boolean http = DEFAULT_HTTP_ACTIVATION;
         private boolean https = DEFAULT_HTTPS_ACTIVATION;
         private boolean http2 = DEFAULT_HTTP2_ACTIVATION;
@@ -332,6 +332,10 @@ public ServerConfig setContextPath(String contextPath) {
             return this;
         }
 
+        public boolean isRootContextPath() {
+            return ROOT_CONTEXT_PATH.equals(this.contextPath);
+        }
+
         public boolean isHttp() {
             return http;
         }

web/undertow/src/main/java/org/seedstack/seed/undertow/internal/ServerFactory.java

@@ -42,19 +42,30 @@ class ServerFactory {
     }
 
     Undertow createServer(HttpHandler httpHandler, SSLProvider sslProvider) {
-        InputStream handlersFile = classLoader.getResourceAsStream(undertowConfig.getHandlersFile());
+        HttpHandler effectiveHttpHandler;
+
+        // Configure context path if any
+        if (!serverConfig.isRootContextPath()) {
+            effectiveHttpHandler = Handlers
+                    .path(Handlers.redirect(serverConfig.getContextPath()))
+                    .addPrefixPath(serverConfig.getContextPath(), httpHandler);
+        } else {
+            effectiveHttpHandler = httpHandler;
+        }
+
         // Configure handlers if any
+        InputStream handlersFile = classLoader.getResourceAsStream(undertowConfig.getHandlersFile());
         if (handlersFile != null) {
             List<PredicatedHandler> handlers = PredicatedHandlersParser.parse(
                     handlersFile,
                     classLoader
             );
-            // TODO
+            effectiveHttpHandler = Handlers.predicates(handlers, effectiveHttpHandler);
         }
 
-        Undertow.Builder builder = Undertow.builder().setWorker(xnioWorker);
 
         // Configure HTTP(s) listeners
+        Undertow.Builder builder = Undertow.builder().setWorker(xnioWorker);
         if (!serverConfig.isHttp() && !serverConfig.isHttps()) {
             throw SeedException.createNew(UndertowErrorCode.NO_LISTENER_CONFIGURED);
         } else {
@@ -70,10 +81,9 @@ Undertow createServer(HttpHandler httpHandler, SSLProvider sslProvider) {
             }
         }
 
-        // Configure context path
-        return builder.setHandler(Handlers
-                .path(Handlers.redirect(serverConfig.getContextPath()))
-                .addPrefixPath(serverConfig.getContextPath(), httpHandler))
+        // Build the server
+        return builder
+                .setHandler(effectiveHttpHandler)
                 .build();
     }
 

web/undertow/src/test/java/org/seedstack/seed/undertow/AbstractUndertowIT.java

@@ -120,5 +120,14 @@ public void sessionCookieConfigIsHonored() {
                 .get(baseUrl + "/sessionTest");
     }
 
+    @Test
+    public void handlersFileIsHonored() {
+        expect()
+                .statusCode(200)
+                .header("handlersFileHeader", "testValue")
+                .when()
+                .get(baseUrl + "/index.html");
+    }
+
     abstract ResponseSpecification expect();
 }

web/undertow/src/test/resources/undertow-handlers.conf

@@ -0,0 +1 @@
+header(header='handlersFileHeader', value='testValue')