提交 4407b19b 编写于 作者: D Daniel P. Berrange 提交者: Eric Blake

Include process start time when doing polkit checks

Since PIDs can be reused, polkit prefers to be given
a (PID,start time) pair. If given a PID on its own,
it will attempt to lookup the start time in /proc/pid/stat,
though this is subject to races.

It is safer if the client app resolves the PID start
time itself, because as long as the app has the client
socket open, the client PID won't be reused.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
(cherry picked from commit 979e9c56)
Signed-off-by: NEric Blake <eblake@redhat.com>

Conflicts:
	src/rpc/virnetsocket.h - context
	src/util/virprocess.c - needed #include "virstring.h"
	src/util/virstring.c - context
	src/util/virstring.h - context
上级 07381289
......@@ -2370,6 +2370,7 @@ remoteDispatchAuthList(virNetServerPtr server ATTRIBUTE_UNUSED,
uid_t callerUid;
gid_t callerGid;
pid_t callerPid;
unsigned long long timestamp;
/* If the client is root then we want to bypass the
* policykit auth to avoid root being denied if
......@@ -2377,7 +2378,7 @@ remoteDispatchAuthList(virNetServerPtr server ATTRIBUTE_UNUSED,
*/
if (auth == VIR_NET_SERVER_SERVICE_AUTH_POLKIT) {
if (virNetServerClientGetUNIXIdentity(client, &callerUid, &callerGid,
&callerPid) < 0) {
&callerPid, &timestamp) < 0) {
/* Don't do anything on error - it'll be validated at next
* phase of auth anyway */
virResetLastError();
......@@ -2803,6 +2804,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
pid_t callerPid = -1;
gid_t callerGid = -1;
uid_t callerUid = -1;
unsigned long long timestamp;
const char *action;
int status = -1;
char *ident = NULL;
......@@ -2828,7 +2830,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
}
if (virNetServerClientGetUNIXIdentity(client, &callerUid, &callerGid,
&callerPid) < 0) {
&callerPid, &timestamp) < 0) {
goto authfail;
}
......@@ -2836,7 +2838,11 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
(long long) callerPid, callerUid);
virCommandAddArg(cmd, "--process");
virCommandAddArgFormat(cmd, "%lld", (long long) callerPid);
if (timestamp != 0) {
virCommandAddArgFormat(cmd, "%lld,%llu", (long long) callerPid, timestamp);
} else {
virCommandAddArgFormat(cmd, "%lld", (long long) callerPid);
}
virCommandAddArg(cmd, "--allow-user-interaction");
if (virAsprintf(&ident, "pid:%lld,uid:%d",
......
......@@ -1750,6 +1750,7 @@ virStorageFileResize;
virStringArrayHasString;
virStringFreeList;
virStringJoin;
virStringListLength;
virStringSplit;
......
......@@ -782,6 +782,7 @@ virLockDaemonClientNew(virNetServerClientPtr client,
virLockDaemonClientPtr priv;
uid_t clientuid;
gid_t clientgid;
unsigned long long timestamp;
bool privileged = opaque != NULL;
if (VIR_ALLOC(priv) < 0) {
......@@ -798,7 +799,8 @@ virLockDaemonClientNew(virNetServerClientPtr client,
if (virNetServerClientGetUNIXIdentity(client,
&clientuid,
&clientgid,
&priv->clientPid) < 0)
&priv->clientPid,
&timestamp) < 0)
goto error;
VIR_DEBUG("New client pid %llu uid %llu",
......
......@@ -634,12 +634,15 @@ bool virNetServerClientIsLocal(virNetServerClientPtr client)
int virNetServerClientGetUNIXIdentity(virNetServerClientPtr client,
uid_t *uid, gid_t *gid, pid_t *pid)
uid_t *uid, gid_t *gid, pid_t *pid,
unsigned long long *timestamp)
{
int ret = -1;
virObjectLock(client);
if (client->sock)
ret = virNetSocketGetUNIXIdentity(client->sock, uid, gid, pid);
ret = virNetSocketGetUNIXIdentity(client->sock,
uid, gid, pid,
timestamp);
virObjectUnlock(client);
return ret;
}
......@@ -649,6 +652,7 @@ static virIdentityPtr
virNetServerClientCreateIdentity(virNetServerClientPtr client)
{
char *processid = NULL;
char *processtime = NULL;
char *username = NULL;
char *groupname = NULL;
#if WITH_SASL
......@@ -662,15 +666,23 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
gid_t gid;
uid_t uid;
pid_t pid;
if (virNetSocketGetUNIXIdentity(client->sock, &uid, &gid, &pid) < 0)
unsigned long long timestamp;
if (virNetSocketGetUNIXIdentity(client->sock,
&uid, &gid, &pid,
&timestamp) < 0)
goto cleanup;
if (!(username = virGetUserName(uid)))
goto cleanup;
if (!(groupname = virGetGroupName(gid)))
goto cleanup;
if (virAsprintf(&processid, "%lld",
(long long)pid) < 0) {
if (virAsprintf(&processid, "%llu",
(unsigned long long)pid) < 0) {
virReportOOMError();
goto cleanup;
}
if (virAsprintf(&processtime, "%llu",
timestamp) < 0) {
virReportOOMError();
goto cleanup;
}
......@@ -720,6 +732,11 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client)
VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
processid) < 0)
goto error;
if (processtime &&
virIdentitySetAttr(ret,
VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
processtime) < 0)
goto error;
#if HAVE_SASL
if (saslname &&
virIdentitySetAttr(ret,
......@@ -742,6 +759,7 @@ cleanup:
VIR_FREE(username);
VIR_FREE(groupname);
VIR_FREE(processid);
VIR_FREE(processtime);
VIR_FREE(seccontext);
#if HAVE_SASL
VIR_FREE(saslname);
......
......@@ -99,7 +99,8 @@ bool virNetServerClientIsSecure(virNetServerClientPtr client);
bool virNetServerClientIsLocal(virNetServerClientPtr client);
int virNetServerClientGetUNIXIdentity(virNetServerClientPtr client,
uid_t *uid, gid_t *gid, pid_t *pid);
uid_t *uid, gid_t *gid, pid_t *pid,
unsigned long long *timestamp);
int virNetServerClientGetSecurityContext(virNetServerClientPtr client,
char **context);
......
......@@ -1103,31 +1103,41 @@ int virNetSocketGetPort(virNetSocketPtr sock)
int virNetSocketGetUNIXIdentity(virNetSocketPtr sock,
uid_t *uid,
gid_t *gid,
pid_t *pid)
pid_t *pid,
unsigned long long *timestamp)
{
struct ucred cr;
socklen_t cr_len = sizeof(cr);
int ret = -1;
virObjectLock(sock);
if (getsockopt(sock->fd, SOL_SOCKET, SO_PEERCRED, &cr, &cr_len) < 0) {
virReportSystemError(errno, "%s",
_("Failed to get client socket identity"));
virObjectUnlock(sock);
return -1;
goto cleanup;
}
if (virProcessGetStartTime(cr.pid, timestamp) < 0)
goto cleanup;
*pid = cr.pid;
*uid = cr.uid;
*gid = cr.gid;
ret = 0;
cleanup:
virObjectUnlock(sock);
return 0;
return ret;
}
#elif defined(LOCAL_PEERCRED)
int virNetSocketGetUNIXIdentity(virNetSocketPtr sock,
uid_t *uid,
gid_t *gid,
pid_t *pid)
pid_t *pid,
unsigned long long *timestamp ATTRIBUTE_UNUSED)
{
struct xucred cr;
socklen_t cr_len = sizeof(cr);
......@@ -1151,7 +1161,8 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock,
int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED,
uid_t *uid ATTRIBUTE_UNUSED,
gid_t *gid ATTRIBUTE_UNUSED,
pid_t *pid ATTRIBUTE_UNUSED)
pid_t *pid ATTRIBUTE_UNUSED,
unsigned long long *timestamp ATTRIBUTE_UNUSED)
{
/* XXX Many more OS support UNIX socket credentials we could port to. See dbus ....*/
virReportSystemError(ENOSYS, "%s",
......
......@@ -113,7 +113,8 @@ int virNetSocketGetPort(virNetSocketPtr sock);
int virNetSocketGetUNIXIdentity(virNetSocketPtr sock,
uid_t *uid,
gid_t *gid,
pid_t *pid);
pid_t *pid,
unsigned long long *timestamp);
int virNetSocketGetSecurityContext(virNetSocketPtr sock,
char **context);
......
......@@ -31,6 +31,7 @@ typedef enum {
VIR_IDENTITY_ATTR_UNIX_USER_NAME,
VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
VIR_IDENTITY_ATTR_SASL_USER_NAME,
VIR_IDENTITY_ATTR_X509_DISTINGUISHED_NAME,
VIR_IDENTITY_ATTR_SECURITY_CONTEXT,
......
......@@ -33,12 +33,20 @@
#endif
#include <sched.h>
#ifdef __FreeBSD__
# include <sys/param.h>
# include <sys/sysctl.h>
# include <sys/user.h>
#endif
#include "viratomic.h"
#include "virprocess.h"
#include "virerror.h"
#include "viralloc.h"
#include "virfile.h"
#include "virlog.h"
#include "virutil.h"
#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE
......@@ -755,3 +763,112 @@ virProcessSetMaxFiles(pid_t pid ATTRIBUTE_UNUSED, unsigned int files)
return -1;
}
#endif /* ! (HAVE_SETRLIMIT && defined(RLIMIT_NOFILE)) */
#ifdef __linux__
/*
* Port of code from polkitunixprocess.c under terms
* of the LGPLv2+
*/
int virProcessGetStartTime(pid_t pid,
unsigned long long *timestamp)
{
char *filename = NULL;
char *buf = NULL;
char *tmp;
int ret = -1;
int len;
char **tokens = NULL;
if (virAsprintf(&filename, "/proc/%llu/stat",
(unsigned long long)pid) < 0) {
virReportOOMError();
return -1;
}
if ((len = virFileReadAll(filename, 1024, &buf)) < 0)
goto cleanup;
/* start time is the token at index 19 after the '(process name)' entry - since only this
* field can contain the ')' character, search backwards for this to avoid malicious
* processes trying to fool us
*/
if (!(tmp = strrchr(buf, ')'))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Cannot find start time in %s"),
filename);
goto cleanup;
}
tmp += 2; /* skip ') ' */
if ((tmp - buf) >= len) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Cannot find start time in %s"),
filename);
goto cleanup;
}
tokens = virStringSplit(tmp, " ", 0);
if (virStringListLength(tokens) < 20) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Cannot find start time in %s"),
filename);
goto cleanup;
}
if (virStrToLong_ull(tokens[19],
NULL,
10,
timestamp) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Cannot parse start time %s in %s"),
tokens[19], filename);
goto cleanup;
}
ret = 0;
cleanup:
virStringFreeList(tokens);
VIR_FREE(filename);
VIR_FREE(buf);
return ret;
}
#elif defined(__FreeBSD__)
int virProcessGetStartTime(pid_t pid,
unsigned long long *timestamp)
{
struct kinfo_proc p;
int mib[4];
size_t len = 4;
sysctlnametomib("kern.proc.pid", mib, &len);
len = sizeof(struct kinfo_proc);
mib[3] = pid;
if (sysctl(mib, 4, &p, &len, NULL, 0) < 0) {
virReportSystemError(errno, "%s",
_("Unable to query process ID start time"));
return -1;
}
*timestamp = (unsigned long long)p.ki_start.tv_sec;
return 0;
}
#else
int virProcessGetStartTime(pid_t pid,
unsigned long long *timestamp)
{
static int warned = 0;
if (virAtomicIntInc(&warned) == 1) {
VIR_WARN("Process start time of pid %llu not available on this platform",
(unsigned long long)pid);
warned = true;
}
*timestamp = 0;
return 0;
}
#endif
......@@ -47,6 +47,9 @@ int virProcessGetAffinity(pid_t pid,
virBitmapPtr *map,
int maxcpu);
int virProcessGetStartTime(pid_t pid,
unsigned long long *timestamp);
int virProcessGetNamespaces(pid_t pid,
size_t *nfdlist,
int **fdlist);
......
......@@ -180,3 +180,14 @@ virStringArrayHasString(char **strings, const char *needle)
return false;
}
size_t virStringListLength(char **strings)
{
size_t i = 0;
while (strings && strings[i])
i++;
return i;
}
......@@ -37,4 +37,6 @@ void virStringFreeList(char **strings);
bool virStringArrayHasString(char **strings, const char *needle);
size_t virStringListLength(char **strings);
#endif /* __VIR_STRING_H__ */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册