Merge branch 'fredrik/ssh/rekeying'

* fredrik/ssh/rekeying:
  ssh_basic_SUITE rekey test modifications
  Modifications to idle_time testcase
  Added test for rekeying
  Added doc for rekey_limit option
  Renegotiating every hour and every gb sent, can be decreased with option {rekey_limit, integer()}

5 files changed, 74 insertions, 13 deletions

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 517cbf1ef9..a0afb5056e 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -181,10 +181,13 @@
 	  (simply passed on to the transport protocol).</p></item>
 	  <tag><c><![CDATA[{ipv6_disabled, boolean()}]]></c></tag>
 	  <item>
-	  <p>Determines if SSH shall use IPv6 or not.</p></item>
-	  <tag><c><![CDATA[{idle_time, timeout()}]]></c></tag>
+	    <p>Determines if SSH shall use IPv6 or not.</p>
+	  </item>
+	  <tag><c><![CDATA[{rekey_limit, integer()}]]></c></tag>
 	  <item>
-	  <p>Sets a timeout on connection when no channels are active, default is infinity</p></item>
+	    <p>Provide, in bytes, when rekeying should be initiated, 
+	    defaults to one time each GB and one time per hour.</p>
+	  </item>
 	</taglist>
       </desc>   
     </func>
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index a3ba8148eb..3ef26b1678 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -369,6 +369,8 @@ handle_option([{quiet_mode, _} = Opt|Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{idle_time, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+handle_option([{rekey_limit, _} = Opt|Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions).
 
@@ -449,6 +451,8 @@ handle_ssh_option({quiet_mode, Value} = Opt) when Value == true;
     Opt;
 handle_ssh_option({idle_time, Value} = Opt) when is_integer(Value), Value > 0 ->
     Opt;
+handle_ssh_option({rekey_limit, Value} = Opt) when is_integer(Value) -> 
+    Opt;
 handle_ssh_option(Opt) ->
     throw({error, {eoptions, Opt}}).
 
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index b79e8530b7..88b45111ff 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -35,7 +35,8 @@
 
 -export([start_link/4, send/2, renegotiate/1, send_event/2,
 	 connection_info/3,
-	 peer_address/1]).
+	 peer_address/1,
+	 renegotiate_data/1]).
 
 %% gen_fsm callbacks
 -export([hello/2, kexinit/2, key_exchange/2, new_keys/2,
@@ -85,6 +86,8 @@ send(ConnectionHandler, Data) ->
 renegotiate(ConnectionHandler) ->
     send_all_state_event(ConnectionHandler, renegotiate).
  
+renegotiate_data(ConnectionHandler) ->
+    send_all_state_event(ConnectionHandler, data_size).
 connection_info(ConnectionHandler, From, Options) ->
      send_all_state_event(ConnectionHandler, {info, From, Options}).
 
@@ -500,7 +503,22 @@ handle_event(renegotiate, StateName, State) ->
 handle_event({info, From, Options}, StateName,  #state{ssh_params = Ssh} = State) ->
     spawn(?MODULE, ssh_info_handler, [Options, Ssh, From]), 
     {next_state, StateName, State};
-
+handle_event(data_size, connected, #state{ssh_params = Ssh0} = State) ->
+    Sent = inet:getstat(State#state.socket, [send_oct]),
+    MaxSent = proplists:get_value(rekey_limit, State#state.opts, 1024000000),
+    case Sent >= MaxSent of
+	true ->
+	    {KeyInitMsg, SshPacket, Ssh} = ssh_transport:key_exchange_init_msg(Ssh0),
+	    send_msg(SshPacket, State),
+	    {next_state, connected, 
+	     next_packet(State#state{ssh_params = Ssh,
+			     key_exchange_init_msg = KeyInitMsg,
+				     renegotiate = true})};
+	_ ->
+	    {next_state, connected, next_packet(State)}
+    end;
+handle_event(data_size, StateName, State) ->
+    {next_state, StateName, State};
 handle_event({unknown, Data}, StateName, State) ->
     Msg = #ssh_msg_unimplemented{sequence = Data},
     send_msg(Msg, State),
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index 0c1eee5186..94a9ed505f 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -125,7 +125,8 @@ info(ConnectionManager, ChannelProcess) ->
 %% or amount of data sent counter! 
 renegotiate(ConnectionManager) ->
     cast(ConnectionManager, renegotiate).
-
+renegotiate_data(ConnectionManager) ->
+    cast(ConnectionManager, renegotiate_data).
 connection_info(ConnectionManager, Options) ->
     call(ConnectionManager, {connection_info, Options}).
 
@@ -481,7 +482,9 @@ handle_cast({global_request, _, _, _, _} = Request, State0) ->
 handle_cast(renegotiate, #state{connection = Pid} = State) ->
     ssh_connection_handler:renegotiate(Pid),
     {noreply, State};
-
+handle_cast(renegotiate_data, #state{connection = Pid} = State) ->
+    ssh_connection_handler:renegotiate_data(Pid),
+    {noreply, State};
 handle_cast({adjust_window, ChannelId, Bytes}, 
 	    #state{connection = Pid, connection_state =
 		   #connection{channel_cache = Cache}} = State) ->
@@ -520,6 +523,8 @@ handle_info({start_connection, server,
     Exec = proplists:get_value(exec, Options),
     CliSpec = proplists:get_value(ssh_cli, Options, {ssh_cli, [Shell]}),
     ssh_connection_handler:send_event(Connection, socket_control),
+    erlang:send_after(3600000, self(), rekey),
+    erlang:send_after(60000, self(), rekey_data),
     {noreply, State#state{connection = Connection,
 			  connection_state = 
 			  CState#connection{address = Address,
@@ -536,6 +541,8 @@ handle_info({start_connection, client,
     case (catch ssh_transport:connect(Parent, Address, 
 				      Port, SocketOpts, Options)) of
 	{ok, Connection} ->
+	    erlang:send_after(60000, self(), rekey_data),
+	    erlang:send_after(3600000, self(), rekey),
 	    {noreply, State#state{connection = Connection}};
 	Reason ->
 	    Pid ! {self(), not_connected, Reason},
@@ -568,8 +575,15 @@ handle_info({'DOWN', _Ref, process, ChannelPid, _Reason}, State) ->
 
 %%% So that terminate will be run when supervisor is shutdown
 handle_info({'EXIT', _Sup, Reason}, State) ->
-    {stop, Reason, State}.
-
+    {stop, Reason, State};
+handle_info(rekey, State) ->
+    renegotiate(self()),
+    erlang:send_after(3600000, self(), rekey),
+    {noreply, State};
+handle_info(rekey_data, State) ->
+    renegotiate_data(self()),
+    erlang:send_after(60000, self(), rekey_data),
+    {noreply, State}.
 handle_password(Opts) ->
     handle_rsa_password(handle_dsa_password(handle_normal_password(Opts))).
 handle_normal_password(Opts) ->
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 5fec7f0cd7..efcb11f88f 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -42,15 +42,14 @@ all() ->
      {group, dsa_pass_key},
      {group, rsa_pass_key},
      {group, internal_error},
-     {group, idle_time},
      daemon_already_started,
      server_password_option,
      server_userpassword_option,
      close].
 
 groups() -> 
-    [{dsa_key, [], [send, exec, exec_compressed, shell, known_hosts, idle_time]},
-     {rsa_key, [], [send, exec, exec_compressed, shell, known_hosts, idle_time]},
+    [{dsa_key, [], [send, exec, exec_compressed, shell, known_hosts, idle_time, rekey]},
+     {rsa_key, [], [send, exec, exec_compressed, shell, known_hosts, idle_time, rekey]},
      {dsa_pass_key, [], [pass_phrase]},
      {rsa_pass_key, [], [pass_phrase]},
      {internal_error, [], [internal_error]}
@@ -247,7 +246,8 @@ idle_time(Config) ->
     ConnectionRef =
 	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
 					  {user_dir, UserDir},
-					  {user_interaction, false}]),
+					  {user_interaction, false},
+					  {idle_time, 2000}]),
     {ok, Id} = ssh_connection:session_channel(ConnectionRef, 1000),
     ssh_connection:close(ConnectionRef, Id),
     receive
@@ -256,6 +256,28 @@ idle_time(Config) ->
     end,
     ssh:stop_daemon(Pid).
 %%--------------------------------------------------------------------
+rekey(doc) ->
+    ["Idle timeout test"];
+rekey(Config) ->
+    SystemDir = filename:join(?config(priv_dir, Config), system),
+    UserDir = ?config(priv_dir, Config),
+
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+					     {user_dir, UserDir},
+					     {failfun, fun ssh_test_lib:failfun/2},
+					     {rekey_limit, 0}]),
+    ConnectionRef =
+	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user_dir, UserDir},
+					  {user_interaction, false},
+					  {rekey_limit, 0}]),
+    receive
+    after 15000 ->
+	    %%By this time rekeying would have been done
+	    ssh:close(ConnectionRef),
+	    ssh:stop_daemon(Pid)
+    end.
+%%--------------------------------------------------------------------
 shell(doc) ->
     ["Test that ssh:shell/2 works"];
 shell(Config) when is_list(Config) ->