Skip to content
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

Jump to bottom

Multiple times the same cookie : consider the value of the last one, fix for #954 #956

Merged
merged 1 commit into from Feb 13, 2013
Merged

Multiple times the same cookie : consider the value of the last one, fix for #954 #956

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 9 additions & 14 deletions gatling-http/src/main/scala/com/excilys/ebi/gatling/http/cookie/CookieJar.scala
View file
Open in desktop
Expand Up @@ -85,23 +85,18 @@ class CookieJar(store: Map[URI, List[Cookie]]) {

def cookiesEquals(c1: Cookie, c2: Cookie) = c1.getName.equalsIgnoreCase(c2.getName) && c1.getDomain.equalsIgnoreCase(c2.getDomain) && c1.getPath == c2.getPath

@tailrec
def addOrReplaceCookies(newCookies: List[Cookie], oldCookies: List[Cookie]): List[Cookie] = newCookies match {
case Nil => oldCookies
case newCookie :: moreNewCookies =>
val updatedCookies = newCookie :: oldCookies.filterNot(cookiesEquals(_, newCookie))
addOrReplaceCookies(moreNewCookies, updatedCookies)
}

def hasExpired(c: Cookie): Boolean = c.getMaxAge != MAX_AGE_UNSPECIFIED && c.getMaxAge <= 0

val uri = getEffectiveUri(rawURI)

val cookiesWithExactURI = store.get(uri) match {
case Some(cookies) =>
@tailrec
def addOrReplaceCookies(newCookies: List[Cookie], oldCookies: List[Cookie]): List[Cookie] = newCookies match {
case Nil => oldCookies
case newCookie :: moreNewCookies =>
val updatedCookies = newCookie :: oldCookies.filterNot(cookiesEquals(_, newCookie))
addOrReplaceCookies(moreNewCookies, updatedCookies)
}

addOrReplaceCookies(newCookies, cookies)
case _ => newCookies
}
val cookiesWithExactURI = addOrReplaceCookies(newCookies, store.get(uri).getOrElse(List.empty))
val nonExpiredCookies = cookiesWithExactURI.filterNot(hasExpired)
new CookieJar(store + (uri -> nonExpiredCookies))
}
Expand Down
11 changes: 11 additions & 0 deletions gatling-http/src/test/scala/com/excilys/ebi/gatling/http/cookie/CookieJarSpec.scala
View file
Open in desktop
Expand Up @@ -188,5 +188,16 @@ class CookieJarSpec extends Specification {
// RFC 6265, 5.1.3. Domain Matching
cookieStore.get(new URI("https://y.x.foo.org/")).length must beEqualTo(1)
}

"should serve the last cookie when they are definied twice" in {
val cookie1 = parseCookie("cookie1=VALUE1; Path=/")
val cookie2 = parseCookie("cookie1=VALUE2; Path=/")
val cookie3 = parseCookie("cookie1=VALUE3; Path=/")
val cookieStore = CookieJar(new URI("https://foo.org/"), List(cookie1, cookie2, cookie3))

val cookies = cookieStore.get(new URI("https://foo.org/"))
cookies.length must beEqualTo(1)
cookies.head.getValue must beEqualTo("VALUE3")
}
}
}