Skip to content

[#2578] Filter extra cookies on resubmit #2588

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

Open
lprimak wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[#2578] Filter extra cookies on resubmit #2588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
941177f
bugfix: Ignore any cookies that start with session ID, not just sessi…
lprimak Feb 28, 2026
fbd38c4
bugfix: skip remember me cookie as well during resubmit
lprimak Feb 28, 2026
4290b24
enh: better error handling of relogin issues with stateless forms and…
lprimak Mar 1, 2026
4b037a9
fix: make sure ajax redirects are only made for redirect response code
lprimak Mar 1, 2026
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
9 changes: 5 additions & 4 deletions support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormResubmitSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import java.util.Optional;
import java.util.UUID;
import static java.util.function.Predicate.not;
import static org.apache.shiro.web.mgt.CookieRememberMeManager.DEFAULT_REMEMBER_ME_COOKIE_NAME;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static javax.faces.application.StateManager.STATE_SAVING_METHOD_CLIENT;
Expand Down Expand Up @@ -405,8 +406,7 @@ static String resubmitSavedForm(@NonNull String savedFormData, @NonNull String s
deleteCookie(originalResponse, servletContext, SHIRO_FORM_DATA_KEY);
return processResubmitResponse(response, originalRequest, originalResponse,
response.headers(), savedRequest, servletContext,
(rememberedAjaxResubmit && decodedFormData.isStatelessRequest) ? false
: decodedFormData.isPartialAjaxRequest, rememberedAjaxResubmit);
decodedFormData.isPartialAjaxRequest, rememberedAjaxResubmit);
}
}

Expand Down Expand Up @@ -486,7 +486,7 @@ private static String processResubmitResponse(HttpResponse<String> response,
.startsWith(getSessionCookieName(servletContext, getSecurityManager()))))
.forEach(entry -> addCookie(originalResponse, servletContext,
entry.getKey(), entry.getValue(), -1));
if (isPartialAjaxRequest) {
if (response.statusCode() == FOUND && isPartialAjaxRequest) {
originalResponse.setHeader(CONTENT_TYPE, TEXT_XML);
originalResponse.setCharacterEncoding(StandardCharsets.UTF_8.name());
originalResponse.getWriter().append(String.format(
Expand Down Expand Up @@ -520,7 +520,8 @@ private static HttpClient buildHttpClient(URI savedRequest, ServletContext servl
cookieManager.getCookieStore().add(savedRequest, sessionCookie);
log.debug("Setting Cookie {}", sessionCookieName);
for (Cookie origCookie : originalRequest.getCookies()) {
if (!origCookie.getName().equals(sessionCookieName)) {
if (!origCookie.getName().startsWith(sessionCookieName)
&& !origCookie.getName().equals(DEFAULT_REMEMBER_ME_COOKIE_NAME)) {
try {
log.debug("Setting Cookie {}", origCookie.getName());
HttpCookie cookie = new HttpCookie(origCookie.getName(), origCookie.getValue());
Expand Down
2 changes: 1 addition & 1 deletion support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/FormResubmitSupportCookies.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ static String getSessionCookieName(ServletContext context, org.apache.shiro.mgt.

static Map<String, String> transformCookieHeader(@NonNull List<String> cookies) {
return cookieStreamFromHeader(cookies)
.collect(Collectors.toMap(HttpCookie::getName, HttpCookie::getValue));
.collect(Collectors.toMap(HttpCookie::getName, HttpCookie::getValue, (var, v2) -> v2));
}

static Stream<HttpCookie> cookieStreamFromHeader(@NonNull List<String> cookies) {
Expand Down
Loading