fixup! ssh: handshakers removal prototype

erlang · Dec 20, 2024 · e57594f · e57594f
1 parent ab5836e
commit e57594f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
@@ -408,7 +408,16 @@ init([Role, Socket, Opts]) when Role==client ; Role==server ->
     %% ssh_params will be updated after receiving socket_control event
     %% in wait_for_socket state;
     D = #data{socket = Socket, ssh_params = #ssh{role = Role, opts = Opts}},
-    {ok, {wait_for_socket, Role}, D}.
+    ParallelLogin = ?GET_OPT(parallel_login, Opts, disabled),
+    case ParallelLogin of
+        true ->
+            NegTimeout = ?GET_INTERNAL_OPT(negotiation_timeout, Opts,
+                                           ?GET_OPT(negotiation_timeout, Opts)),
+            {ok, {wait_for_socket, Role}, D,
+             [{{timeout, negotiation_timeout}, NegTimeout, close_connection}]};
+        _ ->
+            {ok, {wait_for_socket, Role}, D}
+    end.
 
 %%%----------------------------------------------------------------
 %%% Connection start and initialization helpers
@@ -726,6 +735,9 @@ handle_event(internal, {#ssh_msg_kexinit{},_}, {connected,Role}, D0) ->
     send_bytes(SshPacket, D),
     {next_state, {kexinit,Role,renegotiate}, D, [postpone, {change_callback_module,ssh_fsm_kexinit}]};
 
+handle_event({timeout, negotiation_timeout}, close_connection, _StateName, _D) ->
+    {stop, {shutdown,"Negotiation timeout."}};
+
 handle_event(internal, #ssh_msg_disconnect{description=Desc} = Msg, StateName, D0) ->
     {disconnect, _, RepliesCon} =
 	ssh_connection:handle_msg(Msg, D0#data.connection_state, ?role(StateName), D0#data.ssh_params),

diff --git a/lib/ssh/src/ssh_fsm_userauth_server.erl b/lib/ssh/src/ssh_fsm_userauth_server.erl
@@ -74,6 +74,7 @@ handle_event(internal,
                     D = connected_state(Reply, Ssh1, User, Method, D0),
                     {next_state, {connected,server}, D,
                      [set_max_initial_idle_timeout(D),
+                      {{timeout, negotiation_timeout}, cancel},
                       {change_callback_module,ssh_connection_handler}
                      ]
                     }
@@ -90,6 +91,7 @@ handle_event(internal,
                             D = connected_state(Reply, Ssh1, User, Method, D0),
                             {next_state, {connected,server}, D,
                              [set_max_initial_idle_timeout(D),
+                              {{timeout, negotiation_timeout}, cancel},
                               {change_callback_module,ssh_connection_handler}
                              ]};
 			{not_authorized, {User, Reason}, {Reply, Ssh}} when Method == "keyboard-interactive" ->
@@ -126,6 +128,7 @@ handle_event(internal, #ssh_msg_userauth_info_response{} = Msg, {userauth_keyboa
             D = connected_state(Reply, Ssh1, User, "keyboard-interactive", D0),
             {next_state, {connected,server}, D,
              [set_max_initial_idle_timeout(D),
+              {{timeout, negotiation_timeout}, cancel},
               {change_callback_module,ssh_connection_handler}
              ]};
 	{not_authorized, {User, Reason}, {Reply, Ssh}} ->
@@ -144,6 +147,7 @@ handle_event(internal, #ssh_msg_userauth_info_response{} = Msg, {userauth_keyboa
     D = connected_state(Reply, Ssh1, User, "keyboard-interactive", D0),
     {next_state, {connected,server}, D,
      [set_max_initial_idle_timeout(D),
+      {{timeout, negotiation_timeout}, cancel},
       {change_callback_module,ssh_connection_handler}
      ]
     };

diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl
@@ -1024,7 +1024,7 @@ client_close_after_hello(Config0) ->
             length(Handshakers), Handshakers,
             length(Parents), Parents]),
     if
-        length(Handshakers)>0 ->
+        length(Handshakers) == 0 -> % no handshakers are created after parallel_login rewrite
             lists:foreach(fun(P) -> exit(P,some_reason) end, Parents),
             ct:log("After sending exits; now going to sleep", []),
             timer:sleep((SleepSec+15)*1000),
@@ -1052,7 +1052,7 @@ client_close_after_hello(Config0) ->
             end;
 
         true ->
-            {fail, no_handshakers}
+            {fail, handshakers_found}
     end.