Merge pull request #71 from thiagoelg/fix-http-root-path

Remove httpRootPath prefix from routes

Author: sberyozkin

deployment/src/test/java/io/quarkus/oidc/proxy/OidcProxyHttpRootPathTestCase.java

@@ -0,0 +1,57 @@
+package io.quarkus.oidc.proxy;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.htmlunit.SilentCssErrorHandler;
+import org.htmlunit.TextPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlPage;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class OidcProxyHttpRootPathTestCase {
+
+    private static Class<?>[] testClasses = {
+            OidcServiceResource.class,
+            OidcWebAppResource.class,
+            ServiceApiClient.class
+    };
+
+    @RegisterExtension
+    static final QuarkusDevModeTest test = new QuarkusDevModeTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(testClasses)
+                    .addAsResource("application-http-root-path.properties", "application.properties"));
+
+    @Test
+    public void testOidcProxy() throws Exception {
+
+        try (final WebClient webClient = createWebClient()) {
+            HtmlPage page = webClient.getPage("http://localhost:8080/my-custom-root-path/web-app");
+
+            assertEquals("Sign in to quarkus", page.getTitleText());
+
+            HtmlForm loginForm = page.getForms().get(0);
+
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+
+            TextPage textPage = loginForm.getButtonByName("login").click();
+
+            assertEquals("web-app: ID alice, service: Bearer alice", textPage.getContent());
+
+            webClient.getCookieManager().clearCookies();
+        }
+
+    }
+
+    private WebClient createWebClient() {
+        WebClient webClient = new WebClient();
+        webClient.setCssErrorHandler(new SilentCssErrorHandler());
+        return webClient;
+    }
+
+}

deployment/src/test/resources/application-http-root-path.properties

@@ -0,0 +1,10 @@
+quarkus.http.root-path=/my-custom-root-path
+
+quarkus.oidc.web-app.auth-server-url=http://localhost:8080/my-custom-root-path/q/oidc
+quarkus.oidc.web-app.client-id=${quarkus.oidc.client-id}
+quarkus.oidc.web-app.credentials.secret=secret
+quarkus.oidc.web-app.application-type=web-app
+quarkus.oidc.web-app.authentication.cookie-path=/my-custom-root-path/web-app
+quarkus.rest-client.service-api-client.url=http://localhost:8080/my-custom-root-path/service
+
+quarkus.log.category."org.htmlunit".level=ERROR

runtime/src/main/java/io/quarkus/oidc/proxy/runtime/OidcProxy.java

@@ -44,18 +44,20 @@ public class OidcProxy {
     final OidcProxyConfig oidcProxyConfig;
     final WebClient client;
     final String configuredClientSecret;
+    final String httpRootPath;
 
-    public OidcProxy(TenantConfigBean tenantConfig, OidcProxyConfig oidcProxyConfig) {
+    public OidcProxy(TenantConfigBean tenantConfig, OidcProxyConfig oidcProxyConfig, String httpRootPath) {
         TenantConfigContext tenantConfigContext = oidcProxyConfig.tenantId().isEmpty() ? tenantConfig.getDefaultTenant()
                 : tenantConfig.getStaticTenantsConfig().get(oidcProxyConfig.tenantId().get());
         this.oidcTenantConfig = tenantConfigContext.getOidcTenantConfig();
         this.oidcMetadata = tenantConfigContext.getOidcMetadata();
         this.client = tenantConfigContext.getOidcProviderClient().getWebClient();
         this.oidcProxyConfig = oidcProxyConfig;
         this.configuredClientSecret = OidcCommonUtils.clientSecret(oidcTenantConfig.credentials);
+        this.httpRootPath = httpRootPath;
     }
 
-    public void setup(Router router, String httpRootPath) {
+    public void setup(Router router) {
         if (oidcTenantConfig.applicationType.orElse(ApplicationType.SERVICE) == ApplicationType.WEB_APP) {
             throw new ConfigurationException("OIDC Proxy can only be used with OIDC service applications");
         }
@@ -72,16 +74,16 @@ public void setup(Router router, String httpRootPath) {
             throw new ConfigurationException(
                     "Unsupported OIDC service client authentication method");
         }
-        router.get(httpRootPath + oidcProxyConfig.rootPath() + OidcConstants.WELL_KNOWN_CONFIGURATION)
+        router.get(oidcProxyConfig.rootPath() + OidcConstants.WELL_KNOWN_CONFIGURATION)
                 .handler(this::wellKnownConfig);
         if (oidcMetadata.getJsonWebKeySetUri() != null) {
-            router.get(httpRootPath + oidcProxyConfig.rootPath() + oidcProxyConfig.jwksPath()).handler(this::jwks);
+            router.get(oidcProxyConfig.rootPath() + oidcProxyConfig.jwksPath()).handler(this::jwks);
         }
         if (oidcMetadata.getUserInfoUri() != null && oidcProxyConfig.allowIdToken()) {
-            router.get(httpRootPath + oidcProxyConfig.rootPath() + oidcProxyConfig.userInfoPath()).handler(this::userinfo);
+            router.get(oidcProxyConfig.rootPath() + oidcProxyConfig.userInfoPath()).handler(this::userinfo);
         }
-        router.get(httpRootPath + oidcProxyConfig.rootPath() + oidcProxyConfig.authorizationPath()).handler(this::authorize);
-        router.post(httpRootPath + oidcProxyConfig.rootPath() + oidcProxyConfig.tokenPath()).handler(this::token);
+        router.get(oidcProxyConfig.rootPath() + oidcProxyConfig.authorizationPath()).handler(this::authorize);
+        router.post(oidcProxyConfig.rootPath() + oidcProxyConfig.tokenPath()).handler(this::token);
         if (oidcTenantConfig.authentication.redirectPath.isPresent()) {
             if (!oidcProxyConfig.externalRedirectUri().isPresent()) {
                 throw new ConfigurationException("oidc-proxy.external-redirect-uri property must be configured because"
@@ -91,7 +93,7 @@ public void setup(Router router, String httpRootPath) {
         }
 
         if (oidcMetadata.getEndSessionUri() != null) {
-            router.get(httpRootPath + oidcProxyConfig.rootPath() + oidcProxyConfig.endSessionPath()).handler(this::endSession);
+            router.get(oidcProxyConfig.rootPath() + oidcProxyConfig.endSessionPath()).handler(this::endSession);
             if (oidcTenantConfig.logout().postLogoutPath().isPresent()) {
                 if (!oidcProxyConfig.externalPostLogoutUri().isPresent()) {
                     throw new ConfigurationException("oidc-proxy.external-post-logout-uri property must be configured because"
@@ -511,6 +513,7 @@ private String buildUri(RoutingContext context, String path) {
                 : context.request().scheme();
         return new StringBuilder(scheme).append("://")
                 .append(authority)
+                .append(httpRootPath)
                 .append(path)
                 .toString();
     }

runtime/src/main/java/io/quarkus/oidc/proxy/runtime/OidcProxyRecorder.java

@@ -17,8 +17,8 @@ public OidcProxyRecorder(RuntimeValue<OidcProxyConfig> oidcProxyConfig) {
 
     public void setupRoutes(BeanContainer beanContainer, RuntimeValue<Router> routerValue, String httpRootPath) {
         TenantConfigBean oidcTenantBean = beanContainer.beanInstance(TenantConfigBean.class);
-        OidcProxy proxy = new OidcProxy(oidcTenantBean, oidcProxyConfig.getValue());
+        OidcProxy proxy = new OidcProxy(oidcTenantBean, oidcProxyConfig.getValue(), httpRootPath);
         Router router = routerValue.getValue();
-        proxy.setup(router, httpRootPath);
+        proxy.setup(router);
     }
 }