mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-22 09:57:34 +00:00
Code Issues Releases Wiki Activity

postfix-3.10-20250116

Browse Source
This commit is contained in:
Wietse Z Venema 2025-01-16 00:00:00 -05:00 committed by Viktor Dukhovni
parent 085f0e5f31
commit 8a4eed134b
70 changed files with 979 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
postfix/HISTORY
View File

@ -28795,3 +28795,62 @@ Apologies for any names omitted.
built with tinycdb. Michael Tokarev. Wietse added a test
and documentation. Files: util/dict_cdb.c proto/CDB_README.html,
postmap/Makefile.in.
20250114
Bugfix (defect introduced: Postfix 3.0): the flag "SMTPUTF8
was requested" was random after a message was re-queued,
for example with the command "postsuper -r". The result was
be that some messages that need to be sent using SMTPUTF8
would be sent without using SMTPUTF8 and might be bounced.
Found during code maintenance. File: cleanup/cleanup_envelope.c.
20250115
Bugfix (defect introduced: Postfix 3.0): the bounce daemon
mangled a non-ASCII address localpart in the "X-Postfix-Sender:"
field of a delivery status notification. It backslash-escaped
each byte in a multi-byte character. This behavior was
implemented in Postfix 2.1 (no support for UTF8 local-parts),
but it became incorrect after SMTPUTF8 support was implemented
in Postfix 3.0. File: bounce/bounce_notify_util.c.
20250116
Bugfix (defect introduced: 20250104): a 'fix' not only
eliminated a Postfix TLSRPT client warning message, it also
eliminated all the TLSRPT client functionality. Reported
by Andreas Schulze. File: smtp/smtp_connect.c.
Infrastructure: completed an overhaul of the infrastructure
for passing around SMTPUTF8 related flag bits. This
infrastructure can now be reused to implement the "TLS-Required:
no" header and the REQUIRETLS ESMTP verb with very little
additional code.
This change requires "postfix reload" after upgrade, because
of an intentional change in the delivery agent protocol.
If this step is skipped, Postfix delivery agents will log
a warning: "unexpected attribute smtputf8 from xxx socket
(expecting: sendopts)" where xxx is the delivery agent
service name.
Most changes are for renaming parameters, variables, structure
fields, and protocol fields, without changing their type.
Files: bounce/bounce.c, bounce/bounce_notify_service.c,
bounce/bounce_notify_util.c, bounce/bounce_notify_verp.c,
bounce/bounce_one_service.c, bounce/bounce_service.h,
bounce/bounce_trace_service.c, bounce/bounce_warn_service.c,
cleanup/cleanup.h, cleanup/cleanup_addr.c, cleanup/cleanup_api.c,
cleanup/cleanup_bounce.c, cleanup/cleanup_envelope.c,
cleanup/cleanup_envelope_test.c, cleanup/cleanup_final.c,
cleanup/cleanup_out.c, cleanup/cleanup_state.c, global/abounce.c,
global/bounce.c, global/defer.c, global/deliver_pass.c,
global/deliver_request.c, global/deliver_request.h,
global/mail_proto.h, global/mail_version.h, global/post_mail.c,
global/sendopts.c, global/sendopts.h, global/smtputf8.h,
local/forward.c, local/local.c, local/local.h, oqmgr/qmgr.h,
oqmgr/qmgr_active.c, oqmgr/qmgr_deliver.c, oqmgr/qmgr_message.c,
pickup/pickup.c, qmgr/qmgr.h, qmgr/qmgr_active.c,
qmgr/qmgr_deliver.c, qmgr/qmgr_message.c, qmqpd/qmqpd.c,
smtp/smtp_proto.c, smtpd/smtpd.c, verify/verify.c,

10
postfix/RELEASE_NOTES
View File

@ -26,6 +26,16 @@ now also distributed with the more recent Eclipse Public License
license of their choice. Those who are more comfortable with the
IPL can continue with that license.
[Incompat 20250116]
Postfix needs "postfix reload" after upgrade, because of a change in
the delivery agent protocol. If this step is skipped, Postfix delivery
agents will log a warning:
unexpected attribute smtputf8 from xxx socket (expecting: sendopts)
where xxx is the delivery agent service name.
[Incompat 20250106]
The logging of the Milter 'quarantine' action has changed. Instead

3
postfix/html/bounce.8.html
View File

@ -194,5 +194,8 @@ BOUNCE(8) BOUNCE(8)
111 8th Avenue
New York, NY 10011, USA
Wietse Venema
porcupine.org
BOUNCE(8)
</pre> </body> </html>

3
postfix/html/defer.8.html
View File

@ -194,5 +194,8 @@ BOUNCE(8) BOUNCE(8)
111 8th Avenue
New York, NY 10011, USA
Wietse Venema
porcupine.org
BOUNCE(8)
</pre> </body> </html>

5
postfix/html/local.8.html
View File

@ -524,7 +524,7 @@ LOCAL(8) LOCAL(8)
<b><a href="postconf.5.html#delay_logging_resolution_limit">delay_logging_resolution_limit</a> (2)</b>
The maximal number of digits after the decimal point when log-
ging sub-second delay values.
ging delay values.
<b><a href="postconf.5.html#export_environment">export_environment</a> (see 'postconf -d' output)</b>
The list of environment variables that a Postfix process will
@ -632,5 +632,8 @@ LOCAL(8) LOCAL(8)
111 8th Avenue
New York, NY 10011, USA
Wietse Venema
porcupine.org
LOCAL(8)
</pre> </body> </html>

3
postfix/html/trace.8.html
View File

@ -194,5 +194,8 @@ BOUNCE(8) BOUNCE(8)
111 8th Avenue
New York, NY 10011, USA
Wietse Venema
porcupine.org
BOUNCE(8)
</pre> </body> </html>

3
postfix/man/man8/bounce.8
View File

@ -180,3 +180,6 @@ Wietse Venema
Google, Inc.
111 8th Avenue
New York, NY 10011, USA
Wietse Venema
porcupine.org

5
postfix/man/man8/local.8
View File

@ -574,7 +574,7 @@ How much time a Postfix daemon process may take to handle a
request before it is terminated by a built\-in watchdog timer.
.IP "\fBdelay_logging_resolution_limit (2)\fR"
The maximal number of digits after the decimal point when logging
sub\-second delay values.
delay values.
.IP "\fBexport_environment (see 'postconf -d' output)\fR"
The list of environment variables that a Postfix process will export
to non\-Postfix processes.
@ -673,3 +673,6 @@ Wietse Venema
Google, Inc.
111 8th Avenue
New York, NY 10011, USA
Wietse Venema
porcupine.org

4
postfix/proto/stop
View File

@ -1660,3 +1660,7 @@ iso
ORCPT
RET
ILP
REQUIRETLS
RequireTLS
requiretls
sendopts

6
postfix/proto/stop.double-history
View File

@ -152,3 +152,9 @@ proto proto socketmap_table qmqpd qmqpd c tls tls_misc c
many errors I O timeout lost connection File smtpd smtpd c
that is unknown or known but disabled File smtpd smtpd c
proto proto socketmap_table
Files bounce bounce c bounce bounce_notify_service c
cleanup cleanup h cleanup cleanup_addr c cleanup cleanup_api c
local forward c local local c local local h oqmgr qmgr h
pickup pickup c qmgr qmgr h qmgr qmgr_active c
qmgr qmgr_deliver c qmgr qmgr_message c qmqpd qmqpd c
smtp smtp_proto c smtpd smtpd c verify verify c

1
postfix/proto/stop.spell-cc
View File

@ -1856,3 +1856,4 @@ qp
cntrl
TINYCDB
getdata
XXXSENDOPTS

1
postfix/proto/stop.spell-history
View File

@ -97,3 +97,4 @@ roff
diffs
CLOSEFROM
Roessner
bitflags

1
postfix/proto/stop.spell-proto-html
View File

@ -395,3 +395,4 @@ berkeleydb
doctype
dtd
marc
LP

6
postfix/src/bounce/Makefile.in
View File

@ -279,6 +279,7 @@ bounce_notify_service.o: ../../include/post_mail.h
bounce_notify_service.o: ../../include/rcpt_buf.h
bounce_notify_service.o: ../../include/rec_type.h
bounce_notify_service.o: ../../include/recipient_list.h
bounce_notify_service.o: ../../include/sendopts.h
bounce_notify_service.o: ../../include/smtputf8.h
bounce_notify_service.o: ../../include/stringops.h
bounce_notify_service.o: ../../include/sys_defs.h
@ -322,6 +323,7 @@ bounce_notify_util.o: ../../include/rcpt_buf.h
bounce_notify_util.o: ../../include/rec_type.h
bounce_notify_util.o: ../../include/recipient_list.h
bounce_notify_util.o: ../../include/record.h
bounce_notify_util.o: ../../include/sendopts.h
bounce_notify_util.o: ../../include/smtputf8.h
bounce_notify_util.o: ../../include/stringops.h
bounce_notify_util.o: ../../include/sys_defs.h
@ -382,6 +384,7 @@ bounce_notify_verp.o: ../../include/post_mail.h
bounce_notify_verp.o: ../../include/rcpt_buf.h
bounce_notify_verp.o: ../../include/rec_type.h
bounce_notify_verp.o: ../../include/recipient_list.h
bounce_notify_verp.o: ../../include/sendopts.h
bounce_notify_verp.o: ../../include/smtputf8.h
bounce_notify_verp.o: ../../include/stringops.h
bounce_notify_verp.o: ../../include/sys_defs.h
@ -417,6 +420,7 @@ bounce_one_service.o: ../../include/post_mail.h
bounce_one_service.o: ../../include/rcpt_buf.h
bounce_one_service.o: ../../include/rec_type.h
bounce_one_service.o: ../../include/recipient_list.h
bounce_one_service.o: ../../include/sendopts.h
bounce_one_service.o: ../../include/smtputf8.h
bounce_one_service.o: ../../include/stringops.h
bounce_one_service.o: ../../include/sys_defs.h
@ -497,6 +501,7 @@ bounce_trace_service.o: ../../include/post_mail.h
bounce_trace_service.o: ../../include/rcpt_buf.h
bounce_trace_service.o: ../../include/rec_type.h
bounce_trace_service.o: ../../include/recipient_list.h
bounce_trace_service.o: ../../include/sendopts.h
bounce_trace_service.o: ../../include/smtputf8.h
bounce_trace_service.o: ../../include/stringops.h
bounce_trace_service.o: ../../include/sys_defs.h
@ -529,6 +534,7 @@ bounce_warn_service.o: ../../include/post_mail.h
bounce_warn_service.o: ../../include/rcpt_buf.h
bounce_warn_service.o: ../../include/rec_type.h
bounce_warn_service.o: ../../include/recipient_list.h
bounce_warn_service.o: ../../include/sendopts.h
bounce_warn_service.o: ../../include/smtputf8.h
bounce_warn_service.o: ../../include/stringops.h
bounce_warn_service.o: ../../include/sys_defs.h

35
postfix/src/bounce/bounce.c
View File

@ -160,6 +160,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -313,7 +316,7 @@ static int bounce_notify_proto(char *service_name, VSTREAM *client,
{
const char *myname = "bounce_notify_proto";
int flags;
int smtputf8;
int sendopts;
int dsn_ret;
/*
@ -324,7 +327,7 @@ static int bounce_notify_proto(char *service_name, VSTREAM *client,
RECV_ATTR_STR(MAIL_ATTR_QUEUE, queue_name),
RECV_ATTR_STR(MAIL_ATTR_QUEUEID, queue_id),
RECV_ATTR_STR(MAIL_ATTR_ENCODING, encoding),
RECV_ATTR_INT(MAIL_ATTR_SMTPUTF8, &smtputf8),
RECV_ATTR_INT(MAIL_ATTR_SENDOPTS, &sendopts),
RECV_ATTR_STR(MAIL_ATTR_SENDER, sender),
RECV_ATTR_STR(MAIL_ATTR_DSN_ENVID, dsn_envid),
RECV_ATTR_INT(MAIL_ATTR_DSN_RET, &dsn_ret),
@ -348,9 +351,9 @@ static int bounce_notify_proto(char *service_name, VSTREAM *client,
VS_NEUTER(sender);
VS_NEUTER(dsn_envid);
if (msg_verbose)
msg_info("%s: flags=0x%x service=%s queue=%s id=%s encoding=%s smtputf8=%d sender=%s envid=%s ret=0x%x",
msg_info("%s: flags=0x%x service=%s queue=%s id=%s encoding=%s sendopts=%d sender=%s envid=%s ret=0x%x",
myname, flags, service_name, STR(queue_name), STR(queue_id),
STR(encoding), smtputf8, STR(sender), STR(dsn_envid),
STR(encoding), sendopts, STR(sender), STR(dsn_envid),
dsn_ret);
/*
@ -364,7 +367,7 @@ static int bounce_notify_proto(char *service_name, VSTREAM *client,
* Execute the request.
*/
return (service(flags, service_name, STR(queue_name),
STR(queue_id), STR(encoding), smtputf8,
STR(queue_id), STR(encoding), sendopts,
STR(sender), STR(dsn_envid), dsn_ret,
bounce_templates));
}
@ -375,7 +378,7 @@ static int bounce_verp_proto(char *service_name, VSTREAM *client)
{
const char *myname = "bounce_verp_proto";
int flags;
int smtputf8;
int sendopts;
int dsn_ret;
/*
@ -386,7 +389,7 @@ static int bounce_verp_proto(char *service_name, VSTREAM *client)
RECV_ATTR_STR(MAIL_ATTR_QUEUE, queue_name),
RECV_ATTR_STR(MAIL_ATTR_QUEUEID, queue_id),
RECV_ATTR_STR(MAIL_ATTR_ENCODING, encoding),
RECV_ATTR_INT(MAIL_ATTR_SMTPUTF8, &smtputf8),
RECV_ATTR_INT(MAIL_ATTR_SENDOPTS, &sendopts),
RECV_ATTR_STR(MAIL_ATTR_SENDER, sender),
RECV_ATTR_STR(MAIL_ATTR_DSN_ENVID, dsn_envid),
RECV_ATTR_INT(MAIL_ATTR_DSN_RET, &dsn_ret),
@ -416,9 +419,9 @@ static int bounce_verp_proto(char *service_name, VSTREAM *client)
return (-1);
}
if (msg_verbose)
msg_info("%s: flags=0x%x service=%s queue=%s id=%s encoding=%s smtputf8=%d sender=%s envid=%s ret=0x%x delim=%s",
msg_info("%s: flags=0x%x service=%s queue=%s id=%s encoding=%s sendopts=%d sender=%s envid=%s ret=0x%x delim=%s",
myname, flags, service_name, STR(queue_name),
STR(queue_id), STR(encoding), smtputf8, STR(sender),
STR(queue_id), STR(encoding), sendopts, STR(sender),
STR(dsn_envid), dsn_ret, STR(verp_delims));
/*
@ -436,12 +439,12 @@ static int bounce_verp_proto(char *service_name, VSTREAM *client)
mail_addr_double_bounce())) {
msg_warn("request to send VERP-style notification of bounced mail");
return (bounce_notify_service(flags, service_name, STR(queue_name),
STR(queue_id), STR(encoding), smtputf8,
STR(queue_id), STR(encoding), sendopts,
STR(sender), STR(dsn_envid), dsn_ret,
bounce_templates));
} else
return (bounce_notify_verp(flags, service_name, STR(queue_name),
STR(queue_id), STR(encoding), smtputf8,
STR(queue_id), STR(encoding), sendopts,
STR(sender), STR(dsn_envid), dsn_ret,
STR(verp_delims), bounce_templates));
}
@ -452,7 +455,7 @@ static int bounce_one_proto(char *service_name, VSTREAM *client)
{
const char *myname = "bounce_one_proto";
int flags;
int smtputf8;
int sendopts;
int dsn_ret;
/*
@ -463,7 +466,7 @@ static int bounce_one_proto(char *service_name, VSTREAM *client)
RECV_ATTR_STR(MAIL_ATTR_QUEUE, queue_name),
RECV_ATTR_STR(MAIL_ATTR_QUEUEID, queue_id),
RECV_ATTR_STR(MAIL_ATTR_ENCODING, encoding),
RECV_ATTR_INT(MAIL_ATTR_SMTPUTF8, &smtputf8),
RECV_ATTR_INT(MAIL_ATTR_SENDOPTS, &sendopts),
RECV_ATTR_STR(MAIL_ATTR_SENDER, sender),
RECV_ATTR_STR(MAIL_ATTR_DSN_ENVID, dsn_envid),
RECV_ATTR_INT(MAIL_ATTR_DSN_RET, &dsn_ret),
@ -512,9 +515,9 @@ static int bounce_one_proto(char *service_name, VSTREAM *client)
* RECIPIENT_FROM_RCPT_BUF().
*/
if (msg_verbose)
msg_info("%s: flags=0x%x queue=%s id=%s encoding=%s smtputf8=%d sender=%s envid=%s dsn_ret=0x%x orig_to=%s to=%s off=%ld dsn_orig=%s notif=0x%x stat=%s act=%s why=%s",
msg_info("%s: flags=0x%x queue=%s id=%s encoding=%s sendopts=%d sender=%s envid=%s dsn_ret=0x%x orig_to=%s to=%s off=%ld dsn_orig=%s notif=0x%x stat=%s act=%s why=%s",
myname, flags, STR(queue_name), STR(queue_id),
STR(encoding), smtputf8, STR(sender), STR(dsn_envid),
STR(encoding), sendopts, STR(sender), STR(dsn_envid),
dsn_ret, STR(rcpt_buf->orig_addr), STR(rcpt_buf->address),
rcpt_buf->offset, STR(rcpt_buf->dsn_orcpt),
rcpt_buf->dsn_notify, STR(dsn_buf->status),
@ -524,7 +527,7 @@ static int bounce_one_proto(char *service_name, VSTREAM *client)
* Execute the request.
*/
return (bounce_one_service(flags, STR(queue_name), STR(queue_id),
STR(encoding), smtputf8, STR(sender),
STR(encoding), sendopts, STR(sender),
STR(dsn_envid), dsn_ret, rcpt_buf,
dsn_buf, bounce_templates));
}

14
postfix/src/bounce/bounce_notify_service.c
View File

@ -7,14 +7,14 @@
/* #include "bounce_service.h"
/*
/* int bounce_notify_service(flags, service, queue_name, queue_id,
/* encoding, smtputf8, sender, dsn_envid,
/* encoding, sendopts, sender, dsn_envid,
/* dsn_ret, templates)
/* int flags;
/* char *service;
/* char *queue_name;
/* char *queue_id;
/* char *encoding;
/* int smtputf8;
/* int sendopts;
/* char *sender;
/* char *dsn_envid;
/* int dsn_ret;
@ -84,7 +84,7 @@
int bounce_notify_service(int flags, char *service, char *queue_name,
char *queue_id, char *encoding,
int smtputf8, char *recipient,
int sendopts, char *recipient,
char *dsn_envid, int dsn_ret,
BOUNCE_TEMPLATES *ts)
{
@ -131,7 +131,7 @@ int bounce_notify_service(int flags, char *service, char *queue_name,
* notification is enabled.
*/
bounce_info = bounce_mail_init(service, queue_name, queue_id,
encoding, smtputf8, dsn_envid,
encoding, sendopts, dsn_envid,
ts->failure);
#define NULL_SENDER MAIL_ADDR_EMPTY /* special address */
@ -179,7 +179,7 @@ int bounce_notify_service(int flags, char *service, char *queue_name,
postmaster,
MAIL_SRC_MASK_BOUNCE,
NULL_TRACE_FLAGS,
smtputf8,
sendopts,
new_id)) != 0) {
/*
@ -219,7 +219,7 @@ int bounce_notify_service(int flags, char *service, char *queue_name,
if ((bounce = post_mail_fopen_nowait(NULL_SENDER, recipient,
MAIL_SRC_MASK_BOUNCE,
NULL_TRACE_FLAGS,
smtputf8,
sendopts,
new_id)) != 0) {
/*
@ -274,7 +274,7 @@ int bounce_notify_service(int flags, char *service, char *queue_name,
postmaster,
MAIL_SRC_MASK_BOUNCE,
NULL_TRACE_FLAGS,
smtputf8,
sendopts,
new_id)) != 0) {
count = -1;
if (bounce_header(bounce, bounce_info, postmaster,

39
postfix/src/bounce/bounce_notify_util.c
View File

@ -13,22 +13,22 @@
/* } BOUNCE_INFO;
/*
/* BOUNCE_INFO *bounce_mail_init(service, queue_name, queue_id, encoding,
/* smtputf8, dsn_envid, template)
/* sendopts, dsn_envid, template)
/* const char *service;
/* const char *queue_name;
/* const char *queue_id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *dsn_envid;
/* const BOUNCE_TEMPLATE *template;
/*
/* BOUNCE_INFO *bounce_mail_one_init(queue_name, queue_id, encoding,
/* smtputf8, dsn_envid, dsn_notify,
/* sendopts, dsn_envid, dsn_notify,
/* rcpt_buf, dsn_buf, template)
/* const char *queue_name;
/* const char *queue_id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* int dsn_notify;
/* const char *dsn_envid;
/* RCPT_BUF *rcpt_buf;
@ -160,6 +160,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -221,7 +224,7 @@ static BOUNCE_INFO *bounce_mail_alloc(const char *service,
const char *queue_name,
const char *queue_id,
const char *encoding,
int smtputf8,
int sendopts,
const char *dsn_envid,
RCPT_BUF *rcpt_buf,
DSN_BUF *dsn_buf,
@ -244,7 +247,7 @@ static BOUNCE_INFO *bounce_mail_alloc(const char *service,
bounce_info->service = service;
bounce_info->queue_name = queue_name;
bounce_info->queue_id = queue_id;
bounce_info->smtputf8 = smtputf8;
bounce_info->sendopts = sendopts;
/* Fix 20140708: override MIME encoding: addresses may be 8bit. */
/* Fix 20140718: override MIME encoding: 8bit $myhostname expansion. */
if (var_smtputf8_enable /* was: bounce_info->smtputf8 */ ) {
@ -352,7 +355,8 @@ static BOUNCE_INFO *bounce_mail_alloc(const char *service,
quote_822_local_flags(bounce_info->sender,
VSTRING_LEN(bounce_info->buf) ?
STR(bounce_info->buf) :
mail_addr_mail_daemon(), 0);
mail_addr_mail_daemon(),
QUOTE_FLAG_8BITCLEAN);
}
/*
@ -422,7 +426,7 @@ BOUNCE_INFO *bounce_mail_init(const char *service,
const char *queue_name,
const char *queue_id,
const char *encoding,
int smtputf8,
int sendopts,
const char *dsn_envid,
BOUNCE_TEMPLATE *template)
{
@ -449,7 +453,7 @@ BOUNCE_INFO *bounce_mail_init(const char *service,
dsn_buf = dsb_create();
}
bounce_info = bounce_mail_alloc(service, queue_name, queue_id, encoding,
smtputf8, dsn_envid, rcpt_buf, dsn_buf,
sendopts, dsn_envid, rcpt_buf, dsn_buf,
template, log_handle);
return (bounce_info);
}
@ -459,7 +463,7 @@ BOUNCE_INFO *bounce_mail_init(const char *service,
BOUNCE_INFO *bounce_mail_one_init(const char *queue_name,
const char *queue_id,
const char *encoding,
int smtputf8,
int sendopts,
const char *dsn_envid,
RCPT_BUF *rcpt_buf,
DSN_BUF *dsn_buf,
@ -471,7 +475,7 @@ BOUNCE_INFO *bounce_mail_one_init(const char *queue_name,
* Initialize the bounce_info structure for just one recipient.
*/
bounce_info = bounce_mail_alloc("none", queue_name, queue_id, encoding,
smtputf8, dsn_envid, rcpt_buf, dsn_buf,
sendopts, dsn_envid, rcpt_buf, dsn_buf,
template, (BOUNCE_LOG *) 0);
return (bounce_info);
}
@ -694,12 +698,12 @@ int bounce_header_dsn(VSTREAM *bounce, BOUNCE_INFO *bounce_info)
"Delivery report");
/* Generate *global* only if the original requested SMTPUTF8 support. */
post_mail_fprintf(bounce, "Content-Type: message/%sdelivery-status",
(bounce_info->smtputf8 & SMTPUTF8_FLAG_REQUESTED) ?
(bounce_info->sendopts & SMTPUTF8_FLAG_REQUESTED) ?
"global-" : "");
/* Fix 20140709: addresses may be 8bit. */
if (NOT_7BIT_MIME(bounce_info)
/* BC Fix 20170610: prevent MIME downgrade of message/delivery-status. */
&& (bounce_info->smtputf8 & SMTPUTF8_FLAG_REQUESTED))
&& (bounce_info->sendopts & SMTPUTF8_FLAG_REQUESTED))
post_mail_fprintf(bounce, "Content-Transfer-Encoding: %s",
bounce_info->mime_encoding);
@ -727,7 +731,8 @@ int bounce_header_dsn(VSTREAM *bounce, BOUNCE_INFO *bounce_info)
/* Fix 20140708: use "utf-8" or "rfc822" as appropriate. */
if (VSTRING_LEN(bounce_info->sender) > 0)
post_mail_fprintf(bounce, "X-%s-Sender: %s; %s",
bounce_info->mail_name, bounce_info->smtputf8
bounce_info->mail_name,
(bounce_info->sendopts & SMTPUTF8_FLAG_ALL)
&& IS_UTF8_ADDRESS(STR(bounce_info->sender)) ?
"utf-8" : "rfc822", STR(bounce_info->sender));
if (bounce_info->arrival_time > 0)
@ -746,7 +751,7 @@ int bounce_recipient_dsn(VSTREAM *bounce, BOUNCE_INFO *bounce_info)
post_mail_fputs(bounce, "");
/* Fix 20140708: Don't send "utf-8" type with non-UTF8 address. */
post_mail_fprintf(bounce, "Final-Recipient: %s; %s",
bounce_info->smtputf8
(bounce_info->sendopts & SMTPUTF8_FLAG_ALL)
&& IS_UTF8_ADDRESS(rcpt->address) ?
"utf-8" : "rfc822", rcpt->address);
@ -774,7 +779,7 @@ int bounce_recipient_dsn(VSTREAM *bounce, BOUNCE_INFO *bounce_info)
} else if (NON_NULL_EMPTY(rcpt->orig_addr)) {
/* Fix 20140708: Don't send "utf-8" type with non-UTF8 address. */
post_mail_fprintf(bounce, "Original-Recipient: %s; %s",
bounce_info->smtputf8
(bounce_info->sendopts & SMTPUTF8_FLAG_ALL)
&& IS_UTF8_ADDRESS(rcpt->orig_addr) ?
"utf-8" : "rfc822", rcpt->orig_addr);
}
@ -869,7 +874,7 @@ int bounce_original(VSTREAM *bounce, BOUNCE_INFO *bounce_info,
headers_only == DSN_RET_HDRS ?
"Message Headers" : "Message");
/* Generate *global* only if the original requested SMTPUTF8 support. */
if (bounce_info->smtputf8 & SMTPUTF8_FLAG_REQUESTED)
if (bounce_info->sendopts & SMTPUTF8_FLAG_REQUESTED)
post_mail_fprintf(bounce, "Content-Type: message/%s",
headers_only == DSN_RET_HDRS ?
"global-headers" : "global");

14
postfix/src/bounce/bounce_notify_verp.c
View File

@ -7,7 +7,7 @@
/* #include "bounce_service.h"
/*
/* int bounce_notify_verp(flags, service, queue_name, queue_id,
/* encoding, smtputf8, sender,
/* encoding, sendopts, sender,
/* dsn_envid, dsn_ret, verp_delims,
/* templates)
/* int flags;
@ -15,7 +15,7 @@
/* char *queue_name;
/* char *queue_id;
/* char *encoding;
/* int smtputf8;
/* int sendopts;
/* char *sender;
/* char *dsn_envid;
/* int dsn_ret;
@ -87,7 +87,7 @@
int bounce_notify_verp(int flags, char *service, char *queue_name,
char *queue_id, char *encoding,
int smtputf8, char *recipient,
int sendopts, char *recipient,
char *dsn_envid, int dsn_ret,
char *verp_delims, BOUNCE_TEMPLATES *ts)
{
@ -115,7 +115,7 @@ int bounce_notify_verp(int flags, char *service, char *queue_name,
* Initialize. Open queue file, bounce log, etc.
*/
bounce_info = bounce_mail_init(service, queue_name, queue_id,
encoding, smtputf8, dsn_envid,
encoding, sendopts, dsn_envid,
ts->failure);
/*
@ -131,7 +131,7 @@ int bounce_notify_verp(int flags, char *service, char *queue_name,
vstring_strcpy(rcpt_buf->address, "(recipient address unavailable)");
(void) RECIPIENT_FROM_RCPT_BUF(rcpt_buf);
bounce_status = bounce_one_service(flags, queue_name, queue_id,
encoding, smtputf8, recipient,
encoding, sendopts, recipient,
dsn_envid, dsn_ret, rcpt_buf,
dsn_buf, ts);
rcpb_free(rcpt_buf);
@ -166,7 +166,7 @@ int bounce_notify_verp(int flags, char *service, char *queue_name,
if ((bounce = post_mail_fopen_nowait(NULL_SENDER, STR(verp_buf),
MAIL_SRC_MASK_BOUNCE,
NULL_TRACE_FLAGS,
smtputf8,
sendopts,
new_id)) != 0) {
/*
@ -226,7 +226,7 @@ int bounce_notify_verp(int flags, char *service, char *queue_name,
postmaster,
MAIL_SRC_MASK_BOUNCE,
NULL_TRACE_FLAGS,
smtputf8,
sendopts,
new_id)) != 0) {
if (bounce_header(bounce, bounce_info, postmaster,
POSTMASTER_COPY) == 0

14
postfix/src/bounce/bounce_one_service.c
View File

@ -7,13 +7,13 @@
/* #include "bounce_service.h"
/*
/* int bounce_one_service(flags, queue_name, queue_id, encoding,
/* smtputf8, orig_sender, envid, ret,
/* sendopts, orig_sender, envid, ret,
/* rcpt_buf, dsn_buf, templates)
/* int flags;
/* char *queue_name;
/* char *queue_id;
/* char *encoding;
/* int smtputf8;
/* int sendopts;
/* char *orig_sender;
/* char *envid;
/* int ret;
@ -83,7 +83,7 @@
/* bounce_one_service - send a bounce for one recipient */
int bounce_one_service(int flags, char *queue_name, char *queue_id,
char *encoding, int smtputf8,
char *encoding, int sendopts,
char *orig_sender, char *dsn_envid,
int dsn_ret, RCPT_BUF *rcpt_buf,
DSN_BUF *dsn_buf, BOUNCE_TEMPLATES *ts)
@ -100,7 +100,7 @@ int bounce_one_service(int flags, char *queue_name, char *queue_id,
* Initialize. Open queue file, bounce log, etc.
*/
bounce_info = bounce_mail_one_init(queue_name, queue_id, encoding,
smtputf8, dsn_envid, rcpt_buf,
sendopts, dsn_envid, rcpt_buf,
dsn_buf, ts->failure);
#define NULL_SENDER MAIL_ADDR_EMPTY /* special address */
@ -148,7 +148,7 @@ int bounce_one_service(int flags, char *queue_name, char *queue_id,
var_2bounce_rcpt,
MAIL_SRC_MASK_BOUNCE,
NULL_TRACE_FLAGS,
smtputf8,
sendopts,
new_id)) != 0) {
/*
@ -185,7 +185,7 @@ int bounce_one_service(int flags, char *queue_name, char *queue_id,
if ((bounce = post_mail_fopen_nowait(NULL_SENDER, orig_sender,
MAIL_SRC_MASK_BOUNCE,
NULL_TRACE_FLAGS,
smtputf8,
sendopts,
new_id)) != 0) {
/*
@ -231,7 +231,7 @@ int bounce_one_service(int flags, char *queue_name, char *queue_id,
var_bounce_rcpt,
MAIL_SRC_MASK_BOUNCE,
NULL_TRACE_FLAGS,
smtputf8,
sendopts,
new_id)) != 0) {
if (bounce_header(bounce, bounce_info, var_bounce_rcpt,
POSTMASTER_COPY) == 0

2
postfix/src/bounce/bounce_service.h
View File

@ -90,7 +90,7 @@ typedef struct {
DSN_BUF *dsn_buf; /* delivery status info */
BOUNCE_LOG *log_handle; /* open logfile */
char *mail_name; /* $mail_name, cooked */
int smtputf8; /* SMTPUTF8 requested */
int sendopts; /* smtputf8, requiretls, etc. */
} BOUNCE_INFO;
/* */

10
postfix/src/bounce/bounce_trace_service.c
View File

@ -7,14 +7,14 @@
/* #include "bounce_service.h"
/*
/* int bounce_trace_service(flags, service, queue_name, queue_id,
/* encoding, smtputf8, sender, envid,
/* encoding, sendopts, sender, envid,
/* ret, templates)
/* int flags;
/* char *service;
/* char *queue_name;
/* char *queue_id;
/* char *encoding;
/* int smtputf8;
/* int sendopts;
/* char *sender;
/* char *envid;
/* int ret;
@ -81,7 +81,7 @@
int bounce_trace_service(int flags, char *service, char *queue_name,
char *queue_id, char *encoding,
int smtputf8,
int sendopts,
char *recipient, char *dsn_envid,
int unused_dsn_ret,
BOUNCE_TEMPLATES *ts)
@ -140,7 +140,7 @@ int bounce_trace_service(int flags, char *service, char *queue_name,
#define NON_DSN_FLAGS (DEL_REQ_FLAG_USR_VRFY | DEL_REQ_FLAG_RECORD)
bounce_info = bounce_mail_init(service, queue_name, queue_id,
encoding, smtputf8, dsn_envid,
encoding, sendopts, dsn_envid,
flags & NON_DSN_FLAGS ?
ts->verify : ts->success);
@ -179,7 +179,7 @@ int bounce_trace_service(int flags, char *service, char *queue_name,
if ((bounce = post_mail_fopen_nowait(sender, recipient,
MAIL_SRC_MASK_BOUNCE,
NULL_TRACE_FLAGS,
smtputf8,
sendopts,
new_id)) != 0) {
count = -1;
if (bounce_header(bounce, bounce_info, recipient,

14
postfix/src/bounce/bounce_warn_service.c
View File

@ -7,14 +7,14 @@
/* #include "bounce_service.h"
/*
/* int bounce_warn_service(flags, service, queue_name, queue_id,
/* encoding, smtputf8, sender, envid,
/* encoding, sendopts, sender, envid,
/* dsn_ret, templates)
/* int flags;
/* char *service;
/* char *queue_name;
/* char *queue_id;
/* char *encoding;
/* int smtputf8;
/* int sendopts;
/* char *sender;
/* char *envid;
/* int dsn_ret;
@ -84,7 +84,7 @@
int bounce_warn_service(int unused_flags, char *service, char *queue_name,
char *queue_id, char *encoding,
int smtputf8, char *recipient,
int sendopts, char *recipient,
char *dsn_envid, int dsn_ret,
BOUNCE_TEMPLATES *ts)
{
@ -121,7 +121,7 @@ int bounce_warn_service(int unused_flags, char *service, char *queue_name,
* notify_classes restrictions.
*/
bounce_info = bounce_mail_init(service, queue_name, queue_id,
encoding, smtputf8, dsn_envid, ts->delay);
encoding, sendopts, dsn_envid, ts->delay);
#define NULL_SENDER MAIL_ADDR_EMPTY /* special address */
#define NULL_TRACE_FLAGS 0
@ -168,7 +168,7 @@ int bounce_warn_service(int unused_flags, char *service, char *queue_name,
postmaster,
MAIL_SRC_MASK_BOUNCE,
NULL_TRACE_FLAGS,
smtputf8,
sendopts,
new_id)) != 0) {
/*
@ -207,7 +207,7 @@ int bounce_warn_service(int unused_flags, char *service, char *queue_name,
if ((bounce = post_mail_fopen_nowait(NULL_SENDER, recipient,
MAIL_SRC_MASK_BOUNCE,
NULL_TRACE_FLAGS,
smtputf8,
sendopts,
new_id)) != 0) {
/*
@ -258,7 +258,7 @@ int bounce_warn_service(int unused_flags, char *service, char *queue_name,
postmaster,
MAIL_SRC_MASK_BOUNCE,
NULL_TRACE_FLAGS,
smtputf8,
sendopts,
new_id)) != 0) {
count = -1;
if (bounce_header(bounce, bounce_info, postmaster,

16
postfix/src/cleanup/Makefile.in
View File

@ -15,7 +15,7 @@ HDRS =
TESTSRC =
DEFS = -I. -I$(INC_DIR) -D$(SYSTYPE)
CFLAGS = $(DEBUG) $(OPT) $(DEFS)
TESTPROG= cleanup_masquerade cleanup_milter
TESTPROG= cleanup_masquerade cleanup_milter cleanup_envelope_test
PROG = cleanup
INC_DIR = ../../include
LIBS = ../../lib/lib$(LIB_PREFIX)master$(LIB_SUFFIX) \
@ -57,7 +57,15 @@ cleanup_milter: cleanup_milter.o $(CLEANUP_MILTER_OBJS) $(LIBS)
$(CC) $(CFLAGS) -DTEST -o $@ $@.c $(CLEANUP_MILTER_OBJS) $(LIBS) $(SYSLIBS)
mv junk cleanup_milter.o
tests: cleanup_masquerade_test milter_tests
CLEANUP_SIZE_TEST_OBJS = cleanup_envelope.o cleanup_state.o cleanup_out.o \
cleanup_final.o
cleanup_envelope_test: cleanup_envelope_test.o $(CLEANUP_SIZE_TEST_OBJS) $(LIBS)
$(CC) $(CFLAGS) -DTEST -o $@ $@.c $(CLEANUP_SIZE_TEST_OBJS) $(LIBS) $(SYSLIBS)
tests: cleanup_masquerade_test milter_tests test_cleanup_envelope
test_cleanup_envelope: cleanup_envelope_test
$(SHLIB_ENV) $(VALGRIND) ./cleanup_envelope_test
milter_tests: cleanup_milter_test bug_tests \
cleanup_milter_test2 cleanup_milter_test3 cleanup_milter_test4 \
@ -778,6 +786,7 @@ cleanup_addr.o: ../../include/nvtable.h
cleanup_addr.o: ../../include/rec_type.h
cleanup_addr.o: ../../include/record.h
cleanup_addr.o: ../../include/resolve_clnt.h
cleanup_addr.o: ../../include/sendopts.h
cleanup_addr.o: ../../include/smtputf8.h
cleanup_addr.o: ../../include/string_list.h
cleanup_addr.o: ../../include/stringops.h
@ -821,6 +830,7 @@ cleanup_api.o: ../../include/nvtable.h
cleanup_api.o: ../../include/rec_type.h
cleanup_api.o: ../../include/recipient_list.h
cleanup_api.o: ../../include/resolve_clnt.h
cleanup_api.o: ../../include/sendopts.h
cleanup_api.o: ../../include/smtputf8.h
cleanup_api.o: ../../include/string_list.h
cleanup_api.o: ../../include/sys_defs.h
@ -937,6 +947,7 @@ cleanup_envelope.o: ../../include/rec_type.h
cleanup_envelope.o: ../../include/recipient_list.h
cleanup_envelope.o: ../../include/record.h
cleanup_envelope.o: ../../include/resolve_clnt.h
cleanup_envelope.o: ../../include/sendopts.h
cleanup_envelope.o: ../../include/smtputf8.h
cleanup_envelope.o: ../../include/string_list.h
cleanup_envelope.o: ../../include/stringops.h
@ -1276,6 +1287,7 @@ cleanup_out.o: ../../include/nvtable.h
cleanup_out.o: ../../include/rec_type.h
cleanup_out.o: ../../include/record.h
cleanup_out.o: ../../include/resolve_clnt.h
cleanup_out.o: ../../include/sendopts.h
cleanup_out.o: ../../include/smtputf8.h
cleanup_out.o: ../../include/split_at.h
cleanup_out.o: ../../include/string_list.h

7
postfix/src/cleanup/cleanup.h
View File

@ -129,9 +129,9 @@ typedef struct CLEANUP_STATE {
struct CLEANUP_REGION *curr_body_region;
/*
* Internationalization.
* Internationalization, RequireTLS, etc.
*/
int smtputf8; /* what support is desired */
int sendopts; /* what support is desired */
} CLEANUP_STATE;
/*
@ -369,4 +369,7 @@ extern int cleanup_hfrom_format;
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/

13
postfix/src/cleanup/cleanup_addr.c
View File

@ -68,6 +68,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -149,10 +152,10 @@ off_t cleanup_addr_sender(CLEANUP_STATE *state, const char *buf)
/* Fix 20140711: Auto-detect an UTF8 sender. */
if (var_smtputf8_enable && *STR(clean_addr) && !allascii(STR(clean_addr))
&& valid_utf8_stringz(STR(clean_addr))) {
state->smtputf8 |= SMTPUTF8_FLAG_SENDER;
state->sendopts |= SMTPUTF8_FLAG_SENDER;
/* Fix 20140713: request SMTPUTF8 support selectively. */
if (state->flags & CLEANUP_FLAG_AUTOUTF8)
state->smtputf8 |= SMTPUTF8_FLAG_REQUESTED;
state->sendopts |= SMTPUTF8_FLAG_REQUESTED;
}
CLEANUP_OUT_BUF(state, REC_TYPE_FROM, clean_addr);
if (state->sender) /* XXX Can't happen */
@ -219,12 +222,12 @@ void cleanup_addr_recipient(CLEANUP_STATE *state, const char *buf)
&& valid_utf8_stringz(STR(clean_addr))) {
/* Fix 20140713: request SMTPUTF8 support selectively. */
if (state->flags & CLEANUP_FLAG_AUTOUTF8)
state->smtputf8 |= SMTPUTF8_FLAG_REQUESTED;
state->sendopts |= SMTPUTF8_FLAG_REQUESTED;
}
/* Fix 20141024: Don't fake up a "bare" DSN original rcpt in smtp(8). */
if (state->dsn_orcpt == 0 && *STR(clean_addr) != 0)
state->dsn_orcpt = concatenate((!allascii(STR(clean_addr))
&& (state->smtputf8 & SMTPUTF8_FLAG_REQUESTED)) ?
&& (state->sendopts & SMTPUTF8_FLAG_REQUESTED)) ?
"utf-8" : "rfc822", ";", STR(clean_addr), (char *) 0);
cleanup_out_recipient(state, state->dsn_orcpt, state->dsn_notify,
state->orig_rcpt, STR(clean_addr));
@ -278,7 +281,7 @@ void cleanup_addr_bcc_dsn(CLEANUP_STATE *state, const char *bcc,
&& valid_utf8_stringz(STR(clean_addr))) {
/* Fix 20140713: request SMTPUTF8 support selectively. */
if (state->flags & CLEANUP_FLAG_AUTOUTF8)
state->smtputf8 |= SMTPUTF8_FLAG_REQUESTED;
state->sendopts |= SMTPUTF8_FLAG_REQUESTED;
}
cleanup_out_recipient(state, dsn_orcpt, dsn_notify,
STR(clean_addr), STR(clean_addr));

6
postfix/src/cleanup/cleanup_api.c
View File

@ -100,6 +100,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -206,7 +209,8 @@ void cleanup_control(CLEANUP_STATE *state, int flags)
state->err_mask = ~0;
}
if (state->flags & CLEANUP_FLAG_SMTPUTF8)
state->smtputf8 = SMTPUTF8_FLAG_REQUESTED;
state->sendopts |= SMTPUTF8_FLAG_REQUESTED;
/* TODO(wietse) REQUIRETLS. */
}
/* cleanup_flush - finish queue file */

4
postfix/src/cleanup/cleanup_bounce.c
View File

@ -229,13 +229,13 @@ int cleanup_bounce(CLEANUP_STATE *state)
bounce_err =
bounce_flush(BOUNCE_FLAG_CLEAN,
state->queue_name, state->queue_id,
encoding, state->smtputf8, state->sender,
encoding, state->sendopts, state->sender,
dsn_envid, dsn_ret);
} else {
bounce_err =
bounce_flush_verp(BOUNCE_FLAG_CLEAN,
state->queue_name, state->queue_id,
encoding, state->smtputf8, state->sender,
encoding, state->sendopts, state->sender,
dsn_envid, dsn_ret, state->verp_delims);
}
if (bounce_err != 0) {

14
postfix/src/cleanup/cleanup_envelope.c
View File

@ -42,6 +42,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -350,16 +353,17 @@ static void cleanup_envelope_process(CLEANUP_STATE *state, int type,
/*
* Initial envelope non-recipient record processing.
*
* If the message was requeued with "postsuper -r" use their
* SMTPUTF8_REQUESTED flag.
* If this message was requeued with "postsuper -r", use their sender
* options flags, excluding flags derived from headers or envelopes.
* Those flags may be derived again, depending on Postfix configuration.
*/
if (state->flags & CLEANUP_FLAG_INRCPT)
/* Tell qmgr that recipient records are mixed with other information. */
state->qmgr_opts |= QMGR_READ_FLAG_MIXED_RCPT_OTHER;
if (type == REC_TYPE_SIZE) {
/* Use our own SIZE record, except for the SMTPUTF8_REQUESTED flag. */
(void) sscanf(buf, "%*s $*s %*s %*s %*s %d", &state->smtputf8);
state->smtputf8 &= SMTPUTF8_FLAG_REQUESTED;
/* Ignore their SIZE record, but keep the non-derived sender options. */
(void) sscanf(buf, "%*s %*s %*s %*s %*s %d", &state->sendopts);
state->sendopts &= ~SOPT_FLAG_DERIVED;
return;
}
if (mapped_type == REC_TYPE_CTIME)

267
postfix/src/cleanup/cleanup_envelope_test.c Normal file
View File

@ -0,0 +1,267 @@
/*
* System library.
*/
#include <sys_defs.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h> /* ssscanf() */
#include <ctype.h>
/*
* Utility library.
*/
#include <msg.h>
#include <msg_vstream.h>
#include <vstring.h>
#include <vstream.h>
#include <stringops.h>
/*
* Global library.
*/
#include <been_here.h>
#include <record.h>
#include <rec_type.h>
#include <cleanup_user.h>
#include <mail_params.h>
#include <smtputf8.h>
/*
* Application-specific.
*/
#include <cleanup.h>
/*
* Stubs for parameter dependencies.
*/
int var_delay_warn_time = 0;
int var_dup_filter_limit = DEF_DUP_FILTER_LIMIT;
char *var_remote_rwr_domain = DEF_REM_RWR_DOMAIN;
int var_qattr_count_limit = DEF_QATTR_COUNT_LIMIT;
VSTRING *cleanup_strip_chars = 0;
MILTERS *cleanup_milters = 0;
VSTRING *cleanup_trace_path = 0;
MAPS *cleanup_virt_alias_maps = 0;
char *cleanup_path = "fixed";
/*
* Stubs for cleanup_message.c dependencies. TODO(wietse) replace function
* stubs with mocks that can have expectations and that can report
* unexpected calls.
*/
void cleanup_message(CLEANUP_STATE *state, int type, const char *buf,
ssize_t len)
{
msg_panic("cleanup_message");
}
/*
* Stubs for cleanup_milter.c dependencies.
*/
void cleanup_milter_receive(CLEANUP_STATE *state, int count)
{
msg_panic("cleanup_milter_receive");
}
void cleanup_milter_emul_mail(CLEANUP_STATE *state, MILTERS *milters,
const char *sender)
{
msg_panic("cleanup_milter_emul_mail");
}
void cleanup_milter_emul_rcpt(CLEANUP_STATE *state, MILTERS *milters,
const char *recipient)
{
msg_panic("cleanup_milter_emul_rcpt");
}
/*
* Stubs for cleanup_addr.c dependencies.
*/
off_t cleanup_addr_sender(CLEANUP_STATE *state, const char *addr)
{
msg_panic("cleanup_addr_sender");
}
void cleanup_addr_recipient(CLEANUP_STATE *state, const char *addr)
{
msg_panic("cleanup_addr_recipient");
}
/*
* Stubs for cleanup_region.c dependencies.
*/
void cleanup_region_done(CLEANUP_STATE *state)
{
}
/*
* Tests and test cases.
*/
typedef struct TEST_CASE {
const char *label; /* identifies test case */
int (*action) (const struct TEST_CASE *);
} TEST_CASE;
#define PASS 1
#define FAIL 0
static int overrides_size_fields(const TEST_CASE *tp)
{
/*
* Generate one SIZE record test payload.
*/
VSTRING *input_buf = vstring_alloc(100);
vstring_sprintf(input_buf, REC_TYPE_SIZE_FORMAT,
(REC_TYPE_SIZE_CAST1) ~ 0, /* message segment size */
(REC_TYPE_SIZE_CAST2) ~ 0, /* content offset */
(REC_TYPE_SIZE_CAST3) ~ 0, /* recipient count */
(REC_TYPE_SIZE_CAST4) ~ 0, /* qmgr options */
(REC_TYPE_SIZE_CAST5) ~ 0, /* content length */
(REC_TYPE_SIZE_CAST6) SOPT_FLAG_ALL); /* sendopts */
/*
* Instantiate CLEANUP_STATE, and save information that isn't expected to
* change. We only need to save simple-type CLEANUP_STATE fields that
* correspond with SIZE record fields.
*/
CLEANUP_STATE *state = cleanup_state_alloc((VSTREAM *) 0);
CLEANUP_STATE saved_state = *state;
/*
* Process the test SIZE record payload and write an place-holder SIZE
* record that will be overwritten later with final information.
*/
VSTRING *output_stream_buf = vstring_alloc(100);
if ((state->dst = vstream_memopen(output_stream_buf, O_WRONLY)) == 0) {
msg_warn("vstream_memopen(output_stream_buf, O_WRONLY): %m");
return (FAIL);
}
cleanup_envelope(state, REC_TYPE_SIZE, vstring_str(input_buf),
VSTRING_LEN(input_buf));
if (state->errs != CLEANUP_STAT_OK) {
msg_warn("cleanup_envelope: got: '%s', want: '%s'",
cleanup_strerror(state->errs),
cleanup_strerror(CLEANUP_STAT_OK));
return (FAIL);
}
vstring_free(input_buf);
input_buf = 0;
/*
* Write an updated SIZE record to the output stream.
*/
cleanup_final(state);
if (state->errs != CLEANUP_STAT_OK) {
msg_warn("cleanup_final: got: '%s', want: '%s'",
cleanup_strerror(state->errs),
cleanup_strerror(CLEANUP_STAT_OK));
return (FAIL);
}
(void) vstream_fclose(state->dst);
state->dst = 0;
/*
* Compare the stored record content against the expected content.
*/
VSTREAM *fp;
if ((fp = vstream_memopen(output_stream_buf, O_RDONLY)) == 0) {
msg_warn("vstream_memopen(output_stream_buf, O_RDONLY): %m");
return (FAIL);
}
VSTRING *got_size_payload = vstring_alloc(VSTRING_LEN(output_stream_buf));
int got_rec_type;
if ((got_rec_type = rec_get(fp, got_size_payload, 0)) != REC_TYPE_SIZE) {
msg_warn("rec_get: got: %s, want: %s",
rec_type_name(got_rec_type), rec_type_name(REC_TYPE_SIZE));
return (FAIL);
}
(void) vstream_fclose(fp);
vstring_free(output_stream_buf);
int got_conv;
long data_size, data_offset, cont_length;
int rcpt_count, qmgr_opts, sendopts;
if ((got_conv = sscanf(vstring_str(got_size_payload), "%ld %ld %d %d %ld %d",
&data_size, &data_offset, &rcpt_count, &qmgr_opts,
&cont_length, &sendopts)) != 6) {
msg_warn("sscanf SIZE record fields: got: %d, want 6", got_conv);
return (FAIL);
}
if (data_size != saved_state.xtra_offset - saved_state.data_offset) {
msg_warn("SIZE.data_size: got %ld, want: %ld", (long) data_size,
(long) (saved_state.xtra_offset - saved_state.data_offset));
return (FAIL);
}
if (data_offset != saved_state.data_offset) {
msg_warn("SIZE.data_offset: got %ld, want: %ld", (long) data_offset,
(long) saved_state.data_offset);
return (FAIL);
}
if (rcpt_count != saved_state.rcpt_count) {
msg_warn("SIZE.rcpt_count: got: %d, want: %d", rcpt_count,
(int) saved_state.rcpt_count);
return (FAIL);
}
if (qmgr_opts != saved_state.qmgr_opts) {
msg_warn("SIZE.qmgr_opts: got: %d, want: %d", qmgr_opts,
saved_state.qmgr_opts);
return (FAIL);
}
if (cont_length != saved_state.cont_length) {
msg_warn("SIZE.cont_length: got %ld, want: %ld", (long) cont_length,
(long) saved_state.cont_length);
return (FAIL);
}
if (sendopts != (SOPT_FLAG_ALL & ~SOPT_FLAG_DERIVED)) {
msg_warn("SIZE.sendopts: got: 0x%x, want: 0x%x",
sendopts, SOPT_FLAG_ALL & ~SOPT_FLAG_DERIVED);
return (FAIL);
}
/*
* Cleanup.
*/
vstring_free(got_size_payload);
cleanup_state_free(state);
return (PASS);
}
static const TEST_CASE test_cases[] = {
{"overrides_size_fields",
overrides_size_fields,
},
{0},
};
int main(int argc, char **argv)
{
const TEST_CASE *tp;
int pass = 0;
int fail = 0;
/* XXX How to avoid linking in mail_params.o? */
var_line_limit = DEF_LINE_LIMIT;
msg_vstream_init(sane_basename((VSTRING *) 0, argv[0]), VSTREAM_ERR);
for (tp = test_cases; tp->label != 0; tp++) {
msg_info("RUN %s", tp->label);
if (tp->action(tp) != PASS) {
fail++;
msg_info("FAIL %s", tp->label);
} else {
msg_info("PASS %s", tp->label);
pass++;
}
}
msg_info("PASS=%d FAIL=%d", pass, fail);
exit(fail != 0);
}

2
postfix/src/cleanup/cleanup_final.c
View File

@ -74,5 +74,5 @@ void cleanup_final(CLEANUP_STATE *state)
(REC_TYPE_SIZE_CAST3) state->rcpt_count,
(REC_TYPE_SIZE_CAST4) state->qmgr_opts,
(REC_TYPE_SIZE_CAST5) state->cont_length,
(REC_TYPE_SIZE_CAST6) state->smtputf8);
(REC_TYPE_SIZE_CAST6) state->sendopts);
}

7
postfix/src/cleanup/cleanup_out.c
View File

@ -69,6 +69,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -186,10 +189,10 @@ void cleanup_out_header(CLEANUP_STATE *state, VSTRING *header_buf)
* Fix 20140711: Auto-detect the presence of a non-ASCII header.
*/
if (var_smtputf8_enable && *STR(header_buf) && !allascii(STR(header_buf))) {
state->smtputf8 |= SMTPUTF8_FLAG_HEADER;
state->sendopts |= SMTPUTF8_FLAG_HEADER;
/* Fix 20140713: request SMTPUTF8 support selectively. */
if (state->flags & CLEANUP_FLAG_AUTOUTF8)
state->smtputf8 |= SMTPUTF8_FLAG_REQUESTED;
state->sendopts |= SMTPUTF8_FLAG_REQUESTED;
}
/*

2
postfix/src/cleanup/cleanup_state.c
View File

@ -140,7 +140,7 @@ CLEANUP_STATE *cleanup_state_alloc(VSTREAM *src)
state->milter_err_text = 0;
state->milter_dsn_buf = 0;
state->free_regions = state->body_regions = state->curr_body_region = 0;
state->smtputf8 = 0;
state->sendopts = 0;
return (state);
}

18
postfix/src/global/Makefile.in
View File

@ -37,7 +37,7 @@ SRCS = abounce.c anvil_clnt.c been_here.c bounce.c bounce_log.c \
normalize_mailhost_addr.c map_search.c reject_deliver_request.c \
info_log_addr_form.c sasl_mech_filter.c login_sender_match.c \
test_main.c compat_level.c config_known_tcp_ports.c \
hfrom_format.c rfc2047_code.c ascii_header_text.c
hfrom_format.c rfc2047_code.c ascii_header_text.c sendopts.c
OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \
canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \
clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \
@ -76,7 +76,7 @@ OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \
normalize_mailhost_addr.o map_search.o reject_deliver_request.o \
info_log_addr_form.o sasl_mech_filter.o login_sender_match.o \
test_main.o compat_level.o config_known_tcp_ports.o \
hfrom_format.o rfc2047_code.o ascii_header_text.o
hfrom_format.o rfc2047_code.o ascii_header_text.o sendopts.o
# MAP_OBJ is for maps that may be dynamically loaded with dynamicmaps.cf.
# When hard-linking these maps, makedefs sets NON_PLUGIN_MAP_OBJ=$(MAP_OBJ),
# otherwise it sets the PLUGIN_* macros.
@ -113,7 +113,7 @@ HDRS = abounce.h anvil_clnt.h been_here.h bounce.h bounce_log.h \
maillog_client.h normalize_mailhost_addr.h map_search.h \
info_log_addr_form.h sasl_mech_filter.h login_sender_match.h \
test_main.h compat_level.h config_known_tcp_ports.h \
hfrom_format.h rfc2047_code.h ascii_header_text.h
hfrom_format.h rfc2047_code.h ascii_header_text.h sendopts.h
TESTSRC = rec2stream.c stream2rec.c recdump.c
DEFS = -I. -I$(INC_DIR) -D$(SYSTYPE)
CFLAGS = $(DEBUG) $(OPT) $(DEFS)
@ -131,7 +131,7 @@ TESTPROG= domain_list dot_lockfile mail_addr_crunch mail_addr_find \
fold_addr smtp_reply_footer mail_addr_map normalize_mailhost_addr \
haproxy_srvr map_search delivered_hdr login_sender_match \
compat_level config_known_tcp_ports hfrom_format rfc2047_code \
ascii_header_text
ascii_header_text sendopts
LIBS = ../../lib/lib$(LIB_PREFIX)util$(LIB_SUFFIX)
LIB_DIR = ../../lib
@ -405,6 +405,9 @@ rfc2047_code: rfc2047_code.c $(LIB) $(LIBS)
ascii_header_text: ascii_header_text.c $(LIB) $(LIBS)
$(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS)
sendopts: sendopts.c $(LIB) $(LIBS)
$(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS)
config_known_tcp_ports: config_known_tcp_ports.c $(LIB) $(LIBS)
$(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS)
@ -418,7 +421,7 @@ tests: tok822_test mime_tests strip_addr_test tok822_limit_test \
normalize_mailhost_addr_test haproxy_srvr_test map_search_test \
delivered_hdr_test login_sender_match_test compat_level_test \
config_known_tcp_ports_test hfrom_format_test rfc2047_code_test \
ascii_header_text_test
ascii_header_text_test sendopts_test
mime_tests: mime_test mime_nest mime_8bit mime_dom mime_trunc mime_cvt \
mime_cvt2 mime_cvt3 mime_garb1 mime_garb2 mime_garb3 mime_garb4
@ -790,6 +793,9 @@ rfc2047_code_test: update rfc2047_code
ascii_header_text_test: update ascii_header_text
$(SHLIB_ENV) $(VALGRIND) ./ascii_header_text
sendopts_test: update sendopts
-$(SHLIB_ENV) $(VALGRIND) ./sendopts
clean:
rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAPS)
@ -2399,6 +2405,7 @@ post_mail.o: post_mail.c
post_mail.o: post_mail.h
post_mail.o: rec_type.h
post_mail.o: record.h
post_mail.o: sendopts.h
post_mail.o: smtputf8.h
quote_821_local.o: ../../include/check_arg.h
quote_821_local.o: ../../include/sys_defs.h
@ -2752,6 +2759,7 @@ smtputf8.o: ../../include/vstring.h
smtputf8.o: cleanup_user.h
smtputf8.o: mail_params.h
smtputf8.o: mail_proto.h
smtputf8.o: sendopts.h
smtputf8.o: smtputf8.c
smtputf8.o: smtputf8.h
split_addr.o: ../../include/check_arg.h

59
postfix/src/global/abounce.c
View File

@ -6,26 +6,26 @@
/* SYNOPSIS
/* #include <abounce.h>
/*
/* void abounce_flush(flags, queue, id, encoding, smtputf8, sender,
/* void abounce_flush(flags, queue, id, encoding, sendopts, sender,
/* dsn_envid, dsn_ret, callback, context)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
/* void (*callback)(int status, void *context);
/* void *context;
/*
/* void abounce_flush_verp(flags, queue, id, encoding, smtputf8, sender,
/* void abounce_flush_verp(flags, queue, id, encoding, sendopts, sender,
/* dsn_envid, dsn_ret, verp, callback, context)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
@ -33,26 +33,26 @@
/* void (*callback)(int status, void *context);
/* void *context;
/*
/* void adefer_flush(flags, queue, id, encoding, smtputf8, sender,
/* void adefer_flush(flags, queue, id, encoding, sendopts, sender,
/* dsn_envid, dsn_ret, callback, context)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
/* void (*callback)(int status, void *context);
/* void *context;
/*
/* void adefer_flush_verp(flags, queue, id, encoding, smtputf8, sender,
/* void adefer_flush_verp(flags, queue, id, encoding, sendopts, sender,
/* dsn_envid, dsn_ret, verp, callback, context)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
@ -60,26 +60,26 @@
/* void (*callback)(int status, void *context);
/* void *context;
/*
/* void adefer_warn(flags, queue, id, encoding, smtputf8, sender,
/* void adefer_warn(flags, queue, id, encoding, sendopts, sender,
/* dsn_envid, dsn_ret, callback, context)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
/* void (*callback)(int status, void *context);
/* void *context;
/*
/* void atrace_flush(flags, queue, id, encoding, smtputf8, sender,
/* void atrace_flush(flags, queue, id, encoding, sendopts, sender,
/* dsn_envid, dsn_ret, callback, context)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
@ -138,8 +138,8 @@
/* file has the same name as the original message file.
/* .IP encoding
/* The body content encoding: MAIL_ATTR_ENC_{7BIT,8BIT,NONE}.
/* .IP smtputf8
/* The level of SMTPUTF8 support (to be defined).
/* .IP sendopts
/* Sender-requested SMTPUTF8 or RequireTLS support.
/* .IP sender
/* The sender envelope address.
/* .IP dsn_envid
@ -174,6 +174,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -320,7 +323,7 @@ static void abounce_send(int event, void *context)
static void abounce_connect(const char *class, const char *service,
int command, int flags,
const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender,
const char *dsn_envid, int dsn_ret,
const char *verp, ABOUNCE_FN callback,
@ -363,7 +366,7 @@ static void abounce_connect(const char *class, const char *service,
SEND_ATTR_STR(MAIL_ATTR_QUEUE, queue),
SEND_ATTR_STR(MAIL_ATTR_QUEUEID, id),
SEND_ATTR_STR(MAIL_ATTR_ENCODING, encoding),
SEND_ATTR_INT(MAIL_ATTR_SMTPUTF8, smtputf8),
SEND_ATTR_INT(MAIL_ATTR_SENDOPTS, sendopts),
SEND_ATTR_STR(MAIL_ATTR_SENDER, sender),
SEND_ATTR_STR(MAIL_ATTR_DSN_ENVID, dsn_envid),
SEND_ATTR_INT(MAIL_ATTR_DSN_RET, dsn_ret),
@ -390,77 +393,77 @@ static void abounce_connect(const char *class, const char *service,
/* abounce_flush_verp - asynchronous bounce flush */
void abounce_flush_verp(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *dsn_envid,
int dsn_ret, const char *verp,
ABOUNCE_FN callback,
void *context)
{
abounce_connect(MAIL_CLASS_PRIVATE, var_bounce_service,
BOUNCE_CMD_VERP, flags, queue, id, encoding, smtputf8,
BOUNCE_CMD_VERP, flags, queue, id, encoding, sendopts,
sender, dsn_envid, dsn_ret, verp, callback, context);
}
/* adefer_flush_verp - asynchronous defer flush */
void adefer_flush_verp(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *dsn_envid,
int dsn_ret, const char *verp,
ABOUNCE_FN callback, void *context)
{
flags |= BOUNCE_FLAG_DELRCPT;
abounce_connect(MAIL_CLASS_PRIVATE, var_defer_service,
BOUNCE_CMD_VERP, flags, queue, id, encoding, smtputf8,
BOUNCE_CMD_VERP, flags, queue, id, encoding, sendopts,
sender, dsn_envid, dsn_ret, verp, callback, context);
}
/* abounce_flush - asynchronous bounce flush */
void abounce_flush(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *dsn_envid,
int dsn_ret, ABOUNCE_FN callback,
void *context)
{
abounce_connect(MAIL_CLASS_PRIVATE, var_bounce_service, BOUNCE_CMD_FLUSH,
flags, queue, id, encoding, smtputf8, sender, dsn_envid,
flags, queue, id, encoding, sendopts, sender, dsn_envid,
dsn_ret, ABOUNCE_NO_VERP, callback, context);
}
/* adefer_flush - asynchronous defer flush */
void adefer_flush(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *dsn_envid,
int dsn_ret, ABOUNCE_FN callback, void *context)
{
flags |= BOUNCE_FLAG_DELRCPT;
abounce_connect(MAIL_CLASS_PRIVATE, var_defer_service, BOUNCE_CMD_FLUSH,
flags, queue, id, encoding, smtputf8, sender, dsn_envid,
flags, queue, id, encoding, sendopts, sender, dsn_envid,
dsn_ret, ABOUNCE_NO_VERP, callback, context);
}
/* adefer_warn - send copy of defer log to sender as warning bounce */
void adefer_warn(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *dsn_envid,
int dsn_ret, ABOUNCE_FN callback, void *context)
{
abounce_connect(MAIL_CLASS_PRIVATE, var_defer_service, BOUNCE_CMD_WARN,
flags, queue, id, encoding, smtputf8, sender, dsn_envid,
flags, queue, id, encoding, sendopts, sender, dsn_envid,
dsn_ret, ABOUNCE_NO_VERP, callback, context);
}
/* atrace_flush - asynchronous trace flush */
void atrace_flush(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *dsn_envid,
int dsn_ret, ABOUNCE_FN callback, void *context)
{
abounce_connect(MAIL_CLASS_PRIVATE, var_trace_service, BOUNCE_CMD_TRACE,
flags, queue, id, encoding, smtputf8, sender, dsn_envid,
flags, queue, id, encoding, sendopts, sender, dsn_envid,
dsn_ret, ABOUNCE_NO_VERP, callback, context);
}

39
postfix/src/global/bounce.c
View File

@ -14,36 +14,36 @@
/* const char *relay;
/* DSN *dsn;
/*
/* int bounce_flush(flags, queue, id, encoding, smtputf8, sender,
/* int bounce_flush(flags, queue, id, encoding, sendopts, sender,
/* dsn_envid, dsn_ret)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
/*
/* int bounce_flush_verp(flags, queue, id, encoding, smtputf8,
/* int bounce_flush_verp(flags, queue, id, encoding, sendopts,
/* sender, dsn_envid, dsn_ret, verp_delims)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
/* const char *verp_delims;
/*
/* int bounce_one(flags, queue, id, encoding, smtputf8, sender,
/* int bounce_one(flags, queue, id, encoding, sendopts, sender,
/* dsn_envid, ret, stats, recipient, relay, dsn)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
@ -65,13 +65,13 @@
/* RECIPIENT *rcpt;
/* const char *relay;
/*
/* int bounce_one_intern(flags, queue, id, encoding, smtputf8, sender,
/* int bounce_one_intern(flags, queue, id, encoding, sendopts, sender,
/* dsn_envid, ret, stats, recipient, relay, dsn)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
@ -151,8 +151,8 @@
/* This information is used for syslogging only.
/* .IP encoding
/* The body content encoding: MAIL_ATTR_ENC_{7BIT,8BIT,NONE}.
/* .IP smtputf8
/* The level of SMTPUTF8 support (to be defined).
/* .IP sendopts
/* Sender-requested SMTPUTF8 or RequireTLS support.
/* .IP sender
/* The sender envelope address.
/* .IP dsn_envid
@ -191,6 +191,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -347,7 +350,7 @@ int bounce_append_intern(int flags, const char *id, MSG_STATS *stats,
/* bounce_flush - flush the bounce log and deliver to the sender */
int bounce_flush(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *dsn_envid,
int dsn_ret)
{
@ -365,7 +368,7 @@ int bounce_flush(int flags, const char *queue, const char *id,
SEND_ATTR_STR(MAIL_ATTR_QUEUE, queue),
SEND_ATTR_STR(MAIL_ATTR_QUEUEID, id),
SEND_ATTR_STR(MAIL_ATTR_ENCODING, encoding),
SEND_ATTR_INT(MAIL_ATTR_SMTPUTF8, smtputf8),
SEND_ATTR_INT(MAIL_ATTR_SENDOPTS, sendopts),
SEND_ATTR_STR(MAIL_ATTR_SENDER, sender),
SEND_ATTR_STR(MAIL_ATTR_DSN_ENVID, dsn_envid),
SEND_ATTR_INT(MAIL_ATTR_DSN_RET, dsn_ret),
@ -382,7 +385,7 @@ int bounce_flush(int flags, const char *queue, const char *id,
/* bounce_flush_verp - verpified notification */
int bounce_flush_verp(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *dsn_envid,
int dsn_ret, const char *verp_delims)
{
@ -400,7 +403,7 @@ int bounce_flush_verp(int flags, const char *queue, const char *id,
SEND_ATTR_STR(MAIL_ATTR_QUEUE, queue),
SEND_ATTR_STR(MAIL_ATTR_QUEUEID, id),
SEND_ATTR_STR(MAIL_ATTR_ENCODING, encoding),
SEND_ATTR_INT(MAIL_ATTR_SMTPUTF8, smtputf8),
SEND_ATTR_INT(MAIL_ATTR_SENDOPTS, sendopts),
SEND_ATTR_STR(MAIL_ATTR_SENDER, sender),
SEND_ATTR_STR(MAIL_ATTR_DSN_ENVID, dsn_envid),
SEND_ATTR_INT(MAIL_ATTR_DSN_RET, dsn_ret),
@ -418,7 +421,7 @@ int bounce_flush_verp(int flags, const char *queue, const char *id,
/* bounce_one - send notice for one recipient */
int bounce_one(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *dsn_envid,
int dsn_ret, MSG_STATS *stats, RECIPIENT *rcpt,
const char *relay, DSN *dsn)
@ -443,14 +446,14 @@ int bounce_one(int flags, const char *queue, const char *id,
return (defer_append_intern(flags, id, stats, rcpt, relay, dsn_res));
my_dsn = *dsn_res;
}
return (bounce_one_intern(flags, queue, id, encoding, smtputf8, sender,
return (bounce_one_intern(flags, queue, id, encoding, sendopts, sender,
dsn_envid, dsn_ret, stats, rcpt, relay, &my_dsn));
}
/* bounce_one_intern - send notice for one recipient */
int bounce_one_intern(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *dsn_envid,
int dsn_ret, MSG_STATS *stats,
RECIPIENT *rcpt, const char *relay,
@ -508,7 +511,7 @@ int bounce_one_intern(int flags, const char *queue, const char *id,
SEND_ATTR_STR(MAIL_ATTR_QUEUE, queue),
SEND_ATTR_STR(MAIL_ATTR_QUEUEID, id),
SEND_ATTR_STR(MAIL_ATTR_ENCODING, encoding),
SEND_ATTR_INT(MAIL_ATTR_SMTPUTF8, smtputf8),
SEND_ATTR_INT(MAIL_ATTR_SENDOPTS, sendopts),
SEND_ATTR_STR(MAIL_ATTR_SENDER, sender),
SEND_ATTR_STR(MAIL_ATTR_DSN_ENVID, dsn_envid),
SEND_ATTR_INT(MAIL_ATTR_DSN_RET, dsn_ret),

31
postfix/src/global/defer.c
View File

@ -14,35 +14,35 @@
/* const char *relay;
/* DSN *dsn;
/*
/* int defer_flush(flags, queue, id, encoding, smtputf8, sender,
/* int defer_flush(flags, queue, id, encoding, sendopts, sender,
/* dsn_envid, dsn_ret)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
/*
/* int defer_warn(flags, queue, id, encoding, smtputf8, sender,
/* int defer_warn(flags, queue, id, encoding, sendopts, sender,
dsn_envid, dsn_ret)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
/*
/* int defer_one(flags, queue, id, encoding, smtputf8, sender,
/* int defer_one(flags, queue, id, encoding, sendopts, sender,
/* dsn_envid, ret, stats, recipient, relay, dsn)
/* int flags;
/* const char *queue;
/* const char *id;
/* const char *encoding;
/* int smtputf8;
/* int sendopts;
/* const char *sender;
/* const char *dsn_envid;
/* int dsn_ret;
@ -128,8 +128,8 @@
/* Delivery status. See dsn(3). The specified action is ignored.
/* .IP encoding
/* The body content encoding: MAIL_ATTR_ENC_{7BIT,8BIT,NONE}.
/* .IP smtputf8
/* The level of SMTPUTF8 support (to be defined).
/* .IP sendopts
/* Sender-requested SMTPUTF8 or RequireTLS support.
/* .IP sender
/* The sender envelope address.
/* .IP dsn_envid
@ -158,6 +158,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -300,7 +303,7 @@ int defer_append_intern(int flags, const char *id, MSG_STATS *stats,
/* defer_flush - flush the defer log and deliver to the sender */
int defer_flush(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *dsn_envid,
int dsn_ret)
{
@ -313,7 +316,7 @@ int defer_flush(int flags, const char *queue, const char *id,
SEND_ATTR_STR(MAIL_ATTR_QUEUE, queue),
SEND_ATTR_STR(MAIL_ATTR_QUEUEID, id),
SEND_ATTR_STR(MAIL_ATTR_ENCODING, encoding),
SEND_ATTR_INT(MAIL_ATTR_SMTPUTF8, smtputf8),
SEND_ATTR_INT(MAIL_ATTR_SENDOPTS, sendopts),
SEND_ATTR_STR(MAIL_ATTR_SENDER, sender),
SEND_ATTR_STR(MAIL_ATTR_DSN_ENVID, dsn_envid),
SEND_ATTR_INT(MAIL_ATTR_DSN_RET, dsn_ret),
@ -328,7 +331,7 @@ int defer_flush(int flags, const char *queue, const char *id,
* do not flush the log */
int defer_warn(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *envid, int dsn_ret)
{
if (mail_command_client(MAIL_CLASS_PRIVATE, var_defer_service,
@ -338,7 +341,7 @@ int defer_warn(int flags, const char *queue, const char *id,
SEND_ATTR_STR(MAIL_ATTR_QUEUE, queue),
SEND_ATTR_STR(MAIL_ATTR_QUEUEID, id),
SEND_ATTR_STR(MAIL_ATTR_ENCODING, encoding),
SEND_ATTR_INT(MAIL_ATTR_SMTPUTF8, smtputf8),
SEND_ATTR_INT(MAIL_ATTR_SENDOPTS, sendopts),
SEND_ATTR_STR(MAIL_ATTR_SENDER, sender),
SEND_ATTR_STR(MAIL_ATTR_DSN_ENVID, envid),
SEND_ATTR_INT(MAIL_ATTR_DSN_RET, dsn_ret),
@ -352,7 +355,7 @@ int defer_warn(int flags, const char *queue, const char *id,
/* defer_one - defer mail for one recipient */
int defer_one(int flags, const char *queue, const char *id,
const char *encoding, int smtputf8,
const char *encoding, int sendopts,
const char *sender, const char *dsn_envid,
int dsn_ret, MSG_STATS *stats, RECIPIENT *rcpt,
const char *relay, DSN *dsn)
@ -374,7 +377,7 @@ int defer_one(int flags, const char *queue, const char *id,
if (delivery_status_filter != 0
&& (dsn_res = dsn_filter_lookup(delivery_status_filter, &my_dsn)) != 0) {
if (dsn_res->status[0] == '5')
return (bounce_one_intern(flags, queue, id, encoding, smtputf8,
return (bounce_one_intern(flags, queue, id, encoding, sendopts,
sender, dsn_envid, dsn_ret, stats,
rcpt, relay, dsn_res));
my_dsn = *dsn_res;

5
postfix/src/global/deliver_pass.c
View File

@ -54,6 +54,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -109,7 +112,7 @@ static int deliver_pass_send_request(VSTREAM *stream, DELIVER_REQUEST *request,
SEND_ATTR_LONG(MAIL_ATTR_SIZE, request->data_size),
SEND_ATTR_STR(MAIL_ATTR_NEXTHOP, nexthop),
SEND_ATTR_STR(MAIL_ATTR_ENCODING, request->encoding),
SEND_ATTR_INT(MAIL_ATTR_SMTPUTF8, request->smtputf8),
SEND_ATTR_INT(MAIL_ATTR_SENDOPTS, request->sendopts),
SEND_ATTR_STR(MAIL_ATTR_SENDER, request->sender),
SEND_ATTR_STR(MAIL_ATTR_DSN_ENVID, request->dsn_envid),
SEND_ATTR_INT(MAIL_ATTR_DSN_RET, request->dsn_ret),

12
postfix/src/global/deliver_request.c
View File

@ -16,6 +16,7 @@
/* long data_size;
/* char *nexthop;
/* char *encoding;
/* int sendopts;
/* char *sender;
/* MSG_STATS msg_stats;
/* RECIPIENT_LIST rcpt_list;
@ -97,6 +98,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -213,7 +217,7 @@ static int deliver_request_get(VSTREAM *stream, DELIVER_REQUEST *request)
static VSTRING *dsn_envid;
static RCPT_BUF *rcpt_buf;
int rcpt_count;
int smtputf8;
int sendopts;
int dsn_ret;
/*
@ -253,7 +257,7 @@ static int deliver_request_get(VSTREAM *stream, DELIVER_REQUEST *request)
RECV_ATTR_LONG(MAIL_ATTR_SIZE, &request->data_size),
RECV_ATTR_STR(MAIL_ATTR_NEXTHOP, nexthop),
RECV_ATTR_STR(MAIL_ATTR_ENCODING, encoding),
RECV_ATTR_INT(MAIL_ATTR_SMTPUTF8, &smtputf8),
RECV_ATTR_INT(MAIL_ATTR_SENDOPTS, &sendopts),
RECV_ATTR_STR(MAIL_ATTR_SENDER, address),
RECV_ATTR_STR(MAIL_ATTR_DSN_ENVID, dsn_envid),
RECV_ATTR_INT(MAIL_ATTR_DSN_RET, &dsn_ret),
@ -288,8 +292,8 @@ static int deliver_request_get(VSTREAM *stream, DELIVER_REQUEST *request)
request->queue_id = mystrdup(vstring_str(queue_id));
request->nexthop = mystrdup(vstring_str(nexthop));
request->encoding = mystrdup(vstring_str(encoding));
/* Fix 20140708: dedicated smtputf8 attribute with its own flags. */
request->smtputf8 = smtputf8;
/* Fix 20140708: dedicated attribute for SMTPUTF8 etc. flags. */
request->sendopts = sendopts;
request->sender = mystrdup(vstring_str(address));
request->client_name = mystrdup(vstring_str(client_name));
request->client_addr = mystrdup(vstring_str(client_addr));

5
postfix/src/global/deliver_request.h
View File

@ -42,7 +42,7 @@ typedef struct DELIVER_REQUEST {
long data_size; /* message size */
char *nexthop; /* next hop name */
char *encoding; /* content encoding */
int smtputf8; /* SMTPUTF8 level */
int sendopts; /* smtputf8, requiretls, etc. */
char *sender; /* envelope sender */
MSG_STATS msg_stats; /* time profile */
RECIPIENT_LIST rcpt_list; /* envelope recipients */
@ -151,6 +151,9 @@ extern int PRINTFLIKE(4, 5) reject_deliver_request(const char *,
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
#endif

5
postfix/src/global/mail_proto.h
View File

@ -308,7 +308,7 @@ extern char *mail_pathname(const char *, const char *);
#define MAIL_ATTR_DSN_RET "ret_flags" /* dsn full/headers */
#define MAIL_ATTR_DSN_NOTIFY "notify_flags" /* dsn notify flags */
#define MAIL_ATTR_DSN_ORCPT "dsn_orig_rcpt" /* dsn original recipient */
#define MAIL_ATTR_SMTPUTF8 "smtputf8" /* RFC6531 support */
#define MAIL_ATTR_SENDOPTS "sendopts" /* RFC6531 etc. support */
/*
* SMTP reply footer support.
@ -329,6 +329,9 @@ extern char *mail_pathname(const char *, const char *);
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
#endif

2
postfix/src/global/mail_version.h
View File

@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
#define MAIL_RELEASE_DATE "20250109"
#define MAIL_RELEASE_DATE "20250116"
#define MAIL_VERSION_NUMBER "3.10"
#ifdef SNAPSHOT

39
postfix/src/global/post_mail.c
View File

@ -7,31 +7,31 @@
/* #include <post_mail.h>
/*
/* VSTREAM *post_mail_fopen(sender, recipient, source_class, trace_flags,
/* utf8_flags, queue_id)
/* sendopts, queue_id)
/* const char *sender;
/* const char *recipient;
/* int source_class;
/* int trace_flags;
/* int utf8_flags;
/* int sendopts;
/* VSTRING *queue_id;
/*
/* VSTREAM *post_mail_fopen_nowait(sender, recipient, source_class,
/* trace_flags, utf8_flags, queue_id)
/* trace_flags, sendopts, queue_id)
/* const char *sender;
/* const char *recipient;
/* int source_class;
/* int trace_flags;
/* int utf8_flags;
/* int sendopts;
/* VSTRING *queue_id;
/*
/* void post_mail_fopen_async(sender, recipient, source_class,
/* trace_flags, utf8_flags,
/* trace_flags, sendopts,
/* queue_id, notify, context)
/* const char *sender;
/* const char *recipient;
/* int source_class;
/* int trace_flags;
/* int utf8_flags;
/* int sendopts;
/* VSTRING *queue_id;
/* void (*notify)(VSTREAM *stream, void *context);
/* void *context;
@ -116,9 +116,9 @@
/* autodetection.
/* .IP trace_flags
/* Message tracing flags as specified in \fB<deliver_request.h>\fR.
/* .IP utf8_flags
/* Flags defined in <smtputf8.h>. Flags other than
/* SMTPUTF8_FLAG_REQUESTED are ignored.
/* .IP sendopts
/* Flags defined in <sendopts.h>. This ignores flags based on
/* message header content, or envelope email addresses.
/* .IP queue_id
/* Null pointer, or pointer to buffer that receives the queue
/* ID of the new message.
@ -195,7 +195,7 @@ typedef struct {
char *recipient;
int source_class;
int trace_flags;
int utf8_flags;
int sendopts;
POST_MAIL_NOTIFY notify;
void *context;
VSTREAM *stream;
@ -217,7 +217,7 @@ typedef struct {
static void post_mail_init(VSTREAM *stream, const char *sender,
const char *recipient,
int source_class, int trace_flags,
int utf8_flags, VSTRING *queue_id)
int sendopts, VSTRING *queue_id)
{
VSTRING *id = queue_id ? queue_id : vstring_alloc(100);
struct timeval now;
@ -225,7 +225,8 @@ static void post_mail_init(VSTREAM *stream, const char *sender,
int cleanup_flags =
int_filt_flags(source_class) | CLEANUP_FLAG_MASK_INTERNAL
| smtputf8_autodetect(source_class)
| ((utf8_flags & SMTPUTF8_FLAG_REQUESTED) ? CLEANUP_FLAG_SMTPUTF8 : 0);
| ((sendopts & SMTPUTF8_FLAG_REQUESTED) ? CLEANUP_FLAG_SMTPUTF8 : 0);
/* TODO(wietse) REQUIRETLS. */
GETTIMEOFDAY(&now);
date = mail_date(now.tv_sec);
@ -289,13 +290,13 @@ static void post_mail_init(VSTREAM *stream, const char *sender,
VSTREAM *post_mail_fopen(const char *sender, const char *recipient,
int source_class, int trace_flags,
int utf8_flags, VSTRING *queue_id)
int sendopts, VSTRING *queue_id)
{
VSTREAM *stream;
stream = mail_connect_wait(MAIL_CLASS_PUBLIC, var_cleanup_service);
post_mail_init(stream, sender, recipient, source_class, trace_flags,
utf8_flags, queue_id);
sendopts, queue_id);
return (stream);
}
@ -303,14 +304,14 @@ VSTREAM *post_mail_fopen(const char *sender, const char *recipient,
VSTREAM *post_mail_fopen_nowait(const char *sender, const char *recipient,
int source_class, int trace_flags,
int utf8_flags, VSTRING *queue_id)
int sendopts, VSTRING *queue_id)
{
VSTREAM *stream;
if ((stream = mail_connect(MAIL_CLASS_PUBLIC, var_cleanup_service,
BLOCKING)) != 0)
post_mail_init(stream, sender, recipient, source_class, trace_flags,
utf8_flags, queue_id);
sendopts, queue_id);
else
msg_warn("connect to %s/%s: %m",
MAIL_CLASS_PUBLIC, var_cleanup_service);
@ -339,7 +340,7 @@ static void post_mail_open_event(int event, void *context)
non_blocking(vstream_fileno(state->stream), BLOCKING);
post_mail_init(state->stream, state->sender,
state->recipient, state->source_class,
state->trace_flags, state->utf8_flags,
state->trace_flags, state->sendopts,
state->queue_id);
myfree(state->sender);
myfree(state->recipient);
@ -391,7 +392,7 @@ static void post_mail_open_event(int event, void *context)
void post_mail_fopen_async(const char *sender, const char *recipient,
int source_class, int trace_flags,
int utf8_flags, VSTRING *queue_id,
int sendopts, VSTRING *queue_id,
void (*notify) (VSTREAM *, void *),
void *context)
{
@ -404,7 +405,7 @@ void post_mail_fopen_async(const char *sender, const char *recipient,
state->recipient = mystrdup(recipient);
state->source_class = source_class;
state->trace_flags = trace_flags;
state->utf8_flags = utf8_flags;
state->sendopts = sendopts;
state->notify = notify;
state->context = context;
state->stream = stream;

161
postfix/src/global/sendopts.c Normal file
View File

@ -0,0 +1,161 @@
/*++
/* NAME
/* sendopts 3
/* SUMMARY
/* Support for SMTPUTF8, REQUIRETLS, etc.
/* SYNOPSIS
/* #include <sendopts.h>
/*
/* const char *sendopts_strflags(code)
/* int code;
/* DESCRIPTION
/* Postfix queue files and IPC messages contain a sendopts field
/* with flags that control SMTPUTF8, REQUIRETLS, etc. support. The
/* flags are documented in sendopts(3h), and are based on information
/* received with ESMTP requests or with message content.
/*
/* The SMTPUTF8 flags life cycle is documented in smtputf8(3h).
/*
/* sendopts_strflags() maps a sendopts flag value to printable
/* string. The result is overwritten upon each call.
/* LICENSE
/* .ad
/* .fi
/* The Secure Mailer license must be distributed with this software.
/* AUTHOR(S)
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
#include <sys_defs.h>
/*
* Utility library.
*/
#include <msg.h>
#include <vstring.h>
#include <name_mask.h>
/*
* Global library.
*/
#include <sendopts.h>
/*
* Mapping from flags code to printable string.
*/
static NAME_MASK sendopts_flag_map[] = {
"smtputf8_requested", SOPT_SMTPUTF8_REQUESTED,
"smtputf8_header", SOPT_SMTPUTF8_HEADER,
"smtputf8_sender", SOPT_SMTPUTF8_SENDER,
"smtputf8_recipient", SOPT_SMTPUTF8_RECIPIENT,
"requiretls_header", SOPT_REQUIRETLS_HEADER,
"requiretls_esmtp", SOPT_REQUIRETLS_ESMTP,
0,
};
/* sendopts_strflags - map flags code to printable string */
const char *sendopts_strflags(unsigned flags)
{
static VSTRING *result;
if (flags == 0)
return ("none");
if (result == 0)
result = vstring_alloc(20);
else
VSTRING_RESET(result);
return (str_name_mask_opt(result, "sendopts_strflags", sendopts_flag_map,
flags, NAME_MASK_FATAL));
}
#ifdef TEST
#include <stdlib.h>
#include <string.h>
#include <stringops.h>
#include <msg_vstream.h>
/*
* Tests and test cases.
*/
typedef struct TEST_CASE {
const char *label; /* identifies test case */
int mask;
const char *want;
} TEST_CASE;
static const TEST_CASE test_cases[] = {
{"SOPT_SMTPUTF8_ALL",
SOPT_SMTPUTF8_ALL,
"smtputf8_requested smtputf8_header smtputf8_sender smtputf8_recipient"
},
{"SOPT_SMTPUTF8_DERIVED",
SOPT_SMTPUTF8_DERIVED,
"smtputf8_header smtputf8_sender smtputf8_recipient"
},
{"SOPT_SMTPUTF8_REQUESTED",
SOPT_SMTPUTF8_REQUESTED,
"smtputf8_requested"
},
{"SOPT_SMTPUTF8_HEADER",
SOPT_SMTPUTF8_HEADER,
"smtputf8_header"
},
{"SOPT_SMTPUTF8_SENDER",
SOPT_SMTPUTF8_SENDER,
"smtputf8_sender"
},
{"SOPT_SMTPUTF8_RECIPIENT",
SOPT_SMTPUTF8_RECIPIENT,
"smtputf8_recipient"
},
{"SOPT_REQUIRETLS_ALL",
SOPT_REQUIRETLS_ALL,
"requiretls_header requiretls_esmtp"
},
{"SOPT_REQUIRETLS_DERIVED",
SOPT_REQUIRETLS_DERIVED,
"requiretls_header"
},
{"SOPT_REQUIRETLS_HEADER",
SOPT_REQUIRETLS_HEADER,
"requiretls_header"
},
{"SOPT_REQUIRETLS_ESMTP",
SOPT_REQUIRETLS_ESMTP,
"requiretls_esmtp"
},
{0},
};
int main(int argc, char **argv)
{
const TEST_CASE *tp;
int pass = 0;
int fail = 0;
const char *got;
msg_vstream_init(sane_basename((VSTRING *) 0, argv[0]), VSTREAM_ERR);
for (tp = test_cases; tp->label != 0; tp++) {
msg_info("RUN %s", tp->label);
got = sendopts_strflags(tp->mask);
if (strcmp(got, tp->want) != 0) {
msg_warn("got result '%s', want: '%s'", got, tp->want);
fail++;
msg_info("FAIL %s", tp->label);
} else {
msg_info("PASS %s", tp->label);
pass++;
}
}
msg_info("PASS=%d FAIL=%d", pass, fail);
exit(fail != 0);
}
#endif

63
postfix/src/global/sendopts.h Normal file
View File

@ -0,0 +1,63 @@
#ifndef _SENDOPTS_H_INCLUDED_
#define _SENDOPTS_H_INCLUDED_
/*++
/* NAME
/* sendopts 3h
/* SUMMARY
/* Support for SMTPUTF8, REQUIRETLS, etc.
/* SYNOPSIS
/* #include <sendopts.h>
/* DESCRIPTION
/* .nf
/*
* Support for SMTPUTF8 (RFC 6531, RFC 6532, RFC 6533). These flags were
* migrated from <smtputf8.h> and MUST NOT be changed, to maintain queue
* file compatibility.
*/
#define SOPT_SMTPUTF8_NONE (0)
#define SOPT_SMTPUTF8_REQUESTED (1<<0) /* queue file/delivery/bounce request */
#define SOPT_SMTPUTF8_HEADER (1<<1) /* queue file/delivery/bounce request */
#define SOPT_SMTPUTF8_SENDER (1<<2) /* queue file/delivery/bounce request */
#define SOPT_SMTPUTF8_RECIPIENT (1<<3) /* delivery request only */
#define SOPT_SMTPUTF8_ALL (SOPT_SMTPUTF8_REQUESTED | \
SOPT_SMTPUTF8_HEADER | \
SOPT_SMTPUTF8_SENDER | \
SOPT_SMTPUTF8_RECIPIENT)
#define SOPT_SMTPUTF8_DERIVED \
(SOPT_SMTPUTF8_ALL & ~SOPT_SMTPUTF8_REQUESTED)
/*
* Support for REQUIRETLS (RFC 8689). At this time only the TLS-Required:
* header is implemented, but we reserve the flag that would support it.
*/
#define SOPT_REQUIRETLS_HEADER (1<<4) /* TLS-Required: no */
#define SOPT_REQUIRETLS_ESMTP (1<<5) /* MAIL FROM ... REQUIRETLS */
#define SOPT_REQUIRETLS_ALL (SOPT_REQUIRETLS_HEADER | \
SOPT_REQUIRETLS_ESMTP)
#define SOPT_REQUIRETLS_DERIVED SOPT_REQUIRETLS_HEADER
#define SOPT_FLAG_ALL (SOPT_SMTPUTF8_ALL | SOPT_REQUIRETLS_ALL)
#define SOPT_FLAG_DERIVED (SOPT_SMTPUTF8_DERIVED | SOPT_REQUIRETLS_DERIVED)
/*
* Debug helper.
*/
extern const char *sendopts_strflags(unsigned flags);
/* LICENSE
/* .ad
/* .fi
/* The Secure Mailer license must be distributed with this software.
/* AUTHOR(S)
/* Wietse Venema
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
#endif

63
postfix/src/global/smtputf8.h
View File

@ -11,24 +11,29 @@
/* DESCRIPTION
/* .nf
/*
* Global library.
*/
#include <sendopts.h>
/*
* Avoiding chicken-and-egg problems during the initial SMTPUTF8 roll-out in
* environments with pre-existing mail flows that contain UTF8.
*
*
* Prior to SMTPUTF8, mail flows that contain UTF8 worked because the vast
* majority of MTAs is perfectly capable of handling UTF8 in address
* localparts (and in headers), even if pre-SMTPUTF8 standards do not
* support this practice.
*
*
* When turning on Postfix SMTPUTF8 support for the first time, we don't want
* to suddenly break pre-existing mail flows that contain UTF8 because 1) a
* client does not request SMTPUTF8 support, and because 2) a down-stream
* MTA does not announce SMTPUTF8 support.
*
*
* While 1) is easy enough to avoid (keep accepting UTF8 in address localparts
* just like Postfix has always done), 2) presents a thornier problem. The
* root cause of that problem is the need for SMTPUTF8 autodetection.
*
*
* What is SMTPUTF8 autodetection? Postfix cannot rely solely on the sender's
* declaration that a message requires SMTPUTF8 support, because UTF8 may be
* introduced during local processing (for example, the client hostname in
@ -36,21 +41,21 @@
* incomplete address, address rewriting, alias expansion, automatic BCC
* recipients, local forwarding, and changes made by header checks or Milter
* applications).
*
*
* In summary, after local processing has happened, Postfix may decide that a
* message requires SMTPUTF8 support, even when that message initially did
* not require SMTPUTF8 support. This could make the message undeliverable
* to destinations that do not support SMTPUTF8. In an environment with
* pre-existing mail flows that contain UTF8, we want to avoid disrupting
* those mail flows when rolling out SMTPUTF8 support.
*
*
* For the vast majority of sites, the simplest solution is to autodetect
* SMTPUTF8 support only for Postfix sendmail command-line submissions, at
* least as long as SMTPUTF8 support has not yet achieved wold domination.
*
*
* However, sites that add UTF8 content via local processing (see above) should
* autodetect SMTPUTF8 support for all email.
*
*
* smtputf8_autodetect() uses the setting of the smtputf8_autodetect_classes
* parameter, and the mail source classes defined in mail_params.h.
*/
@ -58,31 +63,35 @@ extern int smtputf8_autodetect(int);
/*
* The flag SMTPUTF8_FLAG_REQUESTED is raised on request by the sender, or
* when a queue file contains at least one UTF8 envelope recipient. One this
* flag is raised it is preserved when mail is forwarded or bounced.
* when SMTPUTF8 auto-detection is enabled and a queue file contains at
* least one UTF8 envelope sender, envelope recipient, or message header.
* Once this flag is raised, it is preserved when mail is forwarded or
* bounced.
*
* The flag SMTPUTF8_FLAG_HEADER is raised when a queue file contains at least
* one UTF8 message header.
* one UTF8 message header even if SMTPUTF8_FLAG_REQUESTED is disabled.
*
* The flag SMTPUTF8_FLAG_SENDER is raised when a queue file contains an UTF8
* envelope sender.
* envelope sender, even if SMTPUTF8_FLAG_REQUESTED is disabled.
*
* The three flags SMTPUTF8_FLAG_REQUESTED/HEADER/SENDER are stored in the
* queue file, are sent with delivery requests to Postfix delivery agents,
* and are sent with "flush" requests to the bounce daemon to ensure that
* the resulting notification message will have a content-transfer-encoding
* of 8bit.
* of 8bit. The derived flags SMTPUTF8_FLAG_HEADER/SENDER are ignored when a
* message is re-queued with "postsuper -r". They may be regenerated by the
* cleanup daemon.
*
* In the future, mailing lists will have a mix of UTF8 and non-UTF8
* subscribers. With the following flag, Postfix can avoid requiring
* SMTPUTF8 delivery when it isn't really needed.
*
* The flag SMTPUTF8_FLAG_RECIPIENT is raised when a delivery request (NOT:
* message) contains at least one UTF8 envelope recipient. The flag is NOT
* stored in the queue file. The flag sent in requests to the bounce daemon
* ONLY when bouncing a single recipient. The flag is used ONLY in requests
* to Postfix delivery agents, to give Postfix flexibility when delivering
* messages to non-SMTPUTF8 servers.
* The fourth flag, SMTPUTF8_FLAG_RECIPIENT, is raised when a delivery request
* (NOT: message) contains at least one UTF8 envelope recipient. This flag
* is NOT stored in the queue file. The flag is used ONLY in requests to
* Postfix delivery agents, to give delivery agents flexibility when
* delivering messages to non-SMTPUTF8 servers. Delivery agents may then
* pass the flag to the bounce daemon.
*
* If a delivery request has none of the flags SMTPUTF8_FLAG_RECIPIENT,
* SMTPUTF8_FLAG_SENDER, or SMTPUTF8_FLAG_HEADER, then the message can
@ -94,10 +103,15 @@ extern int smtputf8_autodetect(int);
* the SMTP client protocol engine.
*/
#define SMTPUTF8_FLAG_NONE (0)
#define SMTPUTF8_FLAG_REQUESTED (1<<0) /* queue file/delivery/bounce request */
#define SMTPUTF8_FLAG_HEADER (1<<1) /* queue file/delivery/bounce request */
#define SMTPUTF8_FLAG_SENDER (1<<2) /* queue file/delivery/bounce request */
#define SMTPUTF8_FLAG_RECIPIENT (1<<3) /* delivery request only */
/* In queue file, delivery request, or bounce request. */
#define SMTPUTF8_FLAG_REQUESTED SOPT_SMTPUTF8_REQUESTED
#define SMTPUTF8_FLAG_HEADER SOPT_SMTPUTF8_HEADER
#define SMTPUTF8_FLAG_SENDER SOPT_SMTPUTF8_SENDER
/* In delivery or bounce request only. */
#define SMTPUTF8_FLAG_RECIPIENT SOPT_SMTPUTF8_RECIPIENT
#define SMTPUTF8_FLAG_ALL SOPT_SMTPUTF8_ALL
#define SMTPUTF8_FLAG_DERIVED SOPT_SMTPUTF8_DERIVED
/* LICENSE
/* .ad
@ -108,6 +122,9 @@ extern int smtputf8_autodetect(int);
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
#endif

1
postfix/src/local/Makefile.in
View File

@ -302,6 +302,7 @@ forward.o: ../../include/rec_type.h
forward.o: ../../include/recipient_list.h
forward.o: ../../include/record.h
forward.o: ../../include/resolve_clnt.h
forward.o: ../../include/sendopts.h
forward.o: ../../include/sent.h
forward.o: ../../include/smtputf8.h
forward.o: ../../include/stringops.h

6
postfix/src/local/forward.c
View File

@ -53,6 +53,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -160,8 +163,9 @@ static FORWARD_INFO *forward_open(DELIVER_REQUEST *request, const char *sender)
#define FORWARD_CLEANUP_FLAGS \
(CLEANUP_FLAG_BOUNCE | CLEANUP_FLAG_MASK_INTERNAL \
| smtputf8_autodetect(MAIL_SRC_MASK_FORWARD) \
| ((request->smtputf8 & SMTPUTF8_FLAG_REQUESTED) ? \
| ((request->sendopts & SMTPUTF8_FLAG_REQUESTED) ? \
CLEANUP_FLAG_SMTPUTF8 : 0))
/* TODO(wietse) REQUIRETLS. */
attr_print(cleanup, ATTR_FLAG_NONE,
SEND_ATTR_INT(MAIL_ATTR_FLAGS, FORWARD_CLEANUP_FLAGS),

7
postfix/src/local/local.c
View File

@ -530,7 +530,7 @@
/* request before it is terminated by a built-in watchdog timer.
/* .IP "\fBdelay_logging_resolution_limit (2)\fR"
/* The maximal number of digits after the decimal point when logging
/* sub-second delay values.
/* delay values.
/* .IP "\fBexport_environment (see 'postconf -d' output)\fR"
/* The list of environment variables that a Postfix process will export
/* to non-Postfix processes.
@ -619,6 +619,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -747,7 +750,7 @@ static int local_deliver(DELIVER_REQUEST *rqst, char *service)
state.msg_attr.fp = rqst->fp;
state.msg_attr.offset = rqst->data_offset;
state.msg_attr.encoding = rqst->encoding;
state.msg_attr.smtputf8 = rqst->smtputf8;
state.msg_attr.sendopts = rqst->sendopts;
state.msg_attr.sender = rqst->sender;
state.msg_attr.dsn_envid = rqst->dsn_envid;
state.msg_attr.dsn_ret = rqst->dsn_ret;

4
postfix/src/local/local.h
View File

@ -72,7 +72,7 @@ typedef struct DELIVER_ATTR {
char *queue_id; /* mail queue id */
long offset; /* data offset */
char *encoding; /* MIME encoding */
int smtputf8; /* from delivery request */
int sendopts; /* from delivery request */
const char *sender; /* taken from envelope */
char *dsn_envid; /* DSN envelope ID */
int dsn_ret; /* DSN headers/full */
@ -135,7 +135,7 @@ typedef struct LOCAL_STATE {
attr.queue_id, &attr.msg_stats, &attr.rcpt, attr.relay, \
DSN_FROM_DSN_BUF(attr.why)
#define BOUNCE_ONE_ATTR(attr) \
attr.queue_name, attr.queue_id, attr.encoding, attr.smtputf8, \
attr.queue_name, attr.queue_id, attr.encoding, attr.sendopts, \
attr.sender, attr.dsn_envid, attr.dsn_ret, \
&attr.msg_stats, &attr.rcpt, attr.relay, \
DSN_FROM_DSN_BUF(attr.why)

2
postfix/src/oqmgr/Makefile.in
View File

@ -175,6 +175,7 @@ qmgr_deliver.o: ../../include/nvtable.h
qmgr_deliver.o: ../../include/rcpt_print.h
qmgr_deliver.o: ../../include/recipient_list.h
qmgr_deliver.o: ../../include/scan_dir.h
qmgr_deliver.o: ../../include/sendopts.h
qmgr_deliver.o: ../../include/smtputf8.h
qmgr_deliver.o: ../../include/stringops.h
qmgr_deliver.o: ../../include/sys_defs.h
@ -272,6 +273,7 @@ qmgr_message.o: ../../include/record.h
qmgr_message.o: ../../include/resolve_clnt.h
qmgr_message.o: ../../include/rewrite_clnt.h
qmgr_message.o: ../../include/scan_dir.h
qmgr_message.o: ../../include/sendopts.h
qmgr_message.o: ../../include/sent.h
qmgr_message.o: ../../include/split_addr.h
qmgr_message.o: ../../include/split_at.h

5
postfix/src/oqmgr/qmgr.h
View File

@ -300,7 +300,7 @@ struct QMGR_MESSAGE {
char *sender; /* complete address */
char *dsn_envid; /* DSN envelope ID */
int dsn_ret; /* DSN headers/full */
int smtputf8; /* requires unicode */
int sendopts; /* smtputf8, requiretls, etc. */
char *verp_delims; /* VERP delimiters */
char *filter_xport; /* filtering transport */
char *inspect_xport; /* inspecting transport */
@ -429,4 +429,7 @@ extern char *qmgr_error_nexthop(DSN *);
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/

15
postfix/src/oqmgr/qmgr_active.c
View File

@ -75,6 +75,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -307,7 +310,7 @@ void qmgr_active_done(QMGR_MESSAGE *message)
message->queue_name,
message->queue_id,
message->encoding,
message->smtputf8,
message->sendopts,
message->sender,
message->dsn_envid,
message->dsn_ret,
@ -318,7 +321,7 @@ void qmgr_active_done(QMGR_MESSAGE *message)
message->queue_name,
message->queue_id,
message->encoding,
message->smtputf8,
message->sendopts,
message->sender,
message->dsn_envid,
message->dsn_ret,
@ -403,7 +406,7 @@ static void qmgr_active_done_2_generic(QMGR_MESSAGE *message)
message->queue_name,
message->queue_id,
message->encoding,
message->smtputf8,
message->sendopts,
message->sender,
message->dsn_envid,
message->dsn_ret,
@ -465,7 +468,7 @@ static void qmgr_active_done_25_generic(QMGR_MESSAGE *message)
message->queue_name,
message->queue_id,
message->encoding,
message->smtputf8,
message->sendopts,
message->sender,
message->dsn_envid,
message->dsn_ret,
@ -476,7 +479,7 @@ static void qmgr_active_done_25_generic(QMGR_MESSAGE *message)
message->queue_name,
message->queue_id,
message->encoding,
message->smtputf8,
message->sendopts,
message->sender,
message->dsn_envid,
message->dsn_ret,
@ -492,7 +495,7 @@ static void qmgr_active_done_25_generic(QMGR_MESSAGE *message)
message->queue_name,
message->queue_id,
message->encoding,
message->smtputf8,
message->sendopts,
message->sender,
message->dsn_envid,
message->dsn_ret,

11
postfix/src/oqmgr/qmgr_deliver.c
View File

@ -45,6 +45,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -147,7 +150,7 @@ static int qmgr_deliver_send_request(QMGR_ENTRY *entry, VSTREAM *stream)
MSG_STATS stats;
char *sender;
int flags;
int smtputf8 = message->smtputf8;
int sendopts = message->sendopts;
const char *addr;
/*
@ -156,9 +159,9 @@ static int qmgr_deliver_send_request(QMGR_ENTRY *entry, VSTREAM *stream)
for (recipient = list.info; recipient < list.info + list.len; recipient++)
if (var_smtputf8_enable && (addr = recipient->address)[0]
&& !allascii(addr) && valid_utf8_stringz(addr)) {
smtputf8 |= SMTPUTF8_FLAG_RECIPIENT;
sendopts |= SMTPUTF8_FLAG_RECIPIENT;
if (message->verp_delims)
smtputf8 |= SMTPUTF8_FLAG_SENDER;
sendopts |= SMTPUTF8_FLAG_SENDER;
}
/*
@ -187,7 +190,7 @@ static int qmgr_deliver_send_request(QMGR_ENTRY *entry, VSTREAM *stream)
SEND_ATTR_LONG(MAIL_ATTR_SIZE, message->cont_length),
SEND_ATTR_STR(MAIL_ATTR_NEXTHOP, entry->queue->nexthop),
SEND_ATTR_STR(MAIL_ATTR_ENCODING, message->encoding),
SEND_ATTR_INT(MAIL_ATTR_SMTPUTF8, smtputf8),
SEND_ATTR_INT(MAIL_ATTR_SENDOPTS, sendopts),
SEND_ATTR_STR(MAIL_ATTR_SENDER, sender),
SEND_ATTR_STR(MAIL_ATTR_DSN_ENVID, message->dsn_envid),
SEND_ATTR_INT(MAIL_ATTR_DSN_RET, message->dsn_ret),

10
postfix/src/oqmgr/qmgr_message.c
View File

@ -94,6 +94,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -137,6 +140,7 @@
#include <split_addr.h>
#include <dsn_mask.h>
#include <rec_attr_map.h>
#include <sendopts.h>
/* Client stubs. */
@ -178,7 +182,7 @@ static QMGR_MESSAGE *qmgr_message_create(const char *queue_name,
message->sender = 0;
message->dsn_envid = 0;
message->dsn_ret = 0;
message->smtputf8 = 0;
message->sendopts = 0;
message->filter_xport = 0;
message->inspect_xport = 0;
message->redirect_addr = 0;
@ -548,7 +552,7 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
&message->data_size, &message->data_offset,
&nrcpt, &message->rflags,
&message->cont_length,
&message->smtputf8)) >= 3) {
&message->sendopts)) >= 3) {
/* Postfix >= 1.0 (a.k.a. 20010228). */
if (message->data_offset <= 0 || message->data_size <= 0) {
msg_warn("%s: invalid size record: %.100s",
@ -562,6 +566,8 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
rec_type = REC_TYPE_ERROR;
break;
}
/* Forward compatibility. */
message->sendopts &= SOPT_FLAG_ALL;
} else if (count == 1) {
/* Postfix < 1.0 (a.k.a. 20010228). */
qmgr_message_oldstyle_scan(message);

1
postfix/src/pickup/Makefile.in
View File

@ -72,6 +72,7 @@ pickup.o: ../../include/rec_type.h
pickup.o: ../../include/record.h
pickup.o: ../../include/safe_open.h
pickup.o: ../../include/scan_dir.h
pickup.o: ../../include/sendopts.h
pickup.o: ../../include/set_ugid.h
pickup.o: ../../include/smtputf8.h
pickup.o: ../../include/stringops.h

1
postfix/src/pickup/pickup.c
View File

@ -486,6 +486,7 @@ static int pickup_file(PICKUP_INFO *info)
cleanup_flags &= ~CLEANUP_FLAG_MILTER;
else
cleanup_flags |= smtputf8_autodetect(MAIL_SRC_MASK_SENDMAIL);
/* TODO(wietse) REQUIRETLS? */
cleanup = mail_connect_wait(MAIL_CLASS_PUBLIC, var_cleanup_service);
if (attr_scan(cleanup, ATTR_FLAG_STRICT,

2
postfix/src/qmgr/Makefile.in
View File

@ -177,6 +177,7 @@ qmgr_deliver.o: ../../include/nvtable.h
qmgr_deliver.o: ../../include/rcpt_print.h
qmgr_deliver.o: ../../include/recipient_list.h
qmgr_deliver.o: ../../include/scan_dir.h
qmgr_deliver.o: ../../include/sendopts.h
qmgr_deliver.o: ../../include/smtputf8.h
qmgr_deliver.o: ../../include/stringops.h
qmgr_deliver.o: ../../include/sys_defs.h
@ -288,6 +289,7 @@ qmgr_message.o: ../../include/resolve_clnt.h
qmgr_message.o: ../../include/rewrite_clnt.h
qmgr_message.o: ../../include/sane_time.h
qmgr_message.o: ../../include/scan_dir.h
qmgr_message.o: ../../include/sendopts.h
qmgr_message.o: ../../include/sent.h
qmgr_message.o: ../../include/split_addr.h
qmgr_message.o: ../../include/split_at.h

5
postfix/src/qmgr/qmgr.h
View File

@ -345,7 +345,7 @@ struct QMGR_MESSAGE {
char *sender; /* complete address */
char *dsn_envid; /* DSN envelope ID */
int dsn_ret; /* DSN headers/full */
int smtputf8; /* requires unicode */
int sendopts; /* smtputf8, requiretls, etc. */
char *verp_delims; /* VERP delimiters */
char *filter_xport; /* filtering transport */
char *inspect_xport; /* inspecting transport */
@ -539,6 +539,9 @@ extern char *qmgr_error_nexthop(DSN *);
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*
/* Preemptive scheduler enhancements:
/* Patrik Rak
/* Modra 6

15
postfix/src/qmgr/qmgr_active.c
View File

@ -75,6 +75,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -307,7 +310,7 @@ void qmgr_active_done(QMGR_MESSAGE *message)
message->queue_name,
message->queue_id,
message->encoding,
message->smtputf8,
message->sendopts,
message->sender,
message->dsn_envid,
message->dsn_ret,
@ -318,7 +321,7 @@ void qmgr_active_done(QMGR_MESSAGE *message)
message->queue_name,
message->queue_id,
message->encoding,
message->smtputf8,
message->sendopts,
message->sender,
message->dsn_envid,
message->dsn_ret,
@ -403,7 +406,7 @@ static void qmgr_active_done_2_generic(QMGR_MESSAGE *message)
message->queue_name,
message->queue_id,
message->encoding,
message->smtputf8,
message->sendopts,
message->sender,
message->dsn_envid,
message->dsn_ret,
@ -465,7 +468,7 @@ static void qmgr_active_done_25_generic(QMGR_MESSAGE *message)
message->queue_name,
message->queue_id,
message->encoding,
message->smtputf8,
message->sendopts,
message->sender,
message->dsn_envid,
message->dsn_ret,
@ -476,7 +479,7 @@ static void qmgr_active_done_25_generic(QMGR_MESSAGE *message)
message->queue_name,
message->queue_id,
message->encoding,
message->smtputf8,
message->sendopts,
message->sender,
message->dsn_envid,
message->dsn_ret,
@ -492,7 +495,7 @@ static void qmgr_active_done_25_generic(QMGR_MESSAGE *message)
message->queue_name,
message->queue_id,
message->encoding,
message->smtputf8,
message->sendopts,
message->sender,
message->dsn_envid,
message->dsn_ret,

11
postfix/src/qmgr/qmgr_deliver.c
View File

@ -50,6 +50,9 @@
/* Google, Inc.
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*--*/
/* System library. */
@ -152,7 +155,7 @@ static int qmgr_deliver_send_request(QMGR_ENTRY *entry, VSTREAM *stream)
MSG_STATS stats;
char *sender;
int flags;
int smtputf8 = message->smtputf8;
int sendopts = message->sendopts;
const char *addr;
/*
@ -161,9 +164,9 @@ static int qmgr_deliver_send_request(QMGR_ENTRY *entry, VSTREAM *stream)
for (recipient = list.info; recipient < list.info + list.len; recipient++)
if (var_smtputf8_enable && (addr = recipient->address)[0]
&& !allascii(addr) && valid_utf8_stringz(addr)) {
smtputf8 |= SMTPUTF8_FLAG_RECIPIENT;
sendopts |= SMTPUTF8_FLAG_RECIPIENT;
if (message->verp_delims)
smtputf8 |= SMTPUTF8_FLAG_SENDER;
sendopts |= SMTPUTF8_FLAG_SENDER;
}
/*
@ -192,7 +195,7 @@ static int qmgr_deliver_send_request(QMGR_ENTRY *entry, VSTREAM *stream)
SEND_ATTR_LONG(MAIL_ATTR_SIZE, message->cont_length),
SEND_ATTR_STR(MAIL_ATTR_NEXTHOP, entry->queue->nexthop),
SEND_ATTR_STR(MAIL_ATTR_ENCODING, message->encoding),
SEND_ATTR_INT(MAIL_ATTR_SMTPUTF8, smtputf8),
SEND_ATTR_INT(MAIL_ATTR_SENDOPTS, sendopts),
SEND_ATTR_STR(MAIL_ATTR_SENDER, sender),
SEND_ATTR_STR(MAIL_ATTR_DSN_ENVID, message->dsn_envid),
SEND_ATTR_INT(MAIL_ATTR_DSN_RET, message->dsn_ret),

10
postfix/src/qmgr/qmgr_message.c
View File

@ -98,6 +98,9 @@
/* 111 8th Avenue
/* New York, NY 10011, USA
/*
/* Wietse Venema
/* porcupine.org
/*
/* Preemptive scheduler enhancements:
/* Patrik Rak
/* Modra 6
@ -146,6 +149,7 @@
#include <split_addr.h>
#include <dsn_mask.h>
#include <rec_attr_map.h>
#include <sendopts.h>
/* Client stubs. */
@ -189,7 +193,7 @@ static QMGR_MESSAGE *qmgr_message_create(const char *queue_name,
message->sender = 0;
message->dsn_envid = 0;
message->dsn_ret = 0;
message->smtputf8 = 0;
message->sendopts = 0;
message->filter_xport = 0;
message->inspect_xport = 0;
message->redirect_addr = 0;
@ -589,7 +593,7 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
&message->data_size, &message->data_offset,
&message->rcpt_unread, &message->rflags,
&message->cont_length,
&message->smtputf8)) >= 3) {
&message->sendopts)) >= 3) {
/* Postfix >= 1.0 (a.k.a. 20010228). */
if (message->data_offset <= 0 || message->data_size <= 0) {
msg_warn("%s: invalid size record: %.100s",
@ -603,6 +607,8 @@ static int qmgr_message_read(QMGR_MESSAGE *message)
rec_type = REC_TYPE_ERROR;
break;
}
/* Forward compatibility. */
message->sendopts &= SOPT_FLAG_ALL;
} else if (count == 1) {
/* Postfix < 1.0 (a.k.a. 20010228). */
qmgr_message_oldstyle_scan(message);

1
postfix/src/qmqpd/Makefile.in
View File

@ -79,6 +79,7 @@ qmqpd.o: ../../include/quote_flags.h
qmqpd.o: ../../include/rec_type.h
qmqpd.o: ../../include/recipient_list.h
qmqpd.o: ../../include/record.h
qmqpd.o: ../../include/sendopts.h
qmqpd.o: ../../include/smtputf8.h
qmqpd.o: ../../include/sys_defs.h
qmqpd.o: ../../include/vbuf.h

1
postfix/src/qmqpd/qmqpd.c
View File

@ -271,6 +271,7 @@ static void qmqpd_open_file(QMQPD_STATE *state)
cleanup_flags = input_transp_cleanup(CLEANUP_FLAG_MASK_EXTERNAL,
qmqpd_input_transp_mask);
cleanup_flags |= smtputf8_autodetect(MAIL_SRC_MASK_QMQPD);
/* TODO(wietse) REQUIRETLS? */
state->dest = mail_stream_service(MAIL_CLASS_PUBLIC, var_cleanup_service);
if (state->dest == 0
|| attr_print(state->dest->stream, ATTR_FLAG_NONE,

2
postfix/src/smtp/Makefile.in
View File

@ -207,6 +207,7 @@ smtp_chat.o: ../../include/post_mail.h
smtp_chat.o: ../../include/recipient_list.h
smtp_chat.o: ../../include/resolve_clnt.h
smtp_chat.o: ../../include/scache.h
smtp_chat.o: ../../include/sendopts.h
smtp_chat.o: ../../include/smtp_stream.h
smtp_chat.o: ../../include/smtputf8.h
smtp_chat.o: ../../include/sock_addr.h
@ -439,6 +440,7 @@ smtp_proto.o: ../../include/recipient_list.h
smtp_proto.o: ../../include/record.h
smtp_proto.o: ../../include/resolve_clnt.h
smtp_proto.o: ../../include/scache.h
smtp_proto.o: ../../include/sendopts.h
smtp_proto.o: ../../include/smtp_stream.h
smtp_proto.o: ../../include/smtputf8.h
smtp_proto.o: ../../include/sock_addr.h

2
postfix/src/smtp/smtp_connect.c
View File

@ -921,7 +921,7 @@ static void smtp_connect_inet(SMTP_STATE *state, const char *nexthop,
*/
#ifdef USE_TLSRPT
if (smtp_mode && var_smtp_tlsrpt_enable
&& state->tls->level > TLS_LEV_NONE
&& tls_level_lookup(var_smtp_tls_level) > TLS_LEV_NONE
&& !valid_hostaddr(domain, DONT_GRIPE))
smtp_tlsrpt_create_wrapper(state, domain);
else

12
postfix/src/smtp/smtp_proto.c
View File

@ -650,8 +650,8 @@ int smtp_helo(SMTP_STATE *state)
* non-SMTPUTF8 server? That could make life easier for mailing lists.
*/
#define DELIVERY_REQUIRES_SMTPUTF8 \
((request->smtputf8 & SMTPUTF8_FLAG_REQUESTED) \
&& (request->smtputf8 & ~SMTPUTF8_FLAG_REQUESTED))
((request->sendopts & SMTPUTF8_FLAG_REQUESTED) \
&& (request->sendopts & SMTPUTF8_FLAG_DERIVED))
/*
* Require that the server supports SMTPUTF8 when delivery requires
@ -1776,8 +1776,9 @@ static int smtp_loop(SMTP_STATE *state, NOCLOBBER int send_state,
* the SMTPUTF8 promise that was made to the sender.
*/
if ((session->features & SMTP_FEATURE_SMTPUTF8) != 0
&& (request->smtputf8 & SMTPUTF8_FLAG_REQUESTED) != 0)
&& (request->sendopts & SMTPUTF8_FLAG_REQUESTED) != 0)
vstring_strcat(next_command, " SMTPUTF8");
/* TODO(wietse) REQUIRETLS. */
/*
* We authenticate the local MTA only, but not the sender.
@ -1841,8 +1842,9 @@ static int smtp_loop(SMTP_STATE *state, NOCLOBBER int send_state,
quote_822_local(session->scratch, rcpt->orig_addr);
vstring_sprintf(session->scratch2, "%s;%s",
/* Fix 20140707: sender must request SMTPUTF8. */
(request->smtputf8 != 0
&& !allascii(vstring_str(session->scratch))) ?
((request->sendopts & SMTPUTF8_FLAG_ALL)
&& !allascii(vstring_str(session->scratch))
&& valid_utf8_stringz(vstring_str(session->scratch))) ?
"utf-8" : "rfc822",
vstring_str(session->scratch));
orcpt_type_addr = vstring_str(session->scratch2);

2
postfix/src/smtpd/Makefile.in
View File

@ -227,6 +227,7 @@ smtpd.o: ../../include/rec_type.h
smtpd.o: ../../include/recipient_list.h
smtpd.o: ../../include/record.h
smtpd.o: ../../include/resolve_clnt.h
smtpd.o: ../../include/sendopts.h
smtpd.o: ../../include/smtp_stream.h
smtpd.o: ../../include/smtputf8.h
smtpd.o: ../../include/sock_addr.h
@ -288,6 +289,7 @@ smtpd_chat.o: ../../include/nvtable.h
smtpd_chat.o: ../../include/post_mail.h
smtpd_chat.o: ../../include/rec_type.h
smtpd_chat.o: ../../include/record.h
smtpd_chat.o: ../../include/sendopts.h
smtpd_chat.o: ../../include/smtp_reply_footer.h
smtpd_chat.o: ../../include/smtp_stream.h
smtpd_chat.o: ../../include/smtputf8.h

1
postfix/src/smtpd/smtpd.c
View File

@ -2213,6 +2213,7 @@ static int mail_open_stream(SMTPD_STATE *state)
cleanup_flags |= CLEANUP_FLAG_SMTPUTF8;
else
cleanup_flags |= smtputf8_autodetect(MAIL_SRC_MASK_SMTPD);
/* TODO(wietse) REQUIRETLS. */
state->dest = mail_stream_service(MAIL_CLASS_PUBLIC,
var_cleanup_service);
if (state->dest == 0

1
postfix/src/verify/Makefile.in
View File

@ -74,6 +74,7 @@ verify.o: ../../include/mymalloc.h
verify.o: ../../include/nvtable.h
verify.o: ../../include/post_mail.h
verify.o: ../../include/recipient_list.h
verify.o: ../../include/sendopts.h
verify.o: ../../include/set_eugid.h
verify.o: ../../include/smtputf8.h
verify.o: ../../include/split_at.h

1
postfix/src/verify/verify.c
View File

@ -534,6 +534,7 @@ static void verify_query_service(VSTREAM *client_stream)
post_mail_fopen_async(make_verify_sender_addr(), STR(addr),
MAIL_SRC_MASK_VERIFY,
DEL_REQ_FLAG_MTA_VRFY,
/* TODO(wietse) disable REQUIRETLS? */
SMTPUTF8_FLAG_NONE,
(VSTRING *) 0,
verify_post_mail_action,