Formatting
See gh-3641
This commit is contained in:
@@ -67,7 +67,8 @@ public abstract class AbstractSslConfigurer<T, S> {
|
||||
}
|
||||
|
||||
protected SslBundle getBundle() {
|
||||
if (ssl.getSslBundle() != null && ssl.getSslBundle().length() > 0 && bundles.getBundleNames().contains(ssl.getSslBundle())) {
|
||||
if (ssl.getSslBundle() != null && ssl.getSslBundle().length() > 0
|
||||
&& bundles.getBundleNames().contains(ssl.getSslBundle())) {
|
||||
return bundles.getBundle(ssl.getSslBundle());
|
||||
}
|
||||
return null;
|
||||
|
||||
@@ -1,15 +1,32 @@
|
||||
/*
|
||||
* Copyright 2013-2023 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.cloud.gateway.test.ssl;
|
||||
|
||||
import io.netty.handler.ssl.SslContextBuilder;
|
||||
import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import reactor.netty.http.client.HttpClient;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.ssl.SslBundles;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
|
||||
import org.springframework.test.annotation.DirtiesContext;
|
||||
import org.springframework.test.context.ActiveProfiles;
|
||||
import reactor.netty.http.client.HttpClient;
|
||||
|
||||
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
|
||||
|
||||
@@ -17,6 +34,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
|
||||
@DirtiesContext
|
||||
@ActiveProfiles("client-auth-ssl-bundle")
|
||||
public class ClientCertAuthSSLBundleTests extends SingleCertSSLTests {
|
||||
|
||||
@Autowired
|
||||
private SslBundles sslBundles;
|
||||
|
||||
@@ -24,10 +42,11 @@ public class ClientCertAuthSSLBundleTests extends SingleCertSSLTests {
|
||||
public void setup() throws Exception {
|
||||
final var sslBundle = sslBundles.getBundle("scg-keystore-with-different-key-password");
|
||||
final var sslContext = SslContextBuilder.forClient()
|
||||
.trustManager(InsecureTrustManagerFactory.INSTANCE)
|
||||
.keyManager(sslBundle.getManagers().getKeyManagerFactory())
|
||||
.build();
|
||||
.trustManager(InsecureTrustManagerFactory.INSTANCE)
|
||||
.keyManager(sslBundle.getManagers().getKeyManagerFactory())
|
||||
.build();
|
||||
HttpClient httpClient = HttpClient.create().secure(ssl -> ssl.sslContext(sslContext));
|
||||
setup(new ReactorClientHttpConnector(httpClient), "https://localhost:" + port);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user