ssl

smqtt-common/src/main/java/io/github/quickmsg/common/config/SslContext.java

 package io.github.quickmsg.common.config;
 
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -8,6 +9,7 @@ import lombok.NoArgsConstructor;
  */
 @Data
 @NoArgsConstructor
+@Builder
 public class SslContext {
 
     private String crt;

smqtt-core/src/main/java/io/github/quickmsg/core/ssl/AbstractSslHandler.java

@@ -4,11 +4,11 @@ import io.github.quickmsg.common.config.Configuration;
 import io.github.quickmsg.common.config.SslContext;
 import io.github.quickmsg.core.mqtt.MqttConfiguration;
 import io.netty.channel.ChannelOption;
-import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.util.SelfSignedCertificate;
 import lombok.extern.slf4j.Slf4j;
 import reactor.netty.tcp.SslProvider;
 import reactor.netty.tcp.TcpServer;
+import reactor.netty.tcp.TcpSslContextSpec;
 
 import java.io.File;
 import java.util.Map;
@@ -25,7 +25,7 @@ public class AbstractSslHandler {
                 File cert;
                 File key;
                 SslContext sslContext = configuration.getSslContext();
-                if (sslContext != null) {
+                if (sslContext != null && sslContext.getCrt() != null && sslContext.getKey() != null) {
                     cert = new File(sslContext.getCrt());
                     key = new File(sslContext.getKey());
 
@@ -33,9 +33,10 @@ public class AbstractSslHandler {
                     SelfSignedCertificate ssc = new SelfSignedCertificate();
                     cert = ssc.certificate();
                     key = ssc.privateKey();
+                    log.error("SelfSignedCertificate cert {} key {}",cert.getAbsolutePath(),key.getAbsolutePath());
                 }
-                SslContextBuilder sslContextBuilder = SslContextBuilder.forServer(cert, key);
-                sslContextSpec.sslContext(sslContextBuilder);
+                TcpSslContextSpec tcpSslContextSpec = TcpSslContextSpec.forServer(cert, key);
+                sslContextSpec.sslContext(tcpSslContextSpec);
             }
 
         } catch (Exception e) {
@@ -48,7 +49,7 @@ public class AbstractSslHandler {
     public TcpServer initTcpServer(MqttConfiguration mqttConfiguration) {
         TcpServer server = TcpServer.create();
         if (mqttConfiguration.getSsl()) {
-            server.secure(sslContextSpec -> this.secure(sslContextSpec, mqttConfiguration));
+            server = server.secure(sslContextSpec -> this.secure(sslContextSpec, mqttConfiguration));
         }
         if (mqttConfiguration.getOptions() != null) {
             for (Map.Entry<String, Object> entry : mqttConfiguration.getOptions().entrySet()) {