Skip to content

Look at all cookies instead just the first #505

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

Closed
wants to merge 1 commit into from
Closed

Look at all cookies instead just the first #505

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
29 changes: 16 additions & 13 deletions ...session/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
*
*
* @author Rob Winch
* @author Eddú Meléndez
* @since 1.0
*/
public final class CookieHttpSessionStrategy
Expand Down Expand Up @@ -292,21 +293,23 @@ public void setCookieName(String cookieName) {

public Map<String, String> getSessionIds(HttpServletRequest request) {
List<String> cookieValues = this.cookieSerializer.readCookieValues(request);
String sessionCookieValue = cookieValues.isEmpty() ? ""
: cookieValues.iterator().next();
Map<String, String> result = new LinkedHashMap<String, String>();
StringTokenizer tokens = new StringTokenizer(sessionCookieValue, " ");
if (tokens.countTokens() == 1) {
result.put(DEFAULT_ALIAS, tokens.nextToken());
return result;
}
while (tokens.hasMoreTokens()) {
String alias = tokens.nextToken();
if (!tokens.hasMoreTokens()) {
break;
for (String cookieValue : cookieValues) {
String sessionCookieValue = cookieValues.isEmpty() ? ""
: cookieValue;
StringTokenizer tokens = new StringTokenizer(sessionCookieValue, " ");
if (tokens.countTokens() == 1) {
result.put(DEFAULT_ALIAS, tokens.nextToken());
return result;
}
while (tokens.hasMoreTokens()) {
String alias = tokens.nextToken();
if (!tokens.hasMoreTokens()) {
break;
}
String id = tokens.nextToken();
result.put(alias, id);
}
String id = tokens.nextToken();
result.put(alias, id);
}
return result;
}
Expand Down
13 changes: 13 additions & 0 deletions ...on/src/test/java/org/springframework/session/web/http/CookieHttpSessionStrategyTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,15 @@ public void getSessionIdsDangling() {
assertThat(sessionIds.get("1")).isEqualTo("b");
}

@Test
public void getSessionIdsMultiCookies() {
setSessionCookies(new Cookie(this.cookieName, "1 b"), new Cookie("OTHER_COOKIE", "0 a"));

Map<String, String> sessionIds = this.strategy.getSessionIds(this.request);
assertThat(sessionIds.size()).isEqualTo(1);
assertThat(sessionIds.get("1")).isEqualTo("b");
}

// --- helper

@Test
Expand Down Expand Up @@ -511,6 +520,10 @@ public void setSessionCookie(String value) {
this.request.setCookies(new Cookie(this.cookieName, value));
}

public void setSessionCookies(Cookie... cookies) {
this.request.setCookies(cookies);
}

public String getSessionId() {
return this.response.getCookie(this.cookieName).getValue();
}
Expand Down