-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* [FEATURE] Built-in secure transports support Signed-off-by: Andriy Redko <[email protected]> * Added more tests, addressing code review comments Signed-off-by: Andriy Redko <[email protected]> * Address code review comments Signed-off-by: Andriy Redko <[email protected]> * Address code review comments Signed-off-by: Andriy Redko <[email protected]> * Address code review comments Signed-off-by: Andriy Redko <[email protected]> --------- Signed-off-by: Andriy Redko <[email protected]> (cherry picked from commit 773a939) (cherry picked from commit 3cc154a)
- Loading branch information
Showing
23 changed files
with
2,237 additions
and
7 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
126 changes: 126 additions & 0 deletions
126
...-netty4/src/main/java/org/opensearch/http/netty4/ssl/SecureNetty4HttpServerTransport.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,126 @@ | ||
| /* | ||
| * Copyright 2015-2017 floragunn GmbH | ||
| * | ||
| * 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 | ||
| * | ||
| * http://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. | ||
| * | ||
| */ | ||
|
|
||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| * | ||
| * Modifications Copyright OpenSearch Contributors. See | ||
| * GitHub history for details. | ||
| */ | ||
|
|
||
| package org.opensearch.http.netty4.ssl; | ||
|
|
||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
| import org.opensearch.common.network.NetworkService; | ||
| import org.opensearch.common.settings.ClusterSettings; | ||
| import org.opensearch.common.settings.Settings; | ||
| import org.opensearch.common.util.BigArrays; | ||
| import org.opensearch.core.xcontent.NamedXContentRegistry; | ||
| import org.opensearch.http.HttpChannel; | ||
| import org.opensearch.http.HttpHandlingSettings; | ||
| import org.opensearch.http.netty4.Netty4HttpServerTransport; | ||
| import org.opensearch.plugins.SecureTransportSettingsProvider; | ||
| import org.opensearch.telemetry.tracing.Tracer; | ||
| import org.opensearch.threadpool.ThreadPool; | ||
| import org.opensearch.transport.SharedGroupFactory; | ||
| import org.opensearch.transport.netty4.ssl.SslUtils; | ||
|
|
||
| import javax.net.ssl.SSLEngine; | ||
|
|
||
| import io.netty.channel.Channel; | ||
| import io.netty.channel.ChannelHandler; | ||
| import io.netty.handler.codec.DecoderException; | ||
| import io.netty.handler.ssl.SslHandler; | ||
|
|
||
| /** | ||
| * @see <a href="https://github.com/opensearch-project/security/blob/d526c9f6c2a438c14db8b413148204510b9fe2e2/src/main/java/org/opensearch/security/ssl/http/netty/SecuritySSLNettyHttpServerTransport.java">SecuritySSLNettyHttpServerTransport</a> | ||
| */ | ||
| public class SecureNetty4HttpServerTransport extends Netty4HttpServerTransport { | ||
| private static final Logger logger = LogManager.getLogger(SecureNetty4HttpServerTransport.class); | ||
| private final SecureTransportSettingsProvider secureTransportSettingsProvider; | ||
| private final SecureTransportSettingsProvider.ServerExceptionHandler exceptionHandler; | ||
|
|
||
| public SecureNetty4HttpServerTransport( | ||
| final Settings settings, | ||
| final NetworkService networkService, | ||
| final BigArrays bigArrays, | ||
| final ThreadPool threadPool, | ||
| final NamedXContentRegistry namedXContentRegistry, | ||
| final Dispatcher dispatcher, | ||
| final ClusterSettings clusterSettings, | ||
| final SharedGroupFactory sharedGroupFactory, | ||
| final SecureTransportSettingsProvider secureTransportSettingsProvider, | ||
| final Tracer tracer | ||
| ) { | ||
| super( | ||
| settings, | ||
| networkService, | ||
| bigArrays, | ||
| threadPool, | ||
| namedXContentRegistry, | ||
| dispatcher, | ||
| clusterSettings, | ||
| sharedGroupFactory, | ||
| tracer | ||
| ); | ||
| this.secureTransportSettingsProvider = secureTransportSettingsProvider; | ||
| this.exceptionHandler = secureTransportSettingsProvider.buildHttpServerExceptionHandler(settings, this) | ||
| .orElse(SecureTransportSettingsProvider.ServerExceptionHandler.NOOP); | ||
| } | ||
|
|
||
| @Override | ||
| public ChannelHandler configureServerChannelHandler() { | ||
| return new SslHttpChannelHandler(this, handlingSettings); | ||
| } | ||
|
|
||
| @Override | ||
| public void onException(HttpChannel channel, Exception cause0) { | ||
| Throwable cause = cause0; | ||
|
|
||
| if (cause0 instanceof DecoderException && cause0 != null) { | ||
| cause = cause0.getCause(); | ||
| } | ||
|
|
||
| exceptionHandler.onError(cause); | ||
| logger.error("Exception during establishing a SSL connection: " + cause, cause); | ||
| super.onException(channel, cause0); | ||
| } | ||
|
|
||
| protected class SslHttpChannelHandler extends Netty4HttpServerTransport.HttpChannelHandler { | ||
| protected SslHttpChannelHandler(final Netty4HttpServerTransport transport, final HttpHandlingSettings handlingSettings) { | ||
| super(transport, handlingSettings); | ||
| } | ||
|
|
||
| @Override | ||
| protected void initChannel(Channel ch) throws Exception { | ||
| super.initChannel(ch); | ||
|
|
||
| final SSLEngine sslEngine = secureTransportSettingsProvider.buildSecureHttpServerEngine( | ||
| settings, | ||
| SecureNetty4HttpServerTransport.this | ||
| ).orElseGet(SslUtils::createDefaultServerSSLEngine); | ||
|
|
||
| final SslHandler sslHandler = new SslHandler(sslEngine); | ||
| ch.pipeline().addFirst("ssl_http", sslHandler); | ||
| } | ||
| } | ||
| } |
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
106 changes: 106 additions & 0 deletions
106
...ransport-netty4/src/main/java/org/opensearch/transport/netty4/ssl/DualModeSslHandler.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,106 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| * | ||
| * Modifications Copyright OpenSearch Contributors. See | ||
| * GitHub history for details. | ||
| */ | ||
| package org.opensearch.transport.netty4.ssl; | ||
|
|
||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
| import org.opensearch.common.settings.Settings; | ||
| import org.opensearch.plugins.SecureTransportSettingsProvider; | ||
| import org.opensearch.transport.TcpTransport; | ||
|
|
||
| import javax.net.ssl.SSLEngine; | ||
| import javax.net.ssl.SSLException; | ||
|
|
||
| import java.nio.charset.StandardCharsets; | ||
| import java.security.NoSuchAlgorithmException; | ||
| import java.util.List; | ||
|
|
||
| import io.netty.buffer.ByteBuf; | ||
| import io.netty.buffer.Unpooled; | ||
| import io.netty.channel.ChannelFutureListener; | ||
| import io.netty.channel.ChannelHandlerContext; | ||
| import io.netty.channel.ChannelPipeline; | ||
| import io.netty.handler.codec.ByteToMessageDecoder; | ||
| import io.netty.handler.ssl.SslHandler; | ||
|
|
||
| /** | ||
| * Modifies the current pipeline dynamically to enable TLS | ||
| * | ||
| * @see <a href="https://github.com/opensearch-project/security/blob/d526c9f6c2a438c14db8b413148204510b9fe2e2/src/main/java/org/opensearch/security/ssl/transport/DualModeSSLHandler.java">DualModeSSLHandler</a> | ||
| */ | ||
| public class DualModeSslHandler extends ByteToMessageDecoder { | ||
|
|
||
| private static final Logger logger = LogManager.getLogger(DualModeSslHandler.class); | ||
| private final Settings settings; | ||
| private final SecureTransportSettingsProvider secureTransportSettingsProvider; | ||
| private final TcpTransport transport; | ||
| private final SslHandler providedSSLHandler; | ||
|
|
||
| public DualModeSslHandler( | ||
| final Settings settings, | ||
| final SecureTransportSettingsProvider secureTransportSettingsProvider, | ||
| final TcpTransport transport | ||
| ) { | ||
| this(settings, secureTransportSettingsProvider, transport, null); | ||
| } | ||
|
|
||
| protected DualModeSslHandler( | ||
| final Settings settings, | ||
| final SecureTransportSettingsProvider secureTransportSettingsProvider, | ||
| final TcpTransport transport, | ||
| SslHandler providedSSLHandler | ||
| ) { | ||
| this.settings = settings; | ||
| this.secureTransportSettingsProvider = secureTransportSettingsProvider; | ||
| this.transport = transport; | ||
| this.providedSSLHandler = providedSSLHandler; | ||
| } | ||
|
|
||
| @Override | ||
| protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception { | ||
| // Will use the first six bytes to detect a protocol. | ||
| if (in.readableBytes() < 6) { | ||
| return; | ||
| } | ||
| int offset = in.readerIndex(); | ||
| if (in.getCharSequence(offset, 6, StandardCharsets.UTF_8).equals(SecureConnectionTestUtil.DUAL_MODE_CLIENT_HELLO_MSG)) { | ||
| logger.debug("Received DualSSL Client Hello message"); | ||
| ByteBuf responseBuffer = Unpooled.buffer(6); | ||
| responseBuffer.writeCharSequence(SecureConnectionTestUtil.DUAL_MODE_SERVER_HELLO_MSG, StandardCharsets.UTF_8); | ||
| ctx.writeAndFlush(responseBuffer).addListener(ChannelFutureListener.CLOSE); | ||
| return; | ||
| } | ||
|
|
||
| if (SslUtils.isTLS(in)) { | ||
| logger.debug("Identified request as SSL request"); | ||
| enableSsl(ctx); | ||
| } else { | ||
| logger.debug("Identified request as non SSL request, running in HTTP mode as dual mode is enabled"); | ||
| ctx.pipeline().remove(this); | ||
| } | ||
| } | ||
|
|
||
| private void enableSsl(ChannelHandlerContext ctx) throws SSLException, NoSuchAlgorithmException { | ||
| final SSLEngine sslEngine = secureTransportSettingsProvider.buildSecureServerTransportEngine(settings, transport) | ||
| .orElseGet(SslUtils::createDefaultServerSSLEngine); | ||
|
|
||
| SslHandler sslHandler; | ||
| if (providedSSLHandler != null) { | ||
| sslHandler = providedSSLHandler; | ||
| } else { | ||
| sslHandler = new SslHandler(sslEngine); | ||
| } | ||
| ChannelPipeline p = ctx.pipeline(); | ||
| p.addAfter("port_unification_handler", "ssl_server", sslHandler); | ||
| p.remove(this); | ||
| logger.debug("Removed port unification handler and added SSL handler as incoming request is SSL"); | ||
| } | ||
| } |
Oops, something went wrong.