From: Aidan Leuck <aidan_le...@selinc.com> Signed-off-by: Aidan Leuck <aidan_le...@selinc.com> --- qga/commands-posix-ssh.c | 47 +--------------------------- qga/commands-ssh-core.c | 57 +++++++++++++++++++++++++++++++++ qga/commands-ssh-core.h | 15 +++++++++ qga/commands-windows-ssh.c | 64 -------------------------------------- qga/commands-windows-ssh.h | 15 ++++----- qga/meson.build | 5 +++ 6 files changed, 86 insertions(+), 117 deletions(-) create mode 100644 qga/commands-ssh-core.c create mode 100644 qga/commands-ssh-core.h
diff --git a/qga/commands-posix-ssh.c b/qga/commands-posix-ssh.c index 236f80de44..9a71b109f9 100644 --- a/qga/commands-posix-ssh.c +++ b/qga/commands-posix-ssh.c @@ -9,6 +9,7 @@ #include <locale.h> #include <pwd.h> +#include "commands-ssh-core.h" #include "qapi/error.h" #include "qga-qapi-commands.h" @@ -80,37 +81,6 @@ mkdir_for_user(const char *path, const struct passwd *p, 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 write_authkeys(const char *path, const GStrv keys, const struct passwd *p, Error **errp) @@ -139,21 +109,6 @@ write_authkeys(const char *path, const GStrv keys, 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 qmp_guest_ssh_add_authorized_keys(const char *username, strList *keys, bool has_reset, bool reset, diff --git a/qga/commands-ssh-core.c b/qga/commands-ssh-core.c new file mode 100644 index 0000000000..c77cee8a11 --- /dev/null +++ b/qga/commands-ssh-core.c @@ -0,0 +1,57 @@ + /* + * 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 <qga-qapi-types.h> +#include <stdbool.h> +#include "qapi/error.h" +#include "commands-ssh-core.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; +} diff --git a/qga/commands-ssh-core.h b/qga/commands-ssh-core.h new file mode 100644 index 0000000000..9c9e992c62 --- /dev/null +++ b/qga/commands-ssh-core.h @@ -0,0 +1,15 @@ +/* + * Header file for commands-ssh-core.c + * + * Copyright IBM Corp. 2024 + * + * Authors: + * Aidan Leuck <aidan_le...@selinc.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +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); \ No newline at end of file diff --git a/qga/commands-windows-ssh.c b/qga/commands-windows-ssh.c index e9faae90fc..0739d694ed 100644 --- a/qga/commands-windows-ssh.c +++ b/qga/commands-windows-ssh.c @@ -23,7 +23,6 @@ #include "lmapibuf.h" #include "lmerr.h" #include "qapi/error.h" - #include "qga-qapi-commands.h" #include "sddl.h" #include "shlobj.h" @@ -35,69 +34,6 @@ #define ADMIN_SID "S-1-5-32-544" #define WORLD_SID "S-1-1-0" -/* - * Reads the authorized_keys file and returns an array of strings for each entry - * parameters: - * path -> Path to the authorized_keys file - * errp -> Error structure that will contain errors upon failure. - * returns: Array of strings, where each entry is an authorized key. - */ -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); -} - -/* - * Checks if a OpenSSH key is valid - * parameters: - * key* Key to check for validity - * errp -> Error structure that will contain errors upon failure. - * returns: true if key is valid, false otherwise - */ -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; -} - -/* - * Checks if all openssh keys in the array are valid - * parameters: - * keys -> Array of keys to check - * errp -> Error structure that will contain errors upon failure. - * returns: true if all keys are valid, false otherwise - */ -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; -} - /* * Frees userInfo structure. This implements the g_auto cleanup * for the structure. diff --git a/qga/commands-windows-ssh.h b/qga/commands-windows-ssh.h index 7d68a1bcef..6b457524e2 100644 --- a/qga/commands-windows-ssh.h +++ b/qga/commands-windows-ssh.h @@ -11,13 +11,14 @@ */ #include <glib/gstrfuncs.h> -#include <stdbool.h> -typedef struct WindowsUserInfo { - char *sshDirectory; - char *authorizedKeyFile; - char *username; - char *SSID; - bool isAdmin; + +typedef struct WindowsUserInfo +{ + char *sshDirectory; + char *authorizedKeyFile; + char *username; + char *SSID; + bool isAdmin; } WindowsUserInfo; typedef WindowsUserInfo *PWindowsUserInfo; diff --git a/qga/meson.build b/qga/meson.build index 4c4a493ec5..2fca6f34fc 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -65,7 +65,12 @@ qga_ss.add(files( 'commands.c', 'guest-agent-command-state.c', 'main.c', +<<<<<<< HEAD 'cutils.c' +======= + 'cutils.c', + 'commands-ssh-core.c' +>>>>>>> windows-ssh-refactor )) if host_os == 'windows' qga_ss.add(files( -- 2.34.1