OF-2608: Do not wait for Dialback response if connection is closed

While waiting for a response to a Dialback request, Openfire should terminate when the underlying connection is closed.
igniterealtime · Jun 26, 2023 · 219963d · 219963d
1 parent 138f4b9
commit 219963d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingServerSocketReader.java b/xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingServerSocketReader.java
@@ -138,6 +138,10 @@ public void run() {
         thread.start();
     }
 
+    public boolean isOpen() {
+        return open;
+    }
+
     private void closeSession() {
         open = false;
         if (session != null) {

diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java b/xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java
@@ -325,7 +325,7 @@ public boolean authenticateDomain(OutgoingServerSocketReader socketReader, Strin
 
             // Process the answer from the Receiving Server
             try {
-                while (true) {
+                while (socketReader.isOpen()) {
                     Element doc = socketReader.getElement(RemoteServerManager.getSocketTimeout(), TimeUnit.MILLISECONDS);
                     if (doc == null) {
                         log.debug( "Failed to authenticate domain: Time out waiting for validation response." );
@@ -349,6 +349,7 @@ else if ("db".equals(doc.getNamespacePrefix()) && "result".equals(doc.getName())
                 log.debug( "Failed to authenticate domain: An interrupt was received while waiting for validation response (is Openfire shutting down?)" );
                 return false;
             }
+            return false;
         }
     }