Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove context path override prefix when handling a request #89

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove context path override prefix when handling a request #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions jawr/jawr-core/src/main/java/net/jawr/web/servlet/JawrRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,8 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro

String requestedPath = "".equals(jawrConfig.getServletMapping()) ? request.getServletPath()
: request.getPathInfo();
// Remove context override prefix from the requested path
requestedPath = removePathOverridePrefix(request, requestedPath);
processRequest(requestedPath, request, response);

} catch (Exception e) {
Expand All @@ -662,6 +664,26 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
}
}

/**
* Remove the context override prefix from the requestedPath
*
* @param request the request
* @param requestedPath the requested path
* @return the requested path without the context override prefix
*/
public String removePathOverridePrefix(HttpServletRequest request, String requestedPath) {
String prefix;
if (request.isSecure()) {
prefix = jawrConfig.getContextPathSslOverride();
} else {
prefix = jawrConfig.getContextPathOverride();
}
if (prefix != null && requestedPath.startsWith(prefix)) {
return requestedPath.substring(prefix.length());
}
return requestedPath;
}

/**
* Handles a resource request.
* <ul>
Expand Down