External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-08 22:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Also store user & group ID values in virIdentity

Browse Source 
Future improvements to the polkit code will require access to
the numeric user ID, not merely user name.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit db7a5688c0)
This commit is contained in:
Daniel P. Berrange 2013-08-22 16:00:01 +01:00
parent 28ca8b386c
commit 37af1f2ea0
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rpc/virnetserverclient.c
View File

@ -652,7 +652,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
char *processid = NULL;
char *processtime = NULL;
char *username = NULL;
char *userid = NULL;
char *groupname = NULL;
char *groupid = NULL;
#if WITH_SASL
char *saslname = NULL;
#endif
@ -672,8 +674,12 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
if (!(username = virGetUserName(uid)))
goto cleanup;
if (virAsprintf(&userid, "%d", (int)uid) < 0)
goto cleanup;
if (!(groupname = virGetGroupName(gid)))
goto cleanup;
if (virAsprintf(&userid, "%d", (int)gid) < 0)
goto cleanup;
if (virAsprintf(&processid, "%llu",
(unsigned long long)pid) < 0)
goto cleanup;
@ -710,11 +716,21 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
VIR_IDENTITY_ATTR_UNIX_USER_NAME,
username) < 0)
goto error;
if (userid &&
virIdentitySetAttr(ret,
VIR_IDENTITY_ATTR_UNIX_USER_ID,
userid) < 0)
goto error;
if (groupname &&
virIdentitySetAttr(ret,
VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
groupname) < 0)
goto error;
if (groupid &&
virIdentitySetAttr(ret,
VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
groupid) < 0)
goto error;
if (processid &&
virIdentitySetAttr(ret,
VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
@ -745,7 +761,9 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
cleanup:
VIR_FREE(username);
VIR_FREE(userid);
VIR_FREE(groupname);
VIR_FREE(groupid);
VIR_FREE(processid);
VIR_FREE(processtime);
VIR_FREE(seccontext);

23
src/util/viridentity.c
View File

@ -133,7 +133,9 @@ int virIdentitySetCurrent(virIdentityPtr ident)
virIdentityPtr virIdentityGetSystem(void)
{
char *username = NULL;
char *userid = NULL;
char *groupname = NULL;
char *groupid = NULL;
char *seccontext = NULL;
virIdentityPtr ret = NULL;
#if WITH_SELINUX
@ -147,8 +149,13 @@ virIdentityPtr virIdentityGetSystem(void)
if (!(username = virGetUserName(getuid())))
goto cleanup;
if (virAsprintf(&userid, "%d", (int)getuid()) < 0)
goto cleanup;
if (!(groupname = virGetGroupName(getgid())))
goto cleanup;
if (virAsprintf(&groupid, "%d", (int)getgid()) < 0)
goto cleanup;
#if WITH_SELINUX
if (getcon(&con) < 0) {
@ -166,16 +173,22 @@ virIdentityPtr virIdentityGetSystem(void)
if (!(ret = virIdentityNew()))
goto cleanup;
if (username &&
virIdentitySetAttr(ret,
if (virIdentitySetAttr(ret,
VIR_IDENTITY_ATTR_UNIX_USER_NAME,
username) < 0)
goto error;
if (groupname &&
virIdentitySetAttr(ret,
if (virIdentitySetAttr(ret,
VIR_IDENTITY_ATTR_UNIX_USER_ID,
userid) < 0)
goto error;
if (virIdentitySetAttr(ret,
VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
groupname) < 0)
goto error;
if (virIdentitySetAttr(ret,
VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
groupid) < 0)
goto error;
if (seccontext &&
virIdentitySetAttr(ret,
VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
@ -188,7 +201,9 @@ virIdentityPtr virIdentityGetSystem(void)
cleanup:
VIR_FREE(username);
VIR_FREE(userid);
VIR_FREE(groupname);
VIR_FREE(groupid);
VIR_FREE(seccontext);
VIR_FREE(processid);
return ret;

2
src/util/viridentity.h
View File

@ -29,7 +29,9 @@ typedef virIdentity *virIdentityPtr;
typedef enum {
VIR_IDENTITY_ATTR_UNIX_USER_NAME,
VIR_IDENTITY_ATTR_UNIX_USER_ID,
VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
VIR_IDENTITY_ATTR_SASL_USER_NAME,