libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge pull request #3853 from pedroigor/RHSSO-767

Browse source 
[RHSSO-767] - Wrong implementation of Request.getRelativePath causing failures on Tomcat-like adapters
This commit is contained in:
Stian Thorgersen 2017-02-13 10:26:34 +01:00 committed by GitHub
commit e3a8bed5b2
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java
View file

@ -67,7 +67,15 @@ public class ServletHttpFacade implements HttpFacade {
@Override @Override
public String getRelativePath() { public String getRelativePath() {
return request.getServletPath(); String uri = request.getRequestURI();
String contextPath = request.getContextPath();
String servletPath = uri.substring(uri.indexOf(contextPath) + contextPath.length());
if ("".equals(servletPath)) {
servletPath = "/";
}
return servletPath;
} }
@Override @Override

10
adapters/spi/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java
View file

@ -80,7 +80,15 @@ public class CatalinaHttpFacade implements HttpFacade {
@Override @Override
public String getRelativePath() { public String getRelativePath() {
return request.getServletPath(); String uri = request.getRequestURI();
String contextPath = request.getContextPath();
String servletPath = uri.substring(uri.indexOf(contextPath) + contextPath.length());
if ("".equals(servletPath)) {
servletPath = "/";
}
return servletPath;
} }
@Override @Override