Merge pull request #331 from xdev-software/develop

AB-xdev · web-flow · commit 9250e9400d84 · 2026-04-20T13:36:52.000+02:00
Release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
+# 2.2.4
+* oauth2-oidc
+  * Improve performance of `FastCookieFinder`
+
 # 2.2.3
-* oauth2-oidc-remember-me
+* oauth2-oidc
   * Fix NPE in `FastCookieFinder`
 
 # 2.2.2
diff --git a/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/util/FastCookieFinder.java b/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/util/FastCookieFinder.java
@@ -27,9 +27,11 @@ public final class FastCookieFinder
 	public static Optional<Cookie> findCookie(final HttpServletRequest request, final String cookieName)
 	{
 		return Optional.ofNullable(request.getHeader("Cookie"))
-			// Quick check if value is present
-			.filter(h -> h.contains(cookieName))
+			// Quick check header if cookieName is present
+			// to prevent expensive parsing of cookies
+			.filter(h -> h.contains(cookieName + "="))
 			.flatMap(x -> {
+				// getCookies might parse Cookies (e.g. Tomcat)
 				final Cookie[] cookies = request.getCookies();
 				if(cookies == null)
 				{

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,11 @@ public final class FastCookieFinder`
`27`	`27`	`public static Optional<Cookie> findCookie(final HttpServletRequest request, final String cookieName)`
`28`	`28`	`{`
`29`	`29`	`return Optional.ofNullable(request.getHeader("Cookie"))`
`30`		`- // Quick check if value is present`
`31`		`- .filter(h -> h.contains(cookieName))`
	`30`	`+ // Quick check header if cookieName is present`
	`31`	`+ // to prevent expensive parsing of cookies`
	`32`	`+ .filter(h -> h.contains(cookieName + "="))`
`32`	`33`	`.flatMap(x -> {`
	`34`	`+ // getCookies might parse Cookies (e.g. Tomcat)`
`33`	`35`	`final Cookie[] cookies = request.getCookies();`
`34`	`36`	`if(cookies == null)`
`35`	`37`	`{`