Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/mailutils

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

Location:

branches/3.2/mindi-busybox/mailutils

Files:

• Kbuild.src (modified) (1 diff)
• mail.c (modified) (5 diffs)
• mail.h (modified) (2 diffs)
• popmaildir.c (modified) (3 diffs)
• sendmail.c (modified) (15 diffs)

branches/3.2/mindi-busybox/mailutils/Kbuild.src

@@ -8 +8 @@
 
 INSERT
-lib-$(CONFIG_MAKEMIME)     += mime.o mail.o
-lib-$(CONFIG_POPMAILDIR)   += popmaildir.o mail.o
-lib-$(CONFIG_REFORMIME)    += mime.o mail.o
-lib-$(CONFIG_SENDMAIL)     += sendmail.o mail.o

branches/3.2/mindi-busybox/mailutils/mail.c

@@ -58 +58 @@
 
     i = (!G.helper_pid) * 2; // for parent:0, for child:2
-    close(pipes[i + 1]); // 1 or 3 - closing one write end
-    close(pipes[2 - i]); // 2 or 0 - closing one read end
-    xmove_fd(pipes[i], STDIN_FILENO); // 0 or 2 - using other read end
-    xmove_fd(pipes[3 - i], STDOUT_FILENO); // 3 or 1 - other write end
+    close(pipes[i + 1]);     // 1 or 3 - closing one write end
+    close(pipes[2 - i]);     // 2 or 0 - closing one read end
+    xmove_fd(pipes[i], STDIN_FILENO);      // 0 or 2 - using other read end
+    xmove_fd(pipes[3 - i], STDOUT_FILENO); // 3 or 1 - using other write end
+    // End result:
+    // parent stdout [3] -> child stdin [2]
+    // child stdout [1] -> parent stdin [0]
 
     if (!G.helper_pid) {
@@ -76 +79 @@
 }
 
-const FAST_FUNC char *command(const char *fmt, const char *param)
+char* FAST_FUNC send_mail_command(const char *fmt, const char *param)
 {
-    const char *msg = fmt;
+    char *msg;
     if (timeout)
         alarm(timeout);
-    if (msg) {
+    msg = (char*)fmt;
+    if (fmt) {
         msg = xasprintf(fmt, param);
+        if (verbose)
+            bb_error_msg("send:'%s'", msg);
         printf("%s\r\n", msg);
     }
@@ -91 +97 @@
 // NB: parse_url can modify url[] (despite const), but only if '@' is there
 /*
-static char FAST_FUNC *parse_url(char *url, char **user, char **pass)
+static char* FAST_FUNC parse_url(char *url, char **user, char **pass)
 {
     // parse [user[:pass]@]host
@@ -114 +120 @@
 {
     enum {
-        SRC_BUF_SIZE = 45,  /* This *MUST* be a multiple of 3 */
+        SRC_BUF_SIZE = 57,  /* This *MUST* be a multiple of 3 */
         DST_BUF_SIZE = 4 * ((SRC_BUF_SIZE + 2) / 3),
     };
@@ -170 +176 @@
         G.pass = xstrdup(bb_ask(fd, /* timeout: */ 0, "Password: "));
     } else {
-        G.user = xmalloc_reads(fd, /* pfx: */ NULL, /* maxsize: */ NULL);
-        G.pass = xmalloc_reads(fd, /* pfx: */ NULL, /* maxsize: */ NULL);
+        G.user = xmalloc_reads(fd, /* maxsize: */ NULL);
+        G.pass = xmalloc_reads(fd, /* maxsize: */ NULL);
     }
     if (!G.user || !*G.user || !G.pass)

branches/3.2/mindi-busybox/mailutils/mail.h

@@ +1 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * helper routines
+ *
+ * Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
 
 struct globals {
     pid_t helper_pid;
     unsigned timeout;
+    unsigned verbose;
     unsigned opts;
     char *user;
@@ -8 +17 @@
     FILE *fp0; // initial stdin
     char *opt_charset;
-    char *content_type;
 };
 
 #define G (*ptr_to_globals)
 #define timeout         (G.timeout  )
+#define verbose         (G.verbose  )
 #define opts            (G.opts     )
-//#define user            (G.user     )
-//#define pass            (G.pass     )
-//#define fp0             (G.fp0      )
-//#define opt_charset     (G.opt_charset)
-//#define content_type    (G.content_type)
 #define INIT_G() do { \
     SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
     G.opt_charset = (char *)CONFIG_FEATURE_MIME_CHARSET; \
-    G.content_type = (char *)"text/plain"; \
 } while (0)
 
 //char FAST_FUNC *parse_url(char *url, char **user, char **pass);
 
-void FAST_FUNC launch_helper(const char **argv);
-void FAST_FUNC get_cred_or_die(int fd);
+void launch_helper(const char **argv) FAST_FUNC;
+void get_cred_or_die(int fd) FAST_FUNC;
 
-const FAST_FUNC char *command(const char *fmt, const char *param);
+char *send_mail_command(const char *fmt, const char *param) FAST_FUNC;
 
-void FAST_FUNC encode_base64(char *fname, const char *text, const char *eol);
+void encode_base64(char *fname, const char *text, const char *eol) FAST_FUNC;

branches/3.2/mindi-busybox/mailutils/popmaildir.c

@@ -10 +10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+//kbuild:lib-$(CONFIG_POPMAILDIR) += popmaildir.o mail.o
+
+//usage:#define popmaildir_trivial_usage
+//usage:       "[OPTIONS] MAILDIR [CONN_HELPER ARGS]"
+//usage:#define popmaildir_full_usage "\n\n"
+//usage:       "Fetch content of remote mailbox to local maildir\n"
+/* //usage:  "\n    -b      Binary mode. Ignored" */
+/* //usage:  "\n    -d      Debug. Ignored" */
+/* //usage:  "\n    -m      Show used memory. Ignored" */
+/* //usage:  "\n    -V      Show version. Ignored" */
+/* //usage:  "\n    -c      Use tcpclient. Ignored" */
+/* //usage:  "\n    -a      Use APOP protocol. Implied. If server supports APOP -> use it" */
+//usage:     "\n    -s      Skip authorization"
+//usage:     "\n    -T      Get messages with TOP instead of RETR"
+//usage:     "\n    -k      Keep retrieved messages on the server"
+//usage:     "\n    -t SEC      Network timeout"
+//usage:    IF_FEATURE_POPMAILDIR_DELIVERY(
+//usage:     "\n    -F \"PROG ARGS\"    Filter program (may be repeated)"
+//usage:     "\n    -M \"PROG ARGS\"    Delivery program"
+//usage:    )
+//usage:     "\n"
+//usage:     "\nFetch from plain POP3 server:"
+//usage:     "\npopmaildir -k DIR nc pop3.server.com 110 <user_and_pass.txt"
+//usage:     "\nFetch from SSLed POP3 server and delete fetched emails:"
+//usage:     "\npopmaildir DIR -- openssl s_client -quiet -connect pop3.server.com:995 <user_and_pass.txt"
+/* //usage:  "\n    -R BYTES    Remove old messages on the server >= BYTES. Ignored" */
+/* //usage:  "\n    -Z N1-N2    Remove messages from N1 to N2 (dangerous). Ignored" */
+/* //usage:  "\n    -L BYTES    Don't retrieve new messages >= BYTES. Ignored" */
+/* //usage:  "\n    -H LINES    Type first LINES of a message. Ignored" */
+//usage:
+//usage:#define popmaildir_example_usage
+//usage:       "$ popmaildir -k ~/Maildir -- nc pop.drvv.ru 110 [<password_file]\n"
+//usage:       "$ popmaildir ~/Maildir -- openssl s_client -quiet -connect pop.gmail.com:995 [<password_file]\n"
+
 #include "libbb.h"
 #include "mail.h"
@@ -15 +50 @@
 static void pop3_checkr(const char *fmt, const char *param, char **ret)
 {
-    const char *msg = command(fmt, param);
+    char *msg = send_mail_command(fmt, param);
     char *answer = xmalloc_fgetline(stdin);
     if (answer && '+' == answer[0]) {
+        free(msg);
         if (timeout)
             alarm(0);
@@ -28 +64 @@
         return;
     }
-    bb_error_msg_and_die("%s failed: %s", msg, answer);
+    bb_error_msg_and_die("%s failed, reply was: %s", msg, answer);
 }
 

branches/3.2/mindi-busybox/mailutils/sendmail.c

@@ -7 +7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+//kbuild:lib-$(CONFIG_SENDMAIL) += sendmail.o mail.o
+
+//usage:#define sendmail_trivial_usage
+//usage:       "[OPTIONS] [RECIPIENT_EMAIL]..."
+//usage:#define sendmail_full_usage "\n\n"
+//usage:       "Read email from stdin and send it\n"
+//usage:     "\nStandard options:"
+//usage:     "\n    -t      Read additional recipients from message body"
+//usage:     "\n    -f SENDER   Sender (required)"
+//usage:     "\n    -o OPTIONS  Various options. -oi implied, others are ignored"
+//usage:     "\n    -i      -oi synonym. implied and ignored"
+//usage:     "\n"
+//usage:     "\nBusybox specific options:"
+//usage:     "\n    -v      Verbose"
+//usage:     "\n    -w SECS     Network timeout"
+//usage:     "\n    -H 'PROG ARGS'  Run connection helper"
+//usage:     "\n            Examples:"
+//usage:     "\n            -H 'exec openssl s_client -quiet -tls1 -starttls smtp"
+//usage:     "\n                -connect smtp.gmail.com:25' <email.txt"
+//usage:     "\n                [4<username_and_passwd.txt | -auUSER -apPASS]"
+//usage:     "\n            -H 'exec openssl s_client -quiet -tls1"
+//usage:     "\n                -connect smtp.gmail.com:465' <email.txt"
+//usage:     "\n                [4<username_and_passwd.txt | -auUSER -apPASS]"
+//usage:     "\n    -S HOST[:PORT]  Server"
+//usage:     "\n    -auUSER     Username for AUTH LOGIN"
+//usage:     "\n    -apPASS     Password for AUTH LOGIN"
+////usage:     "\n  -amMETHOD   Authentication method. Ignored. LOGIN is implied"
+//usage:     "\n"
+//usage:     "\nOther options are silently ignored; -oi -t is implied"
+//usage:    IF_MAKEMIME(
+//usage:     "\nUse makemime to create emails with attachments"
+//usage:    )
+
 #include "libbb.h"
 #include "mail.h"
@@ -14 +48 @@
 #define MAX_HEADERS 256
 
+static void send_r_n(const char *s)
+{
+    if (verbose)
+        bb_error_msg("send:'%s'", s);
+    printf("%s\r\n", s);
+}
+
 static int smtp_checkp(const char *fmt, const char *param, int code)
 {
     char *answer;
-    const char *msg = command(fmt, param);
+    char *msg = send_mail_command(fmt, param);
     // read stdin
-    // if the string has a form \d\d\d- -- read next string. E.g. EHLO response
+    // if the string has a form NNN- -- read next string. E.g. EHLO response
     // parse first bytes to a number
     // if code = -1 then just return this number
     // if code != -1 then checks whether the number equals the code
     // if not equal -> die saying msg
-    while ((answer = xmalloc_fgetline(stdin)) != NULL)
+    while ((answer = xmalloc_fgetline(stdin)) != NULL) {
+        if (verbose)
+            bb_error_msg("recv:'%.*s'", (int)(strchrnul(answer, '\r') - answer), answer);
         if (strlen(answer) <= 3 || '-' != answer[3])
             break;
+        free(answer);
+    }
     if (answer) {
         int n = atoi(answer);
@@ -32 +77 @@
             alarm(0);
         free(answer);
-        if (-1 == code || n == code)
+        if (-1 == code || n == code) {
+            free(msg);
             return n;
+        }
     }
     bb_error_msg_and_die("%s failed", msg);
@@ -72 +119 @@
     char *s;
     llist_t *list = NULL;
-    char *domain = sane_address(safe_getdomainname());
+    char *host = sane_address(safe_gethostname());
     unsigned nheaders = 0;
     int code;
@@ -87 +134 @@
         OPT_S = 1 << 6,         // specify connection string
         OPT_a = 1 << 7,         // authentication tokens
+        OPT_v = 1 << 8,         // verbosity
     };
 
@@ -97 +145 @@
 
     // parse options
-    // -f is required. -H and -S are mutually exclusive
-    opt_complementary = "f:w+:H--S:S--H:a::";
+    // -v is a counter, -f is required. -H and -S are mutually exclusive, -a is a list
+    opt_complementary = "vv:f:w+:H--S:S--H:a::";
     // N.B. since -H and -S are mutually exclusive they do not interfere in opt_connect
     // -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility,
     // it is still under development.
-    opts = getopt32(argv, "tf:o:iw:H:S:a::", &opt_from, NULL, &timeout, &opt_connect, &opt_connect, &list);
+    opts = getopt32(argv, "tf:o:iw:H:S:a::v", &opt_from, NULL,
+            &timeout, &opt_connect, &opt_connect, &list, &verbose);
     //argc -= optind;
     argv += optind;
@@ -129 +178 @@
         // plug it in
         launch_helper(args);
-    // vanilla connection
+        // Now:
+        // our stdout will go to helper's stdin,
+        // helper's stdout will be available on our stdin.
+
+        // Wait for initial server message.
+        // If helper (such as openssl) invokes STARTTLS, the initial 220
+        // is swallowed by helper (and not repeated after TLS is initiated).
+        // We will send NOOP cmd to server and check the response.
+        // We should get 220+250 on plain connection, 250 on STARTTLSed session.
+        //
+        // The problem here is some servers delay initial 220 message,
+        // and consider client to be a spammer if it starts sending cmds
+        // before 220 reached it. The code below is unsafe in this regard:
+        // in non-STARTTLSed case, we potentially send NOOP before 220
+        // is sent by server.
+        // Ideas? (--delay SECS opt? --assume-starttls-helper opt?)
+        code = smtp_check("NOOP", -1);
+        if (code == 220)
+            // we got 220 - this is not STARTTLSed connection,
+            // eat 250 response to our NOOP
+            smtp_check(NULL, 250);
+        else
+        if (code != 250)
+            bb_error_msg_and_die("SMTP init failed");
     } else {
+        // vanilla connection
         int fd;
         // host[:port] not explicitly specified? -> use $SMTPHOST
-        // no $SMTPHOST ? -> use localhost
+        // no $SMTPHOST? -> use localhost
         if (!(opts & OPT_S)) {
             opt_connect = getenv("SMTPHOST");
@@ -144 +217 @@
         xmove_fd(fd, STDIN_FILENO);
         xdup2(STDIN_FILENO, STDOUT_FILENO);
-    }
-    // N.B. from now we know nothing about network :)
-
-    // wait for initial server OK
-    // N.B. if we used openssl the initial 220 answer is already swallowed during openssl TLS init procedure
-    // so we need to kick the server to see whether we are ok
-    code = smtp_check("NOOP", -1);
-    // 220 on plain connection, 250 on openssl-helped TLS session
-    if (220 == code)
-        smtp_check(NULL, 250); // reread the code to stay in sync
-    else if (250 != code)
-        bb_error_msg_and_die("INIT failed");
+
+        // Wait for initial server 220 message
+        smtp_check(NULL, 220);
+    }
 
     // we should start with modern EHLO
-    if (250 != smtp_checkp("EHLO %s", domain, -1)) {
-        smtp_checkp("HELO %s", domain, 250);
-    }
-    if (ENABLE_FEATURE_CLEAN_UP)
-        free(domain);
+    if (250 != smtp_checkp("EHLO %s", host, -1))
+        smtp_checkp("HELO %s", host, 250);
+    free(host);
 
     // perform authentication
@@ -177 +240 @@
 
     // set sender
-    // N.B. we have here a very loosely defined algotythm
+    // N.B. we have here a very loosely defined algorythm
     // since sendmail historically offers no means to specify secrets on cmdline.
     // 1) server can require no authentication ->
@@ -194 +257 @@
     //  opt_from = xasprintf("%s@%s", G.user, domain);
     //}
-    //if (ENABLE_FEATURE_CLEAN_UP)
-    //  free(domain);
     smtp_checkp("MAIL FROM:<%s>", opt_from, 250);
 
@@ -215 +276 @@
                 printf(".");
             // dump read line
-            printf("%s\r\n", s);
+            send_r_n(s);
             free(s);
             continue;
@@ -222 +283 @@
         // analyze headers
         // To: or Cc: headers add recipients
-        if (0 == strncasecmp("To:", s, 3) || 0 == strncasecmp("Bcc:" + 1, s, 3)) {
-            rcptto(sane_address(s+3));
-            goto addheader;
-        // Bcc: header adds blind copy (hidden) recipient
-        } else if (0 == strncasecmp("Bcc:", s, 4)) {
-            rcptto(sane_address(s+4));
-            free(s);
-            // N.B. Bcc: vanishes from headers!
-
-        // other headers go verbatim
-
-        // N.B. RFC2822 2.2.3 "Long Header Fields" allows for headers to occupy several lines.
-        // Continuation is denoted by prefixing additional lines with whitespace(s).
-        // Thanks (stefan.seyfried at googlemail.com) for pointing this out.
-        } else if (strchr(s, ':') || (list && skip_whitespace(s) != s)) {
+        if (opts & OPT_t) {
+            if (0 == strncasecmp("To:", s, 3) || 0 == strncasecmp("Bcc:" + 1, s, 3)) {
+                rcptto(sane_address(s+3));
+                goto addheader;
+            }
+            // Bcc: header adds blind copy (hidden) recipient
+            if (0 == strncasecmp("Bcc:", s, 4)) {
+                rcptto(sane_address(s+4));
+                free(s);
+                continue; // N.B. Bcc: vanishes from headers!
+            }
+        }
+        if (strchr(s, ':') || (list && isspace(s[0]))) {
+            // other headers go verbatim
+            // N.B. RFC2822 2.2.3 "Long Header Fields" allows for headers to occupy several lines.
+            // Continuation is denoted by prefixing additional lines with whitespace(s).
+            // Thanks (stefan.seyfried at googlemail.com) for pointing this out.
  addheader:
             // N.B. we allow MAX_HEADERS generic headers at most to prevent attacks
@@ -242 +305 @@
                 goto bail;
             llist_add_to_end(&list, s);
-        // a line without ":" (an empty line too, by definition) doesn't look like a valid header
-        // so stop "analyze headers" mode
         } else {
+            // a line without ":" (an empty line too, by definition) doesn't look like a valid header
+            // so stop "analyze headers" mode
  reenter:
             // put recipients specified on cmdline
@@ -262 +325 @@
             // dump the headers
             while (list) {
-                printf("%s\r\n", (char *) llist_pop(&list));
+                send_r_n((char *) llist_pop(&list));
             }
             // stop analyzing headers
@@ -269 +332 @@
             // just dump empty line and break the loop
             if (!s) {
-                puts("\r");
+                send_r_n("");
                 break;
             }