diff options
| author | Hans Nilsson <[email protected]> | 2015-11-10 16:04:29 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-11-11 11:41:56 +0100 |
| commit | 37e598c1784595f8e10924ac2460d71c0c251c2c (patch) | |
| tree | 6a197fdd19ee6407f4ea70e1df748de4311e8e94 | |
| parent | 8db16f44bfb77026cd6394fbad8c79b7a727b724 (diff) | |
| download | otp-37e598c1784595f8e10924ac2460d71c0c251c2c.tar.gz otp-37e598c1784595f8e10924ac2460d71c0c251c2c.tar.bz2 otp-37e598c1784595f8e10924ac2460d71c0c251c2c.zip | |
ssh: add better error handling in ssh_file
ssh_file:lookup_user_key_fd and ssh_file:lookup_host_key
| -rw-r--r-- | lib/ssh/src/ssh_file.erl | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh_file.erl b/lib/ssh/src/ssh_file.erl index c087ce14d7..2f16a31cba 100644 --- a/lib/ssh/src/ssh_file.erl +++ b/lib/ssh/src/ssh_file.erl @@ -221,9 +221,11 @@ do_lookup_host_key(KeyToMatch, Host, Alg, Opts) -> {ok, Fd} -> Res = lookup_host_key_fd(Fd, KeyToMatch, Host, Alg), file:close(Fd), - {ok, Res}; - {error, enoent} -> {error, not_found}; - Error -> Error + Res; + {error, enoent} -> + {error, not_found}; + Error -> + Error end. identity_key_filename('ssh-dss' ) -> "id_dsa"; @@ -242,6 +244,9 @@ lookup_host_key_fd(Fd, KeyToMatch, Host, KeyType) -> case io:get_line(Fd, '') of eof -> {error, not_found}; + {error,Error} -> + %% Rare... For example NFS errors + {error,Error}; Line -> case ssh_decode_line(Line, known_hosts) of [{Key, Attributes}] -> @@ -262,7 +267,7 @@ handle_host(Fd, KeyToMatch, Host, HostList, Key, KeyType) -> Host1 = host_name(Host), case lists:member(Host1, HostList) andalso key_match(Key, KeyType) of true when KeyToMatch == Key -> - Key; + {ok,Key}; _ -> lookup_host_key_fd(Fd, KeyToMatch, Host, KeyType) end. @@ -309,6 +314,9 @@ lookup_user_key_fd(Fd, Key) -> case io:get_line(Fd, '') of eof -> {error, not_found}; + {error,Error} -> + %% Rare... For example NFS errors + {error,Error}; Line -> case ssh_decode_line(Line, auth_keys) of [{AuthKey, _}] -> |