Skip to content

Commit

Permalink
TKSS-750: TLCPWithNettyDemo should not use Jetty as server side
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnshajiang
johnshajiang committed Mar 29, 2024
1 parent 74bb08b commit 8e90fa3
Showing 1 changed file with 34 additions and 54 deletions.
88 changes: 34 additions & 54 deletions kona-ssl/src/test/java/com/tencent/kona/ssl/demo/TLCPWithNettyDemo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.tencent.kona.ssl.TestUtils;
import com.tencent.kona.sun.security.x509.SMCertificate;
import io.netty.bootstrap.Bootstrap;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
Expand All @@ -32,6 +33,7 @@
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.handler.codec.LineBasedFrameDecoder;
import io.netty.handler.codec.string.StringDecoder;
Expand All @@ -41,23 +43,13 @@
import io.netty.handler.ssl.ClientAuth;
import io.netty.handler.ssl.JdkSslContext;
import io.netty.handler.ssl.SslContext;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.jupiter.api.Test;

import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManagerFactory;
import java.io.ByteArrayInputStream;
import java.net.InetSocketAddress;
import java.nio.charset.StandardCharsets;
import java.security.KeyFactory;
import java.security.KeyStore;
Expand Down Expand Up @@ -269,47 +261,25 @@ public void tlcpDemo() throws Exception {
// Add providers.
TestUtils.addProviders();

Server server = createServer();
server.start();
int port = server.getURI().getPort();

runClient(port);

server.stop();
}

// Create Jetty server, which can publish service over TLCP.
private static Server createServer() throws Exception {
SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setSslContext(createContext());

HttpConfiguration config = new HttpConfiguration();
config.setSecureScheme("https");
config.addCustomizer(new SecureRequestCustomizer());

Server server = new Server();
ServerConnector httpsConnector = new ServerConnector(server,
new SslConnectionFactory(sslContextFactory,
HttpVersion.HTTP_1_1.asString()),
new HttpConnectionFactory(config));
httpsConnector.setPort(0);
server.addConnector(httpsConnector);

ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
context.addServlet(TLCPWithJettyDemo.HelloServlet.class, "/hello");
server.setHandler(new HandlerList(context, new DefaultHandler()));

return server;
}

private static class AllAllowedCipherSuiteFilter implements CipherSuiteFilter {

@Override
public String[] filterCipherSuites(Iterable<String> ciphers,
List<String> defaultCiphers, Set<String> supportedCiphers) {
return StreamSupport.stream(ciphers.spliterator(), false)
.toArray(String[]::new);
// Run Netty server, which supports TLCP connection.
EventLoopGroup bossGroup = new NioEventLoopGroup();
EventLoopGroup workerGroup = new NioEventLoopGroup();
try {
ServerBootstrap bootstrap = new ServerBootstrap();
bootstrap.group(bossGroup, workerGroup)
.channel(NioServerSocketChannel.class)
.option(ChannelOption.SO_BACKLOG, 128)
.childOption(ChannelOption.SO_KEEPALIVE, true)
.childHandler(new ServerChannelInitializer(
createJdkContext(false)));
ChannelFuture channelFuture = bootstrap.bind(0).sync();

int port = ((InetSocketAddress) channelFuture.channel()
.localAddress()).getPort();
runClient(port);
} finally {
bossGroup.shutdownGracefully();
workerGroup.shutdownGracefully();
}
}

Expand All @@ -333,7 +303,7 @@ protected void initChannel(SocketChannel ch) {
}

// Run Netty client, which supports TLCP connection.
private static void runClient(int port) throws Exception {
private void runClient(int port) throws Exception {
EventLoopGroup workerGroup = new NioEventLoopGroup();
try {
Bootstrap bootstrap = new Bootstrap();
Expand All @@ -353,7 +323,7 @@ private static void runClient(int port) throws Exception {
private static class ClientChannelInitializer
extends ChannelInitializer<SocketChannel> {

private SslContext sslContext;
private final SslContext sslContext;

public ClientChannelInitializer(SslContext sslContext) {
this.sslContext = sslContext;
Expand Down Expand Up @@ -466,4 +436,14 @@ private static PrivateKey loadPrivateKey(String keyPEM) throws Exception {
KeyFactory keyFactory = KeyFactory.getInstance("EC", "KonaCrypto");
return keyFactory.generatePrivate(privateKeySpec);
}

private static class AllAllowedCipherSuiteFilter implements CipherSuiteFilter {

@Override
public String[] filterCipherSuites(Iterable<String> ciphers,
List<String> defaultCiphers, Set<String> supportedCiphers) {
return StreamSupport.stream(ciphers.spliterator(), false)
.toArray(String[]::new);
}
}
}

0 comments on commit 8e90fa3

Please sign in to comment.