File 1202-ssh-Avoid-sensitive-data-in-progress-and-s... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1202-ssh-Avoid-sensitive-data-in-progress-and-supervisor-.patch of Package erlang (Revision 3e233b2d0ea21cbf4e721681a5e11bfd)

Currently displaying revision 3e233b2d0ea21cbf4e721681a5e11bfd , Show latest

From 62c254657f8b0254a596bbdfb939ee41c613d144 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 1 Jun 2021 10:50:17 +0200
Subject: [PATCH 2/5] ssh: Avoid sensitive data in progress and supervisor
 reports

---
 lib/ssh/src/ssh.app.src           | 11 ++++-
 lib/ssh/src/ssh_app.erl           | 70 +++++++++++++++++++++++++++++++
 lib/ssh/src/ssh_subsystem_sup.erl |  2 +-
 3 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 5df6954b8c..c7ad417bef 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -46,7 +46,16 @@
 	     ssh_xfer]},
   {registered, []},
   {applications, [kernel, stdlib, crypto, public_key]},
-  {env, []},
+  {env, [{filter_modules, [
+                           ssh_acceptor_sup,
+                           ssh_acceptor,
+                           ssh_channel_sup,
+                           ssh_connection_handler,
+                           ssh_subsystem_sup,
+                           ssh_system_sup
+                          ]},
+         {default_filter, rm} %% rm | filter
+        ]},
   {mod, {ssh_app, []}},
   {runtime_dependencies, [
 			  "crypto-5.0",
diff --git a/lib/ssh/src/ssh_app.erl b/lib/ssh/src/ssh_app.erl
index 2e8b671362..5a5d024c2f 100644
--- a/lib/ssh/src/ssh_app.erl
+++ b/lib/ssh/src/ssh_app.erl
@@ -60,6 +60,7 @@ stop(_State) ->
 %%%  Supervisor callback
 %%%=========================================================================
 init([ssh_sup]) ->
+    add_logger_filter(),
     SupFlags = #{strategy  => one_for_one,
                  intensity =>   10,
                  period    => 3600
@@ -79,3 +80,72 @@ init([sshX_sup]) ->
                 },
     ChildSpecs = [],
     {ok, {SupFlags,ChildSpecs}}.
+
+
+%%%================================================================
+add_logger_filter() ->
+    DefAct = application:get_env(ssh, default_filter, rm),
+    DefF = start_link,
+    ModulesActions =
+        lists:map(fun(M) when is_atom(M) ->
+                          {M,{DefF,DefAct}};
+
+                     ({M,Act}) when is_atom(M),
+                                    (Act == rm orelse
+                                     Act == filter) ->
+                          {M,{DefF,Act}};
+
+                     ({M,F}) when is_atom(M), is_atom(F) ->
+                          {M,{F,DefAct}};
+
+                     ({M,F,Act}) when is_atom(M), is_atom(F),
+                                      (Act == rm orelse
+                                       Act == filter) ->
+                          {M,{F,Act}}
+                  end, application:get_env(ssh, filter_modules, [])),
+    logger:add_primary_filter(ssh_filter, {fun ssh_filter/2, ModulesActions}).
+
+
+ssh_filter(Ev = #{msg := {report, R=#{report := Rep}}},
+           ModulesActions = [_|_]) when is_list(Rep) ->
+    %% io:format("Ev = ~p~n", [Ev]),
+    try
+        Ev#{msg := {report, R#{report := remove_sensitive(Rep, ModulesActions)}}}
+    catch
+        throw:{ssh_filter_return,Ret} -> 
+            %% io:format("ssh_filter returns ~p~n", [Ret]),
+            Ret;
+        _C:_E ->
+            %% io:format("*** ~p ~p~n", [_C,_E]),
+            stop
+    end;
+ssh_filter(OtherEv, _) ->
+    %% io:format("OtherEv = ~p~n", [OtherEv]),
+    OtherEv.
+
+
+remove_sensitive(L, ModActs) when is_list(L) -> rs(L, ModActs);
+remove_sensitive(_, _) -> throw({ssh_filter_return,ignore}).
+
+
+rs([{K,V0}|T], ModActs) when is_list(V0) ->
+    case proplists:get_value(mfargs, V0) of
+        {M,F,A} ->
+            MFA1 = filter(proplists:get_value(M,ModActs), {M,F,A}),
+            V = lists:keyreplace(mfargs, 1, V0, {mfargs,MFA1}),
+            [{K,V} | T];
+        _ ->
+            [{K,V0} | rs(T,ModActs)]
+    end;
+
+rs([H|T], ModActs) ->
+    [H | rs(T,ModActs)];
+
+rs(Other, _) ->
+    Other.
+
+
+filter({F,Act}, {M,F,A}) -> {M, F, ssh_options:no_sensitive(Act,A)};
+filter(stop, _) -> throw({ssh_filter_return,stop});
+filter(_, _) -> throw({ssh_filter_return,ignore}).
+
diff --git a/lib/ssh/src/ssh_subsystem_sup.erl b/lib/ssh/src/ssh_subsystem_sup.erl
index 28a23d434b..3aa921460f 100644
--- a/lib/ssh/src/ssh_subsystem_sup.erl
+++ b/lib/ssh/src/ssh_subsystem_sup.erl
@@ -70,7 +70,7 @@ init([Role, Address, Id, Socket, Options]) ->
                     type        => worker,
                     significant => true,
                     start       => {ssh_connection_handler,
-                                    start_link_ng,
+                                    start_link,
                                     [Role, Address, Id, Socket,
                                      ?PUT_INTERNAL_OPT([
                                                         {subsystem_sup, SubSysSup}
-- 
2.26.2

Places

File 1202-ssh-Avoid-sensitive-data-in-progress-and-supervisor-.patch of Package erlang (Revision 3e233b2d0ea21cbf4e721681a5e11bfd)

Places