X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/bb6ae3fb80fff36cd342d6f6bff3dfabd7dd243e..6ebc4527c6a103d0532c08744fb916f951018413:/lib/sendmail.c
diff --git a/lib/sendmail.c b/lib/sendmail.c
index 3ecfc40..524f68d 100644
--- a/lib/sendmail.c
+++ b/lib/sendmail.c
@@ -1,33 +1,37 @@
/*
* This file is part of DisOrder
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007-2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * 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 2 of the License, or
+ * 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.
- *
+ *
+ * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see .
*/
+/** @file lib/sendmail.c
+ * @brief Sending email
+ *
+ * Can send email either via a local MTA or by connecting to an SMTP TCP port.
+ * The former is preferred as there is a strong implication that the local MTA
+ * will queue for you than some random TCP SMTP server you found.
+ */
+#include "common.h"
-#include
-#include "types.h"
-
-#include
#include
#include
#include
#include
#include
#include
+#include
+#include
#include "syscalls.h"
#include "log.h"
@@ -37,6 +41,7 @@
#include "hostname.h"
#include "sendmail.h"
#include "base64.h"
+#include "wstat.h"
/** @brief Get a server response
* @param tag Server name
@@ -52,20 +57,20 @@ static int getresponse(const char *tag, FILE *in) {
&& line[2] >= '0' && line[2] <= '9') {
const int rc = 10 * (10 * line[0] + line[1]) + line[2] - 111 * '0';
if(rc >= 400 && rc <= 599)
- error(0, "%s: %s", tag, line);
+ disorder_error(0, "%s: %s", tag, line);
if(line[3] != '-') {
return rc;
}
/* else go round for further response lines */
} else {
- error(0, "%s: malformed response: %s", tag, line);
+ disorder_error(0, "%s: malformed response: %s", tag, line);
return -1;
}
}
if(ferror(in))
- error(errno, "%s: read error", tag);
+ disorder_error(errno, "%s: read error", tag);
else
- error(0, "%s: server closed connection", tag);
+ disorder_error(0, "%s: server closed connection", tag);
return -1;
}
@@ -88,7 +93,7 @@ static int sendcommand(const char *tag, FILE *out, const char *fmt, ...) {
rc = fflush(out);
if(rc >= 0)
return 0;
- error(errno, "%s: write error", tag);
+ disorder_error(errno, "%s: write error", tag);
return -1;
}
@@ -101,7 +106,7 @@ static int sendcommand(const char *tag, FILE *out, const char *fmt, ...) {
* @param recipient Recipient address
* @param subject Subject string
* @param encoding Body encoding
- * @param body_type Content-type of body
+ * @param content_type Content-type of body
* @param body Text of body (encoded, but \n for newline)
* @return 0 on success, non-0 on error
*/
@@ -117,7 +122,13 @@ static int sendmailfp(const char *tag, FILE *in, FILE *out,
const char *ptr;
uint8_t idbuf[20];
char *id;
+ struct tm ut;
+ time_t now;
+ char date[128];
+ xtime(&now);
+ gmtime_r(&now, &ut);
+ strftime(date, sizeof date, "%a, %d %b %Y %H:%M:%S +0000", &ut);
gcry_create_nonce(idbuf, sizeof idbuf);
id = mime_to_base64(idbuf, sizeof idbuf);
if((rc = getresponse(tag, in)) / 100 != 2)
@@ -145,9 +156,10 @@ static int sendmailfp(const char *tag, FILE *in, FILE *out,
|| fprintf(out, "MIME-Version: 1.0\r\n") < 0
|| fprintf(out, "Content-Type: %s\r\n", content_type) < 0
|| fprintf(out, "Content-Transfer-Encoding: %s\r\n", encoding) < 0
+ || fprintf(out, "Date: %s\r\n", date) < 0
|| fprintf(out, "\r\n") < 0) {
write_error:
- error(errno, "%s: write error", tag);
+ disorder_error(errno, "%s: write error", tag);
return -1;
}
for(ptr = body; *ptr; ++ptr) {
@@ -199,44 +211,110 @@ int sendmail(const char *sender,
char *tag;
int fdin, fdout, rc;
FILE *in, *out;
+ pid_t pid = -1;
static const struct addrinfo pref = {
- 0,
- PF_INET,
- SOCK_STREAM,
- IPPROTO_TCP,
- 0,
- 0,
- 0,
- 0
+ .ai_flags = 0,
+ .ai_family = PF_INET,
+ .ai_socktype = SOCK_STREAM,
+ .ai_protocol = IPPROTO_TCP,
};
/* Find the SMTP server */
- a.n = 2;
- a.s = s;
- s[0] = config->smtp_server;
- s[1] = (char *)"smtp";
- if(!(ai = get_address(&a, &pref, &tag)))
- return -1;
- fdin = xsocket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
- if(connect(fdin, ai->ai_addr, ai->ai_addrlen) < 0) {
- error(errno, "error connecting to %s", tag);
- xclose(fdin);
- return -1;
+ if(config->sendmail && config->sendmail[0]) {
+ int inpipe[2], outpipe[2];
+
+ /* If it's a path name, use -bs mode. Exim, Postfix and Sendmail all claim
+ * to support this. */
+ xpipe(inpipe); /* sendmail's stdin */
+ xpipe(outpipe); /* sendmail's stdout */
+ if(!(pid = xfork())) {
+ exitfn = _exit;
+ signal(SIGPIPE, SIG_DFL);
+ xdup2(inpipe[0], 0);
+ xclose(inpipe[1]);
+ xclose(outpipe[0]);
+ xdup2(outpipe[1], 1);
+ execlp(config->sendmail,
+ config->sendmail, "-bs", (char *)0);
+ disorder_fatal(errno, "executing %s", config->sendmail);
+ }
+ xclose(inpipe[0]);
+ xclose(outpipe[1]);
+ fdin = outpipe[0]; /* read from sendmail's stdout */
+ fdout = inpipe[1]; /* write to sendmail's stdin */
+ tag = config->sendmail;
+ } else {
+ a.n = 2;
+ a.s = s;
+ s[0] = config->smtp_server;
+ s[1] = (char *)"smtp";
+ if(!(ai = get_address(&a, &pref, &tag)))
+ return -1;
+ fdin = xsocket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ if(connect(fdin, ai->ai_addr, ai->ai_addrlen) < 0) {
+ disorder_error(errno, "error connecting to %s", tag);
+ xclose(fdin);
+ return -1;
+ }
+ if((fdout = dup(fdin)) < 0)
+ disorder_fatal(errno, "error calling dup2");
}
- if((fdout = dup(fdin)) < 0)
- fatal(errno, "error calling dup2");
if(!(in = fdopen(fdin, "rb")))
- fatal(errno, "error calling fdopen");
+ disorder_fatal(errno, "error calling fdopen");
if(!(out = fdopen(fdout, "wb")))
- fatal(errno, "error calling fdopen");
+ disorder_fatal(errno, "error calling fdopen");
rc = sendmailfp(tag, in, out, sender, pubsender, recipient, subject,
encoding, content_type, body);
fclose(in);
fclose(out);
+ if(pid != -1) {
+ int w;
+
+ while(waitpid(pid, &w, 0) < 0 && errno == EINTR)
+ ;
+ if(w < 0)
+ disorder_fatal(errno, "error calling waitpid");
+ if(w)
+ disorder_info("warning: %s -bs: %s", config->sendmail, wstat(w));
+ /* Not fatal - we determine success/failure from the SMTP conversation.
+ * Some MTAs exit nonzero if you don't QUIT, which is just stupidly
+ * picky. */
+ }
return rc;
}
+/** @brief Start a subproces to send a mail message
+ * @param sender Sender address (can be "")
+ * @param pubsender Visible sender address (must not be "")
+ * @param recipient Recipient address
+ * @param subject Subject string
+ * @param encoding Body encoding
+ * @param content_type Content-type of body
+ * @param body Text of body (encoded, but \n for newline)
+ * @return Subprocess PID on success, -1 on error
+ */
+pid_t sendmail_subprocess(const char *sender,
+ const char *pubsender,
+ const char *recipient,
+ const char *subject,
+ const char *encoding,
+ const char *content_type,
+ const char *body) {
+ pid_t pid;
+
+ if(!(pid = fork())) {
+ exitfn = _exit;
+ if(sendmail(sender, pubsender, recipient, subject,
+ encoding, content_type, body))
+ _exit(1);
+ _exit(0);
+ }
+ if(pid < 0)
+ disorder_error(errno, "error calling fork");
+ return pid;
+}
+
/*
Local Variables:
c-basic-offset:2