knownhosts: Check if the hosts file exists

Fixes T135

Reported-by: Jan Pazdziora <jpazdziora@redhat.com>
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Andreas Schneider
2019-04-29 10:07:31 +02:00
parent cc536377f9
commit 3e8bdb122f
2 changed files with 24 additions and 0 deletions

View File

@@ -557,6 +557,7 @@ enum ssh_known_hosts_e ssh_session_has_known_hosts_entry(ssh_session session)
struct ssh_list *entry_list = NULL;
struct ssh_iterator *it = NULL;
char *host_port = NULL;
bool ok;
int rc;
if (session->opts.knownhosts == NULL) {
@@ -569,6 +570,25 @@ enum ssh_known_hosts_e ssh_session_has_known_hosts_entry(ssh_session session)
}
}
if (session->opts.knownhosts == NULL &&
session->opts.global_knownhosts == NULL) {
return SSH_KNOWN_HOSTS_NOT_FOUND;
}
if (session->opts.knownhosts != NULL) {
ok = ssh_file_readaccess_ok(session->opts.knownhosts);
if (!ok) {
return SSH_KNOWN_HOSTS_NOT_FOUND;
}
}
if (session->opts.global_knownhosts != NULL) {
ok = ssh_file_readaccess_ok(session->opts.global_knownhosts);
if (!ok) {
return SSH_KNOWN_HOSTS_NOT_FOUND;
}
}
host_port = ssh_session_get_host_port(session);
if (host_port == NULL) {
return SSH_KNOWN_HOSTS_ERROR;