diff options
author | Hans Nilsson <[email protected]> | 2016-09-02 14:55:58 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2016-09-05 10:16:10 +0200 |
commit | df8da1d56961e999a43531b64a6f312b60da93d9 (patch) | |
tree | 6db3a88a34ddbff8830fe13fa7028f2fb24bd0f0 /lib/ssh/src/ssh_connection_handler.erl | |
parent | 068185ef518384c0141cc643820f3a2a103ff4c3 (diff) | |
download | otp-df8da1d56961e999a43531b64a6f312b60da93d9.tar.gz otp-df8da1d56961e999a43531b64a6f312b60da93d9.tar.bz2 otp-df8da1d56961e999a43531b64a6f312b60da93d9.zip |
ssh: add tstflg value one_empty to force daemon send empty ssh_msg_userauth_info_request
This behavour is assumed by Codenomicon Defensics.
Diffstat (limited to 'lib/ssh/src/ssh_connection_handler.erl')
-rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index 2eb29c9b32..8ed638cec9 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -822,9 +822,21 @@ handle_event(_, #ssh_msg_userauth_info_response{} = Msg, {userauth_keyboard_inte {not_authorized, {User, Reason}, {Reply, Ssh}} -> retry_fun(User, Reason, D), send_bytes(Reply, D), - {next_state, {userauth,server}, D#data{ssh_params = Ssh}} + {next_state, {userauth,server}, D#data{ssh_params = Ssh}}; + + {authorized_but_one_more, _User, {Reply, Ssh}} -> + send_bytes(Reply, D), + {next_state, {userauth_keyboard_interactive_extra,server}, D#data{ssh_params = Ssh}} end; +handle_event(_, #ssh_msg_userauth_info_response{} = Msg, {userauth_keyboard_interactive_extra, server}, D) -> + {authorized, User, {Reply, Ssh}} = ssh_auth:handle_userauth_info_response({extra,Msg}, D#data.ssh_params), + send_bytes(Reply, D), + D#data.starter ! ssh_connected, + connected_fun(User, "keyboard-interactive", D), + {next_state, {connected,server}, D#data{auth_user = User, + ssh_params = Ssh#ssh{authenticated = true}}}; + handle_event(_, Msg = #ssh_msg_userauth_failure{}, {userauth_keyboard_interactive, client}, #data{ssh_params = Ssh0} = D0) -> Prefs = [{Method,M,F,A} || {Method,M,F,A} <- Ssh0#ssh.userauth_preference, |