import io.netty.handler.timeout.ReadTimeoutHandler;
import io.netty.handler.timeout.WriteTimeoutHandler;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.lang.invoke.MethodHandles;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
-import javax.net.ssl.SSLException;
-
+import org.oransc.policyagent.configuration.ImmutableWebClientConfig;
+import org.oransc.policyagent.configuration.WebClientConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
import org.springframework.lang.Nullable;
+import org.springframework.util.ResourceUtils;
import org.springframework.web.reactive.function.client.WebClient;
import org.springframework.web.reactive.function.client.WebClient.RequestHeadersSpec;
import org.springframework.web.reactive.function.client.WebClientResponseException;
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private WebClient webClient = null;
private final String baseUrl;
+ private static final AtomicInteger sequenceNumber = new AtomicInteger();
+ private final WebClientConfig clientConfig;
public AsyncRestClient(String baseUrl) {
+ this(baseUrl,
+ ImmutableWebClientConfig.builder().isTrustStoreUsed(false).trustStore("").trustStorePassword("").build());
+ }
+
+ public AsyncRestClient(String baseUrl, WebClientConfig config) {
this.baseUrl = baseUrl;
+ this.clientConfig = config;
}
public Mono<ResponseEntity<String>> postForEntity(String uri, @Nullable String body) {
- logger.debug("POST uri = '{}{}''", baseUrl, uri);
+ Object traceTag = createTraceTag();
+ logger.debug("{} POST uri = '{}{}''", traceTag, baseUrl, uri);
+ logger.trace("{} POST body: {}", traceTag, body);
Mono<String> bodyProducer = body != null ? Mono.just(body) : Mono.empty();
return getWebClient() //
.flatMap(client -> {
.uri(uri) //
.contentType(MediaType.APPLICATION_JSON) //
.body(bodyProducer, String.class);
- return retrieve(request);
+ return retrieve(traceTag, request);
});
}
}
public Mono<String> postWithAuthHeader(String uri, String body, String username, String password) {
- logger.debug("POST (auth) uri = '{}{}''", baseUrl, uri);
+ Object traceTag = createTraceTag();
+ logger.debug("{} POST (auth) uri = '{}{}''", traceTag, baseUrl, uri);
+ logger.trace("{} POST body: {}", traceTag, body);
return getWebClient() //
.flatMap(client -> {
RequestHeadersSpec<?> request = client.post() //
.headers(headers -> headers.setBasicAuth(username, password)) //
.contentType(MediaType.APPLICATION_JSON) //
.bodyValue(body);
- return retrieve(request) //
+ return retrieve(traceTag, request) //
.flatMap(this::toBody);
});
}
public Mono<ResponseEntity<String>> putForEntity(String uri, String body) {
- logger.debug("PUT uri = '{}{}''", baseUrl, uri);
+ Object traceTag = createTraceTag();
+ logger.debug("{} PUT uri = '{}{}''", traceTag, baseUrl, uri);
+ logger.trace("{} PUT body: {}", traceTag, body);
return getWebClient() //
.flatMap(client -> {
RequestHeadersSpec<?> request = client.put() //
.uri(uri) //
.contentType(MediaType.APPLICATION_JSON) //
.bodyValue(body);
- return retrieve(request);
+ return retrieve(traceTag, request);
});
}
public Mono<ResponseEntity<String>> putForEntity(String uri) {
- logger.debug("PUT uri = '{}{}''", baseUrl, uri);
+ Object traceTag = createTraceTag();
+ logger.debug("{} PUT uri = '{}{}''", traceTag, baseUrl, uri);
+ logger.trace("{} PUT body: <empty>", traceTag);
return getWebClient() //
.flatMap(client -> {
RequestHeadersSpec<?> request = client.put() //
.uri(uri);
- return retrieve(request);
+ return retrieve(traceTag, request);
});
}
}
public Mono<ResponseEntity<String>> getForEntity(String uri) {
- logger.debug("GET uri = '{}{}''", baseUrl, uri);
+ Object traceTag = createTraceTag();
+ logger.debug("{} GET uri = '{}{}''", traceTag, baseUrl, uri);
return getWebClient() //
.flatMap(client -> {
RequestHeadersSpec<?> request = client.get().uri(uri);
- return retrieve(request);
+ return retrieve(traceTag, request);
});
}
}
public Mono<ResponseEntity<String>> deleteForEntity(String uri) {
- logger.debug("DELETE uri = '{}{}''", baseUrl, uri);
+ Object traceTag = createTraceTag();
+ logger.debug("{} DELETE uri = '{}{}''", traceTag, baseUrl, uri);
return getWebClient() //
.flatMap(client -> {
RequestHeadersSpec<?> request = client.delete().uri(uri);
- return retrieve(request);
+ return retrieve(traceTag, request);
});
}
.flatMap(this::toBody);
}
- private Mono<ResponseEntity<String>> retrieve(RequestHeadersSpec<?> request) {
+ private Mono<ResponseEntity<String>> retrieve(Object traceTag, RequestHeadersSpec<?> request) {
return request.retrieve() //
.toEntity(String.class) //
- .doOnError(this::onHttpError);
+ .doOnNext(entity -> logger.trace("{} Received: {}", traceTag, entity.getBody()))
+ .doOnError(throwable -> onHttpError(traceTag, throwable));
+ }
+
+ private static Object createTraceTag() {
+ return sequenceNumber.incrementAndGet();
}
- private void onHttpError(Throwable t) {
+ private void onHttpError(Object traceTag, Throwable t) {
if (t instanceof WebClientResponseException) {
WebClientResponseException exception = (WebClientResponseException) t;
- logger.debug("HTTP error status = '{}', body '{}'", exception.getStatusCode(),
+ logger.debug("{} HTTP error status = '{}', body '{}'", traceTag, exception.getStatusCode(),
exception.getResponseBodyAsString());
} else {
- logger.debug("HTTP error: {}", t.getMessage());
+ logger.debug("{} HTTP error: {}", traceTag, t.getMessage());
}
}
}
}
- private static SslContext createSslContext() throws SSLException {
+ private boolean isCertificateEntry(KeyStore trustStore, String alias) {
+ try {
+ return trustStore.isCertificateEntry(alias);
+ } catch (KeyStoreException e) {
+ logger.error("Error reading truststore {}", e.getMessage());
+ return false;
+ }
+ }
+
+ private Certificate getCertificate(KeyStore trustStore, String alias) {
+ try {
+ return trustStore.getCertificate(alias);
+ } catch (KeyStoreException e) {
+ logger.error("Error reading truststore {}", e.getMessage());
+ return null;
+ }
+ }
+
+ SslContext createSslContextSecure(String trustStorePath, String trustStorePass)
+ throws NoSuchAlgorithmException, CertificateException, IOException, KeyStoreException {
+
+ final KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+ trustStore.load(new FileInputStream(ResourceUtils.getFile(trustStorePath)), trustStorePass.toCharArray());
+
+ List<Certificate> certificateList = Collections.list(trustStore.aliases()).stream() //
+ .filter(alias -> isCertificateEntry(trustStore, alias)) //
+ .map(alias -> getCertificate(trustStore, alias)) //
+ .collect(Collectors.toList());
+ final X509Certificate[] certificates = certificateList.toArray(new X509Certificate[certificateList.size()]);
+
return SslContextBuilder.forClient() //
- .trustManager(InsecureTrustManagerFactory.INSTANCE) //
+ .trustManager(certificates) //
.build();
}
- private static WebClient createWebClient(String baseUrl, SslContext sslContext) {
+ private SslContext createSslContext()
+ throws NoSuchAlgorithmException, CertificateException, KeyStoreException, IOException {
+ if (this.clientConfig.isTrustStoreUsed()) {
+ return createSslContextSecure(this.clientConfig.trustStore(), this.clientConfig.trustStorePassword());
+ } else {
+ return SslContextBuilder.forClient() //
+ .trustManager(InsecureTrustManagerFactory.INSTANCE) //
+ .build();
+ }
+ }
+
+ private WebClient createWebClient(String baseUrl, SslContext sslContext) {
TcpClient tcpClient = TcpClient.create() //
.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 10_000) //
.secure(c -> c.sslContext(sslContext)) //
.doOnConnected(connection -> {
- connection.addHandler(new ReadTimeoutHandler(10));
- connection.addHandler(new WriteTimeoutHandler(30));
+ connection.addHandlerLast(new ReadTimeoutHandler(30));
+ connection.addHandlerLast(new WriteTimeoutHandler(30));
});
HttpClient httpClient = HttpClient.from(tcpClient);
ReactorClientHttpConnector connector = new ReactorClientHttpConnector(httpClient);
try {
SslContext sslContext = createSslContext();
this.webClient = createWebClient(this.baseUrl, sslContext);
- } catch (SSLException e) {
+ } catch (Exception e) {
logger.error("Could not create WebClient {}", e.getMessage());
return Mono.error(e);
}
Code Review / nonrtric.git / blobdiff