qga: Refactor common SSH functions

Message-Id: <20240424144029.30665-2-aidan_leuck@selinc.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

In preparation of a Windows implementation, move the
non-POSIX specific code to commands-common-ssh.

Signed-off-by: Aidan Leuck <aidan_leuck@selinc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Dehan Meng <demeng@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Link: https://lore.kernel.org/r/20240424144029.30665-2-aidan_leuck@selinc.com
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
This commit is contained in:
aidaleuc 2024-04-24 08:40:28 -06:00 committed by Konstantin Kostiuk
parent 0e5b75a390
commit 1cc9932700
4 changed files with 63 additions and 47 deletions

50
qga/commands-common-ssh.c Normal file
View File

@ -0,0 +1,50 @@
/*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "commands-common-ssh.h"
GStrv read_authkeys(const char *path, Error **errp)
{
g_autoptr(GError) err = NULL;
g_autofree char *contents = NULL;
if (!g_file_get_contents(path, &contents, NULL, &err)) {
error_setg(errp, "failed to read '%s': %s", path, err->message);
return NULL;
}
return g_strsplit(contents, "\n", -1);
}
bool check_openssh_pub_keys(strList *keys, size_t *nkeys, Error **errp)
{
size_t n = 0;
strList *k;
for (k = keys; k != NULL; k = k->next) {
if (!check_openssh_pub_key(k->value, errp)) {
return false;
}
n++;
}
if (nkeys) {
*nkeys = n;
}
return true;
}
bool check_openssh_pub_key(const char *key, Error **errp)
{
/* simple sanity-check, we may want more? */
if (!key || key[0] == '#' || strchr(key, '\n')) {
error_setg(errp, "invalid OpenSSH public key: '%s'", key);
return false;
}
return true;
}

10
qga/commands-common-ssh.h Normal file
View File

@ -0,0 +1,10 @@
/*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#include "qapi/qapi-builtin-types.h"
GStrv read_authkeys(const char *path, Error **errp);
bool check_openssh_pub_keys(strList *keys, size_t *nkeys, Error **errp);
bool check_openssh_pub_key(const char *key, Error **errp);

View File

@ -9,6 +9,7 @@
#include <locale.h> #include <locale.h>
#include <pwd.h> #include <pwd.h>
#include "commands-common-ssh.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qga-qapi-commands.h" #include "qga-qapi-commands.h"
@ -80,37 +81,6 @@ mkdir_for_user(const char *path, const struct passwd *p,
return true; return true;
} }
static bool
check_openssh_pub_key(const char *key, Error **errp)
{
/* simple sanity-check, we may want more? */
if (!key || key[0] == '#' || strchr(key, '\n')) {
error_setg(errp, "invalid OpenSSH public key: '%s'", key);
return false;
}
return true;
}
static bool
check_openssh_pub_keys(strList *keys, size_t *nkeys, Error **errp)
{
size_t n = 0;
strList *k;
for (k = keys; k != NULL; k = k->next) {
if (!check_openssh_pub_key(k->value, errp)) {
return false;
}
n++;
}
if (nkeys) {
*nkeys = n;
}
return true;
}
static bool static bool
write_authkeys(const char *path, const GStrv keys, write_authkeys(const char *path, const GStrv keys,
const struct passwd *p, Error **errp) const struct passwd *p, Error **errp)
@ -139,21 +109,6 @@ write_authkeys(const char *path, const GStrv keys,
return true; return true;
} }
static GStrv
read_authkeys(const char *path, Error **errp)
{
g_autoptr(GError) err = NULL;
g_autofree char *contents = NULL;
if (!g_file_get_contents(path, &contents, NULL, &err)) {
error_setg(errp, "failed to read '%s': %s", path, err->message);
return NULL;
}
return g_strsplit(contents, "\n", -1);
}
void void
qmp_guest_ssh_add_authorized_keys(const char *username, strList *keys, qmp_guest_ssh_add_authorized_keys(const char *username, strList *keys,
bool has_reset, bool reset, bool has_reset, bool reset,

View File

@ -66,6 +66,7 @@ qga_ss.add(files(
'guest-agent-command-state.c', 'guest-agent-command-state.c',
'main.c', 'main.c',
'cutils.c', 'cutils.c',
'commands-common-ssh.c'
)) ))
if host_os == 'windows' if host_os == 'windows'
qga_ss.add(files( qga_ss.add(files(
@ -186,7 +187,7 @@ test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
# this when an alternative is implemented or when the underlying glib # this when an alternative is implemented or when the underlying glib
# issue is identified/fix # issue is identified/fix
if host_os != 'windows' and not get_option('fuzzing') if host_os != 'windows' and not get_option('fuzzing')
srcs = [files('commands-posix-ssh.c')] srcs = [files('commands-common-ssh.c', 'commands-posix-ssh.c')]
i = 0 i = 0
foreach output: qga_qapi_outputs foreach output: qga_qapi_outputs
if output.startswith('qga-qapi-types') or output.startswith('qga-qapi-visit') if output.startswith('qga-qapi-types') or output.startswith('qga-qapi-visit')