summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/responder/common/responder_cmd.h4
-rw-r--r--server/responder/common/responder_common.c132
-rw-r--r--server/responder/common/responder_dp.c1
-rw-r--r--server/responder/common/responder_dp.h1
-rw-r--r--server/responder/common/responder_packet.h2
-rw-r--r--server/responder/pam/pamsrv_dp.c5
6 files changed, 137 insertions, 8 deletions
diff --git a/server/responder/common/responder_cmd.h b/server/responder/common/responder_cmd.h
index 15141a07..e02d5f22 100644
--- a/server/responder/common/responder_cmd.h
+++ b/server/responder/common/responder_cmd.h
@@ -44,9 +44,12 @@ struct nss_ctx {
struct tevent_context *ev;
struct tevent_fd *lfde;
int lfd;
+ struct tevent_fd *priv_lfde;
+ int priv_lfd;
struct sysdb_ctx *sysdb;
struct confdb_ctx *cdb;
char *sock_name;
+ char *priv_sock_name;
struct service_sbus_ctx *ss_ctx;
struct service_sbus_ctx *dp_ctx;
struct btreemap *domain_map;
@@ -70,6 +73,7 @@ struct cli_ctx {
struct sockaddr_un addr;
struct cli_request *creq;
struct getent_ctx *gctx;
+ int priv;
};
#endif
diff --git a/server/responder/common/responder_common.c b/server/responder/common/responder_common.c
index f532102f..490f4e6b 100644
--- a/server/responder/common/responder_common.c
+++ b/server/responder/common/responder_common.c
@@ -31,12 +31,12 @@
#include <errno.h>
#include "popt.h"
#include "util/util.h"
-#include "responder/nss/nsssrv.h"
#include "db/sysdb.h"
#include "confdb/confdb.h"
#include "dbus/dbus.h"
#include "sbus/sssd_dbus.h"
#include "util/btreemap.h"
+#include "responder/common/responder_common.h"
#include "responder/common/responder_packet.h"
#include "responder/common/responder_cmd.h"
#include "responder/common/responder_dp.h"
@@ -102,7 +102,7 @@ static void client_recv(struct tevent_context *ev, struct cli_ctx *cctx)
}
if (!cctx->creq->in) {
- ret = sss_packet_new(cctx->creq, NSS_PACKET_MAX_RECV_SIZE,
+ ret = sss_packet_new(cctx->creq, SSS_PACKET_MAX_RECV_SIZE,
0, &cctx->creq->in);
if (ret != EOK) {
DEBUG(0, ("Failed to alloc request, aborting client!\n"));
@@ -164,6 +164,78 @@ static void client_fd_handler(struct tevent_context *ev,
}
}
+/* TODO: this is a copy of accept_fd_handler, maybe both can be put into on
+ * handler. */
+static void accept_priv_fd_handler(struct tevent_context *ev,
+ struct tevent_fd *fde,
+ uint16_t flags, void *ptr)
+{
+ /* accept and attach new event handler */
+ struct nss_ctx *nctx = talloc_get_type(ptr, struct nss_ctx);
+ struct cli_ctx *cctx;
+ socklen_t len;
+ struct stat stat_buf;
+ int ret;
+
+ ret = stat(nctx->priv_sock_name, &stat_buf);
+ if (ret == -1) {
+ DEBUG(1, ("stat on privileged pipe failed: [%d][%s].\n", errno,
+ strerror(errno)));
+ return;
+ }
+
+ if ( ! (stat_buf.st_uid == 0 && stat_buf.st_gid == 0 &&
+ (stat_buf.st_mode&(S_IFSOCK|S_IRUSR|S_IWUSR)) == stat_buf.st_mode)) {
+ DEBUG(1, ("privileged pipe has an illegal status.\n"));
+/* TODO: what is the best response to this condition? Terminate? */
+ return;
+ }
+
+
+ cctx = talloc_zero(nctx, struct cli_ctx);
+ if (!cctx) {
+ struct sockaddr_un addr;
+ int fd;
+ DEBUG(0, ("Out of memory trying to setup client context on privileged pipe!\n"));
+ /* accept and close to signal the client we have a problem */
+ memset(&addr, 0, sizeof(addr));
+ len = sizeof(addr);
+ fd = accept(nctx->priv_lfd, (struct sockaddr *)&addr, &len);
+ if (fd == -1) {
+ return;
+ }
+ close(fd);
+ return;
+ }
+
+ len = sizeof(cctx->addr);
+ cctx->cfd = accept(nctx->priv_lfd, (struct sockaddr *)&cctx->addr, &len);
+ if (cctx->cfd == -1) {
+ DEBUG(1, ("Accept failed [%s]", strerror(errno)));
+ talloc_free(cctx);
+ return;
+ }
+
+ cctx->priv = 1;
+
+ cctx->cfde = tevent_add_fd(ev, cctx, cctx->cfd,
+ TEVENT_FD_READ, client_fd_handler, cctx);
+ if (!cctx->cfde) {
+ close(cctx->cfd);
+ talloc_free(cctx);
+ DEBUG(2, ("Failed to queue client handler on privileged pipe\n"));
+ }
+
+ cctx->ev = ev;
+ cctx->nctx = nctx;
+
+ talloc_set_destructor(cctx, client_destructor);
+
+ DEBUG(4, ("Client connected to privileged pipe!\n"));
+
+ return;
+}
+
static void accept_fd_handler(struct tevent_context *ev,
struct tevent_fd *fde,
uint16_t flags, void *ptr)
@@ -275,11 +347,32 @@ static int set_unix_socket(struct nss_ctx *nctx)
}
talloc_free(default_pipe);
+ default_pipe = talloc_asprintf(nctx, "%s/private/%s.priv", PIPE_PATH,
+ nctx->sss_pipe_name);
+ if (!default_pipe) {
+ return ENOMEM;
+ }
+
+ ret = confdb_get_string(nctx->cdb, nctx,
+ nctx->confdb_socket_path, "privUnixSocket",
+ default_pipe, &nctx->priv_sock_name);
+ if (ret != EOK) {
+ talloc_free(default_pipe);
+ return ret;
+ }
+ talloc_free(default_pipe);
+
nctx->lfd = socket(AF_UNIX, SOCK_STREAM, 0);
if (nctx->lfd == -1) {
return EIO;
}
+ nctx->priv_lfd = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (nctx->priv_lfd == -1) {
+ close(nctx->lfd);
+ return EIO;
+ }
+
/* Set the umask so that permissions are set right on the socket.
* It must be readable and writable by anybody on the system. */
umask(0111);
@@ -303,8 +396,40 @@ static int set_unix_socket(struct nss_ctx *nctx)
goto failed;
}
+ /* create privileged pipe */
+ umask(0177);
+
+ set_nonblocking(nctx->priv_lfd);
+ set_close_on_exec(nctx->priv_lfd);
+
+ memset(&addr, 0, sizeof(addr));
+ addr.sun_family = AF_UNIX;
+ strncpy(addr.sun_path, nctx->priv_sock_name, sizeof(addr.sun_path));
+
+ unlink(nctx->priv_sock_name);
+
+ if (bind(nctx->priv_lfd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
+ DEBUG(0,("Unable to bind on socket '%s'\n", nctx->priv_sock_name));
+ goto failed;
+ }
+ if (listen(nctx->priv_lfd, 10) != 0) {
+ DEBUG(0,("Unable to listen on socket '%s'\n", nctx->priv_sock_name));
+ goto failed;
+ }
+
nctx->lfde = tevent_add_fd(nctx->ev, nctx, nctx->lfd,
TEVENT_FD_READ, accept_fd_handler, nctx);
+ if (!nctx->lfde) {
+ DEBUG(0, ("Failed to queue handler on pipe\n"));
+ goto failed;
+ }
+
+ nctx->priv_lfde = tevent_add_fd(nctx->ev, nctx, nctx->priv_lfd,
+ TEVENT_FD_READ, accept_priv_fd_handler, nctx);
+ if (!nctx->priv_lfde) {
+ DEBUG(0, ("Failed to queue handler on privileged pipe\n"));
+ goto failed;
+ }
/* we want default permissions on created files to be very strict,
so set our umask to 0177 */
@@ -316,6 +441,7 @@ failed:
so set our umask to 0177 */
umask(0177);
close(nctx->lfd);
+ close(nctx->priv_lfd);
return EIO;
}
@@ -427,7 +553,7 @@ int sss_parse_name(TALLOC_CTX *memctx,
struct btreemap *node;
int ret;
- if ((delim = strchr(fullname, NSS_DOMAIN_DELIM)) != NULL) {
+ if ((delim = strchr(fullname, SSS_DOMAIN_DELIM)) != NULL) {
/* Check for registered domain */
ret = btreemap_search_key(domain_map, (void *)(delim+1), &node);
diff --git a/server/responder/common/responder_dp.c b/server/responder/common/responder_dp.c
index a3dace45..1ae3c376 100644
--- a/server/responder/common/responder_dp.c
+++ b/server/responder/common/responder_dp.c
@@ -1,7 +1,6 @@
#include <sys/time.h>
#include <time.h>
-#include "responder/nss/nsssrv.h"
#include "util/util.h"
#include "responder/common/responder_packet.h"
#include "responder/common/responder_common.h"
diff --git a/server/responder/common/responder_dp.h b/server/responder/common/responder_dp.h
index 2eeddf5b..7010e842 100644
--- a/server/responder/common/responder_dp.h
+++ b/server/responder/common/responder_dp.h
@@ -1,4 +1,3 @@
-#include "responder/nss/nsssrv.h"
#include "sbus/sssd_dbus.h"
int sss_dp_init(struct nss_ctx *nctx, struct sbus_method dp_methods[]);
diff --git a/server/responder/common/responder_packet.h b/server/responder/common/responder_packet.h
index 1a852946..5dc8b016 100644
--- a/server/responder/common/responder_packet.h
+++ b/server/responder/common/responder_packet.h
@@ -24,6 +24,8 @@
#include "../sss_client/sss_cli.h"
+#define SSS_PACKET_MAX_RECV_SIZE 1024
+
struct sss_packet;
int sss_packet_new(TALLOC_CTX *mem_ctx, size_t size,
diff --git a/server/responder/pam/pamsrv_dp.c b/server/responder/pam/pamsrv_dp.c
index 8a10c6bd..5abe0e5d 100644
--- a/server/responder/pam/pamsrv_dp.c
+++ b/server/responder/pam/pamsrv_dp.c
@@ -27,7 +27,6 @@
#include "util/util.h"
#include "responder/common/responder_packet.h"
-#include "responder/nss/nsssrv.h"
#include "providers/data_provider.h"
#include "sbus/sbus_client.h"
#include "providers/dp_sbus.h"
@@ -70,9 +69,9 @@ static void pam_process_dp_reply(DBusPendingCall *pending, void *ptr) {
if (!ret) {
DEBUG(0, ("Failed to parse reply.\n"));
pam_status = PAM_SYSTEM_ERR;
- domain = "";
+ domain = "";
goto done;
- }
+ }
DEBUG(4, ("received: [%d][%s]\n", pam_status, domain));
break;
case DBUS_MESSAGE_TYPE_ERROR:
generated by cgit (git 2.34.1) at 2024-12-28 08:05:00 +0000