Skip to content

Commit dea7dcd

Browse files
Fix "Invalid cookie header" warnings (#791)
Co-authored-by: Günter Grodotzki <[email protected]>
1 parent a7656fc commit dea7dcd

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,6 +1038,7 @@ private CloseableHttpClient getHttpClient(final HttpRequestBase request) {
10381038
HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
10391039
httpClientBuilder.useSystemProperties();
10401040
httpClientBuilder.setRetryHandler(new StandardHttpRequestRetryHandler());
1041+
httpClientBuilder.disableCookieManagement();
10411042

10421043
RequestConfig.Builder requestConfig = RequestConfig.custom();
10431044
String connectTimeout = System.getProperty("http.connect.timeout", "10");

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClientTest.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@
99
import java.util.List;
1010
import java.util.logging.Level;
1111
import java.util.stream.Collectors;
12+
import org.apache.http.impl.client.CloseableHttpClient;
13+
import org.apache.http.impl.client.HttpClientBuilder;
1214
import org.junit.Assert;
1315
import org.junit.Rule;
1416
import org.junit.Test;
1517
import org.jvnet.hudson.test.JenkinsRule;
1618
import org.jvnet.hudson.test.LoggerRule;
1719
import org.jvnet.hudson.test.WithoutJenkins;
20+
import org.mockito.MockedStatic;
1821

1922
import static com.cloudbees.jenkins.plugins.bitbucket.server.client.BitbucketServerAPIClient.API_BROWSE_PATH;
2023
import static org.hamcrest.MatcherAssert.assertThat;
@@ -23,6 +26,10 @@
2326
import static org.hamcrest.Matchers.hasItem;
2427
import static org.hamcrest.Matchers.is;
2528
import static org.hamcrest.Matchers.not;
29+
import static org.mockito.Mockito.mock;
30+
import static org.mockito.Mockito.mockStatic;
31+
import static org.mockito.Mockito.verify;
32+
import static org.mockito.Mockito.when;
2633

2734
public class BitbucketServerAPIClientTest {
2835

@@ -82,4 +89,16 @@ public void sortRepositoriesByName() throws Exception {
8289
assertThat(names, is(List.of("another-repo", "dogs-repo", "test-repos")));
8390
}
8491

92+
@Test
93+
public void disableCookieManager() throws Exception {
94+
try(MockedStatic<HttpClientBuilder> staticHttpClientBuilder = mockStatic(HttpClientBuilder.class)) {
95+
HttpClientBuilder httpClientBuilder = mock(HttpClientBuilder.class);
96+
CloseableHttpClient httpClient = mock(CloseableHttpClient.class);
97+
staticHttpClientBuilder.when(HttpClientBuilder::create).thenReturn(httpClientBuilder);
98+
when(httpClientBuilder.build()).thenReturn(httpClient);
99+
BitbucketApi client = BitbucketIntegrationClientFactory.getClient("localhost", "amuniz", "test-repos");
100+
client.getRepositories();
101+
verify(httpClientBuilder).disableCookieManagement();
102+
}
103+
}
85104
}

0 commit comments

Comments
 (0)