struct aliases aliases = LIST_HEAD_INITIALIZER(aliases);
struct strlist tmpfs = SLIST_HEAD_INITIALIZER(tmpfs);
struct authusers authusers = LIST_HEAD_INITIALIZER(authusers);
-const char *username;
+char username[USERNAME_SIZE];
+uid_t useruid;
const char *logident_base;
+char errmsg[ERRMSG_SIZE];
static int daemonize = 1;
+static int doqueue = 0;
struct config config = {
.smarthost = NULL,
.port = 25,
- .aliases = "/var/mail/aliases",
+ .aliases = "/etc/aliases",
.spooldir = "/var/spool/dma",
.authpath = NULL,
.certfile = NULL,
.features = 0,
.mailname = NULL,
- .mailnamefile = NULL,
+ .masquerade_host = NULL,
+ .masquerade_user = NULL,
};
+static void
+sighup_handler(int signo)
+{
+ (void)signo; /* so that gcc doesn't complain */
+}
+
static char *
set_from(struct queue *queue, const char *osender)
{
+ const char *addr;
char *sender;
if (osender) {
- sender = strdup(osender);
- if (sender == NULL)
- return (NULL);
+ addr = osender;
} else if (getenv("EMAIL") != NULL) {
- sender = strdup(getenv("EMAIL"));
- if (sender == NULL)
+ addr = getenv("EMAIL");
+ } else {
+ if (config.masquerade_user)
+ addr = config.masquerade_user;
+ else
+ addr = username;
+ }
+
+ if (!strchr(addr, '@')) {
+ const char *from_host = hostname();
+
+ if (config.masquerade_host)
+ from_host = config.masquerade_host;
+
+ if (asprintf(&sender, "%s@%s", addr, from_host) <= 0)
return (NULL);
} else {
- if (asprintf(&sender, "%s@%s", username, hostname()) <= 0)
+ sender = strdup(addr);
+ if (sender == NULL)
return (NULL);
}
return (NULL);
}
-out:
queue->sender = sender;
return (sender);
}
return (0);
}
+static int
+do_alias(struct queue *queue, const char *addr)
+{
+ struct alias *al;
+ struct stritem *sit;
+ int aliased = 0;
+
+ LIST_FOREACH(al, &aliases, next) {
+ if (strcmp(al->alias, addr) != 0)
+ continue;
+ SLIST_FOREACH(sit, &al->dests, next) {
+ if (add_recp(queue, sit->str, EXPAND_ADDR) != 0)
+ return (-1);
+ }
+ aliased = 1;
+ }
+
+ return (aliased);
+}
+
int
add_recp(struct queue *queue, const char *str, int expand)
{
struct qitem *it, *tit;
- struct stritem *sit;
- struct alias *al;
struct passwd *pw;
char *host;
int aliased = 0;
if (strrchr(it->addr, '@') == NULL) {
it->remote = 0;
if (expand) {
- LIST_FOREACH(al, &aliases, next) {
- if (strcmp(al->alias, it->addr) != 0)
- continue;
- SLIST_FOREACH(sit, &al->dests, next) {
- if (add_recp(queue, sit->str, 1) != 0)
- return (-1);
- }
- aliased = 1;
- }
+ aliased = do_alias(queue, it->addr);
+ if (!aliased && expand == EXPAND_WILDCARD)
+ aliased = do_alias(queue, "*");
+ if (aliased < 0)
+ return (-1);
if (aliased) {
LIST_REMOVE(it, next);
} else {
daemonize = 0;
bzero(&sa, sizeof(sa));
- sa.sa_flags = SA_NOCLDWAIT;
sa.sa_handler = SIG_IGN;
sigaction(SIGCHLD, &sa, NULL);
/*
* If necessary, acquire the queue and * mail files.
* If this fails, we probably were raced by another
- * process.
+ * process. It is okay to be raced if we're supposed
+ * to flush the queue.
*/
setlogident("%s", it->queueid);
- if (acquirespool(it) < 0)
+ switch (acquirespool(it)) {
+ case 0:
+ break;
+ case 1:
+ if (doqueue)
+ exit(0);
+ syslog(LOG_WARNING, "could not lock queue file");
+ exit(1);
+ default:
exit(1);
+ }
dropspool(queue, it);
return (it);
deliver(struct qitem *it)
{
int error;
- unsigned int backoff = MIN_RETRY;
- const char *errmsg = "unknown bounce reason";
+ unsigned int backoff = MIN_RETRY, slept;
struct timeval now;
struct stat st;
+ snprintf(errmsg, sizeof(errmsg), "unknown bounce reason");
+
retry:
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:
}
if (gettimeofday(&now, NULL) == 0 &&
(now.tv_sec - st.st_mtim.tv_sec > MAX_TIMEOUT)) {
- asprintf(__DECONST(void *, &errmsg),
+ 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;
+ for (slept = 0; slept < backoff;) {
+ slept += SLEEP_TIMEOUT - sleep(SLEEP_TIMEOUT);
+ if (flushqueue_since(slept)) {
+ backoff = MIN_RETRY;
+ goto retry;
+ }
+ }
+ if (slept >= backoff) {
+ /* 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:
int
main(int argc, char **argv)
{
+ struct sigaction act;
char *sender = NULL;
struct queue queue;
int i, ch;
- int nodot = 0, doqueue = 0, showq = 0, queue_only = 0;
+ int nodot = 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;
+
+ errno = 0;
+ pw = getpwnam(DMA_ROOT_USER);
+ if (pw == NULL) {
+ if (errno == 0)
+ errx(1, "user '%s' not found", DMA_ROOT_USER);
+ else
+ 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();
if (argc != 0)
errx(1, "invalid arguments");
goto skipopts;
+ } else if (strcmp(argv[0], "newaliases") == 0) {
+ logident_base = "dma";
+ setlogident(NULL);
+
+ if (read_aliases() != 0)
+ errx(1, "could not parse aliases file `%s'", config.aliases);
+ exit(0);
}
opterr = 0;
break;
case 'q':
+ /* Don't let getopt slup up other arguments */
+ if (optarg && *optarg == '-')
+ optind--;
doqueue = 1;
break;
if (logident_base == NULL)
logident_base = "dma";
setlogident(NULL);
- set_username();
- /* XXX fork root here */
+ 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");
- parse_conf(CONF_PATH);
+ parse_conf(CONF_PATH "/dma.conf");
if (config.authpath != NULL)
parse_authfile(config.authpath);
}
if (doqueue) {
+ flushqueue_signal();
if (load_queue(&queue) < 0)
errlog(1, "can not load queue");
run_queue(&queue);
}
if (read_aliases() != 0)
- errlog(1, "can not read aliases file `%s'", config.aliases);
+ errlog(1, "could not parse aliases file `%s'", config.aliases);
if ((sender = set_from(&queue, sender)) == NULL)
errlog(1, NULL);
if (newspoolf(&queue) != 0)
- errlog(1, "can not create temp file");
+ errlog(1, "can not create temp file in `%s'", config.spooldir);
setlogident("%s", queue.id);
for (i = 0; i < argc; i++) {
- if (add_recp(&queue, argv[i], 1) != 0)
+ if (add_recp(&queue, argv[i], EXPAND_WILDCARD) != 0)
errlogx(1, "invalid recipient `%s'", argv[i]);
}
projects / people / ms / dma.git / blobdiff