[KEYCLOAK-3261] - Properly handle apps deployed at the ROOT context

filipeferraz · Jan 23, 2017 · 13e92cd · 13e92cd
1 parent bd271b2
commit 13e92cd
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 2 deletions.
diff --git a/...dapter-core/src/main/java/org/keycloak/adapters/authorization/AbstractPolicyEnforcer.java b/...dapter-core/src/main/java/org/keycloak/adapters/authorization/AbstractPolicyEnforcer.java
@@ -253,8 +253,7 @@ private PathConfig resolvePathConfig(PathConfig originalConfig, Request request)
     }
 
     private String getPath(Request request) {
-        String pathInfo = URI.create(request.getURI()).getPath().substring(1);
-        return pathInfo.substring(pathInfo.indexOf('/'), pathInfo.length());
+        return request.getRelativePath();
     }
 
     private Set<String> getRequiredScopes(PathConfig pathConfig, Request request) {

diff --git a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java
@@ -66,6 +66,11 @@ public String getURI() {
             return requestContext.getUriInfo().getRequestUri().toString();
         }
 
+        @Override
+        public String getRelativePath() {
+            return requestContext.getUriInfo().getPath();
+        }
+
         @Override
         public boolean isSecure() {
             return securityContext.isSecure();

diff --git a/...ters/oidc/servlet-oauth-client/src/main/java/org/keycloak/servlet/ServletOAuthClient.java b/...ters/oidc/servlet-oauth-client/src/main/java/org/keycloak/servlet/ServletOAuthClient.java
@@ -218,6 +218,11 @@ public String getURI() {
                     return servletRequest.getRequestURL().toString();
                 }
 
+                @Override
+                public String getRelativePath() {
+                    return servletRequest.getServletPath();
+                }
+
                 @Override
                 public boolean isSecure() {
                     return servletRequest.isSecure();

diff --git a/.../src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java b/.../src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java
@@ -70,6 +70,11 @@ public String getURI() {
         return buf.toString();
     }
 
+    @Override
+    public String getRelativePath() {
+        return request.getServletPath();
+    }
+
     @Override
     public boolean isSecure() {
         return request.isSecure();

diff --git a/adapters/spi/adapter-spi/src/main/java/org/keycloak/adapters/spi/HttpFacade.java b/adapters/spi/adapter-spi/src/main/java/org/keycloak/adapters/spi/HttpFacade.java
@@ -43,6 +43,13 @@ interface Request {
          */
         String getURI();
 
+        /**
+         * Get the request relative path.
+         *
+         * @return the request relative path
+         */
+        String getRelativePath();
+
         /**
          * HTTPS?
          *

diff --git a/.../spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java b/.../spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java
@@ -78,6 +78,11 @@ public String getURI() {
             return buf.toString();
         }
 
+        @Override
+        public String getRelativePath() {
+            return request.getServletPath();
+        }
+
         @Override
         public String getFirstParam(String param) {
             return request.getParameter(param);

diff --git a/...pi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java b/...pi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java
@@ -65,6 +65,11 @@ public String getURI() {
             return buf.toString();
         }
 
+        @Override
+        public String getRelativePath() {
+            return request.getServletPath();
+        }
+
         @Override
         public boolean isSecure() {
             return request.isSecure();

diff --git a/...spi/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java b/...spi/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java
@@ -78,6 +78,11 @@ public String getURI() {
             return buf.toString();
         }
 
+        @Override
+        public String getRelativePath() {
+            return request.getServletPath();
+        }
+
         @Override
         public boolean isSecure() {
             return request.isSecure();

diff --git a/...undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java b/...undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java
@@ -83,6 +83,11 @@ public String getURI() {
             return uriBuilder.build().toString();
         }
 
+        @Override
+        public String getRelativePath() {
+            return exchange.getRelativePath();
+        }
+
         @Override
         public boolean isSecure() {
             String protocol = exchange.getRequestScheme();

diff --git a/...ate/offline-access-app/src/main/java/org/keycloak/example/OfflineAccessPortalServlet.java b/...ate/offline-access-app/src/main/java/org/keycloak/example/OfflineAccessPortalServlet.java
@@ -181,6 +181,11 @@ public String getURI() {
                         return servletRequest.getRequestURL().toString();
                     }
 
+                    @Override
+                    public String getRelativePath() {
+                        return servletRequest.getServletPath();
+                    }
+
                     @Override
                     public boolean isSecure() {
                         return servletRequest.isSecure();