fix: OF-2689 - only send a startTLS element if the connection is not …

…encrypted (ie not using DirectTLS)
surevine · Oct 13, 2023 · 9da5342 · 9da5342
1 parent 8286c19
commit 9da5342
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalClientSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalClientSession.java
@@ -272,7 +272,7 @@ public static LocalClientSession createSession(String serverName, XmlPullParser
             document.getRootElement().add(features);
 
             try {
-                if (connection.getConfiguration().getTlsPolicy() != Connection.TLSPolicy.disabled && !connection.getConfiguration().getIdentityStore().getAllCertificates().isEmpty()) {
+                if (!connection.isEncrypted() && connection.getConfiguration().getTlsPolicy() != Connection.TLSPolicy.disabled && !connection.getConfiguration().getIdentityStore().getAllCertificates().isEmpty()) {
                     final Element starttls = DocumentHelper.createElement(QName.get("starttls", "urn:ietf:params:xml:ns:xmpp-tls"));
                     if (connection.getConfiguration().getTlsPolicy() == Connection.TLSPolicy.required) {
                         starttls.addElement("required");