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

remove httpclient caching from DefaultHttpClientFactory #1416

Merged
merged 2 commits into from
Jan 3, 2024
Merged

remove httpclient caching from DefaultHttpClientFactory #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26a04ae
remove httpclient caching from DefaultHttpClientFactory
liga-oz Jan 2, 2024
6c305c5
remove logcaptor
liga-oz Jan 3, 2024
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
6 changes: 0 additions & 6 deletions token-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,6 @@
<version>1.4.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.hakky54</groupId>
<artifactId>logcaptor</artifactId>
<version>2.9.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
Expand Down
16 changes: 2 additions & 14 deletions token-client/src/main/java/com/sap/cloud/security/client/DefaultHttpClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,10 @@
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.net.ssl.SSLContext;
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;

Expand All @@ -41,16 +36,13 @@
* implementation of {@link HttpClientFactory}.
*/
public class DefaultHttpClientFactory implements HttpClientFactory {
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultHttpClientFactory.class);

private static final int DEFAULT_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(5);
private static final int DEFAULT_SOCKET_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(30);
private static final int MAX_CONNECTIONS_PER_ROUTE = 20; // default is 2
private static final int MAX_CONNECTIONS = 200;
private final ConcurrentHashMap<String, SslConnection> sslConnectionPool = new ConcurrentHashMap<>();
private final org.apache.http.client.config.RequestConfig requestConfig;
// reuse ssl connections
final Set<String> httpClientsCreated = Collections.synchronizedSet(new HashSet<>());

public DefaultHttpClientFactory() {
requestConfig = org.apache.http.client.config.RequestConfig.custom()
Expand All @@ -64,15 +56,11 @@ public DefaultHttpClientFactory() {
@Override
public CloseableHttpClient createClient(ClientIdentity clientIdentity) throws HttpClientException {
String clientId = clientIdentity != null ? clientIdentity.getId() : null;
if (httpClientsCreated.contains(clientId)) {
LOGGER.warn("Application has already created HttpClient for clientId = {}, please check.", clientId);
}
httpClientsCreated.add(clientId);
HttpClientBuilder httpClientBuilder = HttpClients.custom().setDefaultRequestConfig(requestConfig);

if (clientId != null && clientIdentity.isCertificateBased()) {
SslConnection connectionPool = sslConnectionPool.computeIfAbsent(clientId,
s -> new SslConnection(clientIdentity));
SslConnection connectionPool = sslConnectionPool.compute(clientId,
(s,c) -> new SslConnection(clientIdentity));
return httpClientBuilder
.setConnectionManager(connectionPool.poolingConnectionManager)
.setSSLContext(connectionPool.context)
Expand Down
46 changes: 0 additions & 46 deletions token-client/src/test/java/com/sap/cloud/security/client/DefaultHttpClientFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@
import com.github.tomakehurst.wiremock.WireMockServer;
import com.sap.cloud.security.config.ClientCredentials;
import com.sap.cloud.security.config.ClientIdentity;
import nl.altindag.log.LogCaptor;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpStatus;
import org.apache.http.client.HttpClient;
import org.apache.http.client.ResponseHandler;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
Expand All @@ -25,9 +22,7 @@
import java.nio.charset.StandardCharsets;

import static com.github.tomakehurst.wiremock.client.WireMock.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.mockito.Mockito.when;

class DefaultHttpClientFactoryTest {
Expand All @@ -37,7 +32,6 @@ class DefaultHttpClientFactoryTest {
private static final ClientIdentity config = Mockito.mock(ClientIdentity.class);
private static final ClientIdentity config2 = Mockito.mock(ClientIdentity.class);
private final DefaultHttpClientFactory cut = new DefaultHttpClientFactory();
private static LogCaptor logCaptor;

@BeforeAll
static void setup() throws IOException {
Expand All @@ -50,48 +44,8 @@ static void setup() throws IOException {
when(config2.getKey()).thenReturn(readFromFile("/privateRSAKey.txt"));
when(config2.getCertificate()).thenReturn(readFromFile("/certificates.txt"));
when(config2.isCertificateBased()).thenCallRealMethod();

logCaptor = LogCaptor.forClass(DefaultHttpClientFactory.class);
}

@AfterEach
void tearDown() {
logCaptor.clearLogs();
}

@Test
void createHttpClient_sameClientId() {
HttpClient client1 = cut.createClient(config);
HttpClient client2 = cut.createClient(config);

assertNotSame(client1, client2);

assertEquals(1, cut.httpClientsCreated.size());
}

@Test
void createHttpClient_differentClientId() {
HttpClient client1 = cut.createClient(config);
HttpClient client2 = cut.createClient(config2);

assertNotSame(client1, client2);

assertEquals(2, cut.httpClientsCreated.size());
}

@Test
void assertWarnWhenCalledMoreThanOnce() {
cut.createClient(config);
cut.createClient(config2);
assertThat(logCaptor.getWarnLogs()).isEmpty();

cut.createClient(config);
assertThat(logCaptor.getWarnLogs()).hasSize(1);
assertThat(logCaptor.getWarnLogs().get(0))
.startsWith("Application has already created HttpClient for clientId = theClientId, please check.");

logCaptor.clearLogs();
}

private static String readFromFile(String file) throws IOException {
return IOUtils.resourceToString(file, StandardCharsets.UTF_8);
Expand Down
Loading