X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/04403ab0b5778126d98d5c9dc8064405688129e0..96c8151125ceb98ed52c0089f6401e6ba05bb41e:/src/src/daemon.c diff --git a/src/src/daemon.c b/src/src/daemon.c index a6980e95e..81fb69447 100644 --- a/src/src/daemon.c +++ b/src/src/daemon.c @@ -126,6 +126,18 @@ if (smtp_out) smtp_printf("421 %s\r\n", FALSE, smtp_msg); +/************************************************* +*************************************************/ + +static void +close_daemon_sockets(int daemon_notifier_fd, + int * listen_sockets, int listen_socket_count) +{ +if (daemon_notifier_fd >= 0) (void) close(daemon_notifier_fd); +for (int i = 0; i < listen_socket_count; i++) (void) close(listen_sockets[i]); +} + + /************************************************* * Handle a connected SMTP call * *************************************************/ @@ -355,7 +367,7 @@ if (LOGGING(smtp_connection)) expansion above did a lookup. */ search_tidyup(); -pid = fork(); +pid = exim_fork(US"daemon accept"); /* Handle the child process */ @@ -406,7 +418,7 @@ if (pid == 0) "please try again later.\r\n", FALSE); mac_smtp_fflush(); search_tidyup(); - exim_underbar_exit(EXIT_FAILURE); + exim_underbar_exit(EXIT_FAILURE, US"conn-accept"); } } else if (*nah) smtp_active_hostname = nah; @@ -424,7 +436,7 @@ if (pid == 0) extensive comment before the reception loop in exim.c for a fuller explanation of this logic. */ - for (i = 0; i < listen_socket_count; i++) (void)close(listen_sockets[i]); + close_daemon_sockets(daemon_notifier_fd, listen_sockets, listen_socket_count); /* Set FD_CLOEXEC on the SMTP socket. We don't want any rogue child processes to be able to communicate with them, under any circumstances. */ @@ -493,7 +505,7 @@ if (pid == 0) { mac_smtp_fflush(); search_tidyup(); - exim_underbar_exit(EXIT_SUCCESS); + exim_underbar_exit(EXIT_SUCCESS, US"conn-smtp"); } for (;;) @@ -521,7 +533,7 @@ if (pid == 0) cancel_cutthrough_connection(TRUE, US"receive dropped"); mac_smtp_fflush(); smtp_log_no_mail(); /* Log no mail if configured */ - exim_underbar_exit(EXIT_SUCCESS); + exim_underbar_exit(EXIT_SUCCESS, US"conn-receive"); } if (message_id[0] == 0) continue; /* No message was accepted */ } @@ -544,7 +556,7 @@ if (pid == 0) /*XXX should we pause briefly, hoping that the client will be the active TCP closer hence get the TCP_WAIT endpoint? */ DEBUG(D_receive) debug_printf("SMTP>>(close on process exit)\n"); - exim_underbar_exit(rc ? EXIT_FAILURE : EXIT_SUCCESS); + exim_underbar_exit(rc ? EXIT_FAILURE : EXIT_SUCCESS, US"conn-setup"); } /* Show the recipients when debugging */ @@ -651,7 +663,7 @@ if (pid == 0) mac_smtp_fflush(); - if ((dpid = fork()) == 0) + if ((dpid = exim_fork(US"daemon-accept delivery")) == 0) { (void)fclose(smtp_in); (void)fclose(smtp_out); @@ -680,7 +692,7 @@ if (pid == 0) (void) deliver_message(message_id, FALSE, FALSE); search_tidyup(); - exim_underbar_exit(EXIT_SUCCESS); + exim_underbar_exit(EXIT_SUCCESS, US"deliver_msg"); } if (dpid > 0) @@ -954,9 +966,22 @@ daemon_die(void) { int pid; +if (daemon_notifier_fd >= 0) + { + close(daemon_notifier_fd); + daemon_notifier_fd = -1; +#ifndef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS + { + uschar * s = expand_string(notifier_socket); + DEBUG(D_any) debug_printf("unlinking notifier socket %s\n", s); + Uunlink(s); + } +#endif + } + if (f.running_in_test_harness || write_pid) { - if ((pid = fork()) == 0) + if ((pid = exim_fork(US"daemon del pidfile")) == 0) { if (override_pid_file_path) (void)child_exec_exim(CEE_EXEC_PANIC, FALSE, NULL, FALSE, 3, @@ -982,40 +1007,64 @@ daemon_notifier_socket(void) { int fd; const uschar * where; -struct sockaddr_un sun = {.sun_family = AF_UNIX}; +struct sockaddr_un sa_un = {.sun_family = AF_UNIX}; int len; +if (override_local_interfaces && !override_pid_file_path) + { + DEBUG(D_any) + debug_printf("-oX used without -oP so not creating notifier socket\n"); + return; + } + DEBUG(D_any) debug_printf("creating notifier socket\n"); -where = US"socket"; #ifdef SOCK_CLOEXEC -if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) - goto bad; +if ((fd = socket(PF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) + { where = US"socket"; goto bad; } #else -if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0))) < 0) - goto bad; +if ((fd = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) + { where = US"socket"; goto bad; } (void)fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); #endif -sun.sun_path[0] = 0; /* Abstract local socket addr - Linux-specific? */ +#ifdef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS +sa_un.sun_path[0] = 0; /* Abstract local socket addr - Linux-specific? */ len = offsetof(struct sockaddr_un, sun_path) + 1 - + snprintf(sun.sun_path+1, sizeof(sun.sun_path)-1, "%s", NOTIFIER_SOCKET_NAME); + + snprintf(sa_un.sun_path+1, sizeof(sa_un.sun_path)-1, "%s", + expand_string(notifier_socket)); +DEBUG(D_any) debug_printf(" @%s\n", sa_un.sun_path+1); +#else /* filesystem-visible and persistent; will neeed removal */ +len = offsetof(struct sockaddr_un, sun_path) + + snprintf(sa_un.sun_path, sizeof(sa_un.sun_path), "%s", + expand_string(notifier_socket)); +DEBUG(D_any) debug_printf(" %s\n", sa_un.sun_path); +#endif -where = US"bind"; -if (bind(fd, (const struct sockaddr *)&sun, len) < 0) - goto bad; +if (bind(fd, (const struct sockaddr *)&sa_un, len) < 0) + { where = US"bind"; goto bad; } -where = US"SO_PASSCRED"; +#ifdef SO_PASSCRED /* Linux */ if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)) < 0) - goto bad; + { where = US"SO_PASSCRED"; goto bad2; } +#elif defined(LOCAL_CREDS) /* FreeBSD-ish */ +if (setsockopt(fd, 0, LOCAL_CREDS, &on, sizeof(on)) < 0) + { where = US"LOCAL_CREDS"; goto bad2; } +#endif /* debug_printf("%s: fd %d\n", __FUNCTION__, fd); */ daemon_notifier_fd = fd; return; +bad2: +#ifndef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS + Uunlink(sa_un.sun_path); +#endif bad: - log_write(0, LOG_MAIN|LOG_PANIC, "%s: %s: %s", + log_write(0, LOG_MAIN|LOG_PANIC, "%s %s: %s", __FUNCTION__, where, strerror(errno)); + close(fd); + return; } @@ -1026,10 +1075,10 @@ static BOOL daemon_notification(void) { uschar buf[256], cbuf[256]; -struct sockaddr_un sun; +struct sockaddr_un sa_un; struct iovec iov = {.iov_base = buf, .iov_len = sizeof(buf)-1}; -struct msghdr msg = { .msg_name = &sun, - .msg_namelen = sizeof(sun), +struct msghdr msg = { .msg_name = &sa_un, + .msg_namelen = sizeof(sa_un), .msg_iov = &iov, .msg_iovlen = 1, .msg_control = cbuf, @@ -1045,16 +1094,28 @@ if (sz >= sizeof(buf)) return FALSE; #ifdef notdef debug_printf("addrlen %d\n", msg.msg_namelen); #endif -DEBUG(D_queue_run) debug_printf("%s from addr%s '%s'\n", __FUNCTION__, - *sun.sun_path ? "" : " abstract", sun.sun_path+ (*sun.sun_path ? 0 : 1)); +DEBUG(D_queue_run) debug_printf("%s from addr '%s%.*s'\n", __FUNCTION__, + *sa_un.sun_path ? "" : "@", + (int)msg.msg_namelen - (*sa_un.sun_path ? 0 : 1), + sa_un.sun_path + (*sa_un.sun_path ? 0 : 1)); /* Refuse to handle the item unless the peer has good credentials */ +#ifdef SCM_CREDENTIALS +# define EXIM_SCM_CR_TYPE SCM_CREDENTIALS +#elif defined(LOCAL_CREDS) && defined(SCM_CREDS) +# define EXIM_SCM_CR_TYPE SCM_CREDS +#else + /* The OS has no way to get the creds of the caller (for a unix/datagram socket. + Punt; don't try to check. */ +#endif +#ifdef EXIM_SCM_CR_TYPE for (struct cmsghdr * cp = CMSG_FIRSTHDR(&msg); cp; cp = CMSG_NXTHDR(&msg, cp)) - if (cp->cmsg_level == SOL_SOCKET && cp->cmsg_type == SCM_CREDENTIALS) + if (cp->cmsg_level == SOL_SOCKET && cp->cmsg_type == EXIM_SCM_CR_TYPE) { +# ifdef SCM_CREDENTIALS /* Linux */ struct ucred * cr = (struct ucred *) CMSG_DATA(cp); if (cr->uid && cr->uid != exim_uid) { @@ -1062,8 +1123,18 @@ for (struct cmsghdr * cp = CMSG_FIRSTHDR(&msg); __FUNCTION__, (int)cr->pid, (int)cr->uid, (int)cr->gid); return FALSE; } +# elif defined(LOCAL_CREDS) /* BSD-ish */ + struct sockcred * cr = (struct sockcred *) CMSG_DATA(cp); + if (cr->sc_uid && cr->sc_uid != exim_uid) + { + DEBUG(D_queue_run) debug_printf("%s: sender creds pid ??? uid %d gid %d\n", + __FUNCTION__, (int)cr->sc_uid, (int)cr->sc_gid); + return FALSE; + } +# endif break; } +#endif buf[sz] = 0; switch (buf[0]) @@ -1085,7 +1156,8 @@ switch (buf[0]) DEBUG(D_queue_run) debug_printf("%s: queue size request: %s\n", __FUNCTION__, buf); - if (sendto(daemon_notifier_fd, buf, len, 0, &sun, msg.msg_namelen) < 0) + if (sendto(daemon_notifier_fd, buf, len, 0, + (const struct sockaddr *)&sa_un, msg.msg_namelen) < 0) log_write(0, LOG_MAIN|LOG_PANIC, "%s: sendto: %s\n", __FUNCTION__, strerror(errno)); return FALSE; @@ -1529,7 +1601,7 @@ if (f.background_daemon) if (getppid() != 1) { - pid_t pid = fork(); + pid_t pid = exim_fork(US"daemon"); if (pid < 0) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "fork() failed when starting daemon: %s", strerror(errno)); if (pid > 0) exit(EXIT_SUCCESS); /* in parent process, just exit */ @@ -2055,10 +2127,10 @@ for (;;) have enough queue runners on the go. If we are not running as root, a re-exec is required. */ - if (queue_interval > 0 && - (local_queue_run_max <= 0 || queue_run_count < local_queue_run_max)) + if ( queue_interval > 0 + && (local_queue_run_max <= 0 || queue_run_count < local_queue_run_max)) { - if ((pid = fork()) == 0) + if ((pid = exim_fork(US"queue runner")) == 0) { DEBUG(D_any) debug_printf("Starting queue-runner: pid %d\n", (int)getpid()); @@ -2071,10 +2143,8 @@ for (;;) /* Close any open listening sockets in the child */ - if (daemon_notifier_fd >= 0) - (void) close(daemon_notifier_fd); - for (int sk = 0; sk < listen_socket_count; sk++) - (void) close(listen_sockets[sk]); + close_daemon_sockets(daemon_notifier_fd, + listen_sockets, listen_socket_count); /* Reset SIGHUP and SIGCHLD in the child in both cases. */ @@ -2151,7 +2221,7 @@ for (;;) else #endif queue_run(NULL, NULL, FALSE); - exim_underbar_exit(EXIT_SUCCESS); + exim_underbar_exit(EXIT_SUCCESS, US"queue-runner"); } if (pid < 0) @@ -2382,8 +2452,8 @@ for (;;) { log_write(0, LOG_MAIN, "pid %d: SIGHUP received: re-exec daemon", getpid()); - for (int sk = 0; sk < listen_socket_count; sk++) - (void)close(listen_sockets[sk]); + close_daemon_sockets(daemon_notifier_fd, + listen_sockets, listen_socket_count); ALARM_CLR(0); signal(SIGHUP, SIG_IGN); sighup_argv[0] = exim_path;