From 1af2d325a63ca378e250eef6c3c97d065a9eff3d Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Fri, 12 May 2017 12:45:36 +0200
Subject: ssh: Tests for ext-info extension (ext-info-s)

---
 lib/ssh/test/ssh_protocol_SUITE.erl | 64 ++++++++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 5 deletions(-)

diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl
index 5a6e0638a7..cdabd839b6 100644
--- a/lib/ssh/test/ssh_protocol_SUITE.erl
+++ b/lib/ssh/test/ssh_protocol_SUITE.erl
@@ -59,7 +59,8 @@ all() ->
      {group,service_requests},
      {group,authentication},
      {group,packet_size_error},
-     {group,field_size_error}
+     {group,field_size_error},
+     {group,ext_info}
     ].
 
 groups() ->
@@ -90,7 +91,11 @@ groups() ->
 			     bad_service_name_then_correct
 			    ]},
      {authentication, [], [client_handles_keyboard_interactive_0_pwds
-			  ]}
+			  ]},
+     {ext_info, [], [no_ext_info_s1,
+                     no_ext_info_s2,
+                     ext_info_s
+                    ]}
     ].
 
 
@@ -644,7 +649,54 @@ client_info_line(_Config) ->
 	    ok
     end.
 	
-    
+%%%--------------------------------------------------------------------
+%%% The server does not send the extension because
+%%% the client does not tell the server to send it
+no_ext_info_s1(Config) ->
+    %% Start the dameon
+    Server = {Pid,_,_} = ssh_test_lib:daemon([{send_ext_info,true},
+                                              {system_dir, system_dir(Config)}]),
+    {ok,AfterKexState} = connect_and_kex([{server,Server}|Config]),
+    {ok,_} = 
+        ssh_trpt_test_lib:exec(
+          [{send, #ssh_msg_service_request{name = "ssh-userauth"}},
+	   {match, #ssh_msg_service_accept{name = "ssh-userauth"}, receive_msg}
+          ], AfterKexState),
+    ssh:stop_daemon(Pid).
+
+%%%--------------------------------------------------------------------
+%%% The server does not send the extension because
+%%% the server is not configured to send it
+no_ext_info_s2(Config) ->    
+    %% Start the dameon
+    Server = {Pid,_,_} = ssh_test_lib:daemon([{send_ext_info,false},
+                                              {system_dir, system_dir(Config)}]),
+    {ok,AfterKexState} = connect_and_kex([{extra_options,[{recv_ext_info,true}]},
+                                          {server,Server}
+                                          | Config]),
+    {ok,_} =
+        ssh_trpt_test_lib:exec(
+          [{send, #ssh_msg_service_request{name = "ssh-userauth"}},
+	   {match, #ssh_msg_service_accept{name = "ssh-userauth"}, receive_msg}
+          ], AfterKexState),
+    ssh:stop_daemon(Pid).
+
+%%%--------------------------------------------------------------------
+%%% The server sends the extension
+ext_info_s(Config) ->    
+    %% Start the dameon
+    Server = {Pid,_,_} = ssh_test_lib:daemon([{send_ext_info,true},
+                                              {system_dir, system_dir(Config)}]),
+    {ok,AfterKexState} = connect_and_kex([{extra_options,[{recv_ext_info,true}]},
+                                          {server,Server}
+                                          | Config]),
+    {ok,_} =
+        ssh_trpt_test_lib:exec(
+          [{match, #ssh_msg_ext_info{_='_'}, receive_msg}
+          ],
+          AfterKexState),
+    ssh:stop_daemon(Pid).
+
 %%%================================================================
 %%%==== Internal functions ========================================
 %%%================================================================
@@ -751,10 +803,12 @@ connect_and_kex(Config, InitialState) ->
 	[{preferred_algorithms,[{kex,[?DEFAULT_KEX]},
                                 {cipher,?DEFAULT_CIPHERS}
                                ]},
-	 {silently_accept_hosts, true},
+         {silently_accept_hosts, true},
          {recv_ext_info, false},
 	 {user_dir, user_dir(Config)},
-	 {user_interaction, false}]},
+	 {user_interaction, false}
+         | proplists:get_value(extra_options,Config,[])
+        ]},
        receive_hello,
        {send, hello},
        {send, ssh_msg_kexinit},
-- 
cgit v1.2.3