Skip to content

issue#70 #71

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

Open
syampol13 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

issue#70 #71

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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>

<groupId>com.blazemeter.jmeter</groupId>
<artifactId>jmeter-bzm-http2</artifactId>
<artifactId>jmeter-bzm-http2-f</artifactId>
<packaging>jar</packaging>
<version>2.0.5</version>
<version>2.0.5_cookie_handling</version>
<name>HTTP/2 Sampler</name>
<description>HTTP/2 protocol sampler</description>

Expand Down
35 changes: 35 additions & 0 deletions src/main/java/com/blazemeter/jmeter/http2/core/HTTP2JettyClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.HttpCookie;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
Expand All @@ -15,14 +16,17 @@
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.protocol.http.control.AuthManager;
Expand Down Expand Up @@ -541,11 +545,42 @@ private String buildCookies(HttpRequest request, URL url, CookieManager cookieMa
if (cookieManager == null) {
return null;
}

if (cookieManager.getCookieCount() == 0 &&
httpClient.getCookieStore().getCookies().size() > 0) {
httpClient.getCookieStore().removeAll();
LOG.debug("Clean Jetty cookie manager as Jmeter's one is empty");
}
Map<String, HttpCookie> jettyCookieMap =
httpClient.getCookieStore().get(request.getURI()).stream()
.collect(Collectors.toMap(HttpCookie::getName, httpCookie -> httpCookie));

//Iterate over Jmeter's cookies and remove such from Jetty's cookie if is present there
cookieManager.getCookies().forEach(e -> {
HttpCookie jettyCookie = jettyCookieMap.get(e.getName());
if (jettyCookie != null) {
LOG.debug("Remove cookie '{}' from Jetty cookie manager as it exist in a Jmeter one",
jettyCookie.getName());
httpClient.getCookieStore().remove(request.getURI(), jettyCookie);
}
});

String cookieString = cookieManager.getCookieHeaderForURL(url);
LOG.trace("Jmeter's cookieString: "+cookieString);
if (cookieString != null) {
HttpField cookieHeader = new HttpField(HTTPConstants.HEADER_COOKIE, cookieString);
request.addHeader(cookieHeader);
}

//Didn't expect any cookie here but better to have this check. Iterate over Jetty's cookies and add to cookieString if something remain.
List<String> cookieStringFull = new ArrayList<>();
cookieStringFull.add(cookieString);
httpClient.getCookieStore().get(request.getURI()).forEach(e -> {
cookieStringFull.add(e.toString());
LOG.info("Cookie exists in Jetty's Cookie manager but absent in Jmeter's one: "+e.toString());
});
cookieString = String.join("; ", cookieStringFull);
LOG.trace("Updated cookieString: "+cookieString);
return cookieString;
}

Expand Down