qga/commands-posix.c | 35 +++++++++++++++++++++++ qga/commands-win32.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ qga/qapi-schema.json | 21 ++++++++++++++ 3 files changed, 136 insertions(+)
From: Vinzenz Feenstra <vfeenstr@redhat.com>
A command that will list all currenctly logged in users having running
processes.
Examples:
virsh # qemu-agent-command F25 '{ "execute": "guest-get-users" }'
{"return":[{"user":"root"}]}
virsh # qemu-agent-command Win2k12r2 '{ "execute": "guest-get-users" }'
{"return":[{"domain":"LADIDA","user":"Administrator"}]}
Signed-off-by: Vinzenz Feenstra <vfeenstr@redhat.com>
---
qga/commands-posix.c | 35 +++++++++++++++++++++++
qga/commands-win32.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++
qga/qapi-schema.json | 21 ++++++++++++++
3 files changed, 136 insertions(+)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 73d93eb..8cb2094 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -15,6 +15,7 @@
#include <sys/ioctl.h>
#include <sys/wait.h>
#include <dirent.h>
+#include <utmpx.h>
#include "qga/guest-agent-core.h"
#include "qga-qmp-commands.h"
#include "qapi/qmp/qerror.h"
@@ -2515,3 +2516,37 @@ void ga_command_state_init(GAState *s, GACommandState *cs)
ga_command_state_add(cs, NULL, guest_fsfreeze_cleanup);
#endif
}
+
+GuestUserList *qmp_guest_get_users(Error **err)
+{
+ GHashTable *cache = g_hash_table_new_full(g_str_hash, g_str_equal,
+ NULL, NULL);
+ GuestUserList *head = NULL, *cur_item = NULL;
+ setutxent();
+ for (;;) {
+ struct utmpx *user_info = getutxent();
+ if (user_info == NULL) {
+ break;
+ } else if (user_info->ut_type != USER_PROCESS) {
+ continue;
+ } else if (g_hash_table_contains(cache, user_info->ut_user)) {
+ continue;
+ }
+
+ g_hash_table_insert(cache, user_info->ut_user, NULL);
+
+ GuestUserList *item = g_new0(GuestUserList, 1);
+ item->value = g_new0(GuestUser, 1);
+ item->value->user = g_strdup(user_info->ut_user);
+
+ if (!cur_item) {
+ head = cur_item = item;
+ } else {
+ cur_item->next = item;
+ cur_item = item;
+ }
+ }
+ endutxent();
+ g_hash_table_unref(cache);
+ return head;
+}
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 19d72b2..46c038b 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -1536,3 +1536,83 @@ void ga_command_state_init(GAState *s, GACommandState *cs)
ga_command_state_add(cs, NULL, guest_fsfreeze_cleanup);
}
}
+
+GuestUserList *qmp_guest_get_users(Error **err)
+{
+ GHashTable *cache = g_hash_table_new_full(g_str_hash, g_str_equal,
+ NULL, NULL);
+ GuestUserList *head = NULL, *cur_item = NULL;
+
+ LPWKSTA_USER_INFO_1 buffer = NULL, iter_buffer = 0;
+ DWORD level = 1; /* Level 1 has more information */
+ DWORD prefered_max_length = MAX_PREFERRED_LENGTH;
+ DWORD entries_read = 0;
+ DWORD total_entries = 0;
+ DWORD resume_handle = 0;
+ LPWSTR server_name = NULL;
+ NET_API_STATUS result = ERROR_MORE_DATA;
+
+ while (result == ERROR_MORE_DATA) {
+ result = NetWkstaUserEnum(
+ server_name,
+ level,
+ (LPBYTE *)&buffer,
+ prefered_max_length,
+ &entries_read,
+ &total_entries,
+ &resume_handle);
+
+ if (result != ERROR_MORE_DATA && result != ERROR_SUCCESS) {
+ error_setg_win32(err, result, "Failed to enumerate active users");
+ goto error;
+ }
+
+ iter_buffer = buffer;
+ DWORD i = 0;
+ for (i = 0; i < entries_read; ++i, ++iter_buffer) {
+ gchar *name = g_utf16_to_utf8(
+ iter_buffer->wkui1_username,
+ -1, NULL, NULL, NULL
+ );
+
+ if (name == NULL) {
+ continue;
+ }
+
+ if (g_hash_table_contains(cache, name)) {
+ g_free(name);
+ continue;
+ }
+
+ gchar *domain = g_utf16_to_utf8(
+ iter_buffer->wkui1_logon_domain,
+ -1, NULL, NULL, NULL
+ );
+
+ g_hash_table_insert(cache, name, NULL);
+ GuestUserList *item = g_new0(GuestUserList, 1);
+ item->value = g_new0(GuestUser, 1);
+ item->value->user = name;
+ item->value->domain = domain;
+ item->value->has_domain = true;
+
+ if (!cur_item) {
+ head = cur_item = item;
+ } else {
+ cur_item->next = item;
+ cur_item = item;
+ }
+ }
+ }
+ NetApiBufferFree(buffer);
+ g_hash_table_unref(cache);
+ return head;
+
+error:
+ if (buffer != NULL) {
+ NetApiBufferFree(buffer);
+ }
+ g_hash_table_unref(cache);
+ qapi_free_GuestUserList(head);
+ return NULL;
+}
diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
index a02dbf2..190e8b4 100644
--- a/qga/qapi-schema.json
+++ b/qga/qapi-schema.json
@@ -1042,3 +1042,24 @@
'data': { 'path': 'str', '*arg': ['str'], '*env': ['str'],
'*input-data': 'str', '*capture-output': 'bool' },
'returns': 'GuestExec' }
+
+##
+# @GuestUser:
+# @user: Username
+# @domain: Logon domain (windows only)
+#
+# Since: 2.10
+##
+{ 'struct': 'GuestUser',
+ 'data': { 'user': 'str', '*domain': 'str' } }
+
+##
+# @guest-get-users:
+# Retrieves a list of currently active user accounts on the VM.
+#
+# Returns: A unique list of users.
+#
+# Since: 2.10
+##
+{ 'command': 'guest-get-users',
+ 'returns': ['GuestUser'] }
--
2.9.3
Hi On Tue, Mar 28, 2017 at 9:22 AM Vinzenz 'evilissimo' Feenstra < vfeenstr@redhat.com> wrote: > From: Vinzenz Feenstra <vfeenstr@redhat.com> > > A command that will list all currenctly logged in users having running > processes. > > Examples: > > virsh # qemu-agent-command F25 '{ "execute": "guest-get-users" }' > {"return":[{"user":"root"}]} > > virsh # qemu-agent-command Win2k12r2 '{ "execute": "guest-get-users" }' > {"return":[{"domain":"LADIDA","user":"Administrator"}]} > > Signed-off-by: Vinzenz Feenstra <vfeenstr@redhat.com> > --- > Is there RFE bugs for these qga patches? If they are public, it would be worthwhile to add a link to your various qga patches. > qga/commands-posix.c | 35 +++++++++++++++++++++++ > qga/commands-win32.c | 80 > ++++++++++++++++++++++++++++++++++++++++++++++++++++ > qga/qapi-schema.json | 21 ++++++++++++++ > 3 files changed, 136 insertions(+) > > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 73d93eb..8cb2094 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -15,6 +15,7 @@ > #include <sys/ioctl.h> > #include <sys/wait.h> > #include <dirent.h> > +#include <utmpx.h> > #include "qga/guest-agent-core.h" > #include "qga-qmp-commands.h" > #include "qapi/qmp/qerror.h" > @@ -2515,3 +2516,37 @@ void ga_command_state_init(GAState *s, > GACommandState *cs) > ga_command_state_add(cs, NULL, guest_fsfreeze_cleanup); > #endif > } > + > +GuestUserList *qmp_guest_get_users(Error **err) > +{ > + GHashTable *cache = g_hash_table_new_full(g_str_hash, g_str_equal, > + NULL, NULL); > if there is no need for new_full() just use new() :) > + GuestUserList *head = NULL, *cur_item = NULL; > + setutxent(); > + for (;;) { > + struct utmpx *user_info = getutxent(); > + if (user_info == NULL) { > + break; > + } else if (user_info->ut_type != USER_PROCESS) { > + continue; > + } else if (g_hash_table_contains(cache, user_info->ut_user)) { g_hash_table_contains requires glib 2.32, you should add a fallback code to glib-compat. + continue; > + } > + > + g_hash_table_insert(cache, user_info->ut_user, NULL); > + > That doesn't look safe to me, user_info->ut_user content may change after iterations. I think you should strdup the value instead. Since you use the hashtable as a set, you could use g_hash_table_add. > + GuestUserList *item = g_new0(GuestUserList, 1); > + item->value = g_new0(GuestUser, 1); > + item->value->user = g_strdup(user_info->ut_user); > + > Or simply use the value of item->value->user, so you don't need to do extra dup/free. + if (!cur_item) { > + head = cur_item = item; > + } else { > + cur_item->next = item; > + cur_item = item; > + } > + } > + endutxent(); > + g_hash_table_unref(cache); > + return head; > +} > diff --git a/qga/commands-win32.c b/qga/commands-win32.c > index 19d72b2..46c038b 100644 > --- a/qga/commands-win32.c > +++ b/qga/commands-win32.c > @@ -1536,3 +1536,83 @@ void ga_command_state_init(GAState *s, > GACommandState *cs) > ga_command_state_add(cs, NULL, guest_fsfreeze_cleanup); > } > } > + > +GuestUserList *qmp_guest_get_users(Error **err) > +{ > + GHashTable *cache = g_hash_table_new_full(g_str_hash, g_str_equal, > + NULL, NULL); > same here > + GuestUserList *head = NULL, *cur_item = NULL; > + > + LPWKSTA_USER_INFO_1 buffer = NULL, iter_buffer = 0; > + DWORD level = 1; /* Level 1 has more information */ > + DWORD prefered_max_length = MAX_PREFERRED_LENGTH; > + DWORD entries_read = 0; > + DWORD total_entries = 0; > + DWORD resume_handle = 0; > + LPWSTR server_name = NULL; > + NET_API_STATUS result = ERROR_MORE_DATA; > + > + while (result == ERROR_MORE_DATA) { > + result = NetWkstaUserEnum( > + server_name, > + level, > + (LPBYTE *)&buffer, > + prefered_max_length, > + &entries_read, > + &total_entries, > + &resume_handle); > + > + if (result != ERROR_MORE_DATA && result != ERROR_SUCCESS) { > + error_setg_win32(err, result, "Failed to enumerate active > users"); > + goto error; > + } > + > + iter_buffer = buffer; > + DWORD i = 0; > + for (i = 0; i < entries_read; ++i, ++iter_buffer) { > + gchar *name = g_utf16_to_utf8( > + iter_buffer->wkui1_username, > + -1, NULL, NULL, NULL > + ); > + > + if (name == NULL) { > + continue; > + } > + > + if (g_hash_table_contains(cache, name)) { > + g_free(name); > + continue; > + } > + > + gchar *domain = g_utf16_to_utf8( > + iter_buffer->wkui1_logon_domain, > + -1, NULL, NULL, NULL > + ); > + > + g_hash_table_insert(cache, name, NULL); > + GuestUserList *item = g_new0(GuestUserList, 1); > + item->value = g_new0(GuestUser, 1); > + item->value->user = name; > + item->value->domain = domain; > + item->value->has_domain = true; > + > + if (!cur_item) { > + head = cur_item = item; > + } else { > + cur_item->next = item; > + cur_item = item; > + } > + } > + } > + NetApiBufferFree(buffer); > + g_hash_table_unref(cache); > + return head; > + > +error: > + if (buffer != NULL) { > + NetApiBufferFree(buffer); > + } > + g_hash_table_unref(cache); > + qapi_free_GuestUserList(head); > + return NULL; > +} > diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json > index a02dbf2..190e8b4 100644 > --- a/qga/qapi-schema.json > +++ b/qga/qapi-schema.json > @@ -1042,3 +1042,24 @@ > 'data': { 'path': 'str', '*arg': ['str'], '*env': ['str'], > '*input-data': 'str', '*capture-output': 'bool' }, > 'returns': 'GuestExec' } > + > +## > +# @GuestUser: > +# @user: Username > +# @domain: Logon domain (windows only) > Or use a flat union? (like suggested for get-osinfo) > +# > +# Since: 2.10 > +## > +{ 'struct': 'GuestUser', > + 'data': { 'user': 'str', '*domain': 'str' } } > + > +## > +# @guest-get-users: > +# Retrieves a list of currently active user accounts on the VM. > +# > +# Returns: A unique list of users. > +# > +# Since: 2.10 > +## > +{ 'command': 'guest-get-users', > + 'returns': ['GuestUser'] } > -- > 2.9.3 > > > -- Marc-André Lureau
On 03/28/2017 04:34 AM, Marc-André Lureau wrote: > Hi > > On Tue, Mar 28, 2017 at 9:22 AM Vinzenz 'evilissimo' Feenstra < > vfeenstr@redhat.com> wrote: > >> From: Vinzenz Feenstra <vfeenstr@redhat.com> >> >> A command that will list all currenctly logged in users having running s/currenctly/currently/ >> processes. Do you also want to include how long the user has been logged in, if available? (a 'num' for floating-point seconds may be the best unit for that). >> +++ b/qga/qapi-schema.json >> @@ -1042,3 +1042,24 @@ >> 'data': { 'path': 'str', '*arg': ['str'], '*env': ['str'], >> '*input-data': 'str', '*capture-output': 'bool' }, >> 'returns': 'GuestExec' } >> + >> +## >> +# @GuestUser: >> +# @user: Username >> +# @domain: Logon domain (windows only) >> > > Or use a flat union? (like suggested for get-osinfo) Here, I don't see much benefit to a flat union. The field is present only when the guest can supply it, and there is no obvious discriminator to mention whether the field must be present. I think the structure is just fine as proposed, unless you want to also add a duration parameter for how long the user has been logged in. >> +## >> +# @guest-get-users: >> +# Retrieves a list of currently active user accounts on the VM. Accounts that exist even if no one is logged in at the moment, or accounts that currently have someone logged in? >> +# >> +# Returns: A unique list of users. >> +# >> +# Since: 2.10 >> +## >> +{ 'command': 'guest-get-users', >> + 'returns': ['GuestUser'] } >> -- >> 2.9.3 >> >> >> -- > Marc-André Lureau > -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
© 2016 - 2024 Red Hat, Inc.