Merge branch 'hans/ssh/zlib_openssh/OTP-12759' into maint

6 files changed, 124 insertions, 81 deletions

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index dd85baf219..93bea09e4e 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -45,7 +45,7 @@
       <item>Supported MAC algorithms: hmac-sha2-256 and hmac-sha1.</item>
       <item>Supported encryption algorithms: aes256-ctr, aes192-ctr, aes128-ctr, aes128-cb and 3des-cbc.</item>
       <item>Supported key exchange algorithms: ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, diffie-hellman-group1-sha1, diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1 and diffie-hellman-group-exchange-sha256.</item>
-      <item>Supported compression algorithms: none, zlib</item>
+      <item>Supported compression algorithms: none, [email protected], zlib</item>
       <item>Supports unicode filenames if the emulator and the underlaying OS support it.
       See section DESCRIPTION in the
       <seealso marker="kernel:file">file</seealso> manual page in <c>kernel</c>
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 646f787874..ee1dd5c9ce 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -530,7 +530,7 @@ userauth(#ssh_msg_userauth_request{service = "ssh-connection",
 		    Pid ! ssh_connected,
 		    connected_fun(User, Address, Method, Opts),
 		    {next_state, connected, 
-		     next_packet(State#state{auth_user = User, ssh_params = Ssh})};
+		     next_packet(State#state{auth_user = User, ssh_params = Ssh#ssh{authenticated = true}})};
 		{not_authorized, {User, Reason}, {Reply, Ssh}} when Method == "keyboard-interactive" ->
 		    retry_fun(User, Address, Reason, Opts),
 		    send_msg(Reply, State),
@@ -622,7 +622,7 @@ userauth_keyboard_interactive(#ssh_msg_userauth_info_response{} = Msg,
 	    Pid ! ssh_connected,
 	    connected_fun(User, Address, "keyboard-interactive", Opts),
 	    {next_state, connected, 
-	     next_packet(State#state{auth_user = User, ssh_params = Ssh})};
+	     next_packet(State#state{auth_user = User, ssh_params = Ssh#ssh{authenticated = true}})};
 	{not_authorized, {User, Reason}, {Reply, Ssh}} ->
 	    retry_fun(User, Address, Reason, Opts),
 	    send_msg(Reply, State),
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index e86c93263f..840564e246 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -65,9 +65,7 @@ default_algorithms() -> [{K,default_algorithms(K)} || K <- algo_classes()].
 
 algo_classes() -> [kex, public_key, cipher, mac, compression].
 
-default_algorithms(compression) ->
-    %% Do not announce '[email protected]' because there seem to be problems
-    supported_algorithms(compression, same(['[email protected]']));
+default_algorithms(kex) -> supported_algorithms(kex, []); %% Just to have a call...
 default_algorithms(Alg) ->
     supported_algorithms(Alg).
 
@@ -106,8 +104,10 @@ supported_algorithms(mac) ->
 	]
        ));
 supported_algorithms(compression) ->
-    same(['none','zlib','[email protected]']).
-
+    same(['none',
+ 	  '[email protected]',
+	  'zlib'
+	 ]).
 
 supported_algorithms(Key, [{client2server,BL1},{server2client,BL2}]) ->
     [{client2server,As1},{server2client,As2}] = supported_algorithms(Key),
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 51431da48e..2ff7198bf8 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -362,30 +362,36 @@ exec(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 %%% Test that compression option works
 exec_compressed(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    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},
-					     {preferred_algorithms,[{compression, [zlib]}]},
-					     {failfun, fun ssh_test_lib:failfun/2}]),
+    case ssh_test_lib:ssh_supports(zlib, compression) of
+	false ->
+	    {skip, "zlib compression is not supported"};
+
+	true ->
+	    process_flag(trap_exit, true),
+	    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},
+						     {preferred_algorithms,[{compression, [zlib]}]},
+						     {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, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
-    success = ssh_connection:exec(ConnectionRef, ChannelId,
-				  "1+1.", infinity),
-    Data = {ssh_cm, ConnectionRef, {data, ChannelId, 0, <<"2\n">>}},
-    case ssh_test_lib:receive_exec_result(Data) of
-	expected ->
-	    ok;
-	Other ->
-	    ct:fail(Other)
-    end,
-    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId),
-    ssh:stop_daemon(Pid).
+	    ConnectionRef =
+		ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+						  {user_dir, UserDir},
+						  {user_interaction, false}]),
+	    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
+	    success = ssh_connection:exec(ConnectionRef, ChannelId,
+					  "1+1.", infinity),
+	    Data = {ssh_cm, ConnectionRef, {data, ChannelId, 0, <<"2\n">>}},
+	    case ssh_test_lib:receive_exec_result(Data) of
+		expected ->
+		    ok;
+		Other ->
+		    ct:fail(Other)
+	    end,
+	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId),
+	    ssh:stop_daemon(Pid)
+    end.
 
 %%--------------------------------------------------------------------
 %%% Idle timeout test
@@ -708,22 +714,28 @@ shell_unicode_string(Config) ->
 %%--------------------------------------------------------------------
 %%% Test basic connection with openssh_zlib
 openssh_zlib_basic_test(Config) ->
-    SystemDir = filename:join(?config(priv_dir, Config), system),
-    UserDir = ?config(priv_dir, Config),
+    case ssh_test_lib:ssh_supports(['[email protected]',none], compression) of
+	{false,L} ->
+	    {skip, io_lib:format("~p compression is not supported",[L])};
 
-    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
-					     {user_dir, UserDir},
-					     {preferred_algorithms,[{compression, ['[email protected]']}]},
-					     {failfun, fun ssh_test_lib:failfun/2}]),
-    ConnectionRef =
-	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
-					  {user_dir, UserDir},
-					  {user_interaction, false},
-					  {preferred_algorithms,[{compression, ['[email protected]',
-										none]}]}
-					 ]),
-    ok = ssh:close(ConnectionRef),
-    ssh:stop_daemon(Pid).
+	true ->
+	    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},
+						     {preferred_algorithms,[{compression, ['[email protected]']}]},
+						     {failfun, fun ssh_test_lib:failfun/2}]),
+	    ConnectionRef =
+		ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+						  {user_dir, UserDir},
+						  {user_interaction, false},
+						  {preferred_algorithms,[{compression, ['[email protected]',
+											none]}]}
+						 ]),
+	    ok = ssh:close(ConnectionRef),
+	    ssh:stop_daemon(Pid)
+    end.
 
 %%--------------------------------------------------------------------
 ssh_info_print(Config) ->
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 6d568125bb..e16df6f959 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -552,4 +552,24 @@ algo_intersection(_, _) ->
 
 to_atoms(L) -> lists:map(fun erlang:list_to_atom/1, L).
     
-    
+%%%----------------------------------------------------------------    
+ssh_supports(Alg, SshDefaultAlg_tag) ->
+    SupAlgs = 
+	case proplists:get_value(SshDefaultAlg_tag,
+				 ssh:default_algorithms()) of
+	    [{_K1,L1}, {_K2,L2}] ->
+		lists:usort(L1++L2);
+	    L ->
+		L
+	end,
+    if 
+	is_atom(Alg) ->
+	    lists:member(Alg, SupAlgs);
+	is_list(Alg) ->
+	    case Alg--SupAlgs of
+		[] ->
+		    true;
+		UnSup ->
+		    {false,UnSup}
+	    end
+    end.
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 104c1f9107..bc51ae0724 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -182,23 +182,29 @@ erlang_client_openssh_server_exec_compressed() ->
 
 erlang_client_openssh_server_exec_compressed(Config) when is_list(Config) ->
     CompressAlgs = [zlib, '[email protected]',none],
-    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
-							     {user_interaction, false},
-							     {preferred_algorithms,
-							      [{compression,CompressAlgs}]}]),
-    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
-    success = ssh_connection:exec(ConnectionRef, ChannelId,
-				  "echo testing", infinity),
-    Data = {ssh_cm, ConnectionRef, {data, ChannelId, 0, <<"testing\n">>}},
-    case ssh_test_lib:receive_exec_result(Data) of
-	expected ->
-	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId);
-	{unexpected_msg,{ssh_cm, ConnectionRef,
-			 {exit_status, ChannelId, 0}} = ExitStatus} ->
-	    ct:log("0: Collected data ~p", [ExitStatus]),
-	    ssh_test_lib:receive_exec_result(Data,  ConnectionRef, ChannelId);
-	Other ->
-	    ct:fail(Other)
+    case ssh_test_lib:ssh_supports(CompressAlgs, compression) of
+	{false,L} ->
+	    {skip, io_lib:format("~p compression is not supported",[L])};
+
+	true ->
+	    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
+								     {user_interaction, false},
+								     {preferred_algorithms,
+								      [{compression,CompressAlgs}]}]),
+	    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
+	    success = ssh_connection:exec(ConnectionRef, ChannelId,
+					  "echo testing", infinity),
+	    Data = {ssh_cm, ConnectionRef, {data, ChannelId, 0, <<"testing\n">>}},
+	    case ssh_test_lib:receive_exec_result(Data) of
+		expected ->
+		    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId);
+		{unexpected_msg,{ssh_cm, ConnectionRef,
+				 {exit_status, ChannelId, 0}} = ExitStatus} ->
+		    ct:log("0: Collected data ~p", [ExitStatus]),
+		    ssh_test_lib:receive_exec_result(Data,  ConnectionRef, ChannelId);
+		Other ->
+		    ct:fail(Other)
+	    end
     end.
 
 %%--------------------------------------------------------------------
@@ -425,27 +431,32 @@ erlang_server_openssh_client_exec_compressed(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     KnownHosts = filename:join(PrivDir, "known_hosts"),
 
-%%    CompressAlgs = [zlib, '[email protected]'], % Does not work
-    CompressAlgs = [zlib],
-    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
-					     {preferred_algorithms,
-					      [{compression, CompressAlgs}]},
-					     {failfun, fun ssh_test_lib:failfun/2}]),
+    CompressAlgs = [zlib, '[email protected]'], % Does not work
+%%    CompressAlgs = [zlib],
+    case ssh_test_lib:ssh_supports(CompressAlgs, compression) of
+	{false,L} ->
+	    {skip, io_lib:format("~p compression is not supported",[L])};
 
-    ct:sleep(500),
+	true ->
+	    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+						     {preferred_algorithms,
+						      [{compression, CompressAlgs}]},
+						     {failfun, fun ssh_test_lib:failfun/2}]),
 
-    Cmd = "ssh -p " ++ integer_to_list(Port) ++
-	" -o UserKnownHostsFile=" ++ KnownHosts ++ " -C "++ Host ++ " 1+1.",
-    SshPort = open_port({spawn, Cmd}, [binary]),
+	    ct:sleep(500),
 
-    receive
-        {SshPort,{data, <<"2\n">>}} ->
-	    ok
-    after ?TIMEOUT ->
-	    ct:fail("Did not receive answer")
+	    Cmd = "ssh -p " ++ integer_to_list(Port) ++
+		" -o UserKnownHostsFile=" ++ KnownHosts ++ " -C "++ Host ++ " 1+1.",
+	    SshPort = open_port({spawn, Cmd}, [binary]),
 
-    end,
-    ssh:stop_daemon(Pid).
+	    receive
+		{SshPort,{data, <<"2\n">>}} ->
+		    ok
+	    after ?TIMEOUT ->
+		    ct:fail("Did not receive answer")
+	    end,
+	    ssh:stop_daemon(Pid)
+    end.
 
 %%--------------------------------------------------------------------
 erlang_client_openssh_server_setenv() ->