External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: convert virRun to virCommand

Browse Source 
Using snprintf to build up argv seems archaic.

* daemon/remote.c (remoteDispatchAuthPolkit): Modernize command call.
This commit is contained in:
Eric Blake 2012-01-25 17:34:50 -07:00
parent 19896423f7
commit 8dd623b980
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
daemon/remote.c
View File

@ -2468,26 +2468,17 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
uid_t callerUid = -1; uid_t callerUid = -1;
const char *action; const char *action;
int status = -1; int status = -1;
char pidbuf[50]; char *ident = NULL;
char ident[100];
int rv = -1;
struct daemonClientPrivate *priv = struct daemonClientPrivate *priv =
virNetServerClientGetPrivateData(client); virNetServerClientGetPrivateData(client);
virCommandPtr cmd = NULL;
memset(ident, 0, sizeof ident);
virMutexLock(&priv->lock); virMutexLock(&priv->lock);
action = virNetServerClientGetReadonly(client) ? action = virNetServerClientGetReadonly(client) ?
"org.libvirt.unix.monitor" : "org.libvirt.unix.monitor" :
"org.libvirt.unix.manage"; "org.libvirt.unix.manage";
const char * const pkcheck [] = { cmd = virCommandNewArgList(PKCHECK_PATH, "--action-id", action, NULL);
PKCHECK_PATH,
"--action-id", action,
"--process", pidbuf,
"--allow-user-interaction",
NULL
};
VIR_DEBUG("Start PolicyKit auth %d", virNetServerClientGetFD(client)); VIR_DEBUG("Start PolicyKit auth %d", virNetServerClientGetFD(client));
if (virNetServerClientGetAuth(client) != VIR_NET_SERVER_SERVICE_AUTH_POLKIT) { if (virNetServerClientGetAuth(client) != VIR_NET_SERVER_SERVICE_AUTH_POLKIT) {
@ -2495,28 +2486,25 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
goto authfail; goto authfail;
} }
if (virNetServerClientGetUNIXIdentity(client, &callerUid, &callerGid, &callerPid) < 0) { if (virNetServerClientGetUNIXIdentity(client, &callerUid, &callerGid,
&callerPid) < 0) {
goto authfail; goto authfail;
} }
VIR_INFO("Checking PID %d running as %d", callerPid, callerUid); VIR_INFO("Checking PID %d running as %d", callerPid, callerUid);
rv = snprintf(pidbuf, sizeof pidbuf, "%d", callerPid); virCommandAddArg(cmd, "--process");
if (rv < 0 || rv >= sizeof pidbuf) { virCommandAddArgFormat(cmd, "%d", callerPid);
VIR_ERROR(_("Caller PID was too large %d"), callerPid); virCommandAddArg(cmd, "--allow-user-interaction");
if (virAsprintf(&ident, "pid:%d,uid:%d", callerPid, callerUid) < 0) {
virReportOOMError();
goto authfail; goto authfail;
} }
rv = snprintf(ident, sizeof ident, "pid:%d,uid:%d", callerPid, callerUid); if (virCommandRun(cmd, &status) < 0)
if (rv < 0 || rv >= sizeof ident) {
VIR_ERROR(_("Caller identity was too large %d:%d"), callerPid, callerUid);
goto authfail; goto authfail;
}
if (virRun(pkcheck, &status) < 0) {
VIR_ERROR(_("Cannot invoke %s"), PKCHECK_PATH);
goto authfail;
}
if (status != 0) { if (status != 0) {
char *tmp = virCommandTranslateStatus(status); char *tmp = virCommandTranslateStatus(status);
VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d: %s"), VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d: %s"),
@ -2533,10 +2521,14 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
virNetServerClientSetIdentity(client, ident); virNetServerClientSetIdentity(client, ident);
virMutexUnlock(&priv->lock); virMutexUnlock(&priv->lock);
virCommandFree(cmd);
VIR_FREE(ident);
return 0; return 0;
error: error:
virCommandFree(cmd);
VIR_FREE(ident);
virResetLastError(); virResetLastError();
virNetError(VIR_ERR_AUTH_FAILED, "%s", virNetError(VIR_ERR_AUTH_FAILED, "%s",
_("authentication failed")); _("authentication failed"));
@ -2553,7 +2545,7 @@ authfail:
authdeny: authdeny:
PROBE(RPC_SERVER_CLIENT_AUTH_DENY, PROBE(RPC_SERVER_CLIENT_AUTH_DENY,
"client=%p auth=%d identity=%s", "client=%p auth=%d identity=%s",
client, REMOTE_AUTH_POLKIT, (char *)ident); client, REMOTE_AUTH_POLKIT, ident);
goto error; goto error;
} }
#elif HAVE_POLKIT0 #elif HAVE_POLKIT0