|
 |
cdf651 |
From 261ff6442294b11261c11262d2a6acf379803e36 Mon Sep 17 00:00:00 2001
|
|
|
cdf651 |
From: Lukas Slebodnik <lslebodn@redhat.com>
|
|
|
cdf651 |
Date: Tue, 24 Jul 2018 18:52:08 +0000
|
|
|
cdf651 |
Subject: [PATCH] SUDO: Fix running in unprivileged responder
|
|
|
cdf651 |
|
|
|
cdf651 |
There are strict checks for private sockets which does not work with
|
|
|
cdf651 |
unprivileged responder
|
|
|
cdf651 |
|
|
|
cdf651 |
Resolves:
|
|
|
cdf651 |
https://pagure.io/SSSD/sssd/issue/3778
|
|
|
cdf651 |
|
|
|
cdf651 |
Merges: https://pagure.io/SSSD/sssd/pull-request/3784
|
|
|
cdf651 |
|
|
|
cdf651 |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
cdf651 |
(cherry picked from commit 4900b8e59bdbb89fbc1c9718969aabe26f3db34a)
|
|
|
cdf651 |
|
|
|
cdf651 |
DOWNSTREAM:
|
|
|
cdf651 |
Resolves: rhbz#1607313 - When sssd is running as non-root user, the sudo pipe is created as sssd:sssd but then the private pipe ownership fails
|
|
|
cdf651 |
---
|
|
|
cdf651 |
src/responder/sudo/sudosrv.c | 31 +++++++++++++++++++++++++++----
|
|
|
cdf651 |
1 file changed, 27 insertions(+), 4 deletions(-)
|
|
|
cdf651 |
|
|
|
cdf651 |
diff --git a/src/responder/sudo/sudosrv.c b/src/responder/sudo/sudosrv.c
|
|
|
cdf651 |
index e87a24499c2d82fafaa8e1f9b386e44332394266..82315e0a8f7879595e02458a9aa79e7332b04734 100644
|
|
|
cdf651 |
--- a/src/responder/sudo/sudosrv.c
|
|
|
cdf651 |
+++ b/src/responder/sudo/sudosrv.c
|
|
|
cdf651 |
@@ -67,7 +67,8 @@ static void sudo_dp_reconnect_init(struct sbus_connection *conn,
|
|
|
cdf651 |
|
|
|
cdf651 |
int sudo_process_init(TALLOC_CTX *mem_ctx,
|
|
|
cdf651 |
struct tevent_context *ev,
|
|
|
cdf651 |
- struct confdb_ctx *cdb)
|
|
|
cdf651 |
+ struct confdb_ctx *cdb,
|
|
|
cdf651 |
+ int pipe_fd)
|
|
|
cdf651 |
{
|
|
|
cdf651 |
struct resp_ctx *rctx;
|
|
|
cdf651 |
struct sss_cmd_table *sudo_cmds;
|
|
|
cdf651 |
@@ -79,8 +80,8 @@ int sudo_process_init(TALLOC_CTX *mem_ctx,
|
|
|
cdf651 |
sudo_cmds = get_sudo_cmds();
|
|
|
cdf651 |
ret = sss_process_init(mem_ctx, ev, cdb,
|
|
|
cdf651 |
sudo_cmds,
|
|
|
cdf651 |
- NULL, -1, /* No public socket */
|
|
|
cdf651 |
- SSS_SUDO_SOCKET_NAME, -1, /* Private socket only */
|
|
|
cdf651 |
+ SSS_SUDO_SOCKET_NAME, pipe_fd, /* custom permissions on socket */
|
|
|
cdf651 |
+ NULL, -1, /* No private socket */
|
|
|
cdf651 |
CONFDB_SUDO_CONF_ENTRY,
|
|
|
cdf651 |
SSS_SUDO_SBUS_SERVICE_NAME,
|
|
|
cdf651 |
SSS_SUDO_SBUS_SERVICE_VERSION,
|
|
|
cdf651 |
@@ -182,6 +183,7 @@ int main(int argc, const char *argv[])
|
|
|
cdf651 |
char *opt_logger = NULL;
|
|
|
cdf651 |
struct main_context *main_ctx;
|
|
|
cdf651 |
int ret;
|
|
|
cdf651 |
+ int pipe_fd = -1;
|
|
|
cdf651 |
uid_t uid;
|
|
|
cdf651 |
gid_t gid;
|
|
|
cdf651 |
|
|
|
cdf651 |
@@ -219,6 +221,27 @@ int main(int argc, const char *argv[])
|
|
|
cdf651 |
|
|
|
cdf651 |
sss_set_logger(opt_logger);
|
|
|
cdf651 |
|
|
|
cdf651 |
+ if (!is_socket_activated()) {
|
|
|
cdf651 |
+ /* Create pipe file descriptors here with right ownerschip */
|
|
|
cdf651 |
+ ret = create_pipe_fd(SSS_SUDO_SOCKET_NAME, &pipe_fd, SSS_DFL_UMASK);
|
|
|
cdf651 |
+ if (ret != EOK) {
|
|
|
cdf651 |
+ DEBUG(SSSDBG_FATAL_FAILURE,
|
|
|
cdf651 |
+ "create_pipe_fd failed [%d]: %s.\n",
|
|
|
cdf651 |
+ ret, sss_strerror(ret));
|
|
|
cdf651 |
+ return 4;
|
|
|
cdf651 |
+ }
|
|
|
cdf651 |
+
|
|
|
cdf651 |
+ ret = chown(SSS_SUDO_SOCKET_NAME, uid, 0);
|
|
|
cdf651 |
+ if (ret != 0) {
|
|
|
cdf651 |
+ ret = errno;
|
|
|
cdf651 |
+ close(pipe_fd);
|
|
|
cdf651 |
+ DEBUG(SSSDBG_FATAL_FAILURE,
|
|
|
cdf651 |
+ "create_pipe_fd failed [%d]: %s.\n",
|
|
|
cdf651 |
+ ret, sss_strerror(ret));
|
|
|
cdf651 |
+ return 5;
|
|
|
cdf651 |
+ }
|
|
|
cdf651 |
+ }
|
|
|
cdf651 |
+
|
|
|
cdf651 |
ret = server_setup("sssd[sudo]", 0, uid, gid, CONFDB_SUDO_CONF_ENTRY,
|
|
|
cdf651 |
&main_ctx);
|
|
|
cdf651 |
if (ret != EOK) {
|
|
|
cdf651 |
@@ -234,7 +257,7 @@ int main(int argc, const char *argv[])
|
|
|
cdf651 |
|
|
|
cdf651 |
ret = sudo_process_init(main_ctx,
|
|
|
cdf651 |
main_ctx->event_ctx,
|
|
|
cdf651 |
- main_ctx->confdb_ctx);
|
|
|
cdf651 |
+ main_ctx->confdb_ctx, pipe_fd);
|
|
|
cdf651 |
if (ret != EOK) {
|
|
|
cdf651 |
return 3;
|
|
|
cdf651 |
}
|
|
|
cdf651 |
--
|
|
|
cdf651 |
2.14.4
|
|
|
cdf651 |
|