File 1203-ssh-Rework-crash-state-formatting-in-ssh_c... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1203-ssh-Rework-crash-state-formatting-in-ssh_connection_.patch of Package erlang (Revision 0c21b05666799b6f7e661ea62fb04f80)

Currently displaying revision 0c21b05666799b6f7e661ea62fb04f80 , Show latest

From df47070fb817c16c8235240bd2a0030cdb661a5f Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 1 Jun 2021 15:00:24 +0200
Subject: [PATCH 3/5] ssh: Rework crash state formatting in
 ssh_connection_handler

---
 lib/ssh/src/ssh_connection_handler.erl | 101 ++++++++++++++-----------
 1 file changed, 55 insertions(+), 46 deletions(-)

diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 14738cbd03..e0146385af 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -42,7 +42,7 @@
 %%====================================================================
 
 %%% Start and stop
--export([start_link_ng/4, start_link_ng/5,
+-export([start_link/4, start_link/5,
          takeover/4,
 	 stop/1
 	]).
@@ -96,10 +96,10 @@
 %% Start / stop
 %%====================================================================
 
-start_link_ng(Role, Address, Socket, Options) ->
-    start_link_ng(Role, Address, undefined, Socket, Options).
+start_link(Role, Address, Socket, Options) ->
+    start_link(Role, Address, undefined, Socket, Options).
 
-start_link_ng(Role, _Address=#address{}, Id, Socket, Options) ->
+start_link(Role, _Address=#address{}, Id, Socket, Options) ->
     case gen_statem:start_link(?MODULE,
                                [Role, Socket, Options],
                                [{spawn_opt, [{message_queue_data,off_heap}]}]) of
@@ -1384,50 +1384,59 @@ format_status(A, B) ->
         
 format_status0(normal, [_PDict, _StateName, D]) ->
     [{data, [{"State", D}]}];
-format_status0(terminate, [_PDict, _StateName, D=#data{}]) ->
-    [{data, [{"State", state_data2proplist(D)}]}];
-format_status0(terminate, [_PDict, StateName, NotD]) ->
-    lists:flatten(io_lib:format("State = ~p, Data = ~p",[StateName,NotD]));
-format_status0(_, _) ->
-    "???".
-
-state_data2proplist(D) ->
-    DataPropList0 =
-        fmt_stat_rec(record_info(fields, data), D,
-                     [decrypted_data_buffer,
-                      encrypted_data_buffer,
-                      key_exchange_init_msg,
-                      user_passwords,
-                      opts,
-                      inet_initial_recbuf_size]),
-    SshPropList =
-        fmt_stat_rec(record_info(fields, ssh), D#data.ssh_params,
-                     [c_keyinit,
-                      s_keyinit,
-                      send_mac_key,
-                      send_mac_size,
-                      recv_mac_key,
-                      recv_mac_size,
-                      encrypt_keys,
-                      encrypt_ctx,
-                      decrypt_keys,
-                      decrypt_ctx,
-                      compress_ctx,
-                      decompress_ctx,
-                      shared_secret,
-                      exchanged_hash,
-                      session_id,
-                      keyex_key,
-                      keyex_info,
-                      available_host_keys]),
-    lists:keyreplace(ssh_params, 1, DataPropList0,
-                     {ssh_params,SshPropList}).
-    
+format_status0(terminate, [_, _StateName, D]) ->
+    [{data, [{"State", clean(D)}]}].
+
+
+clean(#data{}=R) ->
+    fmt_stat_rec(record_info(fields,data), R,
+                 [decrypted_data_buffer,
+                  encrypted_data_buffer,
+                  key_exchange_init_msg,
+                  user_passwords,
+                  opts,
+                  inet_initial_recbuf_size]);
+clean(#ssh{}=R) ->
+    fmt_stat_rec(record_info(fields, ssh), R,
+                 [c_keyinit,
+                  s_keyinit,
+                  send_mac_key,
+                  send_mac_size,
+                  recv_mac_key,
+                  recv_mac_size,
+                  encrypt_keys,
+                  encrypt_ctx,
+                  decrypt_keys,
+                  decrypt_ctx,
+                  compress_ctx,
+                  decompress_ctx,
+                  shared_secret,
+                  exchanged_hash,
+                  session_id,
+                  keyex_key,
+                  keyex_info,
+                  available_host_keys]);
+clean(#connection{}=R) ->
+    fmt_stat_rec(record_info(fields, connection), R,
+                 []);
+clean(L) when is_list(L) ->
+    lists:map(fun clean/1, L);
+clean(T) when is_tuple(T) ->
+    list_to_tuple( clean(tuple_to_list(T)));
+clean(X) ->
+    ssh_options:no_sensitive(filter, X).
 
 fmt_stat_rec(FieldNames, Rec, Exclude) ->
     Values = tl(tuple_to_list(Rec)),
-    [P || {K,_} = P <- lists:zip(FieldNames, Values),
-	  not lists:member(K, Exclude)].
+    list_to_tuple(
+      [element(1,Rec) |
+       lists:map(fun({K,V}) ->
+                         case lists:member(K, Exclude) of
+                             true -> '****';
+                             false -> clean(V)
+                         end
+                 end, lists:zip(FieldNames, Values))
+      ]).
 
 %%--------------------------------------------------------------------
 -spec code_change(term() | {down,term()},
@@ -2146,7 +2155,7 @@ ssh_dbg_format(terminate, {call, {?MODULE,terminate, [Reason, StateName, D]}}) -
         true ->
             ["Connection Terminating:\n",
              io_lib:format("Reason: ~p, StateName: ~p~n~s~nStateData = ~p",
-                           [Reason, StateName, ExtraInfo, state_data2proplist(D)])
+                           [Reason, StateName, ExtraInfo, clean(D)])
             ]
     end;
 ssh_dbg_format(renegotiation, {return_from, {?MODULE,terminate,3}, _Ret}) ->
-- 
2.26.2

Places

File 1203-ssh-Rework-crash-state-formatting-in-ssh_connection_.patch of Package erlang (Revision 0c21b05666799b6f7e661ea62fb04f80)

Places