Skip to content

request through a proxyPass problem #254

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

Merged
merged 3 commits into from
Mar 29, 2024
Merged

request through a proxyPass problem #254

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c544585
Update JavaScriptServlet.java for proxyPass automatic management
stefano-1973 Mar 19, 2024
f595464
Update JavaScriptServlet.java
stefano-1973 Mar 19, 2024
854dc3f
Update JavaScriptServlet.java
stefano-1973 Mar 25, 2024
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
23 changes: 22 additions & 1 deletion csrfguard/src/main/java/org/owasp/csrfguard/servlet/JavaScriptServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ public final class JavaScriptServlet extends HttpServlet {
JS_REPLACEMENT_MAP.put(SERVLET_PATH_IDENTIFIER, (csrfGuard, request) -> StringUtils.defaultString(request.getContextPath() + request.getServletPath()));
JS_REPLACEMENT_MAP.put(X_REQUESTED_WITH_IDENTIFIER, (csrfGuard, request) -> StringUtils.defaultString(csrfGuard.getJavascriptXrequestedWith()));
JS_REPLACEMENT_MAP.put(DYNAMIC_NODE_CREATION_EVENT_NAME_IDENTIFIER, (csrfGuard, request) -> StringUtils.defaultString(csrfGuard.getJavascriptDynamicNodeCreationEventName()));
JS_REPLACEMENT_MAP.put(DOMAIN_ORIGIN_IDENTIFIER, (csrfGuard, request) -> ObjectUtils.defaultIfNull(csrfGuard.getDomainOrigin(), StringUtils.defaultString(parseDomain(request.getRequestURL()))));
JS_REPLACEMENT_MAP.put(DOMAIN_ORIGIN_IDENTIFIER, (csrfGuard, request) -> ObjectUtils.firstNonNull(
csrfGuard.getDomainOrigin(),
getHostOrNull_Of_XForwardedHost(request.getHeader("X-Forwarded-Host")),
StringUtils.defaultString(JavaScriptServlet.parseDomain(request.getRequestURL()))));
JS_REPLACEMENT_MAP.put(INJECT_INTO_FORMS_IDENTIFIER, (csrfGuard, request) -> Boolean.toString(csrfGuard.isJavascriptInjectIntoForms()));
JS_REPLACEMENT_MAP.put(INJECT_GET_FORMS_IDENTIFIER, (csrfGuard, request) -> Boolean.toString(csrfGuard.isJavascriptInjectGetForms()));
JS_REPLACEMENT_MAP.put(INJECT_FORM_ATTRIBUTES_IDENTIFIER, (csrfGuard, request) -> Boolean.toString(csrfGuard.isJavascriptInjectFormAttributes()));
Expand Down Expand Up @@ -242,6 +245,24 @@ private static String parseDomain(final StringBuffer url) {
}
}

private static String getHostOrNull_Of_XForwardedHost(String xForHost) {
if (StringUtils.isBlank(xForHost)) {
xForHost = null;
}else {
xForHost = xForHost.split(",")[0]; // if there are multiple proxyPass in cascade, XForwardedHost became for example : "fox1:443, spring2:444", where fox1:443 is the first proxyPass encountered
if(xForHost.toLowerCase().startsWith("http")) {
try {
xForHost = new URL(xForHost).getHost();
} catch (final MalformedURLException e) {
xForHost = null;
}
} else {
xForHost = xForHost.split(":")[0];
}
}
return xForHost;
}

private void writeJavaScript(final CsrfGuard csrfGuard, final HttpServletRequest request, final HttpServletResponse response) throws IOException {
final String refererHeader = request.getHeader("referer");

Expand Down