diff options
| author | Erlang/OTP <otp@erlang.org> | 2023-02-22 15:29:01 +0100 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2023-02-22 15:29:01 +0100 |
| commit | 26c1493ac2cf7c47e2a1f3593a140bf1dd7b24ac (patch) | |
| tree | ae1a430796bbe090c2013500b923fd68ec684de2 | |
| parent | 40b07031585669b6e9ae09e0fa1541219a5c1ed7 (diff) | |
| parent | 394648c7948b231c304342e4ddada07e4a110a3d (diff) | |
| download | erlang-26c1493ac2cf7c47e2a1f3593a140bf1dd7b24ac.tar.gz | |
Merge branch 'kuba/maint-24/kuba/ssh/reduce_log_size/OTP-18417' into maint-24
* kuba/maint-24/kuba/ssh/reduce_log_size/OTP-18417:
ssh: reduce log length
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index c200fca6b4..e1046ede3a 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -1091,8 +1091,10 @@ handle_event(info, {Proto, Sock, Info}, {hello,_}, #data{socket = Sock, end; -handle_event(info, {Proto, Sock, NewData}, StateName, D0 = #data{socket = Sock, - transport_protocol = Proto}) -> +handle_event(info, {Proto, Sock, NewData}, StateName, + D0 = #data{socket = Sock, + transport_protocol = Proto, + ssh_params = SshParams}) -> try ssh_transport:handle_packet_part( D0#data.decrypted_data_buffer, <<(D0#data.encrypted_data_buffer)/binary, NewData/binary>>, @@ -1136,10 +1138,11 @@ handle_event(info, {Proto, Sock, NewData}, StateName, D0 = #data{socket = Sock, ]} catch C:E:ST -> - {Shutdown, D} = + MaxLogItemLen = ?GET_OPT(max_log_item_len,SshParams#ssh.opts), + {Shutdown, D} = ?send_disconnect(?SSH_DISCONNECT_PROTOCOL_ERROR, - io_lib:format("Bad packet: Decrypted, but can't decode~n~p:~p~n~p", - [C,E,ST]), + io_lib:format("Bad packet: Decrypted, but can't decode~n~p:~p~n~P", + [C,E,ST,MaxLogItemLen]), StateName, D1), {stop, Shutdown, D} end; @@ -1170,9 +1173,11 @@ handle_event(info, {Proto, Sock, NewData}, StateName, D0 = #data{socket = Sock, {stop, Shutdown, D} catch C:E:ST -> - {Shutdown, D} = + MaxLogItemLen = ?GET_OPT(max_log_item_len,SshParams#ssh.opts), + {Shutdown, D} = ?send_disconnect(?SSH_DISCONNECT_PROTOCOL_ERROR, - io_lib:format("Bad packet: Couldn't decrypt~n~p:~p~n~p",[C,E,ST]), + io_lib:format("Bad packet: Couldn't decrypt~n~p:~p~n~P", + [C,E,ST,MaxLogItemLen]), StateName, D0), {stop, Shutdown, D} end; |