-
Notifications
You must be signed in to change notification settings - Fork 643
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Expose an API for applying the SslContext's default configuration pri…
…or any other configuration. SslProvider.SslContextSpec#sslContext(SslProvider.ProtocolSslContextSpec) provides, specific for the protocol, default configuration (DefaultSslContextSpec, TcpSslContextSpec, Http11SslContextSpec, Http2SslContextSpec). As opposed to SslProvider.SslContextSpec#sslContext(SslContextBuilder), the default configuration is applied before any other custom configuration. Fixes #1543
- Loading branch information
Showing
37 changed files
with
1,134 additions
and
304 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
reactor-netty-core/src/main/java/reactor/netty/tcp/AbstractProtocolSslContextSpec.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * Copyright (c) 2011-Present VMware, Inc. or its affiliates, All Rights Reserved. | ||
| * | ||
| * 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 reactor.netty.tcp; | ||
|
|
||
| import io.netty.handler.ssl.SslContext; | ||
| import io.netty.handler.ssl.SslContextBuilder; | ||
|
|
||
| import javax.net.ssl.SSLException; | ||
| import java.util.Objects; | ||
| import java.util.function.Consumer; | ||
| import java.util.function.Supplier; | ||
|
|
||
| /** | ||
| * SslContext builder that provides, specific for protocol, default configuration. | ||
| * | ||
| * @author Violeta Georgieva | ||
| * @since 1.0.6 | ||
| */ | ||
| public abstract class AbstractProtocolSslContextSpec<T extends AbstractProtocolSslContextSpec<T>> | ||
| implements SslProvider.ProtocolSslContextSpec, Supplier<T> { | ||
|
|
||
| final SslContextBuilder sslContextBuilder; | ||
|
|
||
| protected AbstractProtocolSslContextSpec(SslContextBuilder sslContextBuilder) { | ||
| this.sslContextBuilder = sslContextBuilder; | ||
| configure(defaultConfiguration()); | ||
| } | ||
|
|
||
| protected abstract Consumer<SslContextBuilder> defaultConfiguration(); | ||
|
|
||
| @Override | ||
| public T configure(Consumer<SslContextBuilder> sslCtxBuilder) { | ||
| Objects.requireNonNull(sslCtxBuilder, "sslCtxBuilder"); | ||
| sslCtxBuilder.accept(sslContextBuilder); | ||
| return get(); | ||
| } | ||
|
|
||
| @Override | ||
| public SslContext sslContext() throws SSLException { | ||
| return sslContextBuilder.build(); | ||
| } | ||
| } |
153 changes: 153 additions & 0 deletions
153
reactor-netty-core/src/main/java/reactor/netty/tcp/DefaultSslContextSpec.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| /* | ||
| * Copyright (c) 2011-Present VMware, Inc. or its affiliates, All Rights Reserved. | ||
| * | ||
| * 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 reactor.netty.tcp; | ||
|
|
||
| import io.netty.handler.ssl.SslContext; | ||
| import io.netty.handler.ssl.SslContextBuilder; | ||
|
|
||
| import javax.net.ssl.KeyManager; | ||
| import javax.net.ssl.KeyManagerFactory; | ||
| import java.io.File; | ||
| import java.io.InputStream; | ||
| import java.security.PrivateKey; | ||
| import java.security.cert.X509Certificate; | ||
| import java.util.function.Consumer; | ||
|
|
||
| /** | ||
| * SslContext builder that does not provide any default configuration. | ||
| * | ||
| * @author Violeta Georgieva | ||
| * @since 1.0.6 | ||
| */ | ||
| public final class DefaultSslContextSpec extends AbstractProtocolSslContextSpec<DefaultSslContextSpec> { | ||
|
|
||
| /** | ||
| * Creates a builder for new client-side {@link SslContext}. | ||
| * | ||
| * @return {@literal this} | ||
| */ | ||
| public static DefaultSslContextSpec forClient() { | ||
| return new DefaultSslContextSpec(SslContextBuilder.forClient()); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a builder for new server-side {@link SslContext}. | ||
| * | ||
| * @see SslContextBuilder#forServer(File, File) | ||
| */ | ||
| public static DefaultSslContextSpec forServer(File keyCertChainFile, File keyFile) { | ||
| return new DefaultSslContextSpec(SslContextBuilder.forServer(keyCertChainFile, keyFile)); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a builder for new server-side {@link SslContext}. | ||
| * | ||
| * @see SslContextBuilder#forServer(File, File, String) | ||
| */ | ||
| public static DefaultSslContextSpec forServer(File keyCertChainFile, File keyFile, String keyPassword) { | ||
| return new DefaultSslContextSpec(SslContextBuilder.forServer(keyCertChainFile, keyFile, keyPassword)); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a builder for new server-side {@link SslContext}. | ||
| * | ||
| * @see SslContextBuilder#forServer(InputStream, InputStream) | ||
| */ | ||
| public static DefaultSslContextSpec forServer(InputStream keyCertChainInputStream, InputStream keyInputStream) { | ||
| return new DefaultSslContextSpec(SslContextBuilder.forServer(keyCertChainInputStream, keyInputStream)); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a builder for new server-side {@link SslContext}. | ||
| * | ||
| * @see SslContextBuilder#forServer(InputStream, InputStream, String) | ||
| */ | ||
| public static DefaultSslContextSpec forServer( | ||
| InputStream keyCertChainInputStream, InputStream keyInputStream, String keyPassword) { | ||
| return new DefaultSslContextSpec(SslContextBuilder.forServer(keyCertChainInputStream, keyInputStream, keyPassword)); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a builder for new server-side {@link SslContext}. | ||
| * | ||
| * @see SslContextBuilder#forServer(KeyManager) | ||
| */ | ||
| public static DefaultSslContextSpec forServer(KeyManager keyManager) { | ||
| return new DefaultSslContextSpec(SslContextBuilder.forServer(keyManager)); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a builder for new server-side {@link SslContext}. | ||
| * | ||
| * @see SslContextBuilder#forServer(KeyManagerFactory) | ||
| */ | ||
| public static DefaultSslContextSpec forServer(KeyManagerFactory keyManagerFactory) { | ||
| return new DefaultSslContextSpec(SslContextBuilder.forServer(keyManagerFactory)); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a builder for new server-side {@link SslContext}. | ||
| * | ||
| * @see SslContextBuilder#forServer(PrivateKey, Iterable) | ||
| */ | ||
| public static DefaultSslContextSpec forServer(PrivateKey key, Iterable<? extends X509Certificate> keyCertChain) { | ||
| return new DefaultSslContextSpec(SslContextBuilder.forServer(key, keyCertChain)); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a builder for new server-side {@link SslContext}. | ||
| * | ||
| * @see SslContextBuilder#forServer(PrivateKey, String, Iterable) | ||
| */ | ||
| public static DefaultSslContextSpec forServer( | ||
| PrivateKey key, String keyPassword, Iterable<? extends X509Certificate> keyCertChain) { | ||
| return new DefaultSslContextSpec(SslContextBuilder.forServer(key, keyPassword, keyCertChain)); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a builder for new server-side {@link SslContext}. | ||
| * | ||
| * @see SslContextBuilder#forServer(PrivateKey, String, X509Certificate...) | ||
| */ | ||
| public static DefaultSslContextSpec forServer(PrivateKey key, String keyPassword, X509Certificate... keyCertChain) { | ||
| return new DefaultSslContextSpec(SslContextBuilder.forServer(key, keyPassword, keyCertChain)); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a builder for new server-side {@link SslContext}. | ||
| * | ||
| * @see SslContextBuilder#forServer(PrivateKey, X509Certificate...) | ||
| */ | ||
| public static DefaultSslContextSpec forServer(PrivateKey key, X509Certificate... keyCertChain) { | ||
| return new DefaultSslContextSpec(SslContextBuilder.forServer(key, keyCertChain)); | ||
| } | ||
|
|
||
| DefaultSslContextSpec(SslContextBuilder sslContextBuilder) { | ||
| super(sslContextBuilder); | ||
| } | ||
|
|
||
| @Override | ||
| public DefaultSslContextSpec get() { | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| protected Consumer<SslContextBuilder> defaultConfiguration() { | ||
| return DEFAULT_CONFIGURATOR; | ||
| } | ||
|
|
||
| static final Consumer<SslContextBuilder> DEFAULT_CONFIGURATOR = sslCtxBuilder -> {}; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.