From 133eafbed79bb1ca27604c4fea122b55ec998e9d Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 26 Jan 2009 10:36:18 -0500 Subject: Add skeleton for InfoPipe service --- server/Makefile.in | 2 +- server/confdb/confdb.c | 18 ++++- server/infopipe/infopipe.c | 191 +++++++++++++++++++++++++++++++++++++++++++++ server/infopipe/infopipe.h | 28 +++++++ server/monitor/monitor.c | 2 + server/server.mk | 6 ++ 6 files changed, 243 insertions(+), 4 deletions(-) create mode 100644 server/infopipe/infopipe.c create mode 100644 server/infopipe/infopipe.h (limited to 'server') diff --git a/server/Makefile.in b/server/Makefile.in index aabb80ddd..f8056ea2c 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -61,7 +61,7 @@ OBJS = $(SERVER_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ) headers = -LIBEXECBINS = sbin/sssd_nss sbin/sssd_dp sbin/sssd_be +LIBEXECBINS = sbin/sssd_nss sbin/sssd_dp sbin/sssd_be sbin/sssd_info BINS = sbin/sssd $(LIBEXECBINS) SOLIBS = lib/libsss_proxy.$(SHLIBEXT) diff --git a/server/confdb/confdb.c b/server/confdb/confdb.c index f9cd20a1c..f0290b471 100644 --- a/server/confdb/confdb.c +++ b/server/confdb/confdb.c @@ -457,7 +457,7 @@ static int confdb_init_db(struct confdb_ctx *cdb) if (ret != EOK) goto done; /* Data Provider */ - /* set the sssd_dp description */ + /* Set the sssd_dp description */ val[0] = "Data Provider Configuration"; ret = confdb_add_param(cdb, false, "config/services/dp", "description", val); if (ret != EOK) goto done; @@ -472,9 +472,21 @@ static int confdb_init_db(struct confdb_ctx *cdb) ret = confdb_add_param(cdb, false, "config/services", "activeServices", val); if (ret != EOK) goto done; -#if 0 /* Not yet implemented */ /* InfoPipe */ -#endif + /* Set the sssd_info description */ + val[0] = "InfoPipe Configuration"; + ret = confdb_add_param(cdb, false, "config/services/infp", "description", val); + if (ret != EOK) goto done; + + /* Set the sssd_info command path */ + val[0] = talloc_asprintf(tmp_ctx, "%s/sssd_info", SSSD_LIBEXEC_PATH); + ret = confdb_add_param(cdb, false, "config/services/infp", "command", val); + if (ret != EOK) goto done; + + /* Add the InfoPipe to the list of active services */ + val[0] = "infp"; + ret = confdb_add_param(cdb, false, "config/services", "activeServices", val); + if (ret != EOK) goto done; /* Domains */ val[0] = "Domains served by SSSD"; diff --git a/server/infopipe/infopipe.c b/server/infopipe/infopipe.c new file mode 100644 index 000000000..14e0354f0 --- /dev/null +++ b/server/infopipe/infopipe.c @@ -0,0 +1,191 @@ +/* + SSSD + + InfoPipe + + Copyright (C) Stephen Gallagher 2009 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ +#define _GNU_SOURCE +#include +#include +#include "popt.h" +#include "infopipe.h" +#include "util/util.h" +#include "sbus/sbus_client.h" +#include "monitor/monitor_sbus.h" +#include "monitor/monitor_interfaces.h" + +struct infp_ctx { + struct event_context *ev; + struct confdb_ctx *cdb; + struct service_sbus_ctx *ss_ctx; + struct sbus_srv_ctx *sbus_srv; +}; + +static int service_identity(DBusMessage *message, void *data, DBusMessage **r) +{ + dbus_uint16_t version = INFOPIPE_VERSION; + const char *name = INFOPIPE_SERVICE_NAME; + DBusMessage *reply; + dbus_bool_t ret; + + DEBUG(4, ("Sending identity data [%s,%d]\n", name, version)); + + reply = dbus_message_new_method_return(message); + ret = dbus_message_append_args(reply, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_UINT16, &version, + DBUS_TYPE_INVALID); + if (!ret) { + return EIO; + } + + *r = reply; + return EOK; +} + +static int service_pong(DBusMessage *message, void *data, DBusMessage **r) +{ + DBusMessage *reply; + dbus_bool_t ret; + + reply = dbus_message_new_method_return(message); + ret = dbus_message_append_args(reply, DBUS_TYPE_INVALID); + if (!ret) { + return EIO; + } + + *r = reply; + return EOK; +} + +static int service_reload(DBusMessage *message, void *data, DBusMessage **r) { + /* Monitor calls this function when we need to reload + * our configuration information. Perform whatever steps + * are needed to update the configuration objects. + */ + + /* Send an empty reply to acknowledge receipt */ + return service_pong(message, data, r); +} + +struct sbus_method mon_sbus_methods[] = { + { SERVICE_METHOD_IDENTITY, service_identity }, + { SERVICE_METHOD_PING, service_pong }, + { SERVICE_METHOD_RELOAD, service_reload }, + { NULL, NULL } +}; + +static int infp_monitor_init(struct infp_ctx *infp_ctx) +{ + int ret; + char *sbus_address; + struct service_sbus_ctx *ss_ctx; + struct sbus_method_ctx *sm_ctx; + + /* Set up SBUS connection to the monitor */ + ret = monitor_get_sbus_address(infp_ctx, infp_ctx->cdb, &sbus_address); + if (ret != EOK) { + DEBUG(0, ("Could not locate monitor address.\n")); + return ret; + } + + ret = monitor_init_sbus_methods(infp_ctx, mon_sbus_methods, &sm_ctx); + if (ret != EOK) { + DEBUG(0, ("Could not initialize SBUS methods.\n")); + return ret; + } + + ret = sbus_client_init(infp_ctx, infp_ctx->ev, + sbus_address, sm_ctx, + NULL /* Private Data */, + NULL /* Destructor */, + &ss_ctx); + if (ret != EOK) { + DEBUG(0, ("Failed to connect to monitor services.\n")); + return ret; + } + + /* Set up InfoPipe-specific listeners */ + /* None currently used */ + + infp_ctx->ss_ctx = ss_ctx; + + return EOK; +} + +static int infp_process_init(TALLOC_CTX *mem_ctx, + struct event_context *ev, + struct confdb_ctx *cdb) +{ + struct infp_ctx *infp_ctx; + int ret; + + infp_ctx = talloc_zero(mem_ctx, struct infp_ctx); + if (infp_ctx == NULL) { + DEBUG(0, ("Fatal error initializing infp_ctx\n")); + return ENOMEM; + } + infp_ctx->ev = ev; + infp_ctx->cdb = cdb; + + ret = infp_monitor_init(infp_ctx); + if (ret != EOK) { + DEBUG(0, ("Fatal error setting up monitor bus\n")); + } + return ret; +} + +int main(int argc, const char *argv[]) +{ + int opt; + poptContext pc; + struct main_context *main_ctx; + int ret; + + struct poptOption long_options[] = { + POPT_AUTOHELP + SSSD_MAIN_OPTS + { NULL } + }; + + pc = poptGetContext(argv[0], argc, argv, long_options, 0); + while((opt = poptGetNextOpt(pc)) != -1) { + switch(opt) { + default: + fprintf(stderr, "\nInvalid option %s: %s\n\n", + poptBadOption(pc, 0), poptStrerror(opt)); + poptPrintUsage(pc, stderr, 0); + return 1; + } + } + + poptFreeContext(pc); + + /* set up things like debug , signals, daemonization, etc... */ + ret = server_setup("sssd[infp]", 0, &main_ctx); + if (ret != EOK) return 2; + + ret = infp_process_init(main_ctx, + main_ctx->event_ctx, + main_ctx->confdb_ctx); + if (ret != EOK) return 3; + + /* loop on main */ + server_loop(main_ctx); + + return 0; +} diff --git a/server/infopipe/infopipe.h b/server/infopipe/infopipe.h new file mode 100644 index 000000000..c888b1daf --- /dev/null +++ b/server/infopipe/infopipe.h @@ -0,0 +1,28 @@ +/* + SSSD + + InfoPipe + + Copyright (C) Stephen Gallagher 2009 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef INFOPIPE_H_ +#define INFOPIPE_H_ + +#define INFOPIPE_VERSION 0x0001 +#define INFOPIPE_SERVICE_NAME "infp" + +#endif /* INFOPIPE_H_ */ diff --git a/server/monitor/monitor.c b/server/monitor/monitor.c index 75742eab7..f441403d1 100644 --- a/server/monitor/monitor.c +++ b/server/monitor/monitor.c @@ -595,6 +595,8 @@ static void identity_check(DBusPendingCall *pending, void *data) svc->mt_conn = fake_svc->mt_conn; talloc_free(fake_svc); + DEBUG(1, ("Service %s connected\n", svc->name)); + /* Set up the destructor for this service */ break; diff --git a/server/server.mk b/server/server.mk index 34c2c874d..66f013899 100644 --- a/server/server.mk +++ b/server/server.mk @@ -31,6 +31,9 @@ NSSSRV_OBJ = \ nss/nsssrv_cmd.o \ nss/nsssrv_dp.o +INFOPIPE_OBJ = \ + infopipe/infopipe.o + install:: all ${INSTALLCMD} -d $(DESTDIR)$(sbindir) ${INSTALLCMD} -m 700 sbin/sssd $(DESTDIR)$(sbindir) @@ -49,5 +52,8 @@ sbin/sssd_dp: $(DP_OBJ) $(UTIL_OBJ) sbin/sssd_be: $(DP_BE_OBJ) $(UTIL_OBJ) $(CC) -Wl,-E -o sbin/sssd_be $(DP_BE_OBJ) $(UTIL_OBJ) $(LDFLAGS) $(LIBS) +sbin/sssd_info: $(INFOPIPE_OBJ) $(UTIL_OBJ) + $(CC) -o sbin/sssd_info $(INFOPIPE_OBJ) $(UTIL_OBJ) $(LDFLAGS) $(LIBS) + lib/libsss_proxy.$(SHLIBEXT): $(PROXY_BE_OBJ) $(SHLD) $(SHLD_FLAGS) -o $@ $(PROXY_BE_OBJ) $(LDFLAGS) $(LIBS) -- cgit