emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sendmail: update from maintainer

Browse Source
This commit is contained in:
Denis Vlasenko 2008-06-27 21:24:08 +00:00
parent bbd55c9ec7
commit 3dee8e2bac
3 changed files with 90 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/applets.h
View File

@ -306,7 +306,7 @@ USE_RX(APPLET(rx, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_SCRIPT(APPLET(script, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_SCRIPT(APPLET(script, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_SED(APPLET(sed, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_SED(APPLET(sed, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_SELINUXENABLED(APPLET(selinuxenabled, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) USE_SELINUXENABLED(APPLET(selinuxenabled, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
USE_SENDMAIL(APPLET_ODDNAME(sendmail, sendgetmail, _BB_DIR_USR_BIN, _BB_SUID_NEVER, sendmail)) USE_SENDMAIL(APPLET_ODDNAME(sendmail, sendgetmail, _BB_DIR_USR_SBIN, _BB_SUID_NEVER, sendmail))
USE_SEQ(APPLET_NOFORK(seq, seq, _BB_DIR_USR_BIN, _BB_SUID_NEVER, seq)) USE_SEQ(APPLET_NOFORK(seq, seq, _BB_DIR_USR_BIN, _BB_SUID_NEVER, seq))
USE_SESTATUS(APPLET(sestatus, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) USE_SESTATUS(APPLET(sestatus, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
USE_SETARCH(APPLET(setarch, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_SETARCH(APPLET(setarch, _BB_DIR_BIN, _BB_SUID_NEVER))

17
include/usage.h
View File

@ -1088,11 +1088,12 @@
"\n -S SECTORS" \ "\n -S SECTORS" \
#define fetchmail_trivial_usage \ #define fetchmail_trivial_usage \
"[-w timeout] [-U user] -P password [-X] [-t] [-z] server[:port] maildir [prog]" "[-w timeout] [-H server[:port]] [-U user] -P password [-X] [-t] [-z] maildir [prog]"
#define fetchmail_full_usage "\n\n" \ #define fetchmail_full_usage "\n\n" \
"Fetch content of remote mailbox to local Maildir.\n" \ "Fetch content of remote mailbox to local Maildir.\n" \
"\nOptions:" \ "\nOptions:" \
"\n -w timeout Set timeout on network operations" \ "\n -w timeout Set timeout on network operations" \
"\n -H server[:port] Set server" \
"\n -U username Authenticate with specified username/password" \ "\n -U username Authenticate with specified username/password" \
"\n -P password" \ "\n -P password" \
"\n -X Use openssl connection helper for secured servers" \ "\n -X Use openssl connection helper for secured servers" \
@ -3425,19 +3426,23 @@
#define selinuxenabled_full_usage "" #define selinuxenabled_full_usage ""
#define sendmail_trivial_usage \ #define sendmail_trivial_usage \
"[-w timeout] [-U user] [-P password] [-X]\n" \ "[-w timeout] [-H server[:port]] [-U user] [-P password] [-X]\n" \
"-t to [-t to]... [-n] [-s subject] [-c charset] server[:port] from [body] [attachment ...]" "[-c charset] [-n] [-i] [-s subject] [-a attach]... [-t] [-f sender] [rcpt]..."
#define sendmail_full_usage "\n\n" \ #define sendmail_full_usage "\n\n" \
"Send an email.\n" \ "Send an email.\n" \
"\nOptions:" \ "\nOptions:" \
"\n -w timeout Set timeout on network operations" \ "\n -w timeout Set timeout on network operations" \
"\n -H server[:port] Set server" \
"\n -U username Authenticate with specified username/password" \ "\n -U username Authenticate with specified username/password" \
"\n -P password" \ "\n -P password" \
"\n -t address Recipient(s). May be repeated" \
"\n -X Use openssl connection helper for secured servers" \ "\n -X Use openssl connection helper for secured servers" \
"\n -n Request delivery notification to sender" \
"\n -s subject Subject" \
"\n -c charset Assumed charset for body and subject [utf-8]" \ "\n -c charset Assumed charset for body and subject [utf-8]" \
"\n -n Request delivery notification to sender" \
"\n -i Ignore single dots in mail body. Implied" \
"\n -s subject Subject" \
"\n -a file File to attach. May be multiple" \
"\n -t Read recipients and subject from body" \
"\n -f Set sender address" \
#define seq_trivial_usage \ #define seq_trivial_usage \
"[first [increment]] last" "[first [increment]] last"

130
networking/sendmail.c
View File

@ -61,6 +61,8 @@ static void uuencode(char *fname, const char *text)
} }
if (fname) if (fname)
close(fd); close(fd);
#undef src_buf
#undef len
} }
struct globals { struct globals {
@ -82,7 +84,7 @@ struct globals {
xargs[1] = "s_client"; \ xargs[1] = "s_client"; \
xargs[2] = "-quiet"; \ xargs[2] = "-quiet"; \
xargs[3] = "-connect"; \ xargs[3] = "-connect"; \
/*xargs[4] = "server[:port]";*/ \ /*xargs[4] = "localhost";*/ \
xargs[5] = "-tls1"; \ xargs[5] = "-tls1"; \
xargs[6] = "-starttls"; \ xargs[6] = "-starttls"; \
xargs[7] = "smtp"; \ xargs[7] = "smtp"; \
@ -115,6 +117,16 @@ static void signal_handler(int signo)
if (wait_any_nohang(&err) > 0) if (wait_any_nohang(&err) > 0)
if (WIFEXITED(err) && WEXITSTATUS(err)) if (WIFEXITED(err) && WEXITSTATUS(err))
bb_error_msg_and_die("child exited (%d)", WEXITSTATUS(err)); bb_error_msg_and_die("child exited (%d)", WEXITSTATUS(err));
#undef err
}
/* libbb candidate */
static pid_t vfork_or_die(void)
{
pid_t pid = vfork();
if (pid < 0)
bb_perror_msg_and_die("vfork");
return pid;
} }
static void launch_helper(const char **argv) static void launch_helper(const char **argv)
@ -122,12 +134,11 @@ static void launch_helper(const char **argv)
// setup vanilla unidirectional pipes interchange // setup vanilla unidirectional pipes interchange
int idx; int idx;
int pipes[4]; int pipes[4];
xpipe(pipes); xpipe(pipes);
xpipe(pipes+2); xpipe(pipes+2);
helper_pid = vfork(); helper_pid = vfork_or_die();
if (helper_pid < 0) idx = (!helper_pid) * 2;
bb_perror_msg_and_die("vfork");
idx = (!helper_pid)*2;
xdup2(pipes[idx], STDIN_FILENO); xdup2(pipes[idx], STDIN_FILENO);
xdup2(pipes[3-idx], STDOUT_FILENO); xdup2(pipes[3-idx], STDOUT_FILENO);
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
@ -255,29 +266,31 @@ int sendgetmail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv) int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
{ {
llist_t *opt_recipients = NULL; llist_t *opt_recipients = NULL;
llist_t *opt_attachments = NULL;
char *opt_from;
const char *opt_user; const char *opt_user;
const char *opt_pass; const char *opt_pass;
enum { enum {
OPT_w = 1 << 0, // network timeout OPT_w = 1 << 0, // network timeout
OPT_U = 1 << 1, // user OPT_H = 1 << 1, // server[:port]
OPT_P = 1 << 2, // password OPT_U = 1 << 2, // user
OPT_X = 1 << 3, // connect using openssl s_client helper OPT_P = 1 << 3, // password
OPT_X = 1 << 4, // connect using openssl s_client helper
OPTS_n = 1 << 4, // sendmail: request notification OPTS_t = 1 << 5, // sendmail: read addresses from body
OPTF_t = 1 << 4, // fetchmail: use "TOP" not "RETR" OPTF_t = 1 << 5, // fetchmail: use "TOP" not "RETR"
OPTS_s = 1 << 5, // sendmail: subject OPTS_s = 1 << 6, // sendmail: subject
OPTF_z = 1 << 5, // fetchmail: delete from server OPTF_z = 1 << 6, // fetchmail: delete from server
OPTS_c = 1 << 6, // sendmail: assumed charset OPTS_c = 1 << 7, // sendmail: assumed charset
OPTS_t = 1 << 7, // sendmail: recipient(s) OPTS_a = 1 << 8, // sendmail: attachment(s)
OPTS_i = 1 << 8, // sendmail: ignore lone dots in message body (implied) OPTS_i = 1 << 9, // sendmail: ignore lone dots in message body (implied)
OPTS_n = 1 << 10, // sendmail: request notification
}; };
const char *options; const char *options;
unsigned opts; int opts;
// init global variables // init global variables
INIT_G(); INIT_G();
@ -289,25 +302,30 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
// SENDMAIL // SENDMAIL
// save initial stdin (body or attachements can be piped!) // save initial stdin (body or attachements can be piped!)
xdup2(STDIN_FILENO, INITIAL_STDIN_FILENO); xdup2(STDIN_FILENO, INITIAL_STDIN_FILENO);
opt_complementary = "-2:w+:t::"; opt_complementary = "w+:a::";
options = "w:U:P:X" "ns:c:t:i"; options = "w:H:U:P:Xt" "s:c:a:inf:";
// body is pseudo attachment read from stdin
llist_add_to_end(&opt_attachments, (char *)"-");
} else { } else {
// FETCHMAIL // FETCHMAIL
opt_after_connect = NULL; opt_after_connect = NULL;
opt_complementary = "-2:w+:P"; opt_complementary = "-1:w+:P";
options = "w:U:P:X" "tz"; options = "w:H:U:P:Xt" "z";
} }
opts = getopt32(argv, options, opts = getopt32(argv, options,
&timeout, &opt_user, &opt_pass, &timeout, &opt_connect, &opt_user, &opt_pass,
&opt_subject, &opt_charset, &opt_recipients &opt_subject, &opt_charset, &opt_attachments, &opt_from
); );
//argc -= optind; //argc -= optind;
argv += optind; argv += optind;
// first argument is remote server[:port]
opt_connect = *argv++;
// connect to server // connect to server
// host[:port] not specified ? -> use $HOST. no $HOST ? -> use localhost
if (!(opts & OPT_H)) {
opt_connect = getenv("HOST");
if (!opt_connect)
opt_connect = "127.0.0.1";
}
// SSL ordered? -> // SSL ordered? ->
if (opts & OPT_X) { if (opts & OPT_X) {
// ... use openssl helper // ... use openssl helper
@ -323,20 +341,27 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
} }
#if ENABLE_FETCHMAIL #if ENABLE_FETCHMAIL
// we are sendmail? // are we sendmail?
if (opt_after_connect) if (opt_after_connect)
#endif #endif
{
/*************************************************** /***************************************************
* SENDMAIL * SENDMAIL
***************************************************/ ***************************************************/
{
char *opt_from;
int code; int code;
char *boundary; char *boundary;
const char *fmt; const char *fmt;
const char *p; const char *p;
char *q; char *q;
llist_t *l;
// recipients specified as arguments
while (*argv) {
// loose test on email address validity
if (strchr(sane(*argv), '@'))
llist_add_to_end(&opt_recipients, *argv);
argv++;
}
// we didn't use SSL helper? -> // we didn't use SSL helper? ->
if (!(opts & OPT_X)) { if (!(opts & OPT_X)) {
@ -344,13 +369,13 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
smtp_check(NULL, 220); smtp_check(NULL, 220);
} }
// get the sender // if -t specified or no recipients specified -> enter all-included mode
opt_from = sane(*argv++);
// if no recipients _and_ no body files specified -> enter all-included mode
// i.e. scan stdin for To: and Subject: lines ... // i.e. scan stdin for To: and Subject: lines ...
// ... and then use the rest of stdin as message body // ... and then use the rest of stdin as message body
if (!opt_recipients && !*argv) { // N.B. subject read from body has priority
// over that specified on command line.
// recipients are merged
if (opts & OPTS_t || !opt_recipients) {
// fetch recipients and (optionally) subject // fetch recipients and (optionally) subject
char *s; char *s;
while ((s = xmalloc_reads(INITIAL_STDIN_FILENO, NULL, NULL)) != NULL) { while ((s = xmalloc_reads(INITIAL_STDIN_FILENO, NULL, NULL)) != NULL) {
@ -366,13 +391,11 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
break; // empty line break; // empty line
} }
} }
// order to read body from stdin
*--argv = (char *)"-";
} }
// introduce to server // introduce to server
// we should start with modern EHLO // we should start with modern EHLO
if (250 != smtp_checkp("EHLO %s", opt_from, -1)) { if (250 != smtp_checkp("EHLO %s", sane(opt_from), -1)) {
smtp_checkp("HELO %s", opt_from, 250); smtp_checkp("HELO %s", opt_from, 250);
} }
@ -404,8 +427,8 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
} }
// set recipients // set recipients
for (llist_t *to = opt_recipients; to; to = to->link) { for (l = opt_recipients; l; l = l->link) {
smtp_checkp("RCPT TO:<%s>", sane(to->data), 250); smtp_checkp("RCPT TO:<%s>", sane(l->data), 250);
} }
// enter "put message" mode // enter "put message" mode
@ -413,8 +436,8 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
// put address headers // put address headers
printf("From: %s\r\n", opt_from); printf("From: %s\r\n", opt_from);
for (llist_t *to = opt_recipients; to; to = to->link) { for (l = opt_recipients; l; l = l->link) {
printf("To: %s\r\n", to->data); printf("To: %s\r\n", l->data);
} }
// put encoded subject // put encoded subject
@ -455,7 +478,8 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
; ;
p = opt_charset; p = opt_charset;
q = (char *)""; q = (char *)"";
while (*argv) { l = opt_attachments;
while (l) {
printf( printf(
fmt fmt
, boundary , boundary
@ -472,9 +496,10 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
"%s; filename=\"%s\"\r\n" "%s; filename=\"%s\"\r\n"
"%s" "%s"
; ;
uuencode(*argv, NULL); uuencode(l->data, NULL);
if (*(++argv)) l = l->link;
q = bb_get_last_path_component_strip(*argv); if (l)
q = bb_get_last_path_component_strip(l->data);
} }
// put message terminator // put message terminator
@ -484,12 +509,12 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
smtp_check(".", 250); smtp_check(".", 250);
// ... and say goodbye // ... and say goodbye
smtp_check("QUIT", 221); smtp_check("QUIT", 221);
}
#if ENABLE_FETCHMAIL #if ENABLE_FETCHMAIL
} else {
/*************************************************** /***************************************************
* FETCHMAIL * FETCHMAIL
***************************************************/ ***************************************************/
else {
char *buf; char *buf;
unsigned nmsg; unsigned nmsg;
@ -570,7 +595,8 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
for (; nmsg; nmsg--) { for (; nmsg; nmsg--) {
// generate unique filename // generate unique filename
char *filename = xasprintf("tmp/%llu.%u.%s", monotonic_us(), pid, hostname); char *filename = xasprintf("tmp/%llu.%u.%s",
monotonic_us(), (unsigned)pid, hostname);
char *target; char *target;
int rc; int rc;
@ -604,8 +630,8 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv)
// Bye // Bye
pop3_check("QUIT", NULL); pop3_check("QUIT", NULL);
#endif // ENABLE_FETCHMAIL
} }
#endif // ENABLE_FETCHMAIL
return 0; return 0;
} }