* 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/net.c,v 1.6 2008/04/20 13:44:24 swildner Exp $
*/
+#include "dfcompat.h"
+
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#ifdef HAVE_CRYPTO
#include <openssl/ssl.h>
-#endif /* HAVE_CRYPTO */
+#include <openssl/err.h>
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
#include <netdb.h>
#include <setjmp.h>
#include <signal.h>
#include "dma.h"
-extern struct config *config;
-extern struct authusers authusers;
-static jmp_buf timeout_alarm;
+char neterr[ERRMSG_SIZE];
-static void
-sig_alarm(int signo __unused)
+char *
+ssl_errstr(void)
{
- longjmp(timeout_alarm, 1);
+ long oerr, nerr;
+
+ oerr = 0;
+ while ((nerr = ERR_get_error()) != 0)
+ oerr = nerr;
+
+ return (ERR_error_string(oerr, NULL));
}
ssize_t
{
va_list va;
char cmd[4096];
- ssize_t len = 0;
+ size_t len, pos;
+ int s;
+ ssize_t n;
va_start(va, fmt);
- vsprintf(cmd, fmt, va);
+ s = vsnprintf(cmd, sizeof(cmd) - 2, fmt, va);
+ va_end(va);
+ if (s == sizeof(cmd) - 2 || s < 0) {
+ strcpy(neterr, "Internal error: oversized command string");
+ return (-1);
+ }
- if (((config->features & SECURETRANS) != 0) &&
- ((config->features & NOSSL) == 0)) {
- len = SSL_write(config->ssl, (const char*)cmd, strlen(cmd));
- SSL_write(config->ssl, "\r\n", 2);
+ /* We *know* there are at least two more bytes available */
+ strcat(cmd, "\r\n");
+ len = strlen(cmd);
+
+ if (((config.features & SECURETRANS) != 0) &&
+ ((config.features & NOSSL) == 0)) {
+ while ((s = SSL_write(config.ssl, (const char*)cmd, len)) <= 0) {
+ s = SSL_get_error(config.ssl, s);
+ if (s != SSL_ERROR_WANT_READ &&
+ s != SSL_ERROR_WANT_WRITE) {
+ strncpy(neterr, ssl_errstr(), sizeof(neterr));
+ return (-1);
+ }
+ }
}
else {
- len = write(fd, cmd, strlen(cmd));
- write(fd, "\r\n", 2);
+ pos = 0;
+ while (pos < len) {
+ n = write(fd, cmd + pos, len - pos);
+ if (n < 0)
+ return (-1);
+ pos += n;
+ }
}
- va_end(va);
- return (len+2);
+ return (len);
}
int
-read_remote(int fd)
+read_remote(int fd, int extbufsize, char *extbuf)
{
ssize_t rlen = 0;
- size_t pos, len;
+ size_t pos, len, copysize;
char buff[BUF_SIZE];
- int done = 0, status = 0;
+ int done = 0, status = 0, status_running = 0, extbufpos = 0;
+ enum { parse_status, parse_spacedash, parse_rest } parsestate;
- if (signal(SIGALRM, sig_alarm) == SIG_ERR) {
- syslog(LOG_ERR, "SIGALRM error: %m");
- }
- if (setjmp(timeout_alarm) != 0) {
- syslog(LOG_ERR, "Timeout reached");
- return (1);
+ if (do_timeout(CON_TIMEOUT, 1) != 0) {
+ snprintf(neterr, sizeof(neterr), "Timeout reached");
+ return (-1);
}
- alarm(CON_TIMEOUT);
/*
* Remote reading code from femail.c written by Henning Brauer of
* OpenBSD and released under a BSD style license.
*/
- for (len = pos = 0; !done; ) {
+ len = 0;
+ pos = 0;
+ parsestate = parse_status;
+ neterr[0] = 0;
+ while (!(done && parsestate == parse_status)) {
+ rlen = 0;
if (pos == 0 ||
(pos > 0 && memchr(buff + pos, '\n', len - pos) == NULL)) {
memmove(buff, buff + pos, len - pos);
len -= pos;
pos = 0;
- if (((config->features & SECURETRANS) != 0) &&
- (config->features & NOSSL) == 0) {
- if ((rlen = SSL_read(config->ssl, buff + len,
- sizeof(buff) - len)) == -1)
- err(1, "read");
+ if (((config.features & SECURETRANS) != 0) &&
+ (config.features & NOSSL) == 0) {
+ if ((rlen = SSL_read(config.ssl, buff + len, sizeof(buff) - len)) == -1) {
+ strncpy(neterr, ssl_errstr(), sizeof(neterr));
+ goto error;
+ }
} else {
- if ((rlen = read(fd, buff + len,
- sizeof(buff) - len)) == -1)
- err(1, "read");
+ if ((rlen = read(fd, buff + len, sizeof(buff) - len)) == -1) {
+ strncpy(neterr, strerror(errno), sizeof(neterr));
+ goto error;
+ }
}
len += rlen;
+
+ copysize = sizeof(neterr) - strlen(neterr) - 1;
+ if (copysize > len)
+ copysize = len;
+ strncat(neterr, buff, copysize);
+ }
+ /*
+ * If there is an external buffer with a size bigger than zero
+ * and as long as there is space in the external buffer and
+ * there are new characters read from the mailserver
+ * copy them to the external buffer
+ */
+ if (extbufpos <= (extbufsize - 1) && rlen > 0 && extbufsize > 0 && extbuf != NULL) {
+ /* do not write over the bounds of the buffer */
+ if(extbufpos + rlen > (extbufsize - 1)) {
+ rlen = extbufsize - extbufpos;
+ }
+ memcpy(extbuf + extbufpos, buff + len - rlen, rlen);
+ extbufpos += rlen;
}
- for (; pos < len && buff[pos] >= '0' && buff[pos] <= '9'; pos++)
- ; /* Do nothing */
if (pos == len)
- return (0);
+ continue;
+
+ switch (parsestate) {
+ case parse_status:
+ for (; pos < len; pos++) {
+ if (isdigit(buff[pos])) {
+ status_running = status_running * 10 + (buff[pos] - '0');
+ } else {
+ status = status_running;
+ status_running = 0;
+ parsestate = parse_spacedash;
+ break;
+ }
+ }
+ continue;
+
+ case parse_spacedash:
+ switch (buff[pos]) {
+ case ' ':
+ done = 1;
+ break;
- if (buff[pos] == ' ')
- done = 1;
- else if (buff[pos] != '-')
- syslog(LOG_ERR, "invalid syntax in reply from server");
+ case '-':
+ /* ignore */
+ /* XXX read capabilities */
+ break;
- /* skip up to \n */
- for (; pos < len && buff[pos - 1] != '\n'; pos++)
- ; /* Do nothing */
+ default:
+ strcpy(neterr, "invalid syntax in reply from server");
+ goto error;
+ }
+
+ pos++;
+ parsestate = parse_rest;
+ continue;
+
+ case parse_rest:
+ /* skip up to \n */
+ for (; pos < len; pos++) {
+ if (buff[pos] == '\n') {
+ pos++;
+ parsestate = parse_status;
+ break;
+ }
+ }
+ }
}
- alarm(0);
- status = atoi(buff);
+ do_timeout(0, 0);
+
+ /* chop off trailing newlines */
+ while (neterr[0] != 0 && strchr("\r\n", neterr[strlen(neterr) - 1]) != 0)
+ neterr[strlen(neterr) - 1] = 0;
+
return (status/100);
+
+error:
+ do_timeout(0, 0);
+ return (-1);
}
/*
* Handle SMTP authentication
- *
- * XXX TODO: give me AUTH CRAM-MD5
*/
static int
-smtp_login(struct qitem *it, int fd, char *login, char* password)
+smtp_login(int fd, char *login, char* password)
{
char *temp;
int len, res = 0;
- /* Send AUTH command according to RFC 2554 */
- send_remote_command(fd, "AUTH LOGIN");
- if (read_remote(fd) != 3) {
- syslog(LOG_ERR, "%s: remote delivery deferred:"
- " AUTH login not available: %m", it->queueid);
+ res = smtp_auth_md5(fd, login, password);
+ if (res == 0) {
+ return (0);
+ } else if (res == -2) {
+ /*
+ * If the return code is -2, then then the login attempt failed,
+ * do not try other login mechanisms
+ */
return (1);
}
- len = base64_encode(login, strlen(login), &temp);
- if (len <= 0)
- return (-1);
+ if ((config.features & INSECURE) != 0 ||
+ (config.features & SECURETRANS) != 0) {
+ /* Send AUTH command according to RFC 2554 */
+ send_remote_command(fd, "AUTH LOGIN");
+ if (read_remote(fd, 0, NULL) != 3) {
+ syslog(LOG_NOTICE, "remote delivery deferred:"
+ " AUTH login not available: %s",
+ neterr);
+ return (1);
+ }
- send_remote_command(fd, "%s", temp);
- if (read_remote(fd) != 3) {
- syslog(LOG_ERR, "%s: remote delivery deferred:"
- " AUTH login failed: %m", it->queueid);
- return (-1);
- }
+ len = base64_encode(login, strlen(login), &temp);
+ if (len < 0) {
+encerr:
+ syslog(LOG_ERR, "can not encode auth reply: %m");
+ return (1);
+ }
- len = base64_encode(password, strlen(password), &temp);
- if (len <= 0)
- return (-1);
+ send_remote_command(fd, "%s", temp);
+ free(temp);
+ res = read_remote(fd, 0, NULL);
+ if (res != 3) {
+ syslog(LOG_NOTICE, "remote delivery %s: AUTH login failed: %s",
+ res == 5 ? "failed" : "deferred", neterr);
+ return (res == 5 ? -1 : 1);
+ }
- send_remote_command(fd, "%s", temp);
- res = read_remote(fd);
- if (res == 5) {
- syslog(LOG_ERR, "%s: remote delivery failed:"
- " Authentication failed: %m", it->queueid);
- return (-1);
- } else if (res != 2) {
- syslog(LOG_ERR, "%s: remote delivery failed:"
- " AUTH password failed: %m", it->queueid);
- return (-1);
+ len = base64_encode(password, strlen(password), &temp);
+ if (len < 0)
+ goto encerr;
+
+ send_remote_command(fd, "%s", temp);
+ free(temp);
+ res = read_remote(fd, 0, NULL);
+ if (res != 2) {
+ syslog(LOG_NOTICE, "remote delivery %s: Authentication failed: %s",
+ res == 5 ? "failed" : "deferred", neterr);
+ return (res == 5 ? -1 : 1);
+ }
+ } else {
+ syslog(LOG_WARNING, "non-encrypted SMTP login is disabled in config, so skipping it. ");
+ return (1);
}
return (0);
}
static int
-open_connection(struct qitem *it, const char *host)
+open_connection(struct mx_hostentry *h)
{
- struct addrinfo hints, *res, *res0;
- char servname[128];
- const char *errmsg = NULL;
- int fd, error = 0, port;
-
- if (config->port != 0)
- port = config->port;
- else
- port = SMTP_PORT;
-
- /* Shamelessly taken from getaddrinfo(3) */
- memset(&hints, 0, sizeof(hints));
- hints.ai_family = PF_UNSPEC;
- hints.ai_socktype = SOCK_STREAM;
- hints.ai_protocol = IPPROTO_TCP;
-
- snprintf(servname, sizeof(servname), "%d", port);
- error = getaddrinfo(host, servname, &hints, &res0);
- if (error) {
- syslog(LOG_ERR, "%s: remote delivery deferred: "
- "%s: %m", it->queueid, gai_strerror(error));
+ int fd;
+
+ syslog(LOG_INFO, "trying remote delivery to %s [%s] pref %d",
+ h->host, h->addr, h->pref);
+
+ fd = socket(h->ai.ai_family, h->ai.ai_socktype, h->ai.ai_protocol);
+ if (fd < 0) {
+ syslog(LOG_INFO, "socket for %s [%s] failed: %m",
+ h->host, h->addr);
return (-1);
}
- fd = -1;
- for (res = res0; res; res = res->ai_next) {
- fd=socket(res->ai_family, res->ai_socktype, res->ai_protocol);
- if (fd < 0) {
- errmsg = "socket failed";
- continue;
- }
- if (connect(fd, res->ai_addr, res->ai_addrlen) < 0) {
- errmsg = "connect failed";
- close(fd);
- fd = -1;
- continue;
- }
- break;
- }
- if (fd < 0) {
- syslog(LOG_ERR, "%s: remote delivery deferred: %s (%s:%s)",
- it->queueid, errmsg, host, servname);
- freeaddrinfo(res0);
+
+ if (connect(fd, (struct sockaddr *)&h->sa, h->ai.ai_addrlen) < 0) {
+ syslog(LOG_INFO, "connect to %s [%s] failed: %m",
+ h->host, h->addr);
+ close(fd);
return (-1);
}
- freeaddrinfo(res0);
+
return (fd);
}
-int
-deliver_remote(struct qitem *it, const char **errmsg)
+static void
+close_connection(int fd)
+{
+ if (config.ssl != NULL) {
+ if (((config.features & SECURETRANS) != 0) &&
+ ((config.features & NOSSL) == 0))
+ SSL_shutdown(config.ssl);
+ SSL_free(config.ssl);
+ }
+
+ close(fd);
+}
+
+static int
+deliver_to_host(struct qitem *it, struct mx_hostentry *host)
{
struct authuser *a;
- char *host, line[1000];
- int fd, error = 0, do_auth = 0, res = 0;
+ char line[1000];
size_t linelen;
+ int fd, error = 0, do_auth = 0, res = 0;
- host = strrchr(it->addr, '@');
- /* Should not happen */
- if (host == NULL)
- return(-1);
- else
- /* Step over the @ */
- host++;
-
- /* Smarthost support? */
- if (config->smarthost != NULL && strlen(config->smarthost) > 0) {
- syslog(LOG_INFO, "%s: using smarthost (%s)",
- it->queueid, config->smarthost);
- host = config->smarthost;
+ if (fseek(it->mailf, 0, SEEK_SET) != 0) {
+ snprintf(errmsg, sizeof(errmsg), "can not seek: %s", strerror(errno));
+ return (-1);
}
- fd = open_connection(it, host);
+ fd = open_connection(host);
if (fd < 0)
return (1);
- /* Check first reply from remote host */
- config->features |= NOSSL;
- res = read_remote(fd);
- if (res != 2) {
- syslog(LOG_INFO, "%s: Invalid initial response: %i",
- it->queueid, res);
- return(1);
+#define READ_REMOTE_CHECK(c, exp) \
+ res = read_remote(fd, 0, NULL); \
+ if (res == 5) { \
+ syslog(LOG_ERR, "remote delivery to %s [%s] failed after %s: %s", \
+ host->host, host->addr, c, neterr); \
+ snprintf(errmsg, sizeof(errmsg), "%s [%s] did not like our %s:\n%s", \
+ host->host, host->addr, c, neterr); \
+ return (-1); \
+ } else if (res != exp) { \
+ syslog(LOG_NOTICE, "remote delivery deferred: %s [%s] failed after %s: %s", \
+ host->host, host->addr, c, neterr); \
+ return (1); \
}
- config->features &= ~NOSSL;
-
-#ifdef HAVE_CRYPTO
- if ((config->features & SECURETRANS) != 0) {
- error = smtp_init_crypto(it, fd, config->features);
- if (error >= 0)
- syslog(LOG_INFO, "%s: SSL initialization successful",
- it->queueid);
+
+ /* Check first reply from remote host */
+ config.features |= NOSSL;
+ READ_REMOTE_CHECK("connect", 2);
+
+ config.features &= ~NOSSL;
+
+ if ((config.features & SECURETRANS) != 0) {
+ error = smtp_init_crypto(fd, config.features);
+ if (error == 0)
+ syslog(LOG_DEBUG, "SSL initialization successful");
else
goto out;
}
- /*
- * If the user doesn't want STARTTLS, but SSL encryption, we
- * have to enable SSL first, then send EHLO
- */
- if (((config->features & STARTTLS) == 0) &&
- ((config->features & SECURETRANS) != 0)) {
- send_remote_command(fd, "EHLO %s", hostname());
- if (read_remote(fd) != 2) {
- syslog(LOG_ERR, "%s: remote delivery deferred: "
- " EHLO failed: %m", it->queueid);
- return (-1);
- }
- }
-#endif /* HAVE_CRYPTO */
- if (((config->features & SECURETRANS) == 0)) {
- send_remote_command(fd, "EHLO %s", hostname());
- if (read_remote(fd) != 2) {
- syslog(LOG_ERR, "%s: remote delivery deferred: "
- " EHLO failed: %m", it->queueid);
- return (-1);
- }
- }
+ /* XXX allow HELO fallback */
+ /* XXX record ESMTP keywords */
+ send_remote_command(fd, "EHLO %s", hostname());
+ READ_REMOTE_CHECK("EHLO", 2);
/*
* Use SMTP authentication if the user defined an entry for the remote
* or smarthost
*/
SLIST_FOREACH(a, &authusers, next) {
- if (strcmp(a->host, host) == 0) {
+ if (strcmp(a->host, host->host) == 0) {
do_auth = 1;
break;
}
* Check if the user wants plain text login without using
* encryption.
*/
- if ((config->features & INSECURE) != 0) {
- syslog(LOG_INFO, "%s: Use SMTP authentication",
- it->queueid);
- error = smtp_login(it, fd, a->login, a->password);
- if (error < 0) {
- syslog(LOG_ERR, "%s: remote delivery failed:"
- " SMTP login failed: %m", it->queueid);
- return (-1);
- }
- /* SMTP login is not available, so try without */
- else if (error > 0)
- syslog(LOG_ERR, "%s: SMTP login not available."
- " Try without", it->queueid);
- } else {
- syslog(LOG_ERR, "%s: Skip SMTP login. ",
- it->queueid);
+ syslog(LOG_INFO, "using SMTP authentication for user %s", a->login);
+ error = smtp_login(fd, a->login, a->password);
+ if (error < 0) {
+ syslog(LOG_ERR, "remote delivery failed:"
+ " SMTP login failed: %m");
+ snprintf(errmsg, sizeof(errmsg), "SMTP login to %s failed", host->host);
+ return (-1);
+ }
+ /* SMTP login is not available, so try without */
+ else if (error > 0) {
+ syslog(LOG_WARNING, "SMTP login not available. Trying without.");
}
}
+ /* XXX send ESMTP ENVID, RET (FULL/HDRS) and 8BITMIME */
send_remote_command(fd, "MAIL FROM:<%s>", it->sender);
- if (read_remote(fd) != 2) {
- syslog(LOG_ERR, "%s: remote delivery deferred:"
- " MAIL FROM failed: %m", it->queueid);
- return (1);
- }
+ READ_REMOTE_CHECK("MAIL FROM", 2);
- /* XXX TODO:
- * Iterate over all recepients and open only one connection
- */
+ /* XXX send ESMTP ORCPT */
send_remote_command(fd, "RCPT TO:<%s>", it->addr);
- if (read_remote(fd) != 2) {
- syslog(LOG_ERR, "%s: remote delivery deferred:"
- " RCPT TO failed: %m", it->queueid);
- return (1);
- }
+ READ_REMOTE_CHECK("RCPT TO", 2);
send_remote_command(fd, "DATA");
- if (read_remote(fd) != 3) {
- syslog(LOG_ERR, "%s: remote delivery deferred:"
- " DATA failed: %m", it->queueid);
- return (1);
- }
-
- if (fseek(it->queuef, it->hdrlen, SEEK_SET) != 0) {
- syslog(LOG_ERR, "%s: remote delivery deferred: cannot seek: %m",
- it->queueid);
- return (1);
- }
+ READ_REMOTE_CHECK("DATA", 3);
- while (!feof(it->queuef)) {
- if (fgets(line, sizeof(line), it->queuef) == NULL)
+ error = 0;
+ while (!feof(it->mailf)) {
+ if (fgets(line, sizeof(line), it->mailf) == NULL)
break;
linelen = strlen(line);
if (linelen == 0 || line[linelen - 1] != '\n') {
- syslog(LOG_CRIT, "%s: remote delivery failed:"
- "corrupted queue file", it->queueid);
- *errmsg = "corrupted queue file";
+ syslog(LOG_CRIT, "remote delivery failed: corrupted queue file");
+ snprintf(errmsg, sizeof(errmsg), "corrupted queue file");
error = -1;
goto out;
}
linelen++;
if (send_remote_command(fd, "%s", line) != (ssize_t)linelen+1) {
- syslog(LOG_ERR, "%s: remote delivery deferred: "
- "write error", it->queueid);
+ syslog(LOG_NOTICE, "remote delivery deferred: write error");
error = 1;
goto out;
}
}
send_remote_command(fd, ".");
- if (read_remote(fd) != 2) {
- syslog(LOG_ERR, "%s: remote delivery deferred: %m",
- it->queueid);
- return (1);
- }
+ READ_REMOTE_CHECK("final DATA", 2);
send_remote_command(fd, "QUIT");
- if (read_remote(fd) != 2) {
- syslog(LOG_ERR, "%s: remote delivery deferred: "
- "QUIT failed: %m", it->queueid);
- return (1);
- }
+ if (read_remote(fd, 0, NULL) != 2)
+ syslog(LOG_INFO, "remote delivery succeeded but QUIT failed: %s", neterr);
out:
- close(fd);
+ close_connection(fd);
return (error);
}
+int
+deliver_remote(struct qitem *it)
+{
+ struct mx_hostentry *hosts, *h;
+ const char *host;
+ int port;
+ int error = 1, smarthost = 0;
+
+ host = strrchr(it->addr, '@');
+ /* Should not happen */
+ if (host == NULL) {
+ snprintf(errmsg, sizeof(errmsg), "Internal error: badly formed address %s",
+ it->addr);
+ return(-1);
+ } else {
+ /* Step over the @ */
+ host++;
+ }
+
+ port = SMTP_PORT;
+
+ /* Smarthost support? */
+ if (config.smarthost != NULL) {
+ host = config.smarthost;
+ port = config.port;
+ syslog(LOG_INFO, "using smarthost (%s:%i)", host, port);
+ smarthost = 1;
+ }
+
+ error = dns_get_mx_list(host, port, &hosts, smarthost);
+ if (error) {
+ syslog(LOG_NOTICE, "remote delivery %s: DNS failure (%s)",
+ error < 0 ? "failed" : "deferred",
+ host);
+ return (error);
+ }
+
+ for (h = hosts; *h->host != 0; h++) {
+ switch (deliver_to_host(it, h)) {
+ case 0:
+ /* success */
+ error = 0;
+ goto out;
+ case 1:
+ /* temp failure */
+ error = 1;
+ break;
+ default:
+ /* perm failure */
+ error = -1;
+ goto out;
+ }
+ }
+out:
+ free(hosts);
+
+ return (error);
+}
projects / people / ms / dma.git / blobdiff