mlmmj-bounce: use send_mail directly and stop executing mlmmj-send

This makes mlmmj-send -l 5 obsolete

diff --git a/include/send_mail.h b/include/send_mail.h
index 0e33ceead83c7fbe24c46180ae14a95081711155..a7945c42f94bda921f8d211495a696c0696a3803 100644 (file)
--- a/include/send_mail.h
+++ b/include/send_mail.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2004, 2003, 2004 Mads Martin Joergensen <mmj at mmj.dk>
- * Copyright (C) 2022 Baptiste Daroussin <bapt@FreeBSD.org>
+ * Copyright (C) 2022-2023 Baptiste Daroussin <bapt@FreeBSD.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -25,11 +25,14 @@
 
 #include <sys/types.h>
 #include <stdbool.h>
+#include <stdio.h>
+#include "mlmmj.h"
 
 struct mail {
        const char *from;
        const char *to;
        const char *replyto;
+       FILE *fp;
        char *map;
        size_t size;
        char *hdrs;
@@ -38,6 +41,7 @@ struct mail {
        bool addtohdr;
 };
 
+int newsmtp(struct ml *ml);
 int initsmtp(int *sockfd, const char *relayhost, unsigned short port, const char *heloname);
 int endsmtp(int *sockfd);
 int send_mail(int sockfd, struct mail *mail, int listfd, int ctrlfd, bool bounce);

diff --git a/src/mlmmj-bounce.c b/src/mlmmj-bounce.c
index 18282f81ebfe4d7451d2e0daaabe2a9e76a48a4c..6da2c0ba557145910ca56f4402f5ed8713ca1dff 100644 (file)
--- a/src/mlmmj-bounce.c
+++ b/src/mlmmj-bounce.c
@@ -48,9 +48,30 @@
 #include "find_email_adr.h"
 #include "gethdrline.h"
 #include "utils.h"
+#include "send_mail.h"
 
+static void
+save_queue(const char *queuefilename, const char *from, const char *to)
+{
+       char *tmpstr;
+       int fd;
+       xasprintf(&tmpstr, "%s.mailfrom", queuefilename);
+       fd = open(tmpstr, O_WRONLY|O_CREAT|O_EXCL|O_SYNC, S_IRUSR|S_IWUSR);
+       if (fd == -1)
+               return;
+       dprintf(fd, "%s", from);
+       close(fd);
+       free(tmpstr);
+       xasprintf(&tmpstr, "%s.recripto", queuefilename);
+       fd = open(tmpstr, O_WRONLY|O_CREAT|O_EXCL|O_SYNC, S_IRUSR|S_IWUSR);
+       if (fd == -1)
+               return;
+       dprintf(fd, "%s", to);
+       close(fd);
+       free(tmpstr);
+}
 
-void do_probe(struct ml *ml, const char *mlmmjsend, const char *addr)
+void do_probe(struct ml *ml, const char *addr)
 {
        text *txt;
        file_lines_state *fls;
@@ -58,7 +79,10 @@ void do_probe(struct ml *ml, const char *mlmmjsend, const char *addr)
        char *probefile;
        int fd;
        time_t t;
+       struct mail mail;
+       int sockfd;
 
+       memset(&mail, 0, sizeof(mail));
        myaddr = lowercase(addr);
 
        gen_addr_cookie(from, ml, "bounces-probe-", myaddr)
@@ -95,11 +119,22 @@ void do_probe(struct ml *ml, const char *mlmmjsend, const char *addr)
        else
                if (dprintf(fd, "%ld", (long int)t) < 0)
                        log_error(LOG_ARGS, "Could not write time in probe");
-
        free(probefile);
 
-       exec_or_die(mlmmjsend, "-l", "5", "-L", ml->dir, "-T", myaddr,
-           "-F", from, "-m", queuefilename, NULL);
+       mail.to = myaddr;
+       mail.from = from;
+       mail.fp = fopen(queuefilename, "r");
+       sockfd = newsmtp(ml);
+       if (sockfd == -1)
+               exit(EXIT_FAILURE);
+       if (send_mail(sockfd, &mail, ml->fd, ml->ctrlfd, false)) {
+               close(sockfd);
+               save_queue(queuefilename, mail.from, mail.to);
+               exit(EXIT_FAILURE);
+       }
+       fclose(mail.fp);
+       endsmtp(&sockfd);
+       exit(EXIT_SUCCESS);
 }
 
 static void print_help(const char *prg)
@@ -122,21 +157,15 @@ int main(int argc, char **argv)
        int opt, dsnbounce = 0;
        char *address = NULL, *number = NULL;
        const char *thisaddr;
-       char *bindir, *mlmmjsend, *a;
+       char *a;
        const char *mailname = NULL;
        bool probe = false;
        bounce_t bret;
        struct ml ml;
 
        log_set_name(argv[0]);
-
-       CHECKFULLPATH(argv[0]);
        ml_init(&ml);
 
-       bindir = mydirname(argv[0]);
-       xasprintf(&mlmmjsend, "%s/mlmmj-send", bindir);
-       free(bindir);
-
        while ((opt = getopt(argc, argv, "hdVL:a:n:m:p")) != -1) {
                switch(opt) {
                case 'L':
@@ -197,7 +226,7 @@ int main(int argc, char **argv)
 
        if (probe) {
                /* send out a probe */
-               do_probe(&ml, mlmmjsend, thisaddr);
+               do_probe(&ml, thisaddr);
                /* do_probe() will never return */
                exit(EXIT_FAILURE);
        }
@@ -213,6 +242,5 @@ int main(int argc, char **argv)
        if (bret == BOUNCE_OK && mailname != NULL)
                unlink(mailname);
 
-       free(mlmmjsend);
        return (bret == BOUNCE_FAIL ? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/src/mlmmj-send.c b/src/mlmmj-send.c
index dce4c2e70527d372cb7cd84d35e96de9904b5ba7..984d988439dbe35f48e0b3f279fdebabe6c1888a 100644 (file)
--- a/src/mlmmj-send.c
+++ b/src/mlmmj-send.c
@@ -436,7 +436,6 @@ int main(int argc, char **argv)
        char *relayhost = NULL, *archivefilename = NULL, *tmpstr;
        const char *subddirname = NULL;
        char listctrl = 0;
-       char *probefile, *a;
        char *verp = NULL;
        char *verpfrom;
        char *reply, *smtphelo, *requeuefilename;
@@ -592,7 +591,9 @@ int main(int argc, char **argv)
 
        switch(listctrl) {
        case '1': /* A single mail is to be sent, do nothing */
+               break;
        case '5':
+               err(EXIT_FAILURE, "5 is not supported anymore");
                break;
        case '2': /* Moderators */
                if((subfd = openat(ml.ctrlfd, "moderators", O_RDONLY)) < 0) {
@@ -736,24 +737,6 @@ int main(int argc, char **argv)
                }
                break;
        case '5': /* bounceprobe - handle relayhost local users bouncing*/
-               initsmtp(&sockfd, relayhost, smtpport, smtphelo);
-               mail.from = bounceaddr;
-               if(send_mail(sockfd, &mail, ml.fd, ml.ctrlfd, false)) {
-                       close(sockfd);
-                       sockfd = -1;
-                       /* error, so remove the probefile */
-                       tmpstr = xstrdup(mail.to);
-                       a = strchr(tmpstr, '@');
-                       MY_ASSERT(a);
-                       *a = '=';
-                       probefile = concatstr(4, ml.dir, "/bounce/", tmpstr,
-                                       "-probe");
-                       unlink(probefile);
-                       free(probefile);
-                       free(tmpstr);
-               } else {
-                       endsmtp(&sockfd);
-               }
                break;
        case '7':
                digest = 1;

diff --git a/src/send_mail.c b/src/send_mail.c
index dd7c8d53f7ede987ccc7cd1157241bb5850da277..eee1df90e0aee8422262a76b9664d2705148e8b2 100644 (file)
--- a/src/send_mail.c
+++ b/src/send_mail.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2004, 2003, 2004 Mads Martin Joergensen <mmj at mmj.dk>
- * Copyright (C) 2022 Baptiste Daroussin <bapt@FreeBSD.org>
+ * Copyright (C) 2022-2023 Baptiste Daroussin <bapt@FreeBSD.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -31,7 +31,9 @@
 #include "log_error.h"
 #include "init_sockfd.h"
 #include "mlmmj.h"
+#include "strgen.h"
 #include "xmalloc.h"
+#include "ctrlvalue.h"
 
 int
 initsmtp(int *sockfd, const char *relayhost, unsigned short port, const char *heloname)
@@ -256,7 +258,7 @@ send_mail(int sockfd, struct mail *mail, int listfd, int ctrlfd, bool bounce)
                        log_error(LOG_ARGS, "No body or headers");
                        return (0);
                }
-       } else {
+       } else if (mail->fp == NULL) {
                if (mail->size == 0 || mail->map == NULL) {
                        log_error(LOG_ARGS, "No mmap mail");
                        return (0);
@@ -342,6 +344,24 @@ send_mail(int sockfd, struct mail *mail, int listfd, int ctrlfd, bool bounce)
                        log_error(LOG_ARGS, "Could not write mailbody.\n");
                        return retval;
                }
+       } else if (mail->fp != NULL) {
+               int c, next;
+               bool addhdr = true;
+               while ((c = fgetc(mail->fp)) != EOF) {
+                       if (c != '\n') {
+                               dprintf(sockfd, "%c", c);
+                               continue;
+                       }
+                       next = fgetc(mail->fp);
+                       if (next == '.') {
+                               dprintf(sockfd, "\r\n.");
+                       }
+                       if (addhdr && mail->addtohdr && next == '\n') {
+                               dprintf(sockfd, "To: %s\r\n", mail->to);
+                               addhdr = false;
+                       }
+                       ungetc(c, mail->fp);
+               }
        } else {
                retval = write_mailbody_from_map(sockfd, mail->map, mail->size,
                    mail->addtohdr ? mail->to : NULL);
@@ -371,3 +391,21 @@ send_mail(int sockfd, struct mail *mail, int listfd, int ctrlfd, bool bounce)
 
        return 0;
 }
+
+int
+newsmtp(struct ml *ml)
+{
+       int sockfd;
+       char *relayhost, *smtphelo;
+       unsigned short smtpport = ctrlushort(ml->ctrlfd, "smtpport", 25);
+
+       relayhost = ctrlvalue(ml->ctrlfd, "relayhost");
+       if (relayhost == NULL)
+               relayhost = xstrdup(RELAYHOST);
+       smtphelo = ctrlvalue(ml->ctrlfd, "smtphelo");
+       if (smtphelo == NULL)
+               smtphelo = hostnamestr();
+       if (initsmtp(&sockfd, relayhost, smtpport, smtphelo) != 0)
+               return (-1);
+       return (sockfd);
+}

diff --git a/tests/mlmmj.c b/tests/mlmmj.c
index 7d1628baa9f5f866a74011a5857b255ba8dde8e5..75fd370b708899fcdbc85d0e5a67202360f7efbe 100644 (file)
--- a/tests/mlmmj.c
+++ b/tests/mlmmj.c
@@ -2492,6 +2492,10 @@ ATF_TC_BODY(get_processed_text_line, tc)
        close_text(txt);
 }
 
+ATF_TC_BODY(do_probe)
+{
+}
+
 ATF_TP_ADD_TCS(tp)
 {
        ATF_TP_ADD_TC(tp, random_int);