bf33c0e62e
Maintainers Notes below. ~~~ Hello, New versions of all the skarnet.org packages are available. skalibs has undergone a major update, with a few APIs having disappeared, and others having changed. Compatibility with previous versions is *not* assured. Consequently, all the rest of the skarnet.org software has undergone at least a release bump, in order to build with the new skalibs. But some packages also have new functionality added (hence, a minor bump), and others also have their own incompatible changes (hence, a major bump). The new versions are the following: skalibs-2.11.0.0 (major) nsss-0.2.0.0 (major) utmps-0.1.0.3 (release) execline-2.8.1.0 (minor) s6-2.11.0.0 (major) s6-rc-0.5.2.3 (release) s6-portable-utils-2.2.3.3 (release) s6-linux-utils-2.5.1.6 (release) s6-linux-init-1.0.6.4 (release) s6-dns-2.3.5.2 (release) s6-networking-2.5.0.0 (major) mdevd-0.1.5.0 (minor) bcnm-0.0.1.4 (release) dnsfunnel-0.0.1.2 (release) Additionally, a new package has been released: smtpd-starttls-proxy-0.0.1.0 Dependencies have all been updated to the latest versions. They are, this time, partially strict: libraries and binaries may build with older releases of their dependencies, but not across major version bumps. The safest approach is to upgrade everything at the same time. You do not need to recompile your s6-rc service databases or recreate your s6-linux-init run-images. You should restart your supervision tree after upgrading skalibs and s6, as soon as is convenient for you. Details of major and minor package changes follow. * skalibs-2.11.0.0 ---------------- - A lot of obsolete or useless functionality has been removed: libbiguint, rc4, md5, iobuffer, skasigaction, environ.h and getpeereid.h headers, various functions that have not proven their value in a while. - Some functions changed signatures or changed names, or both. - All custom types ending in _t have been renamed, to avoid treading on POSIX namespace. (The same change has not been done yet in other packages, but skalibs was the biggest offender by far.) - Signal functions have been deeply reworked. - cdb has been reworked, the API is now more user-friendly. - New functions have been added. The deletion of significant portions of code has made skalibs leaner. libskarnet.so has dropped under 190 kB on x86_64. The cdb rewrite on its own has helped reduce an important amount of boilerplate in cdb-using code. All in all, code linked against the new skalibs should be slightly smaller and use a tiny bit less RAM. https://skarnet.org/software/skalibs/ git://git.skarnet.org/skalibs * nsss-0.2.0.0 ------------ - Bugfixes. - nsss-switch wire protocol slightly modified, which is enough to warrant a major version bump. - _r functions are now entirely thread-safe. - Spawned nsssd programs are now persistent and only expire after a timeout on non-enumeration queries. This saves a lot of forking with applications that can call primitives such as getpwnam() repeatedly, as e.g. mdevd does when initially parsing its configuration file. - New nsssd-switch program, implementing real nsswitch functionality by dispatching queries to various backends according to a script. It does not dlopen a single library or read a single config file. https://skarnet.org/software/nsss/ git://git.skarnet.org/nsss * execline-2.8.1.0 ---------------- - Bugfixes. - New binary: case. It compares a value against a series of regular expressions, executing into another command line on the first match. https://skarnet.org/software/execline/ git://git.skarnet.org/execline * s6-2.11.0.0 ----------- - Bugfixes. - Some libs6 header names have been simplified. - s6-svwait now accepts -r and -R options. - s6-supervise now reads an optional lock-fd file in the service directory; if it finds one, the first action of the service is to take a blocking lock. This prevents confusion when a controller process dies while still leaving workers holding resources; it also prevents log spamming on user mistakes (autobackgrounding services, notably). - New binaries: s6-socklog, s6-svlink, s6-svunlink. The former is a rewrite of smarden.org's socklog program, in order to implement a fully functional syslogd with only s6 programs. The latter are tools that start and stop services by symlinking/unlinking service directories from a scan directory, in order to make it easier to integrate s6-style services in boot scripts for sequential service managers such as OpenRC. https://skarnet.org/software/s6/ git://git.skarnet.org/s6 * s6-networking-2.5.0.0 --------------------- - Bugfixes. - minidentd has been removed. It was an old and somehow still buggy piece of code that was only hanging around for nostalgia reasons. - Full support for client certificates. Details of the client certificate are transmitted to the application via environment variables (or via an environment string in the case of opportunistic TLS). - Full SNI support, including server-side. (That involved a deep dive into the bearssl internals, which is why it took so long.) The filenames containing secret keys and certificates for <domain> are read in the environment variables KEYFILE:<domain> and CERTFILE:<domain>. Complete client certificate and SNI support now make the TLS part of s6-networking a fully viable replacement of stunnel and other similar TLS tunneling tools. This is most interesting when s6-networking is built against bearssl, which uses about 1/9 of the resources that OpenSSL needs. https://skarnet.org/software/s6-networking/ git://git.skarnet.org/s6-networking * mdevd-0.1.5.0 ------------- - A new option to mdevd is available: -O <nlgroups>. This option makes mdevd rebroadcast uevents to a netlink group (or set of netlink groups) once they have been handled. This allows applications to read uevents from a netlink group *after* the device manager is done with them. This is useful, for instance, when pairing mdevd with libudev-zero for full udev emulation. - The * and & directives, which previously were only triggered by "add" and "remove" actions, are now triggered by *all* action types. This gives users full scripting access to any event, which can be used to implement complex rules similar to udev ones. These two changes make it possible to now build a full-featured desktop system based on mdevd + libudev-zero, without running systemd-udevd or eudev. https://skarnet.org/software/mdevd/ git://git.skarnet.org/mdevd * smtpd-starttls-proxy-0.0.1.0 ---------------------------- This new package, in conjunction with the latest s6-networking, implements the STARTTLS functionality for inetd-like mail servers that do not already support it. (Currently only tested with qmail-smtpd.) If you have noticed that sending mail to skarnet.org supports STARTTLS now, it is thanks to this little piece of software. https://skarnet.org/software/smtpd-starttls-proxy/ git://git.skarnet.org/smtpd-starttls-proxy Enjoy, Bug-reports welcome. Laurent
175 lines
5.8 KiB
C
175 lines
5.8 KiB
C
/*
|
|
Copyright: (C)2015-2020 Laurent Bercot. http://skarnet.org/
|
|
ISC license. See http://opensource.org/licenses/ISC
|
|
|
|
Build-time requirements: skalibs. https://skarnet.org/software/skalibs/
|
|
Run-time requirements: none, if you link skalibs statically.
|
|
|
|
Compilation:
|
|
gcc -o sdnotify-wrapper -L/usr/lib/skalibs sdnotify-wrapper.c -lskarnet
|
|
Use /usr/lib/skalibs/libskarnet.a instead of -lskarnet to link statically.
|
|
Adapt gcc's -I and -L options to your skalibs installation paths.
|
|
|
|
Usage: if a daemon would be launched by systemd as "foobard args...",
|
|
launch it as "sdnotify-wrapper foobard args..." instead, and you can now
|
|
tell systemd that this daemon supports readiness notification.
|
|
|
|
Instead of using sd_notify() and having to link against the systemd
|
|
library, the daemon notifies readiness by writing whatever it wants
|
|
to a file descriptor (by default: stdout), then a newline. (Then it
|
|
should close that file descriptor.) The simplest way is something like
|
|
int notify_readiness() { write(1, "\n", 1) ; close(1) ; }
|
|
This mechanism is understandable by any notification readiness framework.
|
|
|
|
Readiness notification occurs when the newline is written, not when
|
|
the descriptor is closed; but since sdnotify-wrapper stops reading
|
|
after the first newline and will exit, any subsequent writes will
|
|
fail and it's best to simply close the descriptor right away.
|
|
|
|
sdnotify-wrapper sees the notification when it occurs and sends it
|
|
to systemd using the sd_notify format.
|
|
|
|
Options:
|
|
-d fd: the daemon will write its notification on descriptor fd.
|
|
Default is 1.
|
|
-f: do not doublefork. Use if the daemon waits for children it does
|
|
not know it has (for instance, superservers do this). When in doubt,
|
|
do not use that option, or you may have a zombie hanging around.
|
|
-t timeout: if the daemon has not sent a notification after timeout
|
|
milliseconds, give up and exit; systemd will not be notified.
|
|
-k: keep the NOTIFY_SOCKET environment variable when execing into the
|
|
daemon. By default, the variable is unset: the daemon should not need it.
|
|
|
|
Notes:
|
|
sdnotify-wrapper does not change the daemon's pid. It runs as a
|
|
(grand)child of the daemon.
|
|
If the NOTIFY_SOCKET environment variable is not set, sdnotify-wrapper
|
|
does nothing - it only execs into the daemon.
|
|
sdnotify-wrapper is more liberal than sd_notify(). It will accept
|
|
a relative path in NOTIFY_SOCKET.
|
|
*/
|
|
|
|
|
|
#include <sys/types.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/un.h>
|
|
|
|
#include <skalibs/uint64.h>
|
|
#include <skalibs/types.h>
|
|
#include <skalibs/bytestr.h>
|
|
#include <skalibs/sgetopt.h>
|
|
#include <skalibs/strerr2.h>
|
|
#include <skalibs/allreadwrite.h>
|
|
#include <skalibs/tai.h>
|
|
#include <skalibs/iopause.h>
|
|
#include <skalibs/djbunix.h>
|
|
#include <skalibs/socket.h>
|
|
#include <skalibs/exec.h>
|
|
|
|
#define USAGE "sdnotify-wrapper [ -d fd ] [ -f ] [ -t timeout ] [ -k ] prog..."
|
|
#define dieusage() strerr_dieusage(100, USAGE)
|
|
|
|
#define VAR "NOTIFY_SOCKET"
|
|
|
|
static inline int ipc_sendto (int fd, char const *s, size_t len, char const *path)
|
|
{
|
|
struct sockaddr_un sa ;
|
|
size_t l = strlen(path) ;
|
|
if (l > IPCPATH_MAX) return (errno = ENAMETOOLONG, 0) ;
|
|
memset(&sa, 0, sizeof sa) ;
|
|
sa.sun_family = AF_UNIX ;
|
|
memcpy(sa.sun_path, path, l+1) ;
|
|
if (path[0] == '@') sa.sun_path[0] = 0 ;
|
|
return sendto(fd, s, len, MSG_NOSIGNAL, (struct sockaddr *)&sa, sizeof sa) >= 0 ;
|
|
}
|
|
|
|
static inline void notify_systemd (pid_t pid, char const *socketpath)
|
|
{
|
|
size_t n = 16 ;
|
|
char fmt[16 + PID_FMT] = "READY=1\nMAINPID=" ;
|
|
int fd = ipc_datagram_b() ;
|
|
if (fd < 0) strerr_diefu1sys(111, "create socket") ;
|
|
n += pid_fmt(fmt + n, pid) ;
|
|
fmt[n++] = '\n' ;
|
|
if (!ipc_sendto(fd, fmt, n, socketpath))
|
|
strerr_diefu2sys(111, "send notification message to ", socketpath) ;
|
|
close(fd) ;
|
|
}
|
|
|
|
static inline int run_child (int fd, unsigned int timeout, pid_t pid, char const *s)
|
|
{
|
|
char dummy[4096] ;
|
|
iopause_fd x = { .fd = fd, .events = IOPAUSE_READ } ;
|
|
tain deadline ;
|
|
tain_now_g() ;
|
|
if (timeout) tain_from_millisecs(&deadline, timeout) ;
|
|
else deadline = tain_infinite_relative ;
|
|
tain_add_g(&deadline, &deadline) ;
|
|
for (;;)
|
|
{
|
|
int r = iopause_g(&x, 1, &deadline) ;
|
|
if (r < 0) strerr_diefu1sys(111, "iopause") ;
|
|
if (!r) return 99 ;
|
|
r = sanitize_read(fd_read(fd, dummy, 4096)) ;
|
|
if (r < 0)
|
|
if (errno == EPIPE) return 1 ;
|
|
else strerr_diefu1sys(111, "read from parent") ;
|
|
else if (r && memchr(dummy, '\n', r)) break ;
|
|
}
|
|
close(fd) ;
|
|
notify_systemd(pid, s) ;
|
|
return 0 ;
|
|
}
|
|
|
|
int main (int argc, char const *const *argv)
|
|
{
|
|
char const *s = getenv(VAR) ;
|
|
unsigned int fd = 1 ;
|
|
unsigned int timeout = 0 ;
|
|
int df = 1, keep = 0 ;
|
|
PROG = "sdnotify-wrapper" ;
|
|
{
|
|
subgetopt l = SUBGETOPT_ZERO ;
|
|
for (;;)
|
|
{
|
|
int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ;
|
|
if (opt == -1) break ;
|
|
switch (opt)
|
|
{
|
|
case 'd' : if (!uint0_scan(l.arg, &fd)) dieusage() ; break ;
|
|
case 'f' : df = 0 ; break ;
|
|
case 't' : if (!uint0_scan(l.arg, &timeout)) dieusage() ; break ;
|
|
case 'k' : keep = 1 ; break ;
|
|
default : dieusage() ;
|
|
}
|
|
}
|
|
argc -= l.ind ; argv += l.ind ;
|
|
}
|
|
if (!argc) dieusage() ;
|
|
|
|
if (!s) xexec(argv) ;
|
|
else
|
|
{
|
|
pid_t parent = getpid() ;
|
|
pid_t child ;
|
|
int p[2] ;
|
|
if (pipe(p) < 0) strerr_diefu1sys(111, "pipe") ;
|
|
child = df ? doublefork() : fork() ;
|
|
if (child < 0) strerr_diefu1sys(111, df ? "doublefork" : "fork") ;
|
|
else if (!child)
|
|
{
|
|
PROG = "sdnotify-wrapper (child)" ;
|
|
close(p[1]) ;
|
|
return run_child(p[0], timeout, parent, s) ;
|
|
}
|
|
close(p[0]) ;
|
|
if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "move descriptor") ;
|
|
if (keep) xexec(argv) ;
|
|
else xmexec_m(argv, VAR, sizeof(VAR)) ;
|
|
}
|
|
}
|