* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $DragonFly: src/libexec/dma/dma.c,v 1.5 2008/09/30 17:47:21 swildner Exp $
*/
+#include "dfcompat.h"
+
#include <sys/param.h>
+#include <sys/types.h>
#include <sys/queue.h>
#include <sys/stat.h>
-#include <sys/types.h>
+#include <sys/time.h>
#include <sys/wait.h>
-#ifdef HAVE_CRYPTO
-#include <openssl/ssl.h>
-#endif /* HAVE_CRYPTO */
-
#include <dirent.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
-#include <netdb.h>
#include <paths.h>
#include <pwd.h>
#include <signal.h>
#include "dma.h"
-
static void deliver(struct qitem *);
-static int add_recp(struct queue *, const char *, const char *, int);
struct aliases aliases = LIST_HEAD_INITIALIZER(aliases);
-static struct strlist tmpfs = SLIST_HEAD_INITIALIZER(tmpfs);
-struct virtusers virtusers = LIST_HEAD_INITIALIZER(virtusers);
+struct strlist tmpfs = SLIST_HEAD_INITIALIZER(tmpfs);
struct authusers authusers = LIST_HEAD_INITIALIZER(authusers);
-static int daemonize = 1;
-struct config *config;
-static const char *username;
-static uid_t uid;
-static struct strlist seenmsg[16][16];
-
+char username[USERNAME_SIZE];
+uid_t useruid;
+const char *logident_base;
+char errmsg[ERRMSG_SIZE];
-char *
-hostname(void)
-{
- static char name[MAXHOSTNAMELEN+1];
- int initialized = 0;
- FILE *fp;
- size_t len;
-
- if (initialized)
- return (name);
-
- if (config->mailname != NULL && config->mailname[0] != '\0') {
- snprintf(name, sizeof(name), "%s", config->mailname);
- initialized = 1;
- return (name);
- }
- if (config->mailnamefile != NULL && config->mailnamefile[0] != '\0') {
- fp = fopen(config->mailnamefile, "r");
- if (fp != NULL) {
- if (fgets(name, sizeof(name), fp) != NULL) {
- len = strlen(name);
- while (len > 0 &&
- (name[len - 1] == '\r' ||
- name[len - 1] == '\n'))
- name[--len] = '\0';
- if (name[0] != '\0') {
- initialized = 1;
- return (name);
- }
- }
- fclose(fp);
- }
- }
- if (gethostname(name, sizeof(name)) != 0)
- strcpy(name, "(unknown hostname)");
- initialized = 1;
- return name;
-}
+static int daemonize = 1;
-static const char *
-check_username(const char *name, uid_t ckuid)
-{
- struct passwd *pwd;
+struct config config = {
+ .smarthost = NULL,
+ .port = 25,
+ .aliases = "/etc/aliases",
+ .spooldir = "/var/spool/dma",
+ .authpath = NULL,
+ .certfile = NULL,
+ .features = 0,
+ .mailname = NULL,
+};
- if (name == NULL)
- return (NULL);
- pwd = getpwnam(name);
- if (pwd == NULL || pwd->pw_uid != ckuid)
- return (NULL);
- return (name);
-}
static void
-set_username(void)
+sighup_handler(int signo)
{
- struct passwd *pwd;
- char *u = NULL;
-
- uid = getuid();
- username = check_username(getlogin(), uid);
- if (username != NULL)
- return;
- username = check_username(getenv("LOGNAME"), uid);
- if (username != NULL)
- return;
- username = check_username(getenv("USER"), uid);
- if (username != NULL)
- return;
- pwd = getpwuid(uid);
- if (pwd != NULL && pwd->pw_name != NULL && pwd->pw_name[0] != '\0' &&
- (u = strdup(pwd->pw_name)) != NULL) {
- username = check_username(u, uid);
- if (username != NULL)
- return;
- else
- free(u);
- }
- asprintf(__DECONST(void *, &username), "%ld", (long)uid);
- if (username != NULL)
- return;
- username = "unknown-or-invalid-username";
+ (void)signo; /* so that gcc doesn't complain */
}
static char *
-set_from(const char *osender)
+set_from(struct queue *queue, const char *osender)
{
- struct virtuser *v;
char *sender;
- if ((config->features & VIRTUAL) != 0) {
- SLIST_FOREACH(v, &virtusers, next) {
- if (strcmp(v->login, username) == 0) {
- sender = strdup(v->address);
- if (sender == NULL)
- return(NULL);
- goto out;
- }
- }
- }
-
if (osender) {
sender = strdup(osender);
if (sender == NULL)
return (NULL);
+ } else if (getenv("EMAIL") != NULL) {
+ sender = strdup(getenv("EMAIL"));
+ if (sender == NULL)
+ return (NULL);
} else {
if (asprintf(&sender, "%s@%s", username, hostname()) <= 0)
return (NULL);
return (NULL);
}
-out:
+ queue->sender = sender;
return (sender);
}
static int
read_aliases(void)
{
- yyin = fopen(config->aliases, "r");
- if (yyin == NULL)
- return (0); /* not fatal */
+ yyin = fopen(config.aliases, "r");
+ if (yyin == NULL) {
+ /*
+ * Non-existing aliases file is not a fatal error
+ */
+ if (errno == ENOENT)
+ return (0);
+ /* Other problems are. */
+ return (-1);
+ }
if (yyparse())
return (-1); /* fatal error, probably malloc() */
fclose(yyin);
return (0);
}
-static int
-add_recp(struct queue *queue, const char *str, const char *sender, int expand)
+int
+add_recp(struct queue *queue, const char *str, int expand)
{
struct qitem *it, *tit;
struct stritem *sit;
if (it->addr == NULL)
return (-1);
- it->sender = sender;
+ it->sender = queue->sender;
host = strrchr(it->addr, '@');
if (host != NULL &&
(strcmp(host + 1, hostname()) == 0 ||
if (strcmp(al->alias, it->addr) != 0)
continue;
SLIST_FOREACH(sit, &al->dests, next) {
- if (add_recp(queue, sit->str, sender, 1) != 0)
+ if (add_recp(queue, sit->str, 1) != 0)
return (-1);
}
aliased = 1;
pw = getpwnam(it->addr);
if (pw == NULL)
goto out;
+ /* XXX read .forward */
endpwent();
}
}
return (-1);
}
-static void
-deltmp(void)
-{
- struct stritem *t;
-
- SLIST_FOREACH(t, &tmpfs, next) {
- unlink(t->str);
- }
-}
-
-static int
-gentempf(struct queue *queue)
-{
- char fn[PATH_MAX+1];
- struct stritem *t;
- int fd;
-
- if (snprintf(fn, sizeof(fn), "%s/%s", config->spooldir, "tmp_XXXXXXXXXX") <= 0)
- return (-1);
- fd = mkstemp(fn);
- if (fd < 0)
- return (-1);
- if (flock(fd, LOCK_EX) == -1)
- return (-1);
- queue->mailfd = fd;
- queue->tmpf = strdup(fn);
- if (queue->tmpf == NULL) {
- unlink(fn);
- return (-1);
- }
- t = malloc(sizeof(*t));
- if (t != NULL) {
- t->str = queue->tmpf;
- SLIST_INSERT_HEAD(&tmpfs, t, next);
- }
- return (0);
-}
-
-static int
-open_locked(const char *fname, int flags)
-{
-#ifndef O_EXLOCK
- int fd, save_errno;
-
- fd = open(fname, flags, 0);
- if (fd < 0)
- return(fd);
- if (flock(fd, LOCK_EX|((flags & O_NONBLOCK)? LOCK_NB: 0)) < 0) {
- save_errno = errno;
- close(fd);
- errno = save_errno;
- return(-1);
- }
- return(fd);
-#else
- return(open(fname, flags|O_EXLOCK));
-#endif
-}
-
-/*
- * spool file format:
- *
- * envelope-from
- * queue-id1 envelope-to1
- * queue-id2 envelope-to2
- * ...
- * <empty line>
- * mail data
- *
- * queue ids are unique, formed from the inode of the spool file
- * and a unique identifier.
- */
-static int
-preparespool(struct queue *queue, const char *sender)
-{
- char line[1000]; /* by RFC2822 */
- struct stat st;
- int error;
- struct qitem *it;
- FILE *queuef;
- off_t hdrlen;
-
- error = snprintf(line, sizeof(line), "%s\n", sender);
- if (error < 0 || (size_t)error >= sizeof(line)) {
- errno = E2BIG;
- return (-1);
- }
- if (write(queue->mailfd, line, error) != error)
- return (-1);
-
- queuef = fdopen(queue->mailfd, "r+");
- if (queuef == NULL)
- return (-1);
-
- /*
- * Assign queue id to each dest.
- */
- if (fstat(queue->mailfd, &st) != 0)
- return (-1);
- queue->id = st.st_ino;
- LIST_FOREACH(it, &queue->queue, next) {
- if (asprintf(&it->queueid, "%"PRIxMAX".%"PRIxPTR,
- queue->id, (uintptr_t)it) <= 0)
- return (-1);
- if (asprintf(&it->queuefn, "%s/%s",
- config->spooldir, it->queueid) <= 0)
- return (-1);
- /* File may not exist yet */
- if (stat(it->queuefn, &st) == 0)
- return (-1);
- it->queuef = queuef;
- error = snprintf(line, sizeof(line), "%s %s\n",
- it->queueid, it->addr);
- if (error < 0 || (size_t)error >= sizeof(line))
- return (-1);
- if (write(queue->mailfd, line, error) != error)
- return (-1);
- }
- line[0] = '\n';
- if (write(queue->mailfd, line, 1) != 1)
- return (-1);
-
- hdrlen = lseek(queue->mailfd, 0, SEEK_CUR);
- LIST_FOREACH(it, &queue->queue, next) {
- it->hdrlen = hdrlen;
- }
- return (0);
-}
-
-static char *
-rfc822date(void)
-{
- static char str[50];
- size_t error;
- time_t now;
-
- now = time(NULL);
- error = strftime(str, sizeof(str), "%a, %d %b %Y %T %z",
- localtime(&now));
- if (error == 0)
- strcpy(str, "(date fail)");
- return (str);
-}
-
-static int
-readmail(struct queue *queue, const char *sender, int nodot)
-{
- char line[1000]; /* by RFC2822 */
- size_t linelen;
- int error;
-
- error = snprintf(line, sizeof(line), "\
-Received: from %s (uid %d)\n\
-\t(envelope-from %s)\n\
-\tid %"PRIxMAX"\n\
-\tby %s (%s)\n\
-\t%s\n",
- username, uid,
- sender,
- queue->id,
- hostname(), VERSION,
- rfc822date());
- if (error < 0 || (size_t)error >= sizeof(line))
- return (-1);
- if (write(queue->mailfd, line, error) != error)
- return (-1);
-
- while (!feof(stdin)) {
- if (fgets(line, sizeof(line), stdin) == NULL)
- break;
- linelen = strlen(line);
- if (linelen == 0 || line[linelen - 1] != '\n') {
- errno = EINVAL; /* XXX mark permanent errors */
- return (-1);
- }
- if (!nodot && linelen == 2 && line[0] == '.')
- break;
- if ((size_t)write(queue->mailfd, line, linelen) != linelen)
- return (-1);
- }
- if (fsync(queue->mailfd) != 0)
- return (-1);
- return (0);
-}
-
-static int
-linkspool(struct queue *queue)
-{
- struct qitem *it;
-
- LIST_FOREACH(it, &queue->queue, next) {
- if (link(queue->tmpf, it->queuefn) != 0)
- goto delfiles;
- }
- unlink(queue->tmpf);
- return (0);
-
-delfiles:
- LIST_FOREACH(it, &queue->queue, next) {
- unlink(it->queuefn);
- }
- return (-1);
-}
-
static struct qitem *
go_background(struct queue *queue)
{
struct sigaction sa;
struct qitem *it;
- FILE *newqf;
pid_t pid;
if (daemonize && daemon(0, 0) != 0) {
daemonize = 0;
bzero(&sa, sizeof(sa));
- sa.sa_flags = SA_NOCLDWAIT;
sa.sa_handler = SIG_IGN;
sigaction(SIGCHLD, &sa, NULL);
LIST_FOREACH(it, &queue->queue, next) {
/* No need to fork for the last dest */
if (LIST_NEXT(it, next) == NULL)
- return (it);
+ goto retit;
pid = fork();
switch (pid) {
*
* return and deliver mail
*/
+retit:
/*
- * We have to prevent sharing of fds between children, so
- * we have to re-open the queue file.
+ * If necessary, acquire the queue and * mail files.
+ * If this fails, we probably were raced by another
+ * process.
*/
- newqf = fopen(it->queuefn, "r");
- if (newqf == NULL) {
- syslog(LOG_ERR, "can not re-open queue file `%s': %m",
- it->queuefn);
+ setlogident("%s", it->queueid);
+ if (acquirespool(it) < 0)
exit(1);
- }
- fclose(it->queuef);
- it->queuef = newqf;
+ dropspool(queue, it);
return (it);
default:
exit(1);
}
-static void
-bounce(struct qitem *it, const char *reason)
-{
- struct queue bounceq;
- struct qitem *bit;
- char line[1000];
- size_t pos;
- int error;
-
- /* Don't bounce bounced mails */
- if (it->sender[0] == 0) {
- syslog(LOG_INFO, "%s: can not bounce a bounce message, discarding",
- it->queueid);
- exit(1);
- }
-
- syslog(LOG_ERR, "%s: delivery failed, bouncing",
- it->queueid);
-
- LIST_INIT(&bounceq.queue);
- if (add_recp(&bounceq, it->sender, "", 1) != 0)
- goto fail;
- if (gentempf(&bounceq) != 0)
- goto fail;
- if (preparespool(&bounceq, "") != 0)
- goto fail;
-
- bit = LIST_FIRST(&bounceq.queue);
- error = fprintf(bit->queuef, "\
-Received: from MAILER-DAEMON\n\
-\tid %"PRIxMAX"\n\
-\tby %s (%s)\n\
-\t%s\n\
-X-Original-To: <%s>\n\
-From: MAILER-DAEMON <>\n\
-To: %s\n\
-Subject: Mail delivery failed\n\
-Message-Id: <%"PRIxMAX"@%s>\n\
-Date: %s\n\
-\n\
-This is the %s at %s.\n\
-\n\
-There was an error delivering your mail to <%s>.\n\
-\n\
-%s\n\
-\n\
-%s\n\
-\n\
-",
- bounceq.id,
- hostname(), VERSION,
- rfc822date(),
- it->addr,
- it->sender,
- bounceq.id, hostname(),
- rfc822date(),
- VERSION, hostname(),
- it->addr,
- reason,
- config->features & FULLBOUNCE? "Original message follows.":
- "Message headers follow.");
- if (error < 0)
- goto fail;
- if (fflush(bit->queuef) != 0)
- goto fail;
-
- if (fseek(it->queuef, it->hdrlen, SEEK_SET) != 0)
- goto fail;
- if (config->features & FULLBOUNCE) {
- while ((pos = fread(line, 1, sizeof(line), it->queuef)) > 0) {
- if ((size_t)write(bounceq.mailfd, line, pos) != pos)
- goto fail;
- }
- } else {
- while (!feof(it->queuef)) {
- if (fgets(line, sizeof(line), it->queuef) == NULL)
- break;
- if (line[0] == '\n')
- break;
- if ((size_t)write(bounceq.mailfd, line, strlen(line)) != strlen(line))
- goto fail;
- }
- }
- if (fsync(bounceq.mailfd) != 0)
- goto fail;
- if (linkspool(&bounceq) != 0)
- goto fail;
- /* bounce is safe */
-
- unlink(it->queuefn);
- fclose(it->queuef);
-
- bit = go_background(&bounceq);
- deliver(bit);
- /* NOTREACHED */
-
-fail:
- syslog(LOG_CRIT, "%s: error creating bounce: %m", it->queueid);
- unlink(it->queuefn);
- exit(1);
-}
-
-static int
-deliver_local(struct qitem *it, const char **errmsg)
-{
- char fn[PATH_MAX+1];
- char line[1000];
- size_t linelen;
- int mbox;
- int error;
- off_t mboxlen;
- time_t now = time(NULL);
-
- error = snprintf(fn, sizeof(fn), "%s/%s", _PATH_MAILDIR, it->addr);
- if (error < 0 || (size_t)error >= sizeof(fn)) {
- syslog(LOG_NOTICE, "%s: local delivery deferred: %m",
- it->queueid);
- return (1);
- }
-
- /* mailx removes users mailspool file if empty, so open with O_CREAT */
- mbox = open_locked(fn, O_WRONLY | O_APPEND | O_CREAT);
- if (mbox < 0) {
- syslog(LOG_NOTICE, "%s: local delivery deferred: can not open `%s': %m",
- it->queueid, fn);
- return (1);
- }
- mboxlen = lseek(mbox, 0, SEEK_CUR);
-
- if (fseek(it->queuef, it->hdrlen, SEEK_SET) != 0) {
- syslog(LOG_NOTICE, "%s: local delivery deferred: can not seek: %m",
- it->queueid);
- return (1);
- }
-
- error = snprintf(line, sizeof(line), "From %s\t%s", it->sender, ctime(&now));
- if (error < 0 || (size_t)error >= sizeof(line)) {
- syslog(LOG_NOTICE, "%s: local delivery deferred: can not write header: %m",
- it->queueid);
- return (1);
- }
- if (write(mbox, line, error) != error)
- goto wrerror;
-
- while (!feof(it->queuef)) {
- if (fgets(line, sizeof(line), it->queuef) == NULL)
- break;
- linelen = strlen(line);
- if (linelen == 0 || line[linelen - 1] != '\n') {
- syslog(LOG_CRIT, "%s: local delivery failed: corrupted queue file",
- it->queueid);
- *errmsg = "corrupted queue file";
- error = -1;
- goto chop;
- }
-
- if (strncmp(line, "From ", 5) == 0) {
- const char *gt = ">";
-
- if (write(mbox, gt, 1) != 1)
- goto wrerror;
- }
- if ((size_t)write(mbox, line, linelen) != linelen)
- goto wrerror;
- }
- line[0] = '\n';
- if (write(mbox, line, 1) != 1)
- goto wrerror;
- close(mbox);
- return (0);
-
-wrerror:
- syslog(LOG_ERR, "%s: local delivery failed: write error: %m",
- it->queueid);
- error = 1;
-chop:
- if (ftruncate(mbox, mboxlen) != 0)
- syslog(LOG_WARNING, "%s: error recovering mbox `%s': %m",
- it->queueid, fn);
- close(mbox);
- return (error);
-}
-
static void
deliver(struct qitem *it)
{
int error;
unsigned int backoff = MIN_RETRY;
- const char *errmsg = "unknown bounce reason";
struct timeval now;
struct stat st;
- syslog(LOG_INFO, "%s: mail from=<%s> to=<%s>",
- it->queueid, it->sender, it->addr);
+ snprintf(errmsg, sizeof(errmsg), "unknown bounce reason");
retry:
- syslog(LOG_INFO, "%s: trying delivery",
- it->queueid);
+ syslog(LOG_INFO, "trying delivery");
if (it->remote)
- error = deliver_remote(it, &errmsg);
+ error = deliver_remote(it);
else
- error = deliver_local(it, &errmsg);
+ error = deliver_local(it);
switch (error) {
case 0:
- unlink(it->queuefn);
- syslog(LOG_INFO, "%s: delivery successful",
- it->queueid);
+ delqueue(it);
+ syslog(LOG_INFO, "delivery successful");
exit(0);
case 1:
if (stat(it->queuefn, &st) != 0) {
- syslog(LOG_ERR, "%s: lost queue file `%s'",
- it->queueid, it->queuefn);
+ syslog(LOG_ERR, "lost queue file `%s'", it->queuefn);
exit(1);
}
if (gettimeofday(&now, NULL) == 0 &&
- (now.tv_sec - st.st_mtimespec.tv_sec > MAX_TIMEOUT)) {
- asprintf(__DECONST(void *, &errmsg),
+ (now.tv_sec - st.st_mtim.tv_sec > MAX_TIMEOUT)) {
+ snprintf(errmsg, sizeof(errmsg),
"Could not deliver for the last %d seconds. Giving up.",
MAX_TIMEOUT);
goto bounce;
}
- sleep(backoff);
- backoff *= 2;
- if (backoff > MAX_RETRY)
- backoff = MAX_RETRY;
+ if (sleep(backoff) == 0) {
+ /* pick the next backoff between [1.5, 2.5) times backoff */
+ backoff = backoff + backoff / 2 + random() % backoff;
+ if (backoff > MAX_RETRY)
+ backoff = MAX_RETRY;
+ }
goto retry;
case -1:
/* NOTREACHED */
}
-static int
-c2x(char c)
-{
- if (c <= '9')
- return (c - '0');
- else if (c <= 'F')
- return (c - 'A' + 10);
- else
- return (c - 'a' + 10);
-}
-
-static void
-seen_init(void)
-{
- int i, j;
-
- for (i = 0; i < 16; i++)
- for (j = 0; j < 16; j++)
- SLIST_INIT(&seenmsg[i][j]);
-}
-
-static int
-seen(const char *msgid)
-{
- const char *p;
- size_t len;
- int i, j;
- struct stritem *t;
-
- p = strchr(msgid, '.');
- if (p == NULL)
- return (0);
- len = p - msgid;
- if (len >= 2) {
- i = c2x(msgid[len - 2]);
- j = c2x(msgid[len - 1]);
- } else if (len == 1) {
- i = c2x(msgid[0]);
- j = 0;
- } else {
- i = j = 0;
- }
- if (i < 0 || i >= 16 || j < 0 || j >= 16)
- errx(1, "INTERNAL ERROR: bad seen code for msgid %s", msgid);
- SLIST_FOREACH(t, &seenmsg[i][j], next)
- if (!strncmp(t->str, msgid, len))
- return (1);
- t = malloc(sizeof(*t));
- if (t == NULL)
- errx(1, "Could not allocate %lu bytes",
- (unsigned long)(sizeof(*t)));
- t->str = strdup(msgid);
- if (t->str == NULL)
- errx(1, "Could not duplicate msgid %s", msgid);
- SLIST_INSERT_HEAD(&seenmsg[i][j], t, next);
- return (0);
-}
-
-static void
-load_queue(struct queue *queue, int ignorelock)
-{
- struct stat st;
- struct qitem *it;
- //struct queue queue, itmqueue;
- struct queue itmqueue;
- DIR *spooldir;
- struct dirent *de;
- char line[1000];
- char *fn;
- FILE *queuef;
- char *sender;
- char *addr;
- char *queueid;
- char *queuefn;
- off_t hdrlen;
- int fd, locked, seenit;
-
- LIST_INIT(&queue->queue);
-
- spooldir = opendir(config->spooldir);
- if (spooldir == NULL)
- err(1, "reading queue");
-
- seen_init();
- while ((de = readdir(spooldir)) != NULL) {
- sender = NULL;
- queuef = NULL;
- queueid = NULL;
- queuefn = NULL;
- fn = NULL;
- LIST_INIT(&itmqueue.queue);
-
- /* ignore temp files */
- if (strncmp(de->d_name, "tmp_", 4) == 0 ||
- de->d_type != DT_REG)
- continue;
- if (asprintf(&queuefn, "%s/%s", config->spooldir, de->d_name) < 0)
- goto fail;
- seenit = seen(de->d_name);
- locked = 0;
- fd = open_locked(queuefn, O_RDONLY|O_NONBLOCK);
- if (fd < 0) {
- /* Ignore locked files */
- if (errno != EWOULDBLOCK)
- goto skip_item;
- if (!ignorelock || seenit)
- continue;
- fd = open(queuefn, O_RDONLY);
- if (fd < 0)
- goto skip_item;
- locked = 1;
- }
-
- queuef = fdopen(fd, "r");
- if (queuef == NULL)
- goto skip_item;
- if (fgets(line, sizeof(line), queuef) == NULL ||
- line[0] == 0)
- goto skip_item;
- line[strlen(line) - 1] = 0; /* chop newline */
- sender = strdup(line);
- if (sender == NULL)
- goto skip_item;
-
- for (;;) {
- if (fgets(line, sizeof(line), queuef) == NULL ||
- line[0] == 0)
- goto skip_item;
- if (line[0] == '\n')
- break;
- line[strlen(line) - 1] = 0;
- queueid = strdup(line);
- if (queueid == NULL)
- goto skip_item;
- addr = strchr(queueid, ' ');
- if (addr == NULL)
- goto skip_item;
- *addr++ = 0;
- if (fn != NULL)
- free(fn);
- if (asprintf(&fn, "%s/%s", config->spooldir, queueid) < 0)
- goto skip_item;
- /* Item has already been delivered? */
- if (stat(fn, &st) != 0)
- continue;
- if (add_recp(&itmqueue, addr, sender, 0) != 0)
- goto skip_item;
- it = LIST_FIRST(&itmqueue.queue);
- it->queuef = queuef;
- it->queueid = queueid;
- it->queuefn = fn;
- it->locked = locked;
- fn = NULL;
- }
- if (LIST_EMPTY(&itmqueue.queue)) {
- warnx("queue file without items: `%s'", queuefn);
- goto skip_item2;
- }
- hdrlen = ftell(queuef);
- while ((it = LIST_FIRST(&itmqueue.queue)) != NULL) {
- it->hdrlen = hdrlen;
- LIST_REMOVE(it, next);
- LIST_INSERT_HEAD(&queue->queue, it, next);
- }
- continue;
-
-skip_item:
- warn("reading queue: `%s'", queuefn);
-skip_item2:
- if (sender != NULL)
- free(sender);
- if (queuefn != NULL)
- free(queuefn);
- if (fn != NULL)
- free(fn);
- if (queueid != NULL)
- free(queueid);
- close(fd);
- }
- closedir(spooldir);
- return;
-
-fail:
- err(1, "reading queue");
-}
-
-static void
+void
run_queue(struct queue *queue)
{
struct qitem *it;
show_queue(struct queue *queue)
{
struct qitem *it;
+ int locked = 0; /* XXX */
if (LIST_EMPTY(&queue->queue)) {
printf("Mail queue is empty\n");
}
LIST_FOREACH(it, &queue->queue, next) {
- printf("\
-ID\t: %s%s\n\
-From\t: %s\n\
-To\t: %s\n--\n", it->queueid, it->locked? "*": "", it->sender, it->addr);
+ printf("ID\t: %s%s\n"
+ "From\t: %s\n"
+ "To\t: %s\n",
+ it->queueid,
+ locked ? "*" : "",
+ it->sender, it->addr);
+
+ if (LIST_NEXT(it, next) != NULL)
+ printf("--\n");
}
}
int
main(int argc, char **argv)
{
+ struct sigaction act;
char *sender = NULL;
- char tag[255];
- struct qitem *it;
struct queue queue;
- struct queue lqueue;
int i, ch;
- int nodot = 0, doqueue = 0, showq = 0;
+ int nodot = 0, doqueue = 0, showq = 0, queue_only = 0;
+ int recp_from_header = 0;
+
+ set_username();
+
+ /*
+ * We never run as root. If called by root, drop permissions
+ * to the mail user.
+ */
+ if (geteuid() == 0 || getuid() == 0) {
+ struct passwd *pw;
+
+ pw = getpwnam(DMA_ROOT_USER);
+ if (pw == NULL)
+ err(1, "cannot drop root privileges");
+
+ if (setuid(pw->pw_uid) != 0)
+ err(1, "cannot drop root privileges");
+
+ if (geteuid() == 0 || getuid() == 0)
+ errx(1, "cannot drop root privileges");
+ }
atexit(deltmp);
+ init_random();
+
+ bzero(&queue, sizeof(queue));
LIST_INIT(&queue.queue);
- snprintf(tag, 254, "dma");
+
+ if (strcmp(argv[0], "mailq") == 0) {
+ argv++; argc--;
+ showq = 1;
+ if (argc != 0)
+ errx(1, "invalid arguments");
+ goto skipopts;
+ }
opterr = 0;
- while ((ch = getopt(argc, argv, "A:b:B:C:d:Df:F:h:iL:N:no:O:q:r:R:UV:vX:")) != -1) {
+ while ((ch = getopt(argc, argv, ":A:b:B:C:d:Df:F:h:iL:N:no:O:q:r:R:tUV:vX:")) != -1) {
switch (ch) {
case 'A':
/* -AX is being ignored, except for -A{c,m} */
if (optarg[0] == 'p') {
showq = 1;
break;
+ } else if (optarg[0] == 'q') {
+ queue_only = 1;
+ break;
}
/* else FALLTRHOUGH */
case 'D':
daemonize = 0;
break;
case 'L':
- if (optarg != NULL)
- snprintf(tag, 254, "%s", optarg);
+ logident_base = optarg;
break;
case 'f':
case 'r':
sender = optarg;
break;
+ case 't':
+ recp_from_header = 1;
+ break;
+
case 'o':
/* -oX is being ignored, except for -oi */
if (optarg[0] != 'i')
case 'X':
break;
+ case ':':
+ if (optopt == 'q') {
+ doqueue = 1;
+ break;
+ }
+ /* FALLTHROUGH */
+
default:
+ fprintf(stderr, "invalid argument: `-%c'\n", optopt);
exit(1);
}
}
argv += optind;
opterr = 1;
- openlog(tag, LOG_PID, LOG_MAIL);
- set_username();
+ if (argc != 0 && (showq || doqueue))
+ errx(1, "sending mail and queue operations are mutually exclusive");
- config = malloc(sizeof(struct config));
- if (config == NULL)
- errx(1, "Cannot allocate enough memory");
+ if (showq + doqueue > 1)
+ errx(1, "conflicting queue operations");
- memset(config, 0, sizeof(struct config));
- if (parse_conf(CONF_PATH, config) < 0) {
- free(config);
- errx(1, "reading config file");
- }
+skipopts:
+ if (logident_base == NULL)
+ logident_base = "dma";
+ setlogident(NULL);
+
+ act.sa_handler = sighup_handler;
+ act.sa_flags = 0;
+ sigemptyset(&act.sa_mask);
+ if (sigaction(SIGHUP, &act, NULL) != 0)
+ syslog(LOG_WARNING, "can not set signal handler: %m");
- if (config->features & VIRTUAL)
- if (parse_virtuser(config->virtualpath) < 0)
- errx(1, "error reading virtual user file: %s",
- config->virtualpath);
+ parse_conf(CONF_PATH);
- if (parse_authfile(config->authpath) < 0)
- err(1, "reading SMTP authentication file");
+ if (config.authpath != NULL)
+ parse_authfile(config.authpath);
if (showq) {
- if (argc != 0)
- errx(1, "sending mail and displaying queue is"
- " mutually exclusive");
- load_queue(&lqueue, 1);
- show_queue(&lqueue);
+ if (load_queue(&queue) < 0)
+ errlog(1, "can not load queue");
+ show_queue(&queue);
return (0);
}
if (doqueue) {
- if (argc != 0)
- errx(1, "sending mail and queue pickup is mutually exclusive");
- load_queue(&lqueue, 0);
- run_queue(&lqueue);
+ if (load_queue(&queue) < 0)
+ errlog(1, "can not load queue");
+ run_queue(&queue);
return (0);
}
if (read_aliases() != 0)
- err(1, "reading aliases");
+ errlog(1, "can not read aliases file `%s'", config.aliases);
+
+ if ((sender = set_from(&queue, sender)) == NULL)
+ errlog(1, NULL);
- if ((sender = set_from(sender)) == NULL)
- err(1, "setting from address");
+ if (newspoolf(&queue) != 0)
+ errlog(1, "can not create temp file");
+
+ setlogident("%s", queue.id);
for (i = 0; i < argc; i++) {
- if (add_recp(&queue, argv[i], sender, 1) != 0)
- errx(1, "invalid recipient `%s'\n", argv[i]);
+ if (add_recp(&queue, argv[i], 1) != 0)
+ errlogx(1, "invalid recipient `%s'", argv[i]);
}
- if (LIST_EMPTY(&queue.queue))
- errx(1, "no recipients");
+ if (LIST_EMPTY(&queue.queue) && !recp_from_header)
+ errlogx(1, "no recipients");
- if (gentempf(&queue) != 0)
- err(1, "create temp file");
+ if (readmail(&queue, nodot, recp_from_header) != 0)
+ errlog(1, "can not read mail");
- if (preparespool(&queue, sender) != 0)
- err(1, "creating spools (1)");
-
- if (readmail(&queue, sender, nodot) != 0)
- err(1, "reading mail");
+ if (LIST_EMPTY(&queue.queue))
+ errlogx(1, "no recipients");
if (linkspool(&queue) != 0)
- err(1, "creating spools (2)");
+ errlog(1, "can not create spools");
/* From here on the mail is safe. */
- if (config->features & DEFER)
+ if (config.features & DEFER || queue_only)
return (0);
- it = go_background(&queue);
- deliver(it);
+ run_queue(&queue);
/* NOTREACHED */
return (0);
projects / people / ms / dma.git / blobdiff