From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 8 Dec 2020 12:42:40 +0000 (+0100)
Subject: virsh: cmdSetUserSSHKeys: Error early if the file doesn't contain any keys
X-Git-Tag: v7.0.0-rc1~276
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9dcaede6574b80fa2bd6645ff74a82c892792a4;p=thirdparty%2Flibvirt.git

virsh: cmdSetUserSSHKeys: Error early if the file doesn't contain any keys

When removing SSH keys via set-user-sshkeys virsh command, then
files to remove are read from passed file. But when
experimenting, I've passed /dev/null as the file which resulted
in API checks which caught that @keys argument of
virDomainAuthorizedSSHKeysSet() can't be NULL. This is because if
the file is empty then its content is an empty string and thus
the buffer the file was read in to is not NULL.

Long story short, error is reported correctly, but it's not
necessary to go through public API to catch it.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 6266c7acd2..befa8d2448 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -14398,6 +14398,10 @@ cmdSetUserSSHKeys(vshControl *ctl, const vshCmd *cmd)
             goto cleanup;
 
         nkeys = virStringListLength((const char **) keys);
+        if (nkeys == 0) {
+            vshError(ctl, _("File %s contains no keys"), from);
+            goto cleanup;
+        }
     }
 
     if (virDomainAuthorizedSSHKeysSet(dom, user,