Consider failing login task (FAForever#1664)

make sure the login future is completed exceptionally if anything unsuspected happens. Prepares FAForever#1663
mrchris2000 · Apr 15, 2022 · fe3a1c1 · fe3a1c1
1 parent d3780ff
commit fe3a1c1
Showing 1 changed file with 24 additions and 7 deletions.
diff --git a/src/main/java/com/faforever/client/remote/FafServerAccessorImpl.java b/src/main/java/com/faforever/client/remote/FafServerAccessorImpl.java
@@ -96,9 +96,9 @@
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
+import javax.security.auth.login.LoginException;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.Socket;
@@ -219,10 +219,10 @@ public CompletableFuture<LoginMessage> connectAndLogIn(String username, String p
     this.password = password;
 
     // TODO extract class?
-    fafConnectionTask = new Task<Void>() {
+    fafConnectionTask = new Task<>() {
 
       @Override
-      protected Void call() throws Exception {
+      protected Void call() {
         while (!isCancelled()) {
           Server server = clientProperties.getServer();
           String serverHost = server.getHost();
@@ -254,6 +254,12 @@ protected Void call() throws Exception {
             if (isCancelled()) {
               log.debug("Connection to FAF server has been closed");
             } else {
+              if (loginFuture != null) {
+                loginFuture.completeExceptionally(new LoginFailedException("Lost connection to server during login"));
+                loginFuture = null;
+                fafConnectionTask.cancel();
+                return null;
+              }
               log.warn("Lost connection to Server", e);
               reconnectTimerService.incrementConnectionFailures();
               reconnectTimerService.waitForReconnect();
@@ -263,6 +269,18 @@ protected Void call() throws Exception {
         return null;
       }
 
+      @Override
+      protected void failed() {
+        super.failed();
+        log.error("Server connection task failed", getException());
+        if (loginFuture != null) {
+          loginFuture.completeExceptionally(new LoginException("The server connection task failed, an internal error occurred"));
+          loginFuture = null;
+        }
+        IOUtils.closeQuietly(serverWriter);
+        IOUtils.closeQuietly(fafServerSocket);
+      }
+
       @Override
       protected void cancelled() {
         IOUtils.closeQuietly(serverWriter);
@@ -464,10 +482,7 @@ private void parseServerObject(String jsonString) {
             .forEach(consumer -> consumer.accept(serverMessage));
         messageClass = messageClass.getSuperclass();
       }
-      for (Class<?> type : ClassUtils.getAllInterfacesForClassAsSet(messageClass)) {
-        messageListeners.getOrDefault(messageClass, Collections.emptyList())
-            .forEach(consumer -> consumer.accept(serverMessage));
-      }
+
     } catch (JsonSyntaxException e) {
       log.warn("Could not deserialize message: " + jsonString, e);
     }
@@ -489,6 +504,8 @@ private void onFafLoginSucceeded(LoginMessage loginServerMessage) {
     if (loginFuture != null) {
       loginFuture.complete(loginServerMessage);
       loginFuture = null;
+    } else {
+      log.warn("Unexpected login message from server");
     }
   }