|
 |
841ac7 |
From c8d517bacd47f3d5c706a53561924ac20d0b3321 Mon Sep 17 00:00:00 2001
|
|
|
841ac7 |
From: Sumit Bose <sbose@redhat.com>
|
|
|
841ac7 |
Date: Fri, 7 Sep 2018 22:19:26 +0200
|
|
|
841ac7 |
Subject: [PATCH 20/21] getsockopt_wrapper: add support for PAM clients
|
|
|
841ac7 |
|
|
|
841ac7 |
PAM clients expect that the private socket of the PAM responder is
|
|
|
841ac7 |
handled by root. With this patch getsockopt_wrapper can return the
|
|
|
841ac7 |
expected UID and GID to PAM clients.
|
|
|
841ac7 |
|
|
|
841ac7 |
Related to https://pagure.io/SSSD/sssd/issue/3500
|
|
|
841ac7 |
|
|
|
841ac7 |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
841ac7 |
(cherry picked with fixes from commit d332c8a0e7a4c7f0b3ee1b2110145a23cbd61c2a)
|
|
|
841ac7 |
---
|
|
|
841ac7 |
src/tests/intg/getsockopt_wrapper.c | 35 +++++++++++++++++++++++++++++
|
|
|
841ac7 |
1 file changed, 35 insertions(+)
|
|
|
841ac7 |
|
|
|
841ac7 |
diff --git a/src/tests/intg/getsockopt_wrapper.c b/src/tests/intg/getsockopt_wrapper.c
|
|
|
841ac7 |
index 77c832329..eb8fa56dd 100644
|
|
|
841ac7 |
--- a/src/tests/intg/getsockopt_wrapper.c
|
|
|
841ac7 |
+++ b/src/tests/intg/getsockopt_wrapper.c
|
|
|
841ac7 |
@@ -9,6 +9,7 @@
|
|
|
841ac7 |
#include <sys/socket.h>
|
|
|
841ac7 |
#include <sys/un.h>
|
|
|
841ac7 |
#include <dlfcn.h>
|
|
|
841ac7 |
+#include <stdlib.h>
|
|
|
841ac7 |
|
|
|
841ac7 |
static bool is_dbus_socket(int fd)
|
|
|
841ac7 |
{
|
|
|
841ac7 |
@@ -27,6 +28,38 @@ static bool is_dbus_socket(int fd)
|
|
|
841ac7 |
return NULL != strstr(unix_socket->sun_path, "system_bus_socket");
|
|
|
841ac7 |
}
|
|
|
841ac7 |
|
|
|
841ac7 |
+static bool peer_is_private_pam(int fd)
|
|
|
841ac7 |
+{
|
|
|
841ac7 |
+ int ret;
|
|
|
841ac7 |
+ struct sockaddr_storage addr = { 0 };
|
|
|
841ac7 |
+ socklen_t addrlen = sizeof(addr);
|
|
|
841ac7 |
+ struct sockaddr_un *unix_socket;
|
|
|
841ac7 |
+
|
|
|
841ac7 |
+ ret = getpeername(fd, (struct sockaddr *)&addr, &addrlen);
|
|
|
841ac7 |
+ if (ret != 0) return false;
|
|
|
841ac7 |
+
|
|
|
841ac7 |
+ if (addr.ss_family != AF_UNIX) return false;
|
|
|
841ac7 |
+
|
|
|
841ac7 |
+ unix_socket = (struct sockaddr_un *)&addr;
|
|
|
841ac7 |
+
|
|
|
841ac7 |
+ return NULL != strstr(unix_socket->sun_path, "private/pam");
|
|
|
841ac7 |
+}
|
|
|
841ac7 |
+
|
|
|
841ac7 |
+static void fake_peer_uid_gid(uid_t *uid, gid_t *gid)
|
|
|
841ac7 |
+{
|
|
|
841ac7 |
+ char *val;
|
|
|
841ac7 |
+
|
|
|
841ac7 |
+ val = getenv("SSSD_INTG_PEER_UID");
|
|
|
841ac7 |
+ if (val != NULL) {
|
|
|
841ac7 |
+ *uid = atoi(val);
|
|
|
841ac7 |
+ }
|
|
|
841ac7 |
+
|
|
|
841ac7 |
+ val = getenv("SSSD_INTG_PEER_GID");
|
|
|
841ac7 |
+ if (val != NULL) {
|
|
|
841ac7 |
+ *gid = atoi(val);
|
|
|
841ac7 |
+ }
|
|
|
841ac7 |
+}
|
|
|
841ac7 |
+
|
|
|
841ac7 |
typedef typeof(getsockopt) getsockopt_fn_t;
|
|
|
841ac7 |
|
|
|
841ac7 |
static getsockopt_fn_t *orig_getsockopt = NULL;
|
|
|
841ac7 |
@@ -52,6 +85,8 @@ int getsockopt(int sockfd, int level, int optname,
|
|
|
841ac7 |
cr = optval;
|
|
|
841ac7 |
if (cr->uid != 0 && is_dbus_socket(sockfd)) {
|
|
|
841ac7 |
cr->uid = 0;
|
|
|
841ac7 |
+ } else if (peer_is_private_pam(sockfd)) {
|
|
|
841ac7 |
+ fake_peer_uid_gid(&cr->uid, &cr->gid);
|
|
|
841ac7 |
}
|
|
|
841ac7 |
}
|
|
|
841ac7 |
|
|
|
841ac7 |
--
|
|
|
841ac7 |
2.19.1
|
|
|
841ac7 |
|