Merge branch 'hans/ssh/idle_time_server/OTP-14312'

4 files changed, 46 insertions, 11 deletions

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 968983c862..88d402cf38 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -699,6 +699,12 @@
 	    <p><c>Peer</c> is in the format of <c>{Host,Port}</c>.</p>
 	  </item>
 
+	  <tag><c><![CDATA[{idle_time, integer()}]]></c></tag>
+	  <item>
+	  <p>Sets a time-out on a connection when no channels are active.
+	  Defaults to <c>infinity</c>.</p>
+	  </item>
+
 	  <tag><c><![CDATA[{ssh_msg_debug_fun, fun(ConnectionRef::ssh_connection_ref(), AlwaysDisplay::boolean(), Msg::binary(), LanguageTag::binary()) -> _}]]></c></tag>
 	  <item>
 	    <p>Provide a fun to implement your own logging of the SSH message SSH_MSG_DEBUG. The last three parameters are from the message, see RFC4253, section 11.3. The <c>ConnectionRef</c> is the reference to the connection on which the message arrived. The return value from the fun is not checked.</p>
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index b9c643c77e..15a05a1b85 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -400,7 +400,9 @@ init_process_state(Role, Socket, Opts) ->
 	    timer:apply_after(?REKEY_DATA_TIMOUT, gen_statem, cast, [self(), data_size]),
 	    cache_init_idle_timer(D);
 	server ->
-	    D#data{connection_state = init_connection(Role, C, Opts)}
+            cache_init_idle_timer(
+              D#data{connection_state = init_connection(Role, C, Opts)}
+             )
     end.
 
 
@@ -919,6 +921,9 @@ handle_event(internal, Msg=#ssh_msg_channel_extended_data{},     StateName, D) -
 handle_event(internal, Msg=#ssh_msg_channel_eof{},               StateName, D) ->
     handle_connection_msg(Msg, StateName, D);
 
+handle_event(internal, Msg=#ssh_msg_channel_close{},  {connected,server} = StateName, D) ->
+    handle_connection_msg(Msg, StateName, cache_request_idle_timer_check(D));
+
 handle_event(internal, Msg=#ssh_msg_channel_close{},             StateName, D) ->
     handle_connection_msg(Msg, StateName, D);
 
@@ -1280,6 +1285,7 @@ handle_event(info, {'EXIT', _Sup, Reason}, _, _) ->
     {stop, {shutdown, Reason}};
 
 handle_event(info, check_cache, _, D) ->
+ct:pal("check_cache",[]),
     {keep_state, cache_check_set_idle_timer(D)};
 
 handle_event(info, UnexpectedMessage, StateName, D = #data{ssh_params = Ssh}) ->
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl
index a882a01eaf..55f9c6bdc8 100644
--- a/lib/ssh/src/ssh_options.erl
+++ b/lib/ssh/src/ssh_options.erl
@@ -490,12 +490,6 @@ default(client) ->
             class => user_options
            },
 
-      {idle_time, def} =>
-          #{default => infinity,
-            chk => fun check_timeout/1,
-            class => user_options
-           },
-
 %%%%% Undocumented
       {keyboard_interact_fun, def} =>
           #{default => undefined,
@@ -548,6 +542,12 @@ default(common) ->
              class => user_options
             },
 
+      {idle_time, def} =>
+          #{default => infinity,
+            chk => fun check_timeout/1,
+            class => user_options
+           },
+
        %% This is a "SocketOption"...
        %% {fd, def} =>
        %%     #{default => undefined,
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index cdf6cf9ae1..a9b6be222e 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -46,7 +46,8 @@
 	 exec_key_differs2/1,
 	 exec_key_differs3/1,
 	 exec_key_differs_fail/1,
-	 idle_time/1,
+	 idle_time_client/1,
+	 idle_time_server/1,
 	 inet6_option/1,
 	 inet_option/1,
 	 internal_error/1,
@@ -139,7 +140,7 @@ basic_tests() ->
      exec, exec_compressed, 
      shell, shell_no_unicode, shell_unicode_string,
      cli, known_hosts, 
-     idle_time, openssh_zlib_basic_test, 
+     idle_time_client, idle_time_server, openssh_zlib_basic_test, 
      misc_ssh_options, inet_option, inet6_option].
 
 
@@ -522,8 +523,8 @@ exec_compressed(Config) when is_list(Config) ->
     end.
 
 %%--------------------------------------------------------------------
-%%% Idle timeout test
-idle_time(Config) ->
+%%% Idle timeout test, client 
+idle_time_client(Config) ->
     SystemDir = filename:join(proplists:get_value(priv_dir, Config), system),
     UserDir = proplists:get_value(priv_dir, Config),
 
@@ -544,6 +545,28 @@ idle_time(Config) ->
     ssh:stop_daemon(Pid).
 
 %%--------------------------------------------------------------------
+%%% Idle timeout test, server
+idle_time_server(Config) ->
+    SystemDir = filename:join(proplists:get_value(priv_dir, Config), system),
+    UserDir = proplists:get_value(priv_dir, Config),
+
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+					     {user_dir, UserDir},
+                                             {idle_time, 2000},
+					     {failfun, fun ssh_test_lib:failfun/2}]),
+    ConnectionRef =
+	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user_dir, UserDir},
+					  {user_interaction, false}]),
+    {ok, Id} = ssh_connection:session_channel(ConnectionRef, 1000),
+    ssh_connection:close(ConnectionRef, Id),
+    receive
+    after 10000 ->
+	    {error, closed} = ssh_connection:session_channel(ConnectionRef, 1000)
+    end,
+    ssh:stop_daemon(Pid).
+
+%%--------------------------------------------------------------------
 %%% Test that ssh:shell/2 works
 shell(Config) when is_list(Config) ->
     process_flag(trap_exit, true),