Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix ssl protocol config for ssl context
Using the raw ssl context instead of the netty handlers missed the configuration of protocols. The ssl testing is broken out into submodules and a new exhaustive set of negotiation circumstances are tested. This affected the bolt server which instantiated its handlers using the context.
- Loading branch information
1 parent
7414bcf
commit d00310c
Showing
9 changed files
with
916 additions
and
476 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
155 changes: 155 additions & 0 deletions
155
integrationtests/src/test/java/org/neo4j/ssl/SecureClient.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,155 @@ | ||
| /* | ||
| * Copyright (c) 2002-2018 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.ssl; | ||
|
|
||
| import io.netty.bootstrap.Bootstrap; | ||
| import io.netty.buffer.ByteBuf; | ||
| import io.netty.buffer.ByteBufAllocator; | ||
| import io.netty.channel.Channel; | ||
| import io.netty.channel.ChannelFuture; | ||
| import io.netty.channel.ChannelHandlerContext; | ||
| import io.netty.channel.ChannelInitializer; | ||
| import io.netty.channel.ChannelPipeline; | ||
| import io.netty.channel.SimpleChannelInboundHandler; | ||
| import io.netty.channel.nio.NioEventLoopGroup; | ||
| import io.netty.channel.socket.SocketChannel; | ||
| import io.netty.channel.socket.nio.NioSocketChannel; | ||
| import io.netty.handler.ssl.SslContext; | ||
| import io.netty.handler.ssl.SslHandler; | ||
| import io.netty.util.concurrent.Future; | ||
|
|
||
| import javax.net.ssl.SSLEngine; | ||
|
|
||
| import static java.util.concurrent.TimeUnit.SECONDS; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.neo4j.test.assertion.Assert.assertEventually; | ||
|
|
||
| class SecureClient | ||
| { | ||
| private Bootstrap bootstrap; | ||
| private ClientInitializer clientInitializer; | ||
| private NioEventLoopGroup eventLoopGroup; | ||
| private Channel channel; | ||
| private Bucket bucket = new Bucket(); | ||
|
|
||
| SecureClient( SslContext sslContext ) | ||
| { | ||
| eventLoopGroup = new NioEventLoopGroup(); | ||
| clientInitializer = new ClientInitializer( sslContext, bucket ); | ||
| bootstrap = new Bootstrap() | ||
| .group( eventLoopGroup ) | ||
| .channel( NioSocketChannel.class ) | ||
| .handler( clientInitializer ); | ||
| } | ||
|
|
||
| @SuppressWarnings( "SameParameterValue" ) | ||
| void connect( int port ) | ||
| { | ||
| ChannelFuture channelFuture = bootstrap.connect( "localhost", port ).awaitUninterruptibly(); | ||
| channel = channelFuture.channel(); | ||
| } | ||
|
|
||
| void disconnect() | ||
| { | ||
| if ( channel != null ) | ||
| { | ||
| channel.close().awaitUninterruptibly(); | ||
| eventLoopGroup.shutdownGracefully( 0, 0, SECONDS ); | ||
| } | ||
|
|
||
| bucket.collectedData.release(); | ||
| } | ||
|
|
||
| void assertResponse( ByteBuf expected ) throws InterruptedException | ||
| { | ||
| assertEventually( channel.toString(), () -> bucket.collectedData, equalTo( expected ), 5, SECONDS ); | ||
| } | ||
|
|
||
| Channel channel() | ||
| { | ||
| return channel; | ||
| } | ||
|
|
||
| Future<Channel> sslHandshakeFuture() | ||
| { | ||
| return clientInitializer.handshakeFuture; | ||
| } | ||
|
|
||
| String ciphers() | ||
| { | ||
| return clientInitializer.sslEngine.getSession().getCipherSuite(); | ||
| } | ||
|
|
||
| String protocol() | ||
| { | ||
| return clientInitializer.sslEngine.getSession().getProtocol(); | ||
| } | ||
|
|
||
| static class Bucket extends SimpleChannelInboundHandler<ByteBuf> | ||
| { | ||
| private final ByteBuf collectedData; | ||
|
|
||
| Bucket() | ||
| { | ||
| collectedData = ByteBufAllocator.DEFAULT.buffer(); | ||
| } | ||
|
|
||
| @Override | ||
| protected void channelRead0( ChannelHandlerContext ctx, ByteBuf msg ) throws Exception | ||
| { | ||
| collectedData.writeBytes( msg ); | ||
| } | ||
|
|
||
| @Override | ||
| public void exceptionCaught( ChannelHandlerContext ctx, Throwable cause ) throws Exception | ||
| { | ||
| //cause.printStackTrace(); // for debugging | ||
| } | ||
| } | ||
|
|
||
| public static class ClientInitializer extends ChannelInitializer<SocketChannel> | ||
| { | ||
| private SslContext sslContext; | ||
| private final Bucket bucket; | ||
| private Future<Channel> handshakeFuture; | ||
| private SSLEngine sslEngine; | ||
|
|
||
| ClientInitializer( SslContext sslContext, Bucket bucket ) | ||
| { | ||
| this.sslContext = sslContext; | ||
| this.bucket = bucket; | ||
| } | ||
|
|
||
| @Override | ||
| protected void initChannel( SocketChannel channel ) throws Exception | ||
| { | ||
| ChannelPipeline pipeline = channel.pipeline(); | ||
|
|
||
| this.sslEngine = sslContext.newEngine( channel.alloc() ); | ||
| this.sslEngine.setUseClientMode( true ); | ||
|
|
||
| SslHandler sslHandler = new SslHandler( sslEngine ); | ||
| handshakeFuture = sslHandler.handshakeFuture(); | ||
|
|
||
| pipeline.addLast( sslHandler ); | ||
| pipeline.addLast( bucket ); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.