SASL-final-server-message -> AuthenticationOk -> ReadyforQuery chain has been fixed

Marat Gainullin · Marat Gainullin · commit 8b4f3517503d · 2020-11-09T15:50:08.000+01:00
diff --git a/src/main/java/com/github/pgasync/PgProtocolStream.java b/src/main/java/com/github/pgasync/PgProtocolStream.java
@@ -90,20 +90,6 @@ public CompletableFuture<Message> authenticate(String userName, String password,
                             throw new IllegalStateException("Bad SASL authentication sequence detected on 'server-first-message' step");
                         }
                     })
-                    .thenCompose(Function.identity())
-                    .thenApply(message -> {
-                        if (message instanceof Authentication) {
-                            byte[] serverAdditionalData = ((Authentication) message).getSaslAdditionalData();
-                            if (serverAdditionalData != null) {
-                                return offerRoundTrip(() -> {
-                                });
-                            } else {
-                                throw new IllegalStateException("Bad SASL authentication sequence message detected on 'server-final-message' step");
-                            }
-                        } else {
-                            throw new IllegalStateException("Bad SASL authentication sequence detected on 'server-final-message' step");
-                        }
-                    })
                     .thenCompose(Function.identity());
         } else {
             return send(new PasswordMessage(userName, password, authRequired.getMd5Salt(), encoding));
@@ -213,7 +199,7 @@ protected void gotMessage(Message message) {
             }
         } else if (message instanceof Authentication) {
             Authentication authentication = (Authentication) message;
-            if (authentication.isAuthenticationOk()) {
+            if (authentication.isAuthenticationOk() || authentication.isSaslServerFinalResponse()) {
                 readyForQueryPendingMessage = message;
             } else {
                 consumeOnResponse().completeAsync(() -> message, futuresExecutor);
diff --git a/src/main/java/com/github/pgasync/message/backend/Authentication.java b/src/main/java/com/github/pgasync/message/backend/Authentication.java
@@ -113,6 +113,10 @@ public boolean isAuthenticationOk() {
         return ok;
     }
 
+    public boolean isSaslServerFinalResponse() {
+        return saslAdditionalData != null;
+    }
+
     public boolean isSaslScramSha256() {
         return saslScramSha256;
     }

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,10 @@ public boolean isAuthenticationOk() {`
`113`	`113`	`return ok;`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ public boolean isSaslServerFinalResponse() {`
	`117`	`+ return saslAdditionalData != null;`
	`118`	`+ }`
	`119`	`+`
`116`	`120`	`public boolean isSaslScramSha256() {`
`117`	`121`	`return saslScramSha256;`
`118`	`122`	`}`