server/encrypted.rs: respect proceed_with_methods in "none" and "pa…

…ssword" authentication methods
warp-tech · Feb 3, 2024 · 44a2392 · 44a2392
1 parent 2ce133d
commit 44a2392
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/russh/src/server/encrypted.rs b/russh/src/server/encrypted.rs
@@ -300,7 +300,14 @@ impl Encrypted {
                     self.state = EncryptedState::InitCompression;
                 } else {
                     auth_user.clear();
-                    auth_request.methods -= MethodSet::PASSWORD;
+                    if let Auth::Reject {
+                        proceed_with_methods: Some(proceed_with_methods),
+                    } = auth
+                    {
+                        auth_request.methods = proceed_with_methods;
+                    } else {
+                        auth_request.methods -= MethodSet::PASSWORD;
+                    }
                     auth_request.partial_success = false;
                     reject_auth_request(until, &mut self.write, auth_request).await;
                 }
@@ -326,7 +333,14 @@ impl Encrypted {
                     self.state = EncryptedState::InitCompression;
                 } else {
                     auth_user.clear();
-                    auth_request.methods -= MethodSet::NONE;
+                    if let Auth::Reject {
+                        proceed_with_methods: Some(proceed_with_methods),
+                    } = auth
+                    {
+                        auth_request.methods = proceed_with_methods;
+                    } else {
+                        auth_request.methods -= MethodSet::NONE;
+                    }
                     auth_request.partial_success = false;
                     reject_auth_request(until, &mut self.write, auth_request).await;
                 }