Skip to content

Commit f72ea53

Browse files
committed
Catch base64 decode exception
Closes gh-15905
1 parent fe79766 commit f72ea53

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

web/src/main/java/org/springframework/security/web/savedrequest/CookieRequestCache.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,13 @@ public SavedRequest getRequest(HttpServletRequest request, HttpServletResponse r
7373
if (savedRequestCookie == null) {
7474
return null;
7575
}
76-
String originalURI = decodeCookie(savedRequestCookie.getValue());
76+
String originalURI;
77+
try {
78+
originalURI = decodeCookie(savedRequestCookie.getValue());
79+
}
80+
catch (IllegalArgumentException ex) {
81+
return null;
82+
}
7783
UriComponents uriComponents = UriComponentsBuilder.fromUriString(originalURI).build();
7884
DefaultSavedRequest.Builder builder = new DefaultSavedRequest.Builder();
7985
int port = getPort(uriComponents);

web/src/test/java/org/springframework/security/web/savedrequest/CookieRequestCacheTests.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,4 +213,15 @@ private static String decodeCookie(String encodedCookieValue) {
213213
return new String(Base64.getDecoder().decode(encodedCookieValue.getBytes()));
214214
}
215215

216+
// gh-15905
217+
@Test
218+
public void illegalCookieValueReturnNull() {
219+
CookieRequestCache cookieRequestCache = new CookieRequestCache();
220+
MockHttpServletRequest request = new MockHttpServletRequest();
221+
request.setCookies(new Cookie(DEFAULT_COOKIE_NAME, "123^456"));
222+
SavedRequest savedRequest = cookieRequestCache.getRequest(request, new MockHttpServletResponse());
223+
assertThat(savedRequest).isNull();
224+
}
225+
226+
216227
}

0 commit comments

Comments
 (0)