From: aidaleuc <aidan_leuck@selinc.com>
Signed-off-by: aidaleuc <aidan_leuck@selinc.com>
---
qga/commands-common-ssh.c | 50 +++++++++++++++++++++++++++++++++++++++
qga/commands-common-ssh.h | 10 ++++++++
qga/commands-posix-ssh.c | 47 +-----------------------------------
qga/meson.build | 1 +
4 files changed, 62 insertions(+), 46 deletions(-)
create mode 100644 qga/commands-common-ssh.c
create mode 100644 qga/commands-common-ssh.h
diff --git a/qga/commands-common-ssh.c b/qga/commands-common-ssh.c
new file mode 100644
index 0000000000..537869fb98
--- /dev/null
+++ b/qga/commands-common-ssh.c
@@ -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;
+}
diff --git a/qga/commands-common-ssh.h b/qga/commands-common-ssh.h
new file mode 100644
index 0000000000..14d955fa84
--- /dev/null
+++ b/qga/commands-common-ssh.h
@@ -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);
diff --git a/qga/commands-posix-ssh.c b/qga/commands-posix-ssh.c
index 236f80de44..dd2ecb453a 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-common-ssh.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/meson.build b/qga/meson.build
index 1c3d2a3d1b..4c3899751b 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -66,6 +66,7 @@ qga_ss.add(files(
'guest-agent-command-state.c',
'main.c',
'cutils.c',
+ 'commands-common-ssh.c'
))
if host_os == 'windows'
qga_ss.add(files(
--
2.34.1On 29/3/24 16:31, aidan_leuck@selinc.com wrote: > From: aidaleuc <aidan_leuck@selinc.com> > "In preparation of a Windows implementation, move the non-POSIX specific code to commands-common-ssh." > Signed-off-by: aidaleuc <aidan_leuck@selinc.com> As in v5 (https://lore.kernel.org/qemu-devel/63600417-9187-4d0b-8bcc-db7e965ff008@linaro.org/): Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > qga/commands-common-ssh.c | 50 +++++++++++++++++++++++++++++++++++++++ > qga/commands-common-ssh.h | 10 ++++++++ > qga/commands-posix-ssh.c | 47 +----------------------------------- > qga/meson.build | 1 + > 4 files changed, 62 insertions(+), 46 deletions(-) > create mode 100644 qga/commands-common-ssh.c > create mode 100644 qga/commands-common-ssh.h Kostiantyn, if you take this patch, please amend the commit description and prefix the subject with 'qga: ' :) Thanks, Phil.
On Tue, Apr 2, 2024 at 12:23 PM Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > On 29/3/24 16:31, aidan_leuck@selinc.com wrote: > > From: aidaleuc <aidan_leuck@selinc.com> > > > > "In preparation of a Windows implementation, move the > non-POSIX specific code to commands-common-ssh." > > > Signed-off-by: aidaleuc <aidan_leuck@selinc.com> > > As in v5 > ( > https://lore.kernel.org/qemu-devel/63600417-9187-4d0b-8bcc-db7e965ff008@linaro.org/ > ): > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > > > --- > > qga/commands-common-ssh.c | 50 +++++++++++++++++++++++++++++++++++++++ > > qga/commands-common-ssh.h | 10 ++++++++ > > qga/commands-posix-ssh.c | 47 +----------------------------------- > > qga/meson.build | 1 + > > 4 files changed, 62 insertions(+), 46 deletions(-) > > create mode 100644 qga/commands-common-ssh.c > > create mode 100644 qga/commands-common-ssh.h > > Kostiantyn, if you take this patch, please amend the commit > description and prefix the subject with 'qga: ' :) > I will do this. Best Regards, Konstantin Kostiuk. > Thanks, > > Phil. > >
© 2016 - 2025 Red Hat, Inc.