On 8/23/19 1:31 PM, Jonathon Jongsma wrote:
This function fetches the list of logged-in users from the qemu agent
and adds them to a list of typed parameters so that they can be used
internally in libvirt.
Also add some basic tests for the function.
Signed-off-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
Tested-by: Daniel Henrique Barboza <danielhb413@xxxxxxxxx>
And, assuming that what I mentioned in my comment below is a
matter of style rather than a syntax sin:
Reviewed-by: Daniel Henrique Barboza <danielhb413@xxxxxxxxx>
---
src/qemu/qemu_agent.c | 91 +++++++++++++++++++++++
src/qemu/qemu_agent.h | 2 +
tests/qemuagenttest.c | 168 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 261 insertions(+)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 361db299a5..963a4b9359 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -2240,3 +2240,94 @@ qemuAgentSetUserPassword(qemuAgentPtr mon,
VIR_FREE(password64);
return ret;
}
+
+int
+qemuAgentGetUsers(qemuAgentPtr mon,
+ virTypedParameterPtr *params,
+ int *nparams,
+ int *maxparams)
+{
+ int ret = -1;
+ size_t i;
+ virJSONValuePtr cmd;
+ virJSONValuePtr reply = NULL;
+ virJSONValuePtr data = NULL;
+ size_t ndata;
+ const char *strvalue;
+
+ if (!(cmd = qemuAgentMakeCommand("guest-get-users", NULL)))
+ return -1;
+
+ if (qemuAgentCommand(mon, cmd, &reply, true,
+ VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)
+ goto cleanup;
+
+ if (!(data = virJSONValueObjectGetArray(reply, "return"))) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("guest-get-users reply was missing return data"));
+ goto cleanup;
+ }
+
+ if (!virJSONValueIsArray(data)) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Malformed guest-get-users data array"));
+ goto cleanup;
+ }
+
+ ndata = virJSONValueArraySize(data);
+
+ if (virTypedParamsAddUInt(params, nparams, maxparams,
+ "user.count", ndata) < 0)
+ goto cleanup;
+
+ for (i = 0; i < ndata; i++) {
+ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH];
+ virJSONValuePtr entry = virJSONValueArrayGet(data, i);
+
+ if (!entry) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("array element missing in guest-get-users return "
+ "value"));
+ goto cleanup;
+ }
+
+ if (!(strvalue = virJSONValueObjectGetString(entry, "user"))) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("'user' missing in reply of guest-get-users"));
+ goto cleanup;
+ }
+
+ snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, "user.%zu.name", i);
+ if (virTypedParamsAddString(params, nparams, maxparams,
+ param_name, strvalue) < 0)
+ goto cleanup;
+
+ /* 'domain' is only present for windows guests */
+ if ((strvalue = virJSONValueObjectGetString(entry, "domain"))) {
+ snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+ "user.%zu.domain", i);
+ if (virTypedParamsAddString(params, nparams, maxparams,
+ param_name, strvalue) < 0)
+ goto cleanup;
+ }
+
+ double logintime;
I'd rather declare 'logintime' at the start of the 'for' loop, together with
'param_name' and 'entry'. Since this patch passed 'make syntax-check' I
believe this is more a matter of "artistic freedom" than a rule, so I guess
it's ok.
+ if (virJSONValueObjectGetNumberDouble(entry, "login-time", &logintime) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("'login-time' missing in reply of guest-get-users"));
+ goto cleanup;
+ }
+ snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+ "user.%zu.login-time", i);
+ if (virTypedParamsAddULLong(params, nparams, maxparams,
+ param_name, logintime * 1000) < 0)
+ goto cleanup;
+ }
+
+ ret = ndata;
+
+ cleanup:
+ virJSONValueFree(cmd);
+ virJSONValueFree(reply);
+ return ret;
+}
diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h
index 6ae9fe54da..05621b521a 100644
--- a/src/qemu/qemu_agent.h
+++ b/src/qemu/qemu_agent.h
@@ -120,3 +120,5 @@ int qemuAgentSetUserPassword(qemuAgentPtr mon,
const char *user,
const char *password,
bool crypted);
+
+int qemuAgentGetUsers(qemuAgentPtr mon, virTypedParameterPtr *params, int *nparams, int *maxparams);
diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c
index 2f79986207..f2936a59f0 100644
--- a/tests/qemuagenttest.c
+++ b/tests/qemuagenttest.c
@@ -902,6 +902,173 @@ testQemuAgentGetInterfaces(const void *data)
return ret;
}
+static const char testQemuAgentUsersResponse[] =
+ "{\"return\": "
+ " ["
+ " {\"user\": \"test\","
+ " \"login-time\": 1561739203.584038"
+ " },"
+ " {\"user\": \"test2\","
+ " \"login-time\": 1561739229.190697"
+ " }"
+ " ]"
+ "}";
+
+static const char testQemuAgentUsersResponse2[] =
+ "{\"return\": "
+ " ["
+ " {\"user\": \"test\","
+ " \"domain\": \"DOMAIN\","
+ " \"login-time\": 1561739203.584038"
+ " }"
+ " ]"
+ "}";
+
+static int getUserInfo(virTypedParameterPtr params, int nparams, size_t nth,
+ const char **username, const char **domain,
+ unsigned long long *logintime)
+{
+ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH];
+
+ snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+ "user.%zu.name", nth);
+ if (username &&
+ virTypedParamsGetString(params, nparams, param_name, username) < 0)
+ return -1;
+
+ snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+ "user.%zu.domain", nth);
+ if (domain &&
+ virTypedParamsGetString(params, nparams, param_name, domain) < 0)
+ return -1;
+
+ snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH,
+ "user.%zu.login-time", nth);
+ if (logintime &&
+ virTypedParamsGetULLong(params, nparams, param_name, logintime) < 0)
+ return -1;
+
+ return 0;
+}
+
+static int
+testQemuAgentUsers(const void *data)
+{
+ virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data;
+ qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt);
+ virTypedParameterPtr params = NULL;
+ int nparams = 0;
+ int maxparams = 0;
+ int ret = -1;
+ const char *username = NULL;
+ const char *domain = NULL;
+ unsigned long long logintime = 0;
+ unsigned int count;
+
+ if (!test)
+ return -1;
+
+ if (qemuMonitorTestAddAgentSyncResponse(test) < 0)
+ goto cleanup;
+
+ if (qemuMonitorTestAddItem(test, "guest-get-users",
+ testQemuAgentUsersResponse) < 0)
+ goto cleanup;
+
+ /* get users */
+ if (qemuAgentGetUsers(qemuMonitorTestGetAgent(test),
+ ¶ms, &nparams, &maxparams) < 0)
+ goto cleanup;
+
+ if (virTypedParamsGetUInt(params, nparams, "user.count", &count) < 0)
+ goto cleanup;
+ if (count != 2) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "Expected '2' users, got '%u'", count);
+ goto cleanup;
+ }
+
+ getUserInfo(params, nparams, 0, &username, NULL, &logintime);
+ if (!username) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Missing username");
+ goto cleanup;
+ }
+ if (STRNEQ(username, "test")) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "Expected user name 'test', got '%s'", username);
+ goto cleanup;
+ }
+ if (logintime != 1561739203584) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "Expected login time of '1561739203584', got '%llu'",
+ logintime);
+ goto cleanup;
+ }
+
+ getUserInfo(params, nparams, 1, &username, NULL, &logintime);
+ if (STRNEQ(username, "test2")) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "Expected user name 'test2', got '%s'", username);
+ goto cleanup;
+ }
+ if (logintime != 1561739229190) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "Expected login time of '1561739229190', got '%llu'",
+ logintime);
+ goto cleanup;
+ }
+
+ if (qemuMonitorTestAddAgentSyncResponse(test) < 0)
+ goto cleanup;
+
+ if (qemuMonitorTestAddItem(test, "guest-get-users",
+ testQemuAgentUsersResponse2) < 0)
+ goto cleanup;
+
+ virTypedParamsFree(params, nparams);
+ params = NULL;
+ nparams = 0;
+ maxparams = 0;
+
+ /* get users with domain */
+ if (qemuAgentGetUsers(qemuMonitorTestGetAgent(test),
+ ¶ms, &nparams, &maxparams) < 0)
+ goto cleanup;
+
+ if (virTypedParamsGetUInt(params, nparams, "user.count", &count) < 0)
+ goto cleanup;
+ if (count != 1) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "Expected '1' user, got '%u'", count);
+ goto cleanup;
+ }
+
+ getUserInfo(params, nparams, 0, &username, &domain, &logintime);
+ if (STRNEQ(username, "test")) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "Expected user name 'test', got '%s'", username);
+ goto cleanup;
+ }
+ if (logintime != 1561739203584) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "Expected login time of '1561739203584', got '%llu'",
+ logintime);
+ goto cleanup;
+ }
+ if (STRNEQ(domain, "DOMAIN")) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "Expected domain 'DOMAIN', got '%s'", domain);
+ goto cleanup;
+ }
+ ret = 0;
+
+ cleanup:
+ virTypedParamsFree(params, nparams);
+ qemuMonitorTestFree(test);
+ return ret;
+}
+
+
static int
mymain(void)
{
@@ -931,6 +1098,7 @@ mymain(void)
DO_TEST(CPU);
DO_TEST(ArbitraryCommand);
DO_TEST(GetInterfaces);
+ DO_TEST(Users);
DO_TEST(Timeout); /* Timeout should always be called last */
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
