Skip to content

Fix double submit csrf cookie #4010

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
duanemay merged 2 commits into from
Aug 13, 2026
+33 −6
Merged

Fix double submit csrf cookie #4010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0382d85
Implement AI Scan -- MEDIUM -- double-submit-csrf-cookie-without-host…
joemahady-comm Jul 29, 2026
5b0dedd
Fix double submit csrf cookie
joemahady-comm Aug 7, 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
22 changes: 17 additions & 5 deletions .../main/java/org/cloudfoundry/identity/uaa/security/web/CookieBasedCsrfTokenRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,19 @@ public void saveToken(CsrfToken token, HttpServletRequest request, HttpServletRe
token = generateToken(request);
expire = true;
}
Cookie csrfCookie = new Cookie(token.getParameterName(), token.getToken());

boolean isSecure = secure || "https".equals(request.getScheme());
String baseName = token.getParameterName().startsWith("__Host-") ? token.getParameterName().substring("__Host-".length()) : token.getParameterName();
String cookieName = isSecure ? "__Host-" + baseName : baseName;

Cookie csrfCookie = new Cookie(cookieName, token.getToken());
csrfCookie.setHttpOnly(true);
csrfCookie.setSecure(secure || "https".equals(request.getScheme()));
csrfCookie.setPath(ofNullable(request.getContextPath()).orElse("") + "/");
csrfCookie.setSecure(isSecure);
if (cookieName.startsWith("__Host-")) {
csrfCookie.setPath("/");
} else {
csrfCookie.setPath(ofNullable(request.getContextPath()).orElse("") + "/");
}
Comment thread
joemahady-comm marked this conversation as resolved.
if (expire) {
csrfCookie.setMaxAge(0);
} else {
Expand All @@ -133,8 +142,11 @@ public CsrfToken loadToken(HttpServletRequest request) {
if (requiresCsrfProtection) {
Cookie[] cookies = request.getCookies();
if (cookies != null) {
for (Cookie cookie : request.getCookies()) {
if (getParameterName().equals(cookie.getName())) {
boolean isSecure = secure || "https".equals(request.getScheme());
String baseName = getParameterName().startsWith("__Host-") ? getParameterName().substring("__Host-".length()) : getParameterName();
String expectedCookieName = isSecure ? "__Host-" + baseName : baseName;
for (Cookie cookie : cookies) {
if (expectedCookieName.equals(cookie.getName())) {
return new DefaultCsrfToken(getHeaderName(), getParameterName(), cookie.getValue());
}
}
Expand Down
17 changes: 16 additions & 1 deletion .../src/test/java/org/cloudfoundry/identity/uaa/web/CookieBasedCsrfTokenRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,21 @@ private MockHttpServletResponse saveTokenAndReturnResponse(boolean isSecure, Str
}

private Cookie saveTokenAndReturnCookie(boolean isSecure, String protocol) {
return saveTokenAndReturnResponse(isSecure, protocol).getCookie("X-Uaa-Csrf");
MockHttpServletResponse response = saveTokenAndReturnResponse(isSecure, protocol);
boolean expectSecure = isSecure || "https".equals(protocol);
String expectedCookieName = expectSecure ? "__Host-X-Uaa-Csrf" : "X-Uaa-Csrf";

String setCookie = response.getHeader("Set-Cookie");
if (setCookie == null || !setCookie.contains(expectedCookieName + "=")) {
throw new IllegalStateException("Expected Set-Cookie header for " + expectedCookieName + " but was: " + setCookie);
}

int valueStart = setCookie.indexOf(expectedCookieName + "=") + (expectedCookieName + "=").length();
int valueEnd = setCookie.indexOf(';', valueStart);
String value = valueEnd >= 0 ? setCookie.substring(valueStart, valueEnd) : setCookie.substring(valueStart);
Cookie cookie = new Cookie(expectedCookieName, value);
cookie.setSecure(setCookie.contains("Secure"));
cookie.setHttpOnly(setCookie.contains("HttpOnly"));
return cookie;
}
}
Loading