Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt to rewritten Reactor Netty.

Browse Source 
Adapt to changes in Reactor Netty and Spring Framework 5.1 RC1.

Disable ClientCertificateAuthenticationOperatorIntegrationTests as HttpClient (Reactor Netty) has issues with multiple SSL configurations.

Closes gh-281.
This commit is contained in:
Mark Paluch
2018-08-02 16:02:42 +02:00
parent be860b2e90
commit 6a4dd3e84f
10 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -20,9 +20,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>5.0.8.RELEASE</spring.version>
<spring.version>5.1.0.RC1</spring.version>
<spring-data-releasetrain.version>Kay-SR9</spring-data-releasetrain.version>
<reactor.version>Bismuth-SR10</reactor.version>
<reactor.version>Californium-M1</reactor.version>
<java.version>1.8</java.version>
<project.type>multi</project.type>
<dist.id>spring-vault</dist.id>

2
spring-vault-core/pom.xml
View File

@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>io.projectreactor.ipc</groupId>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty</artifactId>
<optional>true</optional>
</dependency>

2
spring-vault-core/src/main/java/org/springframework/vault/authentication/AuthenticationStepsExecutor.java
View File

@@ -135,7 +135,7 @@ public class AuthenticationStepsExecutor implements ClientAuthentication {
catch (HttpStatusCodeException e) {
throw new VaultLoginException(String.format(
"HTTP request %s in state %s failed with Status %s and body %s",
o, state, e.getStatusCode(),
o, state, e.getRawStatusCode(),
VaultResponses.getError(e.getResponseBodyAsString())), e);
}
catch (RuntimeException e) {

2
spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java
View File

@@ -333,7 +333,7 @@ getRefreshTrigger().nextExecutionTime(
}
private static String format(String message, HttpStatusCodeException e) {
return String.format("%s: Status %s %s %s", message, e.getStatusCode(),
return String.format("%s: Status %s %s %s", message, e.getRawStatusCode(),
e.getStatusText(), VaultResponses.getError(e.getResponseBodyAsString()));
}

2
spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java
View File

@@ -104,7 +104,7 @@ public class LoginTokenAdapter implements ClientAuthentication {
}
catch (HttpStatusCodeException e) {
throw new VaultTokenLookupException(String.format(
"Token self-lookup failed: %s %s", e.getStatusCode(),
"Token self-lookup failed: %s %s", e.getRawStatusCode(),
VaultResponses.getError(e.getResponseBodyAsString())));
}
catch (RestClientException e) {

2
spring-vault-core/src/main/java/org/springframework/vault/authentication/ReactiveLifecycleAwareSessionManager.java
View File

@@ -427,7 +427,7 @@ public class ReactiveLifecycleAwareSessionManager extends
}
private static String format(String message, WebClientResponseException e) {
return String.format("%s: Status %s %s %s", message, e.getStatusCode(),
return String.format("%s: Status %s %s %s", message, e.getRawStatusCode(),
e.getStatusText(), VaultResponses.getError(e.getResponseBodyAsString()));
}

7
spring-vault-core/src/main/java/org/springframework/vault/client/VaultResponses.java
View File

@@ -61,7 +61,7 @@ public abstract class VaultResponses {
if (StringUtils.hasText(message)) {
return new VaultException(String.format("Status %s %s: %s",
e.getStatusCode(), e.getStatusText(), message));
e.getRawStatusCode(), e.getStatusText(), message));
}
return new VaultException(String.format("Status %s %s", e.getStatusCode(),
@@ -98,11 +98,12 @@ public abstract class VaultResponses {
String statusText, String path, String message) {
if (StringUtils.hasText(message)) {
return new VaultException(String.format("Status %s %s %s: %s", statusCode,
return new VaultException(String.format("Status %s %s %s: %s",
statusCode.value(),
statusText, path, message));
}
return new VaultException(String.format("Status %s %s %s", statusCode,
return new VaultException(String.format("Status %s %s %s", statusCode.value(),
statusText, path));
}

31
spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpConnectorFactory.java
View File

@@ -17,11 +17,10 @@ package org.springframework.vault.config;
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.util.concurrent.atomic.AtomicLong;
import io.netty.channel.ChannelOption;
import io.netty.handler.ssl.SslContextBuilder;
import reactor.ipc.netty.resources.PoolResources;
import reactor.netty.http.client.HttpClient;
import org.springframework.http.client.reactive.ClientHttpConnector;
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
@@ -41,8 +40,6 @@ import static org.springframework.vault.config.ClientHttpRequestFactoryFactory.h
*/
public class ClientHttpConnectorFactory {
private static final AtomicLong POOL_COUNTER = new AtomicLong();
/**
* Create a {@link ClientHttpConnector} for the given {@link ClientOptions} and
* {@link SslConfiguration}.
@@ -54,21 +51,23 @@ public class ClientHttpConnectorFactory {
public static ClientHttpConnector create(ClientOptions options,
SslConfiguration sslConfiguration) {
return new ReactorClientHttpConnector(builder -> {
HttpClient client = HttpClient.create();
if (hasSslConfiguration(sslConfiguration)) {
if (hasSslConfiguration(sslConfiguration)) {
builder.sslSupport(sslContextBuilder -> {
configureSsl(sslConfiguration, sslContextBuilder);
}).poolResources(
PoolResources.elastic("vault-http-"
+ POOL_COUNTER.incrementAndGet()));
}
SslContextBuilder sslContextBuilder = SslContextBuilder.forClient();
configureSsl(sslConfiguration, sslContextBuilder);
builder.sslHandshakeTimeout(options.getConnectionTimeout());
builder.option(ChannelOption.CONNECT_TIMEOUT_MILLIS,
Math.toIntExact(options.getConnectionTimeout().toMillis()));
});
client = client.secure(builder -> {
builder.sslContext(sslContextBuilder);
});
}
client = client.tcpConfiguration(it -> it.option(
ChannelOption.CONNECT_TIMEOUT_MILLIS,
Math.toIntExact(options.getConnectionTimeout().toMillis())));
return new ReactorClientHttpConnector(client);
}
private static void configureSsl(SslConfiguration sslConfiguration,

2
spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationOperatorIntegrationTests.java
View File

@@ -15,6 +15,7 @@
*/
package org.springframework.vault.authentication;
import org.junit.Ignore;
import org.junit.Test;
import reactor.test.StepVerifier;
@@ -27,6 +28,7 @@ import org.springframework.web.reactive.function.client.WebClient;
*
* @author Mark Paluch
*/
@Ignore("See https://github.com/spring-projects/spring-vault/issues/281 and https://github.com/reactor/reactor-netty/issues/407")
public class ClientCertificateAuthenticationOperatorIntegrationTests extends
ClientCertificateAuthenticationIntegrationTestBase {

5
spring-vault-core/src/test/java/org/springframework/vault/util/TestWebClientFactory.java
View File

@@ -44,9 +44,10 @@ public class TestWebClientFactory {
Assert.notNull(sslConfiguration, "SslConfiguration must not be null!");
try {
ClientHttpConnector connector = ClientHttpConnectorFactory.create(
new ClientOptions(), sslConfiguration);
return ReactiveVaultClients.createWebClient(TEST_VAULT_ENDPOINT,
ClientHttpConnectorFactory.create(new ClientOptions(),
sslConfiguration));
connector);
}
catch (Exception e) {
throw new IllegalStateException(e);