fix: OF-2660 - do not send an opening stream header in directTLS mode

By adding a Netty SSL Handler what startTLS set to false, the SSL Handshake is commenced automatically. When TLS has been negotiated, a stream header is sent from the stanza handler.
surevine · Oct 12, 2023 · 91b12ab · 91b12ab
1 parent 1456385
commit 91b12ab
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettySessionInitializer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettySessionInitializer.java
@@ -168,7 +168,9 @@ public boolean exceptionOccurredForDirectTLS(Throwable cause) {
             this.channel.closeFuture().addListener(future -> stop());
 
             // Start the session negotiation
-            sendOpeningStreamHeader(channel);
+            if (!directTLS) {
+                sendOpeningStreamHeader(channel);
+            }
 
             return waitForSession(channel);
         } catch (InterruptedException e) {