NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

client: Change default location of known_hosts file for libssh2 layer

Browse Source 
Unfortunately libssh2 doesn't support all types of host keys that can be
saved in the known_hosts file. Also it does not report that parsing of
the file failed. This results into truncated known_hosts files where the
standard client stores keys also in other formats (eg.
ecdsa-sha2-nistp256).

This patch changes the default location of the known_hosts file into the
libvirt private configuration directory, where it will be only written
by the libssh2 layer itself. This prevents trashing user's known_host
file.
This commit is contained in:
Peter Krempa 2012-08-21 17:54:26 +02:00
parent f1d0b92a01
commit 225f280744
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/rpc/virnetclient.c
View File

@ -417,23 +417,25 @@ virNetClientPtr virNetClientNewLibSSH2(const char *host,
char *command = NULL; char *command = NULL;
char *homedir = virGetUserDirectory(); char *homedir = virGetUserDirectory();
char *confdir = virGetUserConfigDirectory();
char *knownhosts = NULL; char *knownhosts = NULL;
char *privkey = NULL; char *privkey = NULL;
/* Use default paths for known hosts an public keys if not provided */ /* Use default paths for known hosts an public keys if not provided */
if (homedir) { if (confdir) {
if (!knownHostsPath) { if (!knownHostsPath) {
virBufferAsprintf(&buf, "%s/.ssh/known_hosts", homedir); if (virFileExists(confdir)) {
if (!(knownhosts = virBufferContentAndReset(&buf))) virBufferAsprintf(&buf, "%s/known_hosts", confdir);
goto no_memory; if (!(knownhosts = virBufferContentAndReset(&buf)))
goto no_memory;
if (!(virFileExists(knownhosts))) }
VIR_FREE(knownhosts);
} else { } else {
if (!(knownhosts = strdup(knownHostsPath))) if (!(knownhosts = strdup(knownHostsPath)))
goto no_memory; goto no_memory;
} }
}
if (homedir) {
if (!privkeyPath) { if (!privkeyPath) {
/* RSA */ /* RSA */
virBufferAsprintf(&buf, "%s/.ssh/id_rsa", homedir); virBufferAsprintf(&buf, "%s/.ssh/id_rsa", homedir);
@ -501,6 +503,7 @@ cleanup:
VIR_FREE(privkey); VIR_FREE(privkey);
VIR_FREE(knownhosts); VIR_FREE(knownhosts);
VIR_FREE(homedir); VIR_FREE(homedir);
VIR_FREE(confdir);
VIR_FREE(nc); VIR_FREE(nc);
virObjectUnref(sock); virObjectUnref(sock);
return ret; return ret;