From 9ba9728528f309933fd95aa92f748682dd5204f2 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 9 Jun 2015 18:19:12 +0200
Subject: ssh: add test case + corr for ssh_info:print/1

Conflicts:
	lib/ssh/test/ssh_basic_SUITE.erl
---
 lib/ssh/src/ssh_info.erl         |  9 ++---
 lib/ssh/test/ssh_basic_SUITE.erl | 76 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 78 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/ssh/src/ssh_info.erl b/lib/ssh/src/ssh_info.erl
index 9c79d773a7..fc8f564bc3 100644
--- a/lib/ssh/src/ssh_info.erl
+++ b/lib/ssh/src/ssh_info.erl
@@ -79,7 +79,7 @@ print_clients(D) ->
 
 print_client(D, {undefined,Pid,supervisor,[ssh_connection_handler]}) ->
     {{Local,Remote},_Str} = ssh_connection_handler:get_print_info(Pid),
-    io:format(D, "    Local=~s Remote=~s~n",[fmt_host_port(Local),fmt_host_port(Remote)]);
+    io:format(D, "    Local=~s  Remote=~s  ConnectionRef=~p~n",[fmt_host_port(Local),fmt_host_port(Remote),Pid]);
 print_client(D, Other) ->
     io:format(D, "    [[Other 1: ~p]]~n",[Other]).
 
@@ -134,10 +134,11 @@ walk_sups(D, StartPid) ->
     io:format(D, "Start at ~p, ~s.~n",[StartPid,dead_or_alive(StartPid)]),
     walk_sups(D, children(StartPid), _Indent=?inc(0)).
 
-walk_sups(D, [H={_,Pid,SupOrWorker,_}|T], Indent) ->
+walk_sups(D, [H={_,Pid,_,_}|T], Indent) ->
     indent(D, Indent), io:format(D, '~200p  ~p is ~s~n',[H,Pid,dead_or_alive(Pid)]),
-    case SupOrWorker of
-	supervisor -> walk_sups(D, children(Pid), ?inc(Indent));
+    case H of
+	{_,_,supervisor,[ssh_connection_handler]} -> ok;
+	{_,Pid,supervisor,_} -> walk_sups(D, children(Pid), ?inc(Indent));
 	_ -> ok
     end,
     walk_sups(D, T, Indent);
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 873e9a42b1..2ff6aac3b6 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -71,7 +71,8 @@ all() ->
      id_string_no_opt_server,
      id_string_own_string_server,
      id_string_random_server,
-     {group, hardening_tests}
+     {group, hardening_tests},
+     ssh_info_print
     ].
 
 groups() ->
@@ -157,7 +158,8 @@ init_per_group(dir_options, Config) ->
     case {file:read_file_info(Dir_unreadable), 
 	  file:read_file_info(File_readable)} of
 	{{ok, #file_info{type=directory, access=Md}},
-	 {ok, #file_info{type=regular, access=Mf}}} when Md=/=read, Md=/=read_write ->
+	 {ok, #file_info{type=regular, access=Mf}}} when Md=/=read, Md=/=read_write,
+							 Mf=/=read, Mf=/=read_write ->
 	    %% Save:
 	    [{unreadable_dir, Dir_unreadable},
 	     {readable_file, File_readable} 
@@ -820,7 +822,7 @@ connectfun_disconnectfun_client(Config) ->
 					     {user_dir, UserDir},
 					     {password, "morot"},
 					     {failfun, fun ssh_test_lib:failfun/2}]),
-    ConnectionRef =
+    _ConnectionRef =
 	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
 					  {user, "foo"},
 					  {password, "morot"},
@@ -1694,6 +1696,74 @@ max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
 	    {fail,"Too few connections accepted"}
     end.
 
+%%--------------------------------------------------------------------
+ssh_info_print(Config) ->
+    %% Just check that ssh_print:info() crashes
+    PrivDir = ?config(priv_dir, Config),
+    PrintFile = filename:join(PrivDir,info),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = ?config(data_dir, Config),
+
+    Parent = self(),
+    UnexpFun = fun(Msg,_Peer) ->
+		       Parent ! {unexpected,Msg,self()},
+		       skip
+	       end,
+    ConnFun = fun(_,_,_) -> Parent ! {connect,self()} end,
+
+    {DaemonRef, Host, Port} = 
+	ssh_test_lib:daemon([{system_dir, SysDir},
+			     {user_dir, UserDir},
+			     {password, "morot"},
+			     {unexpectedfun, UnexpFun},
+			     {connectfun, ConnFun},
+			     {failfun, fun ssh_test_lib:failfun/2}]),
+    ClientConnRef1 =
+	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user, "foo"},
+					  {password, "morot"},
+					  {user_dir, UserDir},
+					  {unexpectedfun, UnexpFun},
+					  {user_interaction, false}]),
+    ClientConnRef2 =
+	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user, "foo"},
+					  {password, "morot"},
+					  {user_dir, UserDir},
+					  {unexpectedfun, UnexpFun},
+					  {user_interaction, false}]),
+    receive
+	{connect,DaemonConnRef} ->
+	    ct:log("DaemonRef=~p, DaemonConnRef=~p, ClientConnRefs=~p",[DaemonRef, DaemonConnRef, 
+									[ClientConnRef1,ClientConnRef2]
+								       ])
+    after 2000 ->
+	    ok
+    end,
+
+    {ok,D} = file:open(PrintFile, write),
+    ssh_info:print(D),
+    ok = file:close(D),
+
+    {ok,Bin} = file:read_file(PrintFile),
+    ct:log("~s",[Bin]),
+
+    receive
+	{unexpected, Msg, Pid} ->
+	    ct:log("~p got unexpected msg ~p",[Pid,Msg]),
+	    ct:log("process_info(~p) = ~n~p",[Pid,process_info(Pid)]),
+	    ok = ssh:close(ClientConnRef1),
+	    ok = ssh:close(ClientConnRef2),
+	    ok = ssh:stop_daemon(DaemonRef),
+	    {fail,"unexpected msg"}
+    after 1000 ->
+	    ok = ssh:close(ClientConnRef1),
+	    ok = ssh:close(ClientConnRef2),
+	    ok = ssh:stop_daemon(DaemonRef)
+    end.
+
+
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
-- 
cgit v1.2.1