Merge pull request #13700 from iterate-ch/bugfix/GH-13442-auth-order

Prioritise password authentication if one is set.
iterate-ch · Aug 31, 2022 · 59e1090 · 59e1090
2 parents 55e8661 + e7ad2b4
commit 59e1090
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ssh/src/main/java/ch/cyberduck/core/sftp/SFTPSession.java b/ssh/src/main/java/ch/cyberduck/core/sftp/SFTPSession.java
@@ -308,7 +308,12 @@ private void authenticate(final SSHClient client, final Host host, final LoginCa
         }
         defaultMethods.add(new SFTPPublicKeyAuthentication(client));
         defaultMethods.add(new SFTPChallengeResponseAuthentication(client));
-        defaultMethods.add(new SFTPPasswordAuthentication(client));
+        if(credentials.isPasswordAuthentication()) {
+            defaultMethods.add(0, new SFTPPasswordAuthentication(client));
+        }
+        else {
+            defaultMethods.add(new SFTPPasswordAuthentication(client));
+        }
         final LinkedHashMap<String, List<AuthenticationProvider<Boolean>>> methodsMap = new LinkedHashMap<>();
         defaultMethods.forEach(m -> methodsMap.computeIfAbsent(m.getMethod(), k -> new ArrayList<>()).add(m));
         final List<AuthenticationProvider<Boolean>> methods = new ArrayList<>();