Skip to content

WW-5754 Accept cross-site HEAD navigations in the Fetch Metadata policy (6.x) #2123

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
lukaszlenart merged 1 commit into from
Nov 7, 2026
Merged

WW-5754 Accept cross-site HEAD navigations in the Fetch Metadata policy (6.x) #2123

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion core/src/main/java/org/apache/struts2/interceptor/StrutsResourceIsolationPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ private boolean isAllowedTopLevelNavigation(HttpServletRequest request) {
String mode = request.getHeader(SEC_FETCH_MODE_HEADER);
String dest = request.getHeader(SEC_FETCH_DEST_HEADER);

boolean isSimpleTopLevelNavigation = MODE_NAVIGATE.equalsIgnoreCase(mode) && "GET".equalsIgnoreCase(request.getMethod());
String method = request.getMethod();
boolean isSimpleTopLevelNavigation = MODE_NAVIGATE.equalsIgnoreCase(mode)
&& ("GET".equalsIgnoreCase(method) || "HEAD".equalsIgnoreCase(method));
boolean isNotObjectOrEmbedRequest = !DEST_EMBED.equalsIgnoreCase(dest) && !DEST_OBJECT.equalsIgnoreCase(dest);

return isSimpleTopLevelNavigation && isNotObjectOrEmbedRequest;
Expand Down
25 changes: 11 additions & 14 deletions core/src/test/java/org/apache/struts2/interceptor/FetchMetadataInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,18 @@ public void testValidSite() throws Exception {

}

public void testValidTopLevelNavigation() throws Exception {
request.addHeader(SEC_FETCH_MODE_HEADER, MODE_NAVIGATE);
request.addHeader(SEC_FETCH_DEST_HEADER, DEST_SCRIPT);
request.setMethod("GET");

assertNotEquals("Expected interceptor to accept this request", SC_FORBIDDEN, interceptor.intercept(mai));
}

public void testCrossSiteTopLevelGetNavigationAllowed() throws Exception {
request.addHeader(SEC_FETCH_SITE_HEADER, SITE_CROSS_SITE);
request.addHeader(SEC_FETCH_MODE_HEADER, MODE_NAVIGATE);
request.addHeader(SEC_FETCH_DEST_HEADER, DEST_DOCUMENT);
request.setMethod("GET");
public void testCrossSiteTopLevelGetAndHeadNavigationAllowed() throws Exception {
for (String method : Arrays.asList("GET", "HEAD")) {
request.removeHeader(SEC_FETCH_SITE_HEADER);
request.addHeader(SEC_FETCH_SITE_HEADER, SITE_CROSS_SITE);
request.removeHeader(SEC_FETCH_MODE_HEADER);
request.addHeader(SEC_FETCH_MODE_HEADER, MODE_NAVIGATE);
request.removeHeader(SEC_FETCH_DEST_HEADER);
request.addHeader(SEC_FETCH_DEST_HEADER, DEST_DOCUMENT);
request.setMethod(method);

assertNotEquals("Expected interceptor to accept this request", SC_FORBIDDEN, interceptor.intercept(mai));
assertNotEquals("Expected interceptor to accept cross-site " + method + " navigation", SC_FORBIDDEN, interceptor.intercept(mai));
}
}

public void testCrossSiteNavigationWithUnsafeMethodRejected() throws Exception {
Expand Down
Loading