From 51c3acfadfb1e1646da6f8e019fe254e263bc435 Mon Sep 17 00:00:00 2001 From: Wietse Z Venema Date: Fri, 6 Jun 2025 00:00:00 -0500 Subject: [PATCH] postfix-3.11-20250606-nonprod --- postfix/.indent.pro | 1 - postfix/HISTORY | 138 ++++++- postfix/html/lmtp.8.html | 153 ++++---- postfix/html/mailq.1.html | 30 +- postfix/html/newaliases.1.html | 30 +- postfix/html/pipe.8.html | 9 + postfix/html/postconf.5.html | 131 +++++++ postfix/html/sendmail.1.html | 30 +- postfix/html/smtp.8.html | 153 ++++---- postfix/html/smtpd.8.html | 399 +++++++++++---------- postfix/makedefs | 2 +- postfix/man/man1/sendmail.1 | 25 +- postfix/man/man5/postconf.5 | 104 ++++++ postfix/man/man8/pipe.8 | 8 + postfix/man/man8/smtp.8 | 15 +- postfix/man/man8/smtpd.8 | 10 +- postfix/mantools/postlink | 4 + postfix/proto/postconf.proto | 123 ++++++- postfix/proto/stop | 3 + postfix/proto/stop.double-history | 9 +- postfix/proto/stop.spell-cc | 1 + postfix/proto/stop.spell-history | 1 + postfix/src/bounce/bounce_notify_service.c | 12 +- postfix/src/bounce/bounce_notify_util.c | 1 + postfix/src/bounce/bounce_notify_verp.c | 9 + postfix/src/bounce/bounce_one_service.c | 12 +- postfix/src/bounce/bounce_trace_service.c | 9 + postfix/src/bounce/bounce_warn_service.c | 12 +- postfix/src/cleanup/cleanup_api.c | 10 +- postfix/src/global/Makefile.in | 22 +- postfix/src/global/addr_match_list.c | 7 + postfix/src/global/cleanup_strflags.c | 1 + postfix/src/global/cleanup_user.h | 1 + postfix/src/global/domain_list.c | 7 + postfix/src/global/ehlo_mask.c | 62 +--- postfix/src/global/ehlo_mask.h | 28 +- postfix/src/global/ehlo_mask.in | 3 - postfix/src/global/ehlo_mask.ref | 3 - postfix/src/global/ehlo_mask_test.c | 121 +++++++ postfix/src/global/mail_params.c | 3 + postfix/src/global/mail_params.h | 11 + postfix/src/global/namadr_list.c | 7 + postfix/src/global/post_mail.c | 2 +- postfix/src/global/rec_type.h | 2 +- postfix/src/global/string_list.c | 7 + postfix/src/local/forward.c | 3 +- postfix/src/pickup/pickup.c | 6 +- postfix/src/pipe/Makefile.in | 1 + postfix/src/pipe/pipe.c | 14 + postfix/src/sendmail/Makefile.in | 1 + postfix/src/sendmail/sendmail.c | 54 ++- postfix/src/smtp/Makefile.in | 19 + postfix/src/smtp/lmtp_params.c | 1 + postfix/src/smtp/smtp.c | 36 +- postfix/src/smtp/smtp.h | 13 +- postfix/src/smtp/smtp_connect.c | 56 ++- postfix/src/smtp/smtp_params.c | 1 + postfix/src/smtp/smtp_proto.c | 80 ++++- postfix/src/smtp/smtp_state.c | 3 + postfix/src/smtp/smtp_trouble.c | 34 +- postfix/src/smtpd/smtpd.c | 25 +- postfix/src/smtpd/smtpd.h | 1 + postfix/src/util/match_list.c | 13 +- postfix/src/util/match_list.h | 6 +- 64 files changed, 1637 insertions(+), 461 deletions(-) delete mode 100644 postfix/src/global/ehlo_mask.in delete mode 100644 postfix/src/global/ehlo_mask.ref create mode 100644 postfix/src/global/ehlo_mask_test.c diff --git a/postfix/.indent.pro b/postfix/.indent.pro index 86522dfde..9e6670d2b 100644 --- a/postfix/.indent.pro +++ b/postfix/.indent.pro @@ -307,7 +307,6 @@ -TRESPONSE -TREST_TABLE -TRES_CONTEXT --TRING -TRWR_CONTEXT -TSCACHE -TSCACHE_CLNT diff --git a/postfix/HISTORY b/postfix/HISTORY index 13b6b27d6..9ccc0c502 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -28932,7 +28932,7 @@ Apologies for any names omitted. Documentation: updated TLSRPT_README, added postfix-tlspol policy plugin, deprecated the policy_ttl attribute. File: proto/TLSRPT_README.html. - + 20250207 Performance: when a mysql: or pgsql: configuration specifies @@ -29194,3 +29194,139 @@ Apologies for any names omitted. compatibility level >= 3.11. Files: smtp/smtp_tlsrpt.c, global/mail_params.[hc], proto/COMPATIBILITY_README.html. proto/memcache_table, global/dict_memcache.c, util/hex_code.[hc]. + + Baseline is postfix-3.11-20250606 + +NONPROD CODE + + Feature: support for the REQUIRETLS verb in SMTP. According + to RFC 8689, this requires TLS server certificate matching. + Files: cleanup/cleanup_api.c, global/cleanup_strflags.c, + global/post_mail.c, global/post_mail.c, global/ehlo_mask.[hc], + global/ehlo_mask_test.c, local/forward.c, smtpd/smtpd.c, + smtp/smtp_connect.c, smtp/smtp_proto.c. + + Added a configuration parameter "requiretls_enable" (default: + yes). Files: cleanup/cleanup_api.c, global/cleanup_strflags.c, + global/post_mail.c, global/post_mail.c, global/ehlo_mask.[hc], + global/ehlo_mask_test.c, local/forward.c, smtpd/smtpd.c, + smtp/smtp_connect.c, smtp/smtp_proto.c. + + After a certificate check fails, or a remote SMTP server + does not announce REQUIRETLS support, the Postfix SMTP + client will override the RFC 8689 5.x.x. status and treat + it as a soft error, until there are no more alternate MX + servers to try. Files: smtp/smtp.h, smtp/smtp_proto.c, + smtp/smtp_trouble.c. + + When a message received with REQUIRETLS is returned in a + delivery status notification, return the message headers + only, and do not request delivery with REQUIRETLS. Files: + bounce/bounce_notify_service.c, bounce/bounce_one_service.c, + bounce/bounce_trace_service.c, bounce/bounce_verp_service.c, + bounce/bounce_warn_service.c. + + Completed: new Postfix sendmail command option "-O requiretls" + to request that deliveries over SMTP use the REQUIRETLS + extension. The option value "requiretls" is case-insensitive. + Files: sendmail/sendmail.c, global/rec_types.h, pickup/pickup.c. + + Cleanup: new Postfix sendmail command option "-O smtputf8" + to request that deliveries over SMTP use the SMTPUTF8 + extension. This reuses logic that was introduced for + REQUIRETLS. The option value "smtputf8" is case-insensitive. + Files: sendmail/sendmail.c. + + Cleanup: when message delivery requires that a remote SMTP + server supports SMTPUTF8, try multiple MX servers before + returning a message as undeliverable. This reuses logic + that was introduced for REQUIRETLS. File: smtp/smtp_proto.c. + + Completed: support in the pipe(8) daemon to propagate + REQUIRETLS through post-queue content filters that pass + filtered mail to the Postfix sendmail(1) command. This + involves a new a pipe(8) macro ${requiretls} that expands + into a suitable sendmail(1) command-line option. A more + secretive alternative would be to pass the info with a + REQUIRETLS environment variable, but that would require + change to the default import_environment setting. Files: + pipe/pipe.c, sendmail/sendmail.c. + + Completed: the SMTP/LMTP client with "flags=X" will not + require REQUIRETLS support in the final server. Files: + smtp/smtp.c, smtp/smtp_proto.c. + + Completed: REQUIRETLS support can be disabled in the Postfix + SMTP/LMTP client with "{ -o requiretls_enable = no }". This + is recommended for a perimeter MTA that hands off mail to + internal servers that may not support REQUIRETLS. + + Completed: smtp_enforce_requiretls list of next-hop domains + (or UNIX-domain pathnames) that are ready for REQUIRETLS + enforcement. This may help with gradual adoption. + +TODO + + Encapsulate the sendopts-to-cleanup-flags mapping. + + Postfix sendmail -O TlsRequired option? + + What REQUIRETLS expectations can we enforce when delivering + over a UNIX-domain channel? The SMTP/LMTP client currently + implements the same behavior as for TCP, except that + opportunistic TLS is converted into 'none'. + + Document how REQUIRETLS works (or does not) with external + content filters. + + - REQUIRETLS will not affect Milter-based content filters, + assuming that they don't expose message content via some + side channel. + + - REQUIRETLS can work with smtpd_proxy_filter as long as + - the Postfix SMTP server passes the entire Postfix SMTP + client's MAIL FROM command line through the filter to + the Postfix SMTP server after the proxy filter, + - the post-filter Postfix SMTP server allows REQUIRETLS + in a plaintext session. + The Postfix proxy filter client does not need to require + REQUIRETLS (or SMTPUTF8) announcements in the filter's + EHLO response. + + - REQUIRETLS can work with a local SMTP-based after-queue + content filters as long as + - the filter announces REQUIRETLS in the EHLO response + (this could be 'always', or copied from the after-filter + Postfix SMTP server's EHLO response), + - the filter passes the entire MAIL FROM command from the + before-filter Postfix SMTP client to the after-filter + Postfix SMTP server, + - the post-filter Postfix SMTP server allows MAIL FROM + with REQUIRETLS in a plaintext session. + Apart from that, the content filter does not need to + 'know' that REQUIRETLS is active (assuming that it does + not leak message content through some side channel. + + - REQUIRETLS can work with pipe(8)-filter-sendmail(1) + after-queue content filters, by specifying a pipe(8) macro + ${requiretls} which expands to a suitable sendmail(1) + command-line option. Maybe we can also make this work + with a REQUIRETLS environment variable (requires change + to the (Postfix sendmail) import_environment list. + + - The Postfix LMTP client when run with the -X option will + not require that the LMTP server announces REQUIRETLS + support. + + - Perimeter MTA configuration: disable REQUIRETLS (or + REQUIRETLS enforcement) on the inbound relay transport + when internal infrastructure may not be suitable for + REQUIRETLS enforcement. + + If a message contains "TLS-Required: no", should a bounce + message also contain this header? + + Ditto for "tls_required_enable = no" and "TLS-Required: + no". The header is provided by the sender, and enforcement + is up the Postfix SMTP client. + diff --git a/postfix/html/lmtp.8.html b/postfix/html/lmtp.8.html index f5a3945b6..66ec567cb 100644 --- a/postfix/html/lmtp.8.html +++ b/postfix/html/lmtp.8.html @@ -174,7 +174,7 @@ SMTP(8) SMTP(8) RFC 6531 (Internationalized SMTP) RFC 6533 (Internationalized Delivery Status Notifications) RFC 7672 (SMTP security via opportunistic DANE TLS) - RFC 8689 (TLS-Required message header) + RFC 8689 (SMTP REQUIRETLS extension) DIAGNOSTICS Problems and transactions are logged to syslogd(8) or postlogd(8). @@ -507,7 +507,7 @@ SMTP(8) SMTP(8) The delimiter between username and password in sasl_passwd_maps lookup results. -STARTTLS SUPPORT CONTROLS +TLS SUPPORT CONTROLS Detailed information about STARTTLS configuration may be found in the TLS_README document. @@ -766,41 +766,52 @@ SMTP(8) SMTP(8) Enable support for the "TLS-Required: no" message header, defined in RFC 8689. -OBSOLETE STARTTLS CONTROLS - The following configuration parameters exist for compatibility with - Postfix versions before 2.3. Support for these will be removed in a + requiretls_enable (yes) + Enable support for the ESMTP verb "REQUIRETLS", defined in RFC + 8689. + + smtp_enforce_requiretls (empty) + An optional list of next-hop destinations that the Postfix + SMTP/LMTP client will enforce REQUIRETLS for, when a message was + received with the REQUIRETLS option: the next-hop server must + offer a matching TLS server certificate, and the server must + announce REQUIRETLS support). + +OBSOLETE TLS CONTROLS + The following configuration parameters exist for compatibility with + Postfix versions before 2.3. Support for these will be removed in a future release. smtp_use_tls (no) - Opportunistic mode: use TLS when a remote SMTP server announces + Opportunistic mode: use TLS when a remote SMTP server announces STARTTLS support, otherwise send the mail in the clear. smtp_enforce_tls (no) - Enforcement mode: require that remote SMTP servers use TLS + Enforcement mode: require that remote SMTP servers use TLS encryption, and never send mail in the clear. smtp_tls_enforce_peername (yes) - With mandatory TLS encryption, require that the remote SMTP - server hostname matches the information in the remote SMTP + With mandatory TLS encryption, require that the remote SMTP + server hostname matches the information in the remote SMTP server certificate. smtp_tls_per_site (empty) - Optional lookup tables with the Postfix SMTP client TLS usage - policy by next-hop destination and by remote SMTP server host- + Optional lookup tables with the Postfix SMTP client TLS usage + policy by next-hop destination and by remote SMTP server host- name. smtp_tls_cipherlist (empty) - Obsolete Postfix < 2.3 control for the Postfix SMTP client TLS + Obsolete Postfix < 2.3 control for the Postfix SMTP client TLS cipher list. RESOURCE AND RATE CONTROLS smtp_connect_timeout (30s) - The Postfix SMTP client time limit for completing a TCP connec- + The Postfix SMTP client time limit for completing a TCP connec- tion, or zero (use the operating system built-in time limit). smtp_helo_timeout (300s) - The Postfix SMTP client time limit for sending the HELO or EHLO - command, and for receiving the initial remote SMTP server + The Postfix SMTP client time limit for sending the HELO or EHLO + command, and for receiving the initial remote SMTP server response. lmtp_lhlo_timeout (300s) @@ -812,19 +823,19 @@ SMTP(8) SMTP(8) mand, and for receiving the remote SMTP server response. smtp_mail_timeout (300s) - The Postfix SMTP client time limit for sending the MAIL FROM + The Postfix SMTP client time limit for sending the MAIL FROM command, and for receiving the remote SMTP server response. smtp_rcpt_timeout (300s) - The Postfix SMTP client time limit for sending the SMTP RCPT TO + The Postfix SMTP client time limit for sending the SMTP RCPT TO command, and for receiving the remote SMTP server response. smtp_data_init_timeout (120s) - The Postfix SMTP client time limit for sending the SMTP DATA + The Postfix SMTP client time limit for sending the SMTP DATA command, and for receiving the remote SMTP server response. smtp_data_xfer_timeout (180s) - The Postfix SMTP client time limit for sending the SMTP message + The Postfix SMTP client time limit for sending the SMTP message content. smtp_data_done_timeout (600s) @@ -838,13 +849,13 @@ SMTP(8) SMTP(8) Available in Postfix version 2.1 and later: smtp_mx_address_limit (5) - The maximal number of MX (mail exchanger) IP addresses that can - result from Postfix SMTP client mail exchanger lookups, or zero + The maximal number of MX (mail exchanger) IP addresses that can + result from Postfix SMTP client mail exchanger lookups, or zero (no limit). smtp_mx_session_limit (2) - The maximal number of SMTP sessions per delivery request before - the Postfix SMTP client gives up or delivers to a fall-back + The maximal number of SMTP sessions per delivery request before + the Postfix SMTP client gives up or delivers to a fall-back relay host, or zero (no limit). smtp_rset_timeout (20s) @@ -854,17 +865,17 @@ SMTP(8) SMTP(8) Available in Postfix version 2.2 and earlier: lmtp_cache_connection (yes) - Keep Postfix LMTP client connections open for up to $max_idle + Keep Postfix LMTP client connections open for up to $max_idle seconds. Available in Postfix version 2.2 and later: smtp_connection_cache_destinations (empty) - Permanently enable SMTP connection caching for the specified + Permanently enable SMTP connection caching for the specified destinations. smtp_connection_cache_on_demand (yes) - Temporarily enable SMTP connection caching while a destination + Temporarily enable SMTP connection caching while a destination has a high volume of mail in the active queue. smtp_connection_reuse_time_limit (300s) @@ -878,23 +889,23 @@ SMTP(8) SMTP(8) Available in Postfix version 2.3 and later: connection_cache_protocol_timeout (5s) - Time limit for connection cache connect, send or receive opera- + Time limit for connection cache connect, send or receive opera- tions. Available in Postfix version 2.9 - 3.6: smtp_per_record_deadline (no) - Change the behavior of the smtp_*_timeout time limits, from a - time limit per read or write system call, to a time limit to - send or receive a complete record (an SMTP command line, SMTP - response line, SMTP message content line, or TLS protocol mes- + Change the behavior of the smtp_*_timeout time limits, from a + time limit per read or write system call, to a time limit to + send or receive a complete record (an SMTP command line, SMTP + response line, SMTP message content line, or TLS protocol mes- sage). Available in Postfix version 2.11 and later: smtp_connection_reuse_count_limit (0) - When SMTP connection caching is enabled, the number of times - that an SMTP session may be reused before it is closed, or zero + When SMTP connection caching is enabled, the number of times + that an SMTP session may be reused before it is closed, or zero (no limit). Available in Postfix version 3.4 and later: @@ -905,13 +916,13 @@ SMTP(8) SMTP(8) Available in Postfix version 3.7 and later: smtp_per_request_deadline (no) - Change the behavior of the smtp_*_timeout time limits, from a - time limit per plaintext or TLS read or write call, to a com- - bined time limit for sending a complete SMTP request and for + Change the behavior of the smtp_*_timeout time limits, from a + time limit per plaintext or TLS read or write call, to a com- + bined time limit for sending a complete SMTP request and for receiving a complete SMTP response. smtp_min_data_rate (500) - The minimum plaintext data transfer rate in bytes/second for + The minimum plaintext data transfer rate in bytes/second for DATA requests, when deadlines are enabled with smtp_per_request_deadline. @@ -919,54 +930,54 @@ SMTP(8) SMTP(8) transport_destination_concurrency_limit ($default_destination_concur- rency_limit) - A transport-specific override for the default_destination_con- + A transport-specific override for the default_destination_con- currency_limit parameter value, where transport is the master.cf name of the message delivery transport. transport_destination_recipient_limit ($default_destination_recipi- ent_limit) A transport-specific override for the default_destination_recip- - ient_limit parameter value, where transport is the master.cf + ient_limit parameter value, where transport is the master.cf name of the message delivery transport. SMTPUTF8 CONTROLS Preliminary SMTPUTF8 support is introduced with Postfix 3.0. smtputf8_enable (yes) - Enable preliminary SMTPUTF8 support for the protocols described + Enable preliminary SMTPUTF8 support for the protocols described in RFC 6531, RFC 6532, and RFC 6533. smtputf8_autodetect_classes (sendmail, verify) - Detect that a message requires SMTPUTF8 support for the speci- + Detect that a message requires SMTPUTF8 support for the speci- fied mail origin classes. Available in Postfix version 3.2 and later: enable_idna2003_compatibility (no) - Enable 'transitional' compatibility between IDNA2003 and - IDNA2008, when converting UTF-8 domain names to/from the ASCII + Enable 'transitional' compatibility between IDNA2003 and + IDNA2008, when converting UTF-8 domain names to/from the ASCII form that is used for DNS lookups. TROUBLE SHOOTING CONTROLS debug_peer_level (2) - The increment in verbose logging level when a nexthop destina- - tion, remote client or server name or network address matches a + The increment in verbose logging level when a nexthop destina- + tion, remote client or server name or network address matches a pattern given with the debug_peer_list parameter. debug_peer_list (empty) - Optional list of nexthop destination, remote client or server - name or network address patterns that, if matched, cause the - verbose logging level to increase by the amount specified in + Optional list of nexthop destination, remote client or server + name or network address patterns that, if matched, cause the + verbose logging level to increase by the amount specified in $debug_peer_level. error_notice_recipient (postmaster) - The recipient of postmaster notifications about mail delivery + The recipient of postmaster notifications about mail delivery problems that are caused by policy, resource, software or proto- col errors. internal_mail_filter_classes (empty) - What categories of Postfix-generated mail are subject to - before-queue content inspection by non_smtpd_milters, + What categories of Postfix-generated mail are subject to + before-queue content inspection by non_smtpd_milters, header_checks and body_checks. notify_classes (resource, software) @@ -974,46 +985,46 @@ SMTP(8) SMTP(8) MISCELLANEOUS CONTROLS best_mx_transport (empty) - Where the Postfix SMTP client should deliver mail when it + Where the Postfix SMTP client should deliver mail when it detects a "mail loops back to myself" error condition. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con- + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) - How much time a Postfix daemon process may take to handle a + How much time a Postfix daemon process may take to handle a request before it is terminated by a built-in watchdog timer. delay_logging_resolution_limit (2) - The maximal number of digits after the decimal point when log- + The maximal number of digits after the decimal point when log- ging delay values. disable_dns_lookups (no) Disable DNS lookups in the Postfix SMTP and LMTP clients. inet_interfaces (all) - The local network interface addresses that this mail system + The local network interface addresses that this mail system receives mail on. inet_protocols (see 'postconf -d' output) - The Internet protocols Postfix will attempt to use when making + The Internet protocols Postfix will attempt to use when making or accepting connections. ipc_timeout (3600s) - The time limit for sending or receiving information over an + The time limit for sending or receiving information over an internal communication channel. lmtp_assume_final (no) - When a remote LMTP server announces no DSN support, assume that - the server performs final delivery, and send "delivered" deliv- + When a remote LMTP server announces no DSN support, assume that + the server performs final delivery, and send "delivered" deliv- ery status notifications instead of "relayed". lmtp_tcp_port (24) The default TCP port that the Postfix LMTP client connects to. max_idle (100s) - The maximum amount of time that an idle Postfix daemon process + The maximum amount of time that an idle Postfix daemon process waits for an incoming connection before terminating voluntarily. max_use (100) @@ -1027,21 +1038,21 @@ SMTP(8) SMTP(8) The process name of a Postfix command or daemon process. proxy_interfaces (empty) - The remote network interface addresses that this mail system - receives mail on by way of a proxy or network address transla- + The remote network interface addresses that this mail system + receives mail on by way of a proxy or network address transla- tion unit. smtp_address_preference (any) The address type ("ipv6", "ipv4" or "any") that the Postfix SMTP - client will try first, when a destination has IPv6 and IPv4 + client will try first, when a destination has IPv6 and IPv4 addresses with equal MX preference. smtp_bind_address (empty) - An optional numerical network address that the Postfix SMTP + An optional numerical network address that the Postfix SMTP client should bind to when making an IPv4 connection. smtp_bind_address6 (empty) - An optional numerical network address that the Postfix SMTP + An optional numerical network address that the Postfix SMTP client should bind to when making an IPv6 connection. smtp_helo_name ($myhostname) @@ -1061,7 +1072,7 @@ SMTP(8) SMTP(8) The syslog facility of Postfix logging. syslog_name (see 'postconf -d' output) - A prefix that is prepended to the process name in syslog + A prefix that is prepended to the process name in syslog records, so that, for example, "smtpd" becomes "prefix/smtpd". Available with Postfix 2.2 and earlier: @@ -1073,14 +1084,14 @@ SMTP(8) SMTP(8) Available with Postfix 2.3 and later: smtp_fallback_relay ($fallback_relay) - Optional list of relay destinations that will be used when an - SMTP destination is not found, or when delivery fails due to a + Optional list of relay destinations that will be used when an + SMTP destination is not found, or when delivery fails due to a non-permanent error. Available with Postfix 3.0 and later: smtp_address_verify_target (rcpt) - In the context of email address verification, the SMTP protocol + In the context of email address verification, the SMTP protocol stage that determines whether an email address is deliverable. Available with Postfix 3.1 and later: @@ -1102,7 +1113,7 @@ SMTP(8) SMTP(8) Available in Postfix 3.7 and later: smtp_bind_address_enforce (no) - Defer delivery when the Postfix SMTP client cannot apply the + Defer delivery when the Postfix SMTP client cannot apply the smtp_bind_address or smtp_bind_address6 setting. SEE ALSO diff --git a/postfix/html/mailq.1.html b/postfix/html/mailq.1.html index 4645b733a..368636874 100644 --- a/postfix/html/mailq.1.html +++ b/postfix/html/mailq.1.html @@ -168,12 +168,32 @@ SENDMAIL(1) SENDMAIL(1) Delivery status notification control. Specify either a comma-separated list with one or more of failure (send notifica- tion when delivery fails), delay (send notification when deliv- - ery is delayed), or success (send notification when the message + ery is delayed), or success (send notification after the message is delivered); or specify never (don't send any notifications at all). This feature is available in Postfix 2.3 and later. + -O requiretls + When delivering a message to an SMTP or LMTP server, the connec- + tion must use TLS with a verified server certificate, and the + server must support REQUIRETLS. Try multiple servers if possi- + ble, and return the message as undeliverable when these require- + ments were not satisfied with any of the servers that were + tried. The "requiretls" option value is case-insensitive. + + This feature is available in Postfix 3.10 and later. + + -O smtputf8 + When delivering a message to an SMTP or LMTP server, the server + must support SMTPUTF8. Try multiple servers if possible, and + return the message as undeliverable when a message contains an + UTF8 envelope address or message header, but SMTPUTF8 was not + supported by any of the servers that were tried. The "smtputf8" + option value is case-insensitive. + + This feature is available in Postfix 3.10 and later. + -n (ignored) Backwards compatibility. @@ -483,6 +503,12 @@ SENDMAIL(1) SENDMAIL(1) the default Postfix instance, and that are started, stopped, etc., together with the default Postfix instance. + Postfix 3.10 and later: + + requiretls_enable (yes) + Enable support for the ESMTP verb "REQUIRETLS", defined in RFC + 8689. + FILES /var/spool/postfix, mail queue /etc/postfix, configuration files @@ -501,7 +527,7 @@ SENDMAIL(1) SENDMAIL(1) syslogd(8), system logging README_FILES - Use "postconf readme_directory" or "postconf html_directory" to locate + Use "postconf readme_directory" or "postconf html_directory" to locate this information. DEBUG_README, Postfix debugging howto ETRN_README, Postfix ETRN howto diff --git a/postfix/html/newaliases.1.html b/postfix/html/newaliases.1.html index 4645b733a..368636874 100644 --- a/postfix/html/newaliases.1.html +++ b/postfix/html/newaliases.1.html @@ -168,12 +168,32 @@ SENDMAIL(1) SENDMAIL(1) Delivery status notification control. Specify either a comma-separated list with one or more of failure (send notifica- tion when delivery fails), delay (send notification when deliv- - ery is delayed), or success (send notification when the message + ery is delayed), or success (send notification after the message is delivered); or specify never (don't send any notifications at all). This feature is available in Postfix 2.3 and later. + -O requiretls + When delivering a message to an SMTP or LMTP server, the connec- + tion must use TLS with a verified server certificate, and the + server must support REQUIRETLS. Try multiple servers if possi- + ble, and return the message as undeliverable when these require- + ments were not satisfied with any of the servers that were + tried. The "requiretls" option value is case-insensitive. + + This feature is available in Postfix 3.10 and later. + + -O smtputf8 + When delivering a message to an SMTP or LMTP server, the server + must support SMTPUTF8. Try multiple servers if possible, and + return the message as undeliverable when a message contains an + UTF8 envelope address or message header, but SMTPUTF8 was not + supported by any of the servers that were tried. The "smtputf8" + option value is case-insensitive. + + This feature is available in Postfix 3.10 and later. + -n (ignored) Backwards compatibility. @@ -483,6 +503,12 @@ SENDMAIL(1) SENDMAIL(1) the default Postfix instance, and that are started, stopped, etc., together with the default Postfix instance. + Postfix 3.10 and later: + + requiretls_enable (yes) + Enable support for the ESMTP verb "REQUIRETLS", defined in RFC + 8689. + FILES /var/spool/postfix, mail queue /etc/postfix, configuration files @@ -501,7 +527,7 @@ SENDMAIL(1) SENDMAIL(1) syslogd(8), system logging README_FILES - Use "postconf readme_directory" or "postconf html_directory" to locate + Use "postconf readme_directory" or "postconf html_directory" to locate this information. DEBUG_README, Postfix debugging howto ETRN_README, Postfix ETRN howto diff --git a/postfix/html/pipe.8.html b/postfix/html/pipe.8.html index 911a740eb..c8d678a70 100644 --- a/postfix/html/pipe.8.html +++ b/postfix/html/pipe.8.html @@ -309,6 +309,15 @@ PIPE(8) PIPE(8) This information is modified by the hqu flags for quoting and case folding. + ${requiretls} + This feature should be used with content filters that + pass filtered mail to the Postfix sendmail(1) command. + The macro expands to the sendmail(1) command-line option + -Orequiretls if the sender requested REQUIRETLS, other- + wise it expands to -Onoop. + + This feature is available as of Postfix 3.10. + ${sasl_method} This macro expands to the name of the SASL authentication mechanism in the AUTH command when the Postfix SMTP diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html index 0d63f28ee..4a5931780 100644 --- a/postfix/html/postconf.5.html +++ b/postfix/html/postconf.5.html @@ -5041,6 +5041,17 @@ configuration parameter. See there for details.

This feature is available in Postfix 2.11 and later.

+ + +
lmtp_enforce_requiretls +(default: empty)
+ +

The LMTP-specific version of the smtp_enforce_requiretls +configuration parameter. See there for details.

+ +

This feature is available in Postfix ≥ 3.11.

+ +
lmtp_enforce_tls @@ -8218,6 +8229,13 @@ you really want to match subdomains. smtpd_client_event_limit_exceptions +
Postfix version 3.11 and later
+ +
+smtp_enforce_requiretls, +lmtp_enforce_requiretls +
+ @@ -10572,6 +10590,37 @@ the mail server (IMPORTING HOME DIRECTORIES IS NOT RECOMMENDED).

+ + +
requiretls_enable +(default: yes)
+ +

Enable support for the ESMTP verb "REQUIRETLS", defined in RFC +8689. By issuing this verb in the "MAIL FROM" command, a sender +specifies that a message must be delivered over TLS connections +with a verified server certificate, to a server that announces +"REQUIRETLS" support. This corresponds to the Postfix SMTP client +TLS security levels "secure", "verify", "fingerprint", dane-only, +or opportunistic "dane", with a successful certificate match. The +Postfix SMTP client will try one or more servers, controlled with +the smtp_mx_address_limit parameter, until it finds a server that +satisfies requirements. Otherwise, Postfix returns the message as +undeliverable.

+ +

Notes:

+ + + +

This feature is available in Postfix ≥ 3.11.

+ +
reset_owner_alias @@ -11903,6 +11952,86 @@ RES_USE_DNSSEC and RES_USE_EDNS0 resolver options.

This feature is available in Postfix 2.11 and later.

+ + +
smtp_enforce_requiretls +(default: empty)
+ +

An optional list of next-hop destinations that the Postfix +SMTP/LMTP client will enforce REQUIRETLS for, when a message was +received with the REQUIRETLS option: the next-hop server must offer +a matching TLS server certificate, and the server must announce +REQUIRETLS support). Such a message will be returned to the sender +if some REQUIRETLS requirement cannot be satisfied. These "hard" +REQUIRETLS failures are logged as "REQUIRETLS failure".

+ +

Other messages that were received with the REQUIRETLS option +will be delivered with REQUIRETLS if possible. If not, a message +will be delivered as if it was received without the REQUIRETLS +option. This allows a mail sending site to discover when REQUIRETLS +can be enforced, without disrupting email deliveries. These "soft" +REQUIRETLS failures are logged with "REQUIRETLS Debug".

+ +

On a perimeter MTA, it can make sense to turn off REQUIRETLS +enforcement, or even to turn off REQUIRETLS support, when delivering +a message to an internal destination. The internal servers may not +support REQUIRETLS, and their connections may be secured with means +other than DANE, STS, and the like.

+ +

The supported syntax differs with SMTP and LMTP:

+ +
    + +

  • With SMTP, specify a list of next-hop domain names (without +the ":port" or ":service" suffix), "/file/name" patterns or +"type:table" lookup tables, separated by commas and/or whitespace. +Continue long lines by starting the next line with whitespace. A +"/file/name" pattern is replaced by its contents. A "type:table" +lookup table is matched when a domain appears as lookup key. Specify +"!pattern" to exclude a domain.

    + +

  • With LMTP, specify list of domain names (without the "inet": +prefix, or ":port" or ":service" suffix), or UNIX-domain socket +"/path/name" (without the "unix:" prefix), or "type:table" lookup +tables, separated by commas and/or whitespace. Continue long lines +by starting the next line with whitespace. A "type:table" lookup +table is matched when a domain appears as lookup key. Specify +"!pattern" to exclude a domain or socket path.

    + +
+ +

Specify the form ".domain" to match any name ending in ".domain". +To change this behavior, list "smtp_enforce_requiretls" or +"lmtp_enforce_requiretls" in the parent_domain_matches_subdomains +parameter value.

+ +

+SMTP Examples: +

+ +
+# Enforce REQUIRETLS for SMTP with selected next-hop domains.
+smtp_enforce_requiretls = example.com, foo.example
+

+# Enforce REQUIRETLS for SMTP with all but a few next-hop domains.
+smtp_enforce_requiretls = !foo.example, static:all
+
+ +

+LMTP examples: +

+ +
+# Don't enforce REQUIRETLS
+lmtp_enforce_requiretls =
+

+# Enforce REQUIRETLS for specific destinations.
+lmtp_enforce_requiretls = /path/to/socket, message-store.example
+
+ +

This feature is available in Postfix ≥ 3.11.

+ +
smtp_enforce_tls @@ -20763,6 +20892,8 @@ If a message contains a "TLS-Required: no" header, then Postfix will add that header to a delivery status notification for that message.

+

Note: REQUIRETLS overrides "TLS-Required: no".

+

This feature is available in Postfix ≥ 3.10.

diff --git a/postfix/html/sendmail.1.html b/postfix/html/sendmail.1.html index 4645b733a..368636874 100644 --- a/postfix/html/sendmail.1.html +++ b/postfix/html/sendmail.1.html @@ -168,12 +168,32 @@ SENDMAIL(1) SENDMAIL(1) Delivery status notification control. Specify either a comma-separated list with one or more of failure (send notifica- tion when delivery fails), delay (send notification when deliv- - ery is delayed), or success (send notification when the message + ery is delayed), or success (send notification after the message is delivered); or specify never (don't send any notifications at all). This feature is available in Postfix 2.3 and later. + -O requiretls + When delivering a message to an SMTP or LMTP server, the connec- + tion must use TLS with a verified server certificate, and the + server must support REQUIRETLS. Try multiple servers if possi- + ble, and return the message as undeliverable when these require- + ments were not satisfied with any of the servers that were + tried. The "requiretls" option value is case-insensitive. + + This feature is available in Postfix 3.10 and later. + + -O smtputf8 + When delivering a message to an SMTP or LMTP server, the server + must support SMTPUTF8. Try multiple servers if possible, and + return the message as undeliverable when a message contains an + UTF8 envelope address or message header, but SMTPUTF8 was not + supported by any of the servers that were tried. The "smtputf8" + option value is case-insensitive. + + This feature is available in Postfix 3.10 and later. + -n (ignored) Backwards compatibility. @@ -483,6 +503,12 @@ SENDMAIL(1) SENDMAIL(1) the default Postfix instance, and that are started, stopped, etc., together with the default Postfix instance. + Postfix 3.10 and later: + + requiretls_enable (yes) + Enable support for the ESMTP verb "REQUIRETLS", defined in RFC + 8689. + FILES /var/spool/postfix, mail queue /etc/postfix, configuration files @@ -501,7 +527,7 @@ SENDMAIL(1) SENDMAIL(1) syslogd(8), system logging README_FILES - Use "postconf readme_directory" or "postconf html_directory" to locate + Use "postconf readme_directory" or "postconf html_directory" to locate this information. DEBUG_README, Postfix debugging howto ETRN_README, Postfix ETRN howto diff --git a/postfix/html/smtp.8.html b/postfix/html/smtp.8.html index f5a3945b6..66ec567cb 100644 --- a/postfix/html/smtp.8.html +++ b/postfix/html/smtp.8.html @@ -174,7 +174,7 @@ SMTP(8) SMTP(8) RFC 6531 (Internationalized SMTP) RFC 6533 (Internationalized Delivery Status Notifications) RFC 7672 (SMTP security via opportunistic DANE TLS) - RFC 8689 (TLS-Required message header) + RFC 8689 (SMTP REQUIRETLS extension) DIAGNOSTICS Problems and transactions are logged to syslogd(8) or postlogd(8). @@ -507,7 +507,7 @@ SMTP(8) SMTP(8) The delimiter between username and password in sasl_passwd_maps lookup results. -STARTTLS SUPPORT CONTROLS +TLS SUPPORT CONTROLS Detailed information about STARTTLS configuration may be found in the TLS_README document. @@ -766,41 +766,52 @@ SMTP(8) SMTP(8) Enable support for the "TLS-Required: no" message header, defined in RFC 8689. -OBSOLETE STARTTLS CONTROLS - The following configuration parameters exist for compatibility with - Postfix versions before 2.3. Support for these will be removed in a + requiretls_enable (yes) + Enable support for the ESMTP verb "REQUIRETLS", defined in RFC + 8689. + + smtp_enforce_requiretls (empty) + An optional list of next-hop destinations that the Postfix + SMTP/LMTP client will enforce REQUIRETLS for, when a message was + received with the REQUIRETLS option: the next-hop server must + offer a matching TLS server certificate, and the server must + announce REQUIRETLS support). + +OBSOLETE TLS CONTROLS + The following configuration parameters exist for compatibility with + Postfix versions before 2.3. Support for these will be removed in a future release. smtp_use_tls (no) - Opportunistic mode: use TLS when a remote SMTP server announces + Opportunistic mode: use TLS when a remote SMTP server announces STARTTLS support, otherwise send the mail in the clear. smtp_enforce_tls (no) - Enforcement mode: require that remote SMTP servers use TLS + Enforcement mode: require that remote SMTP servers use TLS encryption, and never send mail in the clear. smtp_tls_enforce_peername (yes) - With mandatory TLS encryption, require that the remote SMTP - server hostname matches the information in the remote SMTP + With mandatory TLS encryption, require that the remote SMTP + server hostname matches the information in the remote SMTP server certificate. smtp_tls_per_site (empty) - Optional lookup tables with the Postfix SMTP client TLS usage - policy by next-hop destination and by remote SMTP server host- + Optional lookup tables with the Postfix SMTP client TLS usage + policy by next-hop destination and by remote SMTP server host- name. smtp_tls_cipherlist (empty) - Obsolete Postfix < 2.3 control for the Postfix SMTP client TLS + Obsolete Postfix < 2.3 control for the Postfix SMTP client TLS cipher list. RESOURCE AND RATE CONTROLS smtp_connect_timeout (30s) - The Postfix SMTP client time limit for completing a TCP connec- + The Postfix SMTP client time limit for completing a TCP connec- tion, or zero (use the operating system built-in time limit). smtp_helo_timeout (300s) - The Postfix SMTP client time limit for sending the HELO or EHLO - command, and for receiving the initial remote SMTP server + The Postfix SMTP client time limit for sending the HELO or EHLO + command, and for receiving the initial remote SMTP server response. lmtp_lhlo_timeout (300s) @@ -812,19 +823,19 @@ SMTP(8) SMTP(8) mand, and for receiving the remote SMTP server response. smtp_mail_timeout (300s) - The Postfix SMTP client time limit for sending the MAIL FROM + The Postfix SMTP client time limit for sending the MAIL FROM command, and for receiving the remote SMTP server response. smtp_rcpt_timeout (300s) - The Postfix SMTP client time limit for sending the SMTP RCPT TO + The Postfix SMTP client time limit for sending the SMTP RCPT TO command, and for receiving the remote SMTP server response. smtp_data_init_timeout (120s) - The Postfix SMTP client time limit for sending the SMTP DATA + The Postfix SMTP client time limit for sending the SMTP DATA command, and for receiving the remote SMTP server response. smtp_data_xfer_timeout (180s) - The Postfix SMTP client time limit for sending the SMTP message + The Postfix SMTP client time limit for sending the SMTP message content. smtp_data_done_timeout (600s) @@ -838,13 +849,13 @@ SMTP(8) SMTP(8) Available in Postfix version 2.1 and later: smtp_mx_address_limit (5) - The maximal number of MX (mail exchanger) IP addresses that can - result from Postfix SMTP client mail exchanger lookups, or zero + The maximal number of MX (mail exchanger) IP addresses that can + result from Postfix SMTP client mail exchanger lookups, or zero (no limit). smtp_mx_session_limit (2) - The maximal number of SMTP sessions per delivery request before - the Postfix SMTP client gives up or delivers to a fall-back + The maximal number of SMTP sessions per delivery request before + the Postfix SMTP client gives up or delivers to a fall-back relay host, or zero (no limit). smtp_rset_timeout (20s) @@ -854,17 +865,17 @@ SMTP(8) SMTP(8) Available in Postfix version 2.2 and earlier: lmtp_cache_connection (yes) - Keep Postfix LMTP client connections open for up to $max_idle + Keep Postfix LMTP client connections open for up to $max_idle seconds. Available in Postfix version 2.2 and later: smtp_connection_cache_destinations (empty) - Permanently enable SMTP connection caching for the specified + Permanently enable SMTP connection caching for the specified destinations. smtp_connection_cache_on_demand (yes) - Temporarily enable SMTP connection caching while a destination + Temporarily enable SMTP connection caching while a destination has a high volume of mail in the active queue. smtp_connection_reuse_time_limit (300s) @@ -878,23 +889,23 @@ SMTP(8) SMTP(8) Available in Postfix version 2.3 and later: connection_cache_protocol_timeout (5s) - Time limit for connection cache connect, send or receive opera- + Time limit for connection cache connect, send or receive opera- tions. Available in Postfix version 2.9 - 3.6: smtp_per_record_deadline (no) - Change the behavior of the smtp_*_timeout time limits, from a - time limit per read or write system call, to a time limit to - send or receive a complete record (an SMTP command line, SMTP - response line, SMTP message content line, or TLS protocol mes- + Change the behavior of the smtp_*_timeout time limits, from a + time limit per read or write system call, to a time limit to + send or receive a complete record (an SMTP command line, SMTP + response line, SMTP message content line, or TLS protocol mes- sage). Available in Postfix version 2.11 and later: smtp_connection_reuse_count_limit (0) - When SMTP connection caching is enabled, the number of times - that an SMTP session may be reused before it is closed, or zero + When SMTP connection caching is enabled, the number of times + that an SMTP session may be reused before it is closed, or zero (no limit). Available in Postfix version 3.4 and later: @@ -905,13 +916,13 @@ SMTP(8) SMTP(8) Available in Postfix version 3.7 and later: smtp_per_request_deadline (no) - Change the behavior of the smtp_*_timeout time limits, from a - time limit per plaintext or TLS read or write call, to a com- - bined time limit for sending a complete SMTP request and for + Change the behavior of the smtp_*_timeout time limits, from a + time limit per plaintext or TLS read or write call, to a com- + bined time limit for sending a complete SMTP request and for receiving a complete SMTP response. smtp_min_data_rate (500) - The minimum plaintext data transfer rate in bytes/second for + The minimum plaintext data transfer rate in bytes/second for DATA requests, when deadlines are enabled with smtp_per_request_deadline. @@ -919,54 +930,54 @@ SMTP(8) SMTP(8) transport_destination_concurrency_limit ($default_destination_concur- rency_limit) - A transport-specific override for the default_destination_con- + A transport-specific override for the default_destination_con- currency_limit parameter value, where transport is the master.cf name of the message delivery transport. transport_destination_recipient_limit ($default_destination_recipi- ent_limit) A transport-specific override for the default_destination_recip- - ient_limit parameter value, where transport is the master.cf + ient_limit parameter value, where transport is the master.cf name of the message delivery transport. SMTPUTF8 CONTROLS Preliminary SMTPUTF8 support is introduced with Postfix 3.0. smtputf8_enable (yes) - Enable preliminary SMTPUTF8 support for the protocols described + Enable preliminary SMTPUTF8 support for the protocols described in RFC 6531, RFC 6532, and RFC 6533. smtputf8_autodetect_classes (sendmail, verify) - Detect that a message requires SMTPUTF8 support for the speci- + Detect that a message requires SMTPUTF8 support for the speci- fied mail origin classes. Available in Postfix version 3.2 and later: enable_idna2003_compatibility (no) - Enable 'transitional' compatibility between IDNA2003 and - IDNA2008, when converting UTF-8 domain names to/from the ASCII + Enable 'transitional' compatibility between IDNA2003 and + IDNA2008, when converting UTF-8 domain names to/from the ASCII form that is used for DNS lookups. TROUBLE SHOOTING CONTROLS debug_peer_level (2) - The increment in verbose logging level when a nexthop destina- - tion, remote client or server name or network address matches a + The increment in verbose logging level when a nexthop destina- + tion, remote client or server name or network address matches a pattern given with the debug_peer_list parameter. debug_peer_list (empty) - Optional list of nexthop destination, remote client or server - name or network address patterns that, if matched, cause the - verbose logging level to increase by the amount specified in + Optional list of nexthop destination, remote client or server + name or network address patterns that, if matched, cause the + verbose logging level to increase by the amount specified in $debug_peer_level. error_notice_recipient (postmaster) - The recipient of postmaster notifications about mail delivery + The recipient of postmaster notifications about mail delivery problems that are caused by policy, resource, software or proto- col errors. internal_mail_filter_classes (empty) - What categories of Postfix-generated mail are subject to - before-queue content inspection by non_smtpd_milters, + What categories of Postfix-generated mail are subject to + before-queue content inspection by non_smtpd_milters, header_checks and body_checks. notify_classes (resource, software) @@ -974,46 +985,46 @@ SMTP(8) SMTP(8) MISCELLANEOUS CONTROLS best_mx_transport (empty) - Where the Postfix SMTP client should deliver mail when it + Where the Postfix SMTP client should deliver mail when it detects a "mail loops back to myself" error condition. config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con- + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) - How much time a Postfix daemon process may take to handle a + How much time a Postfix daemon process may take to handle a request before it is terminated by a built-in watchdog timer. delay_logging_resolution_limit (2) - The maximal number of digits after the decimal point when log- + The maximal number of digits after the decimal point when log- ging delay values. disable_dns_lookups (no) Disable DNS lookups in the Postfix SMTP and LMTP clients. inet_interfaces (all) - The local network interface addresses that this mail system + The local network interface addresses that this mail system receives mail on. inet_protocols (see 'postconf -d' output) - The Internet protocols Postfix will attempt to use when making + The Internet protocols Postfix will attempt to use when making or accepting connections. ipc_timeout (3600s) - The time limit for sending or receiving information over an + The time limit for sending or receiving information over an internal communication channel. lmtp_assume_final (no) - When a remote LMTP server announces no DSN support, assume that - the server performs final delivery, and send "delivered" deliv- + When a remote LMTP server announces no DSN support, assume that + the server performs final delivery, and send "delivered" deliv- ery status notifications instead of "relayed". lmtp_tcp_port (24) The default TCP port that the Postfix LMTP client connects to. max_idle (100s) - The maximum amount of time that an idle Postfix daemon process + The maximum amount of time that an idle Postfix daemon process waits for an incoming connection before terminating voluntarily. max_use (100) @@ -1027,21 +1038,21 @@ SMTP(8) SMTP(8) The process name of a Postfix command or daemon process. proxy_interfaces (empty) - The remote network interface addresses that this mail system - receives mail on by way of a proxy or network address transla- + The remote network interface addresses that this mail system + receives mail on by way of a proxy or network address transla- tion unit. smtp_address_preference (any) The address type ("ipv6", "ipv4" or "any") that the Postfix SMTP - client will try first, when a destination has IPv6 and IPv4 + client will try first, when a destination has IPv6 and IPv4 addresses with equal MX preference. smtp_bind_address (empty) - An optional numerical network address that the Postfix SMTP + An optional numerical network address that the Postfix SMTP client should bind to when making an IPv4 connection. smtp_bind_address6 (empty) - An optional numerical network address that the Postfix SMTP + An optional numerical network address that the Postfix SMTP client should bind to when making an IPv6 connection. smtp_helo_name ($myhostname) @@ -1061,7 +1072,7 @@ SMTP(8) SMTP(8) The syslog facility of Postfix logging. syslog_name (see 'postconf -d' output) - A prefix that is prepended to the process name in syslog + A prefix that is prepended to the process name in syslog records, so that, for example, "smtpd" becomes "prefix/smtpd". Available with Postfix 2.2 and earlier: @@ -1073,14 +1084,14 @@ SMTP(8) SMTP(8) Available with Postfix 2.3 and later: smtp_fallback_relay ($fallback_relay) - Optional list of relay destinations that will be used when an - SMTP destination is not found, or when delivery fails due to a + Optional list of relay destinations that will be used when an + SMTP destination is not found, or when delivery fails due to a non-permanent error. Available with Postfix 3.0 and later: smtp_address_verify_target (rcpt) - In the context of email address verification, the SMTP protocol + In the context of email address verification, the SMTP protocol stage that determines whether an email address is deliverable. Available with Postfix 3.1 and later: @@ -1102,7 +1113,7 @@ SMTP(8) SMTP(8) Available in Postfix 3.7 and later: smtp_bind_address_enforce (no) - Defer delivery when the Postfix SMTP client cannot apply the + Defer delivery when the Postfix SMTP client cannot apply the smtp_bind_address or smtp_bind_address6 setting. SEE ALSO diff --git a/postfix/html/smtpd.8.html b/postfix/html/smtpd.8.html index 47be68d07..103351894 100644 --- a/postfix/html/smtpd.8.html +++ b/postfix/html/smtpd.8.html @@ -62,6 +62,7 @@ SMTPD(8) SMTPD(8) RFC 6531 (Internationalized SMTP) RFC 6533 (Internationalized Delivery Status Notifications) RFC 7505 ("Null MX" No Service Resource Record) + RFC 8689 (SMTP REQUIRETLS extension) DIAGNOSTICS Problems and transactions are logged to syslogd(8) or postlogd(8). @@ -430,7 +431,7 @@ SMTPD(8) SMTPD(8) If non-empty, a filter for the SASL mechanism names that the Postfix SMTP server will announce in the EHLO response. -STARTTLS SUPPORT CONTROLS +TLS SUPPORT CONTROLS Detailed information about STARTTLS configuration may be found in the TLS_README document. @@ -655,109 +656,115 @@ SMTPD(8) SMTPD(8) instead of an X.509 certificate, when asking for or requiring client authentication. -OBSOLETE STARTTLS CONTROLS - The following configuration parameters exist for compatibility with - Postfix versions before 2.3. Support for these will be removed in a + Available in Postfix version 3.10 and later: + + requiretls_enable (yes) + Enable support for the ESMTP verb "REQUIRETLS", defined in RFC + 8689. + +OBSOLETE TLS CONTROLS + The following configuration parameters exist for compatibility with + Postfix versions before 2.3. Support for these will be removed in a future release. smtpd_use_tls (no) - Opportunistic TLS: announce STARTTLS support to remote SMTP + Opportunistic TLS: announce STARTTLS support to remote SMTP clients, but do not require that clients use TLS encryption. smtpd_enforce_tls (no) Mandatory TLS: announce STARTTLS support to remote SMTP clients, - and reject all plaintext commands except HELO, EHLO, XCLIENT, + and reject all plaintext commands except HELO, EHLO, XCLIENT, STARTTLS, NOOP, QUIT, and (Postfix >= 3.9) HELP. smtpd_tls_cipherlist (empty) - Obsolete Postfix < 2.3 control for the Postfix SMTP server TLS + Obsolete Postfix < 2.3 control for the Postfix SMTP server TLS cipher list. SMTPUTF8 CONTROLS Preliminary SMTPUTF8 support is introduced with Postfix 3.0. smtputf8_enable (yes) - Enable preliminary SMTPUTF8 support for the protocols described + Enable preliminary SMTPUTF8 support for the protocols described in RFC 6531, RFC 6532, and RFC 6533. strict_smtputf8 (no) Enable stricter enforcement of the SMTPUTF8 protocol. smtputf8_autodetect_classes (sendmail, verify) - Detect that a message requires SMTPUTF8 support for the speci- + Detect that a message requires SMTPUTF8 support for the speci- fied mail origin classes. Available in Postfix version 3.2 and later: enable_idna2003_compatibility (no) - Enable 'transitional' compatibility between IDNA2003 and - IDNA2008, when converting UTF-8 domain names to/from the ASCII + Enable 'transitional' compatibility between IDNA2003 and + IDNA2008, when converting UTF-8 domain names to/from the ASCII form that is used for DNS lookups. VERP SUPPORT CONTROLS - With VERP style delivery, each recipient of a message receives a cus- - tomized copy of the message with his/her own recipient address encoded + With VERP style delivery, each recipient of a message receives a cus- + tomized copy of the message with his/her own recipient address encoded in the envelope sender address. The VERP_README file describes config- - uration and operation details of Postfix support for variable envelope - return path addresses. VERP style delivery is requested with the SMTP - XVERP command or with the "sendmail -V" command-line option and is + uration and operation details of Postfix support for variable envelope + return path addresses. VERP style delivery is requested with the SMTP + XVERP command or with the "sendmail -V" command-line option and is available in Postfix version 1.1 and later. default_verp_delimiters (+=) The two default VERP delimiter characters. verp_delimiter_filter (-=+) - The characters Postfix accepts as VERP delimiter characters on + The characters Postfix accepts as VERP delimiter characters on the Postfix sendmail(1) command line and in SMTP commands. Available in Postfix version 1.1 and 2.0: authorized_verp_clients ($mynetworks) - What remote SMTP clients are allowed to specify the XVERP com- + What remote SMTP clients are allowed to specify the XVERP com- mand. Available in Postfix version 2.1 and later: smtpd_authorized_verp_clients ($authorized_verp_clients) - What remote SMTP clients are allowed to specify the XVERP com- + What remote SMTP clients are allowed to specify the XVERP com- mand. TROUBLE SHOOTING CONTROLS - The DEBUG_README document describes how to debug parts of the Postfix - mail system. The methods vary from making the software log a lot of + The DEBUG_README document describes how to debug parts of the Postfix + mail system. The methods vary from making the software log a lot of detail, to running some daemon processes under control of a call tracer or debugger. debug_peer_level (2) - The increment in verbose logging level when a nexthop destina- - tion, remote client or server name or network address matches a + The increment in verbose logging level when a nexthop destina- + tion, remote client or server name or network address matches a pattern given with the debug_peer_list parameter. debug_peer_list (empty) - Optional list of nexthop destination, remote client or server - name or network address patterns that, if matched, cause the - verbose logging level to increase by the amount specified in + Optional list of nexthop destination, remote client or server + name or network address patterns that, if matched, cause the + verbose logging level to increase by the amount specified in $debug_peer_level. error_notice_recipient (postmaster) - The recipient of postmaster notifications about mail delivery + The recipient of postmaster notifications about mail delivery problems that are caused by policy, resource, software or proto- col errors. internal_mail_filter_classes (empty) - What categories of Postfix-generated mail are subject to - before-queue content inspection by non_smtpd_milters, + What categories of Postfix-generated mail are subject to + before-queue content inspection by non_smtpd_milters, header_checks and body_checks. notify_classes (resource, software) The list of error classes that are reported to the postmaster. smtpd_reject_footer (empty) - Optional information that is appended after each Postfix SMTP + Optional information that is appended after each Postfix SMTP server 4XX or 5XX response. soft_bounce (no) - Safety net to keep mail queued that would otherwise be returned + Safety net to keep mail queued that would otherwise be returned to the sender. Available in Postfix version 2.1 and later: @@ -768,49 +775,49 @@ SMTPD(8) SMTPD(8) Available in Postfix version 2.10 and later: smtpd_log_access_permit_actions (empty) - Enable logging of the named "permit" actions in SMTP server - access lists (by default, the SMTP server logs "reject" actions + Enable logging of the named "permit" actions in SMTP server + access lists (by default, the SMTP server logs "reject" actions but not "permit" actions). KNOWN VERSUS UNKNOWN RECIPIENT CONTROLS - As of Postfix version 2.0, the SMTP server rejects mail for unknown + As of Postfix version 2.0, the SMTP server rejects mail for unknown recipients. This prevents the mail queue from clogging up with undeliv- - erable MAILER-DAEMON messages. Additional information on this topic is + erable MAILER-DAEMON messages. Additional information on this topic is in the LOCAL_RECIPIENT_README and ADDRESS_CLASS_README documents. show_user_unknown_table_name (yes) - Display the name of the recipient table in the "User unknown" + Display the name of the recipient table in the "User unknown" responses. canonical_maps (empty) - Optional address mapping lookup tables for message headers and + Optional address mapping lookup tables for message headers and envelopes. recipient_canonical_maps (empty) - Optional address mapping lookup tables for envelope and header + Optional address mapping lookup tables for envelope and header recipient addresses. sender_canonical_maps (empty) - Optional address mapping lookup tables for envelope and header + Optional address mapping lookup tables for envelope and header sender addresses. Parameters concerning known/unknown local recipients: mydestination ($myhostname, localhost.$mydomain, localhost) - The list of domains that are delivered via the $local_transport + The list of domains that are delivered via the $local_transport mail delivery transport. inet_interfaces (all) - The local network interface addresses that this mail system + The local network interface addresses that this mail system receives mail on. proxy_interfaces (empty) - The remote network interface addresses that this mail system - receives mail on by way of a proxy or network address transla- + The remote network interface addresses that this mail system + receives mail on by way of a proxy or network address transla- tion unit. inet_protocols (see 'postconf -d' output) - The Internet protocols Postfix will attempt to use when making + The Internet protocols Postfix will attempt to use when making or accepting connections. local_recipient_maps (proxy:unix:passwd.byname $alias_maps) @@ -819,61 +826,61 @@ SMTPD(8) SMTPD(8) unknown_local_recipient_reject_code (550) The numerical Postfix SMTP server response code when a recipient - address is local, and $local_recipient_maps specifies a list of + address is local, and $local_recipient_maps specifies a list of lookup tables that does not match the recipient. Parameters concerning known/unknown recipients of relay destinations: relay_domains (Postfix >= 3.0: empty, Postfix < 3.0: $mydestination) - What destination domains (and subdomains thereof) this system + What destination domains (and subdomains thereof) this system will relay mail to. relay_recipient_maps (empty) - Optional lookup tables with all valid addresses in the domains + Optional lookup tables with all valid addresses in the domains that match $relay_domains. unknown_relay_recipient_reject_code (550) - The numerical Postfix SMTP server reply code when a recipient - address matches $relay_domains, and relay_recipient_maps speci- - fies a list of lookup tables that does not match the recipient + The numerical Postfix SMTP server reply code when a recipient + address matches $relay_domains, and relay_recipient_maps speci- + fies a list of lookup tables that does not match the recipient address. - Parameters concerning known/unknown recipients in virtual alias + Parameters concerning known/unknown recipients in virtual alias domains: virtual_alias_domains ($virtual_alias_maps) - Postfix is the final destination for the specified list of vir- + Postfix is the final destination for the specified list of vir- tual alias domains, that is, domains for which all addresses are aliased to addresses in other local or remote domains. virtual_alias_maps ($virtual_maps) Optional lookup tables that are often searched with a full email - address (including domain) and that apply to all recipients: - local(8), virtual, and remote; this is unlike alias_maps that - are only searched with an email address localpart (no domain) + address (including domain) and that apply to all recipients: + local(8), virtual, and remote; this is unlike alias_maps that + are only searched with an email address localpart (no domain) and that apply only to local(8) recipients. unknown_virtual_alias_reject_code (550) - The Postfix SMTP server reply code when a recipient address - matches $virtual_alias_domains, and $virtual_alias_maps speci- - fies a list of lookup tables that does not match the recipient + The Postfix SMTP server reply code when a recipient address + matches $virtual_alias_domains, and $virtual_alias_maps speci- + fies a list of lookup tables that does not match the recipient address. Parameters concerning known/unknown recipients in virtual mailbox domains: virtual_mailbox_domains ($virtual_mailbox_maps) - Postfix is the final destination for the specified list of - domains; mail is delivered via the $virtual_transport mail + Postfix is the final destination for the specified list of + domains; mail is delivered via the $virtual_transport mail delivery transport. virtual_mailbox_maps (empty) - Optional lookup tables with all valid addresses in the domains + Optional lookup tables with all valid addresses in the domains that match $virtual_mailbox_domains. unknown_virtual_mailbox_reject_code (550) - The Postfix SMTP server reply code when a recipient address - matches $virtual_mailbox_domains, and $virtual_mailbox_maps + The Postfix SMTP server reply code when a recipient address + matches $virtual_mailbox_domains, and $virtual_mailbox_maps specifies a list of lookup tables that does not match the recip- ient address. @@ -882,7 +889,7 @@ SMTPD(8) SMTPD(8) control client request rates. line_length_limit (2048) - Upon input, long lines are chopped up into pieces of at most + Upon input, long lines are chopped up into pieces of at most this length; upon delivery, long lines are reconstructed. queue_minfree (0) @@ -890,62 +897,62 @@ SMTPD(8) SMTPD(8) tem that is needed to receive mail. message_size_limit (10240000) - The maximal size in bytes of a message, including envelope + The maximal size in bytes of a message, including envelope information. smtpd_recipient_limit (1000) - The maximal number of recipients that the Postfix SMTP server + The maximal number of recipients that the Postfix SMTP server accepts per message delivery request. smtpd_timeout (normal: 300s, overload: 10s) - When the Postfix SMTP server wants to send an SMTP server - response, how long the Postfix SMTP server will wait for an - underlying network write operation to complete; and when the - Postfix SMTP server Postfix wants to receive an SMTP client - request, how long the Postfix SMTP server will wait for an + When the Postfix SMTP server wants to send an SMTP server + response, how long the Postfix SMTP server will wait for an + underlying network write operation to complete; and when the + Postfix SMTP server Postfix wants to receive an SMTP client + request, how long the Postfix SMTP server will wait for an underlying network read operation to complete. smtpd_history_flush_threshold (100) - The maximal number of lines in the Postfix SMTP server command - history before it is flushed upon receipt of EHLO, RSET, or end + The maximal number of lines in the Postfix SMTP server command + history before it is flushed upon receipt of EHLO, RSET, or end of DATA. Available in Postfix version 2.3 and later: smtpd_peername_lookup (yes) - Attempt to look up the remote SMTP client hostname, and verify + Attempt to look up the remote SMTP client hostname, and verify that the name matches the client IP address. The per SMTP client connection count and request rate limits are imple- - mented in co-operation with the anvil(8) service, and are available in + mented in co-operation with the anvil(8) service, and are available in Postfix version 2.2 and later. smtpd_client_connection_count_limit (50) - How many simultaneous connections any client is allowed to make + How many simultaneous connections any client is allowed to make to this service. smtpd_client_connection_rate_limit (0) - The maximal number of connection attempts any client is allowed + The maximal number of connection attempts any client is allowed to make to this service per time unit. smtpd_client_message_rate_limit (0) - The maximal number of message delivery requests that any client - is allowed to make to this service per time unit, regardless of + The maximal number of message delivery requests that any client + is allowed to make to this service per time unit, regardless of whether or not Postfix actually accepts those messages. smtpd_client_recipient_rate_limit (0) - The maximal number of recipient addresses that any client is - allowed to send to this service per time unit, regardless of + The maximal number of recipient addresses that any client is + allowed to send to this service per time unit, regardless of whether or not Postfix actually accepts those recipients. smtpd_client_event_limit_exceptions ($mynetworks) - Clients that are excluded from smtpd_client_*_count/rate_limit + Clients that are excluded from smtpd_client_*_count/rate_limit restrictions. Available in Postfix version 2.3 and later: smtpd_client_new_tls_session_rate_limit (0) - The maximal number of new (i.e., uncached) TLS sessions that a + The maximal number of new (i.e., uncached) TLS sessions that a remote SMTP client is allowed to negotiate with this service per time unit. @@ -953,29 +960,29 @@ SMTPD(8) SMTPD(8) smtpd_per_record_deadline (normal: no, overload: yes) Change the behavior of the smtpd_timeout and smtpd_start- - tls_timeout time limits, from a time limit per read or write - system call, to a time limit to send or receive a complete - record (an SMTP command line, SMTP response line, SMTP message + tls_timeout time limits, from a time limit per read or write + system call, to a time limit to send or receive a complete + record (an SMTP command line, SMTP response line, SMTP message content line, or TLS protocol message). Available in Postfix version 3.1 and later: smtpd_client_auth_rate_limit (0) - The maximal number of AUTH commands that any client is allowed - to send to this service per time unit, regardless of whether or + The maximal number of AUTH commands that any client is allowed + to send to this service per time unit, regardless of whether or not Postfix actually accepts those commands. Available in Postfix version 3.7 and later: smtpd_per_request_deadline (normal: no, overload: yes) Change the behavior of the smtpd_timeout and smtpd_start- - tls_timeout time limits, from a time limit per plaintext or TLS - read or write call, to a combined time limit for receiving a - complete SMTP request and for sending a complete SMTP response. + tls_timeout time limits, from a time limit per plaintext or TLS + read or write call, to a combined time limit for receiving a + complete SMTP request and for sending a complete SMTP response. smtpd_min_data_rate (500) - The minimum plaintext data transfer rate in bytes/second for - DATA and BDAT requests, when deadlines are enabled with + The minimum plaintext data transfer rate in bytes/second for + DATA and BDAT requests, when deadlines are enabled with smtpd_per_request_deadline. header_from_format (standard) @@ -984,27 +991,27 @@ SMTPD(8) SMTPD(8) Available in Postfix version 3.8 and later: smtpd_client_ipv4_prefix_length (32) - Aggregate smtpd_client_*_count and smtpd_client_*_rate statis- + Aggregate smtpd_client_*_count and smtpd_client_*_rate statis- tics by IPv4 network blocks with the specified network prefix. smtpd_client_ipv6_prefix_length (84) - Aggregate smtpd_client_*_count and smtpd_client_*_rate statis- + Aggregate smtpd_client_*_count and smtpd_client_*_rate statis- tics by IPv6 network blocks with the specified network prefix. Available in Postfix 3.9, 3.8.1, 3.7.6, 3.6.10, 3.5.20 and later: smtpd_forbid_unauth_pipelining (Postfix >= 3.9: yes) - Disconnect remote SMTP clients that violate RFC 2920 (or 5321) + Disconnect remote SMTP clients that violate RFC 2920 (or 5321) command pipelining constraints. Available in Postfix 3.9, 3.8.4, 3.7.9, 3.6.13, 3.5.23 and later: smtpd_forbid_bare_newline (Postfix >= 3.9: normalize) - Reject or restrict input lines from an SMTP client that end in + Reject or restrict input lines from an SMTP client that end in <LF> instead of the standard <CR><LF>. smtpd_forbid_bare_newline_exclusions ($mynetworks) - Exclude the specified clients from smtpd_forbid_bare_newline + Exclude the specified clients from smtpd_forbid_bare_newline enforcement. Available in Postfix 3.9, 3.8.5, 3.7.10, 3.6.14, 3.5.24 and later: @@ -1014,55 +1021,55 @@ SMTPD(8) SMTPD(8) request with "smtpd_forbid_bare_newline = reject". TARPIT CONTROLS - When a remote SMTP client makes errors, the Postfix SMTP server can - insert delays before responding. This can help to slow down run-away - software. The behavior is controlled by an error counter that counts + When a remote SMTP client makes errors, the Postfix SMTP server can + insert delays before responding. This can help to slow down run-away + software. The behavior is controlled by an error counter that counts the number of errors within an SMTP session that a client makes without delivering mail. smtpd_error_sleep_time (1s) - With Postfix version 2.1 and later: the SMTP server response - delay after a client has made more than $smtpd_soft_error_limit - errors, and fewer than $smtpd_hard_error_limit errors, without + With Postfix version 2.1 and later: the SMTP server response + delay after a client has made more than $smtpd_soft_error_limit + errors, and fewer than $smtpd_hard_error_limit errors, without delivering mail. smtpd_soft_error_limit (10) - The number of errors a remote SMTP client is allowed to make - without delivering mail before the Postfix SMTP server slows + The number of errors a remote SMTP client is allowed to make + without delivering mail before the Postfix SMTP server slows down all its responses. smtpd_hard_error_limit (normal: 20, overload: 1) - The maximal number of errors a remote SMTP client is allowed to + The maximal number of errors a remote SMTP client is allowed to make without delivering mail. smtpd_junk_command_limit (normal: 100, overload: 1) - The number of junk commands (NOOP, VRFY, ETRN or RSET) that a - remote SMTP client can send before the Postfix SMTP server + The number of junk commands (NOOP, VRFY, ETRN or RSET) that a + remote SMTP client can send before the Postfix SMTP server starts to increment the error counter with each junk command. Available in Postfix version 2.1 and later: smtpd_recipient_overshoot_limit (1000) - The number of recipients that a remote SMTP client can send in + The number of recipients that a remote SMTP client can send in excess of the limit specified with $smtpd_recipient_limit, - before the Postfix SMTP server increments the per-session error + before the Postfix SMTP server increments the per-session error count for each excess recipient. ACCESS POLICY DELEGATION CONTROLS - As of version 2.1, Postfix can be configured to delegate access policy - decisions to an external server that runs outside Postfix. See the + As of version 2.1, Postfix can be configured to delegate access policy + decisions to an external server that runs outside Postfix. See the file SMTPD_POLICY_README for more information. smtpd_policy_service_max_idle (300s) - The time after which an idle SMTPD policy service connection is + The time after which an idle SMTPD policy service connection is closed. smtpd_policy_service_max_ttl (1000s) - The time after which an active SMTPD policy service connection + The time after which an active SMTPD policy service connection is closed. smtpd_policy_service_timeout (100s) - The time limit for connecting to, writing to, or receiving from + The time limit for connecting to, writing to, or receiving from a delegated SMTPD policy server. Available in Postfix version 3.0 and later: @@ -1072,81 +1079,81 @@ SMTPD(8) SMTPD(8) The default action when an SMTPD policy service request fails. smtpd_policy_service_request_limit (0) - The maximal number of requests per SMTPD policy service connec- + The maximal number of requests per SMTPD policy service connec- tion, or zero (no limit). smtpd_policy_service_try_limit (2) - The maximal number of attempts to send an SMTPD policy service + The maximal number of attempts to send an SMTPD policy service request before giving up. smtpd_policy_service_retry_delay (1s) - The delay between attempts to resend a failed SMTPD policy ser- + The delay between attempts to resend a failed SMTPD policy ser- vice request. Available in Postfix version 3.1 and later: smtpd_policy_service_policy_context (empty) - Optional information that the Postfix SMTP server specifies in - the "policy_context" attribute of a policy service request - (originally, to share the same service endpoint among multiple + Optional information that the Postfix SMTP server specifies in + the "policy_context" attribute of a policy service request + (originally, to share the same service endpoint among multiple check_policy_service clients). ACCESS CONTROLS - The SMTPD_ACCESS_README document gives an introduction to all the SMTP + The SMTPD_ACCESS_README document gives an introduction to all the SMTP server access control features. smtpd_delay_reject (yes) - Wait until the RCPT TO command before evaluating + Wait until the RCPT TO command before evaluating $smtpd_client_restrictions, $smtpd_helo_restrictions and $smtpd_sender_restrictions, or wait until the ETRN command - before evaluating $smtpd_client_restrictions and + before evaluating $smtpd_client_restrictions and $smtpd_helo_restrictions. parent_domain_matches_subdomains (see 'postconf -d' output) - A list of Postfix features where the pattern "example.com" also - matches subdomains of example.com, instead of requiring an + A list of Postfix features where the pattern "example.com" also + matches subdomains of example.com, instead of requiring an explicit ".example.com" pattern. smtpd_client_restrictions (empty) - Optional restrictions that the Postfix SMTP server applies in + Optional restrictions that the Postfix SMTP server applies in the context of a client connection request. smtpd_helo_required (no) - Require that a remote SMTP client introduces itself with the - HELO or EHLO command before sending the MAIL command or other + Require that a remote SMTP client introduces itself with the + HELO or EHLO command before sending the MAIL command or other commands that require EHLO negotiation. smtpd_helo_restrictions (empty) - Optional restrictions that the Postfix SMTP server applies in + Optional restrictions that the Postfix SMTP server applies in the context of a client HELO command. smtpd_sender_restrictions (empty) - Optional restrictions that the Postfix SMTP server applies in + Optional restrictions that the Postfix SMTP server applies in the context of a client MAIL FROM command. smtpd_recipient_restrictions (see 'postconf -d' output) - Optional restrictions that the Postfix SMTP server applies in - the context of a client RCPT TO command, after + Optional restrictions that the Postfix SMTP server applies in + the context of a client RCPT TO command, after smtpd_relay_restrictions. smtpd_etrn_restrictions (empty) - Optional restrictions that the Postfix SMTP server applies in + Optional restrictions that the Postfix SMTP server applies in the context of a client ETRN command. allow_untrusted_routing (no) - Forward mail with sender-specified routing - (user[@%!]remote[@%!]site) from untrusted clients to destina- + Forward mail with sender-specified routing + (user[@%!]remote[@%!]site) from untrusted clients to destina- tions matching $relay_domains. smtpd_restriction_classes (empty) User-defined aliases for groups of access restrictions. smtpd_null_access_lookup_key (<>) - The lookup key to be used in SMTP access(5) tables instead of + The lookup key to be used in SMTP access(5) tables instead of the null sender address. permit_mx_backup_networks (empty) - Restrict the use of the permit_mx_backup SMTP access feature to + Restrict the use of the permit_mx_backup SMTP access feature to only domains whose primary MX hosts match the listed networks. Available in Postfix version 2.0 and later: @@ -1156,19 +1163,19 @@ SMTPD(8) SMTPD(8) applies in the context of the SMTP DATA command. smtpd_expansion_filter (see 'postconf -d' output) - What characters are allowed in $name expansions of RBL reply + What characters are allowed in $name expansions of RBL reply templates. Available in Postfix version 2.1 and later: smtpd_reject_unlisted_sender (no) - Request that the Postfix SMTP server rejects mail from unknown - sender addresses, even when no explicit reject_unlisted_sender + Request that the Postfix SMTP server rejects mail from unknown + sender addresses, even when no explicit reject_unlisted_sender access restriction is specified. smtpd_reject_unlisted_recipient (yes) - Request that the Postfix SMTP server rejects mail for unknown - recipient addresses, even when no explicit + Request that the Postfix SMTP server rejects mail for unknown + recipient addresses, even when no explicit reject_unlisted_recipient access restriction is specified. Available in Postfix version 2.2 and later: @@ -1182,17 +1189,17 @@ SMTPD(8) SMTPD(8) smtpd_relay_restrictions (permit_mynetworks, permit_sasl_authenticated, defer_unauth_destination) Access restrictions for mail relay control that the Postfix SMTP - server applies in the context of the RCPT TO command, before + server applies in the context of the RCPT TO command, before smtpd_recipient_restrictions. SENDER AND RECIPIENT ADDRESS VERIFICATION CONTROLS - Postfix version 2.1 introduces sender and recipient address verifica- + Postfix version 2.1 introduces sender and recipient address verifica- tion. This feature is implemented by sending probe email messages that are not actually delivered. This feature is requested via the - reject_unverified_sender and reject_unverified_recipient access - restrictions. The status of verification probes is maintained by the - verify(8) server. See the file ADDRESS_VERIFICATION_README for infor- - mation about how to configure and operate the Postfix sender/recipient + reject_unverified_sender and reject_unverified_recipient access + restrictions. The status of verification probes is maintained by the + verify(8) server. See the file ADDRESS_VERIFICATION_README for infor- + mation about how to configure and operate the Postfix sender/recipient address verification service. address_verify_poll_count (normal: 3, overload: 1) @@ -1204,7 +1211,7 @@ SMTPD(8) SMTPD(8) fication request in progress. address_verify_sender ($double_bounce_sender) - The sender address to use in address verification probes; prior + The sender address to use in address verification probes; prior to Postfix 2.5 the default was "postmaster". unverified_sender_reject_code (450) @@ -1212,18 +1219,18 @@ SMTPD(8) SMTPD(8) address is rejected by the reject_unverified_sender restriction. unverified_recipient_reject_code (450) - The numerical Postfix SMTP server response when a recipient - address is rejected by the reject_unverified_recipient restric- + The numerical Postfix SMTP server response when a recipient + address is rejected by the reject_unverified_recipient restric- tion. Available in Postfix version 2.6 and later: unverified_sender_defer_code (450) - The numerical Postfix SMTP server response code when a sender + The numerical Postfix SMTP server response code when a sender address probe fails due to a temporary error condition. unverified_recipient_defer_code (450) - The numerical Postfix SMTP server response when a recipient + The numerical Postfix SMTP server response when a recipient address probe fails due to a temporary error condition. unverified_sender_reject_reason (empty) @@ -1235,17 +1242,17 @@ SMTPD(8) SMTPD(8) reject_unverified_recipient. unverified_sender_tempfail_action ($reject_tempfail_action) - The Postfix SMTP server's action when reject_unverified_sender + The Postfix SMTP server's action when reject_unverified_sender fails due to a temporary error condition. unverified_recipient_tempfail_action ($reject_tempfail_action) - The Postfix SMTP server's action when reject_unverified_recipi- + The Postfix SMTP server's action when reject_unverified_recipi- ent fails due to a temporary error condition. Available with Postfix 2.9 and later: address_verify_sender_ttl (0s) - The time between changes in the time-dependent portion of + The time between changes in the time-dependent portion of address verification probe sender addresses. ACCESS CONTROL RESPONSES @@ -1257,36 +1264,36 @@ SMTPD(8) SMTPD(8) map "reject" action. defer_code (450) - The numerical Postfix SMTP server response code when a remote + The numerical Postfix SMTP server response code when a remote SMTP client request is rejected by the "defer" restriction. invalid_hostname_reject_code (501) - The numerical Postfix SMTP server response code when the client - HELO or EHLO command parameter is rejected by the + The numerical Postfix SMTP server response code when the client + HELO or EHLO command parameter is rejected by the reject_invalid_helo_hostname restriction. maps_rbl_reject_code (554) - The numerical Postfix SMTP server response code when a remote - SMTP client request is blocked by the reject_rbl_client, + The numerical Postfix SMTP server response code when a remote + SMTP client request is blocked by the reject_rbl_client, reject_rhsbl_client, reject_rhsbl_reverse_client, reject_rhsbl_sender or reject_rhsbl_recipient restriction. non_fqdn_reject_code (504) - The numerical Postfix SMTP server reply code when a client - request is rejected by the reject_non_fqdn_helo_hostname, + The numerical Postfix SMTP server reply code when a client + request is rejected by the reject_non_fqdn_helo_hostname, reject_non_fqdn_sender or reject_non_fqdn_recipient restriction. plaintext_reject_code (450) - The numerical Postfix SMTP server response code when a request + The numerical Postfix SMTP server response code when a request is rejected by the reject_plaintext_session restriction. reject_code (554) - The numerical Postfix SMTP server response code when a remote + The numerical Postfix SMTP server response code when a remote SMTP client request is rejected by the "reject" restriction. relay_domains_reject_code (554) - The numerical Postfix SMTP server response code when a client - request is rejected by the reject_unauth_destination recipient + The numerical Postfix SMTP server response code when a client + request is rejected by the reject_unauth_destination recipient restriction. unknown_address_reject_code (450) @@ -1294,24 +1301,24 @@ SMTPD(8) SMTPD(8) a sender or recipient address because its domain is unknown. unknown_client_reject_code (450) - The numerical Postfix SMTP server response code when a client - without valid address <=> name mapping is rejected by the + The numerical Postfix SMTP server response code when a client + without valid address <=> name mapping is rejected by the reject_unknown_client_hostname restriction. unknown_hostname_reject_code (450) - The numerical Postfix SMTP server response code when the host- - name specified with the HELO or EHLO command is rejected by the + The numerical Postfix SMTP server response code when the host- + name specified with the HELO or EHLO command is rejected by the reject_unknown_helo_hostname restriction. Available in Postfix version 2.0 and later: default_rbl_reply (see 'postconf -d' output) - The default Postfix SMTP server response template for a request + The default Postfix SMTP server response template for a request that is rejected by an RBL-based restriction. multi_recipient_bounce_reject_code (550) - The numerical Postfix SMTP server response code when a remote - SMTP client request is blocked by the reject_multi_recipi- + The numerical Postfix SMTP server response code when a remote + SMTP client request is blocked by the reject_multi_recipi- ent_bounce restriction. rbl_reply_maps (empty) @@ -1321,52 +1328,52 @@ SMTPD(8) SMTPD(8) access_map_defer_code (450) The numerical Postfix SMTP server response code for an access(5) - map "defer" action, including "defer_if_permit" or + map "defer" action, including "defer_if_permit" or "defer_if_reject". reject_tempfail_action (defer_if_permit) - The Postfix SMTP server's action when a reject-type restriction + The Postfix SMTP server's action when a reject-type restriction fails due to a temporary error condition. unknown_helo_hostname_tempfail_action ($reject_tempfail_action) - The Postfix SMTP server's action when reject_unknown_helo_host- + The Postfix SMTP server's action when reject_unknown_helo_host- name fails due to a temporary error condition. unknown_address_tempfail_action ($reject_tempfail_action) - The Postfix SMTP server's action when - reject_unknown_sender_domain or reject_unknown_recipient_domain + The Postfix SMTP server's action when + reject_unknown_sender_domain or reject_unknown_recipient_domain fail due to a temporary error condition. MISCELLANEOUS CONTROLS config_directory (see 'postconf -d' output) - The default location of the Postfix main.cf and master.cf con- + The default location of the Postfix main.cf and master.cf con- figuration files. daemon_timeout (18000s) - How much time a Postfix daemon process may take to handle a + How much time a Postfix daemon process may take to handle a request before it is terminated by a built-in watchdog timer. command_directory (see 'postconf -d' output) The location of all postfix administrative commands. double_bounce_sender (double-bounce) - The sender address of postmaster notifications that are gener- + The sender address of postmaster notifications that are gener- ated by the mail system. ipc_timeout (3600s) - The time limit for sending or receiving information over an + The time limit for sending or receiving information over an internal communication channel. mail_name (Postfix) - The mail system name that is displayed in Received: headers, in + The mail system name that is displayed in Received: headers, in the SMTP greeting banner, and in bounced mail. mail_owner (postfix) - The UNIX system account that owns the Postfix queue and most + The UNIX system account that owns the Postfix queue and most Postfix daemon processes. max_idle (100s) - The maximum amount of time that an idle Postfix daemon process + The maximum amount of time that an idle Postfix daemon process waits for an incoming connection before terminating voluntarily. max_use (100) @@ -1377,11 +1384,11 @@ SMTPD(8) SMTPD(8) The internet hostname of this mail system. mynetworks (see 'postconf -d' output) - The list of "trusted" remote SMTP clients that have more privi- + The list of "trusted" remote SMTP clients that have more privi- leges than "strangers". myorigin ($myhostname) - The domain name that locally-posted mail appears to come from, + The domain name that locally-posted mail appears to come from, and that locally posted mail is delivered to. process_id (read-only) @@ -1394,24 +1401,24 @@ SMTPD(8) SMTPD(8) The location of the Postfix top-level queue directory. recipient_delimiter (empty) - The set of characters that can separate an email address local- + The set of characters that can separate an email address local- part, user name, or a .forward file name from its extension. smtpd_banner ($myhostname ESMTP $mail_name) - The text that follows the 220 status code in the SMTP greeting + The text that follows the 220 status code in the SMTP greeting banner. syslog_facility (mail) The syslog facility of Postfix logging. syslog_name (see 'postconf -d' output) - A prefix that is prepended to the process name in syslog + A prefix that is prepended to the process name in syslog records, so that, for example, "smtpd" becomes "prefix/smtpd". Available in Postfix version 2.2 and later: smtpd_forbidden_commands (CONNECT GET POST regexp:{{/^[^A-Z]/ Bogus}}) - List of commands that cause the Postfix SMTP server to immedi- + List of commands that cause the Postfix SMTP server to immedi- ately terminate the session with a 221 code. Available in Postfix version 2.5 and later: @@ -1428,13 +1435,13 @@ SMTPD(8) SMTPD(8) Available in Postfix 3.4 and later: smtpd_reject_footer_maps (empty) - Lookup tables, indexed by the complete Postfix SMTP server 4xx + Lookup tables, indexed by the complete Postfix SMTP server 4xx or 5xx response, with reject footer templates. Available in Postfix 3.10 and later: smtpd_hide_client_session (no) - Do not include SMTP client session information in the Postfix + Do not include SMTP client session information in the Postfix SMTP server's Received: message header. SEE ALSO diff --git a/postfix/makedefs b/postfix/makedefs index 9bd730281..5d2a25571 100644 --- a/postfix/makedefs +++ b/postfix/makedefs @@ -979,7 +979,7 @@ CCARGS="$CCARGS -DSNAPSHOT" # Non-production: needs thorough testing, or major changes are still # needed before the code stabilizes. -#CCARGS="$CCARGS -DNONPROD" +CCARGS="$CCARGS -DNONPROD" # Workaround: prepend Postfix include files before other include files. CCARGS="-I. -I../../include $CCARGS" diff --git a/postfix/man/man1/sendmail.1 b/postfix/man/man1/sendmail.1 index e3bc7a639..bbac6acac 100644 --- a/postfix/man/man1/sendmail.1 +++ b/postfix/man/man1/sendmail.1 @@ -158,10 +158,28 @@ Delivery status notification control. Specify either a comma\-separated list with one or more of \fBfailure\fR (send notification when delivery fails), \fBdelay\fR (send notification when delivery is delayed), or \fBsuccess\fR -(send notification when the message is delivered); or specify +(send notification after the message is delivered); or specify \fBnever\fR (don't send any notifications at all). This feature is available in Postfix 2.3 and later. +.IP "\fB\-O requiretls" +When delivering a message to an SMTP or LMTP server, the +connection must use TLS with a verified server certificate, +and the server must support REQUIRETLS. Try multiple servers if +possible, and return the message as undeliverable when these +requirements were not satisfied with any of the servers that +were tried. The "requiretls" option value is case\-insensitive. + +This feature is available in Postfix 3.10 and later. +.IP "\fB\-O smtputf8" +When delivering a message to an SMTP or LMTP server, the server +must support SMTPUTF8. Try multiple servers if possible, and +return the message as undeliverable when a message contains an +UTF8 envelope address or message header, but SMTPUTF8 was not +supported by any of the servers that were tried. The "smtputf8" +option value is case\-insensitive. + +This feature is available in Postfix 3.10 and later. .IP "\fB\-n\fR (ignored)" Backwards compatibility. .IP "\fB\-oA\fIalias_database\fR" @@ -462,6 +480,11 @@ these directories belong to additional Postfix instances that share the Postfix executable files and documentation with the default Postfix instance, and that are started, stopped, etc., together with the default Postfix instance. +.PP +Postfix 3.10 and later: +.IP "\fBrequiretls_enable (yes)\fR" +Enable support for the ESMTP verb "REQUIRETLS", defined in RFC +8689. .SH "FILES" .na .nf diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index 24351183c..d7568526a 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -3136,6 +3136,11 @@ The LMTP\-specific version of the smtp_dns_support_level configuration parameter. See there for details. .PP This feature is available in Postfix 2.11 and later. +.SH lmtp_enforce_requiretls (default: empty) +The LMTP\-specific version of the smtp_enforce_requiretls +configuration parameter. See there for details. +.PP +This feature is available in Postfix >= 3.11. .SH lmtp_enforce_tls (default: no) The LMTP\-specific version of the smtp_enforce_tls configuration parameter. See there for details. @@ -5046,6 +5051,10 @@ postscreen_access_list .IP "Postfix version 3.0 and later" smtpd_client_event_limit_exceptions .br +.IP "Postfix version 3.11 and later" +smtp_enforce_requiretls, +lmtp_enforce_requiretls +.br .br .SH permit_mx_backup_networks (default: empty) Restrict the use of the permit_mx_backup SMTP access feature to @@ -6582,6 +6591,28 @@ Require that a \fBlocal\fR(8) recipient's home directory exists before mail delivery is attempted. By default this test is disabled. It can be useful for environments that import home directories to the mail server (IMPORTING HOME DIRECTORIES IS NOT RECOMMENDED). +.SH requiretls_enable (default: yes) +Enable support for the ESMTP verb "REQUIRETLS", defined in RFC +8689. By issuing this verb in the "MAIL FROM" command, a sender +specifies that a message must be delivered over TLS connections +with a verified server certificate, to a server that announces +"REQUIRETLS" support. This corresponds to the Postfix SMTP client +TLS security levels "secure", "verify", "fingerprint", dane\-only, +or opportunistic "dane", with a successful certificate match. The +Postfix SMTP client will try one or more servers, controlled with +the smtp_mx_address_limit parameter, until it finds a server that +satisfies requirements. Otherwise, Postfix returns the message as +undeliverable. +.PP +Notes: +.IP \(bu +REQUIRETLS enforcement is controlled with smtp_enforce_requiretls +or lmtp_enforce_requiretls. +.IP \(bu +REQUIRETLS overrides "TLS\-Required: no". +.br +.PP +This feature is available in Postfix >= 3.11. .SH reset_owner_alias (default: no) Reset the \fBlocal\fR(8) delivery agent's idea of the owner\-alias attribute, when delivering mail to a child alias that does not have @@ -7516,6 +7547,77 @@ reasonably\-modern DNS \fBresolver\fR(3) library that implements the RES_USE_DNSSEC and RES_USE_EDNS0 resolver options. .PP This feature is available in Postfix 2.11 and later. +.SH smtp_enforce_requiretls (default: empty) +An optional list of next\-hop destinations that the Postfix +SMTP/LMTP client will enforce REQUIRETLS for, when a message was +received with the REQUIRETLS option: the next\-hop server must offer +a matching TLS server certificate, and the server must announce +REQUIRETLS support). Such a message will be returned to the sender +if some REQUIRETLS requirement cannot be satisfied. These "hard" +REQUIRETLS failures are logged as "REQUIRETLS failure". +.PP +Other messages that were received with the REQUIRETLS option +will be delivered with REQUIRETLS if possible. If not, a message +will be delivered as if it was received without the REQUIRETLS +option. This allows a mail sending site to discover when REQUIRETLS +can be enforced, without disrupting email deliveries. These "soft" +REQUIRETLS failures are logged with "REQUIRETLS Debug". +.PP +On a perimeter MTA, it can make sense to turn off REQUIRETLS +enforcement, or even to turn off REQUIRETLS support, when delivering +a message to an internal destination. The internal servers may not +support REQUIRETLS, and their connections may be secured with means +other than DANE, STS, and the like. +.PP +The supported syntax differs with SMTP and LMTP: +.IP \(bu +With SMTP, specify a list of next\-hop domain names (without +the ":port" or ":service" suffix), "/file/name" patterns or +"type:table" lookup tables, separated by commas and/or whitespace. +Continue long lines by starting the next line with whitespace. A +"/file/name" pattern is replaced by its contents. A "type:table" +lookup table is matched when a domain appears as lookup key. Specify +"!pattern" to exclude a domain. +.IP \(bu +With LMTP, specify list of domain names (without the "inet": +prefix, or ":port" or ":service" suffix), or UNIX\-domain socket +"/path/name" (without the "unix:" prefix), or "type:table" lookup +tables, separated by commas and/or whitespace. Continue long lines +by starting the next line with whitespace. A "type:table" lookup +table is matched when a domain appears as lookup key. Specify +"!pattern" to exclude a domain or socket path. +.br +.PP +Specify the form ".domain" to match any name ending in ".domain". +To change this behavior, list "smtp_enforce_requiretls" or +"lmtp_enforce_requiretls" in the parent_domain_matches_subdomains +parameter value. +.PP +SMTP Examples: +.PP +.nf +.na +# Enforce REQUIRETLS for SMTP with selected next\-hop domains. +smtp_enforce_requiretls = example.com, foo.example +.br +# Enforce REQUIRETLS for SMTP with all but a few next\-hop domains. +smtp_enforce_requiretls = !foo.example, static:all +.fi +.ad +.PP +LMTP examples: +.PP +.nf +.na +# Don't enforce REQUIRETLS +lmtp_enforce_requiretls = +.br +# Enforce REQUIRETLS for specific destinations. +lmtp_enforce_requiretls = /path/to/socket, message\-store.example +.fi +.ad +.PP +This feature is available in Postfix >= 3.11. .SH smtp_enforce_tls (default: no) Enforcement mode: require that remote SMTP servers use TLS encryption, and never send mail in the clear. This also requires @@ -14503,6 +14605,8 @@ If a message contains a "TLS\-Required: no" header, then Postfix will add that header to a delivery status notification for that message. .PP +Note: REQUIRETLS overrides "TLS\-Required: no". +.PP This feature is available in Postfix >= 3.10. .SH tls_server_sni_maps (default: empty) Optional lookup tables that map names received from remote SMTP diff --git a/postfix/man/man8/pipe.8 b/postfix/man/man8/pipe.8 index 770a459bc..49b309ba7 100644 --- a/postfix/man/man8/pipe.8 +++ b/postfix/man/man8/pipe.8 @@ -294,6 +294,14 @@ expands to as many command\-line arguments as there are recipients. .sp This information is modified by the \fBhqu\fR flags for quoting and case folding. +.IP \fB${requiretls}\fR +This feature should be used with content filters that pass +filtered mail to the Postfix sendmail(1) command. The macro +expands to the sendmail(1) command\-line option \fB\-Orequiretls\fR +if the sender requested REQUIRETLS, otherwise it expands to +\fB\-Onoop\fR. +.sp +This feature is available as of Postfix 3.10. .IP \fB${sasl_method}\fR This macro expands to the name of the SASL authentication mechanism in the AUTH command when the Postfix SMTP server diff --git a/postfix/man/man8/smtp.8 b/postfix/man/man8/smtp.8 index a6a56a53d..7bd32d584 100644 --- a/postfix/man/man8/smtp.8 +++ b/postfix/man/man8/smtp.8 @@ -190,7 +190,7 @@ RFC 5321 (SMTP protocol) RFC 6531 (Internationalized SMTP) RFC 6533 (Internationalized Delivery Status Notifications) RFC 7672 (SMTP security via opportunistic DANE TLS) -RFC 8689 (TLS\-Required message header) +RFC 8689 (SMTP REQUIRETLS extension) .SH DIAGNOSTICS .ad .fi @@ -485,7 +485,7 @@ Available in Postfix version 3.9 and later: .IP "\fBsmtp_sasl_password_result_delimiter (:)\fR" The delimiter between username and password in sasl_passwd_maps lookup results. -.SH "STARTTLS SUPPORT CONTROLS" +.SH "TLS SUPPORT CONTROLS" .na .nf .ad @@ -688,7 +688,16 @@ information to report). .IP "\fBtls_required_enable (yes)\fR" Enable support for the "TLS\-Required: no" message header, defined in RFC 8689. -.SH "OBSOLETE STARTTLS CONTROLS" +.IP "\fBrequiretls_enable (yes)\fR" +Enable support for the ESMTP verb "REQUIRETLS", defined in RFC +8689. +.IP "\fBsmtp_enforce_requiretls (empty)\fR" +An optional list of next\-hop destinations that the Postfix +SMTP/LMTP client will enforce REQUIRETLS for, when a message was +received with the REQUIRETLS option: the next\-hop server must offer +a matching TLS server certificate, and the server must announce +REQUIRETLS support). +.SH "OBSOLETE TLS CONTROLS" .na .nf .ad diff --git a/postfix/man/man8/smtpd.8 b/postfix/man/man8/smtpd.8 index a671d476b..53cc14fe0 100644 --- a/postfix/man/man8/smtpd.8 +++ b/postfix/man/man8/smtpd.8 @@ -67,6 +67,7 @@ RFC 5321 (SMTP protocol) RFC 6531 (Internationalized SMTP) RFC 6533 (Internationalized Delivery Status Notifications) RFC 7505 ("Null MX" No Service Resource Record) +RFC 8689 (SMTP REQUIRETLS extension) .SH DIAGNOSTICS .ad .fi @@ -402,7 +403,7 @@ Available in Postfix 3.6 and later: .IP "\fBsmtpd_sasl_mechanism_filter (!external, static:rest)\fR" If non\-empty, a filter for the SASL mechanism names that the Postfix SMTP server will announce in the EHLO response. -.SH "STARTTLS SUPPORT CONTROLS" +.SH "TLS SUPPORT CONTROLS" .na .nf .ad @@ -578,7 +579,12 @@ Available in Postfix version 3.9 and later: Request that remote SMTP clients send an RFC7250 raw public key instead of an X.509 certificate, when asking for or requiring client authentication. -.SH "OBSOLETE STARTTLS CONTROLS" +.PP +Available in Postfix version 3.10 and later: +.IP "\fBrequiretls_enable (yes)\fR" +Enable support for the ESMTP verb "REQUIRETLS", defined in RFC +8689. +.SH "OBSOLETE TLS CONTROLS" .na .nf .ad diff --git a/postfix/mantools/postlink b/postfix/mantools/postlink index b06c2d00f..7a8944574 100755 --- a/postfix/mantools/postlink +++ b/postfix/mantools/postlink @@ -1187,6 +1187,10 @@ while (<>) { s;\bignore_srv_lookup_error\b;$&;g; s;\btls_required_enable\b;$&;g; + s;\brequiretls_enable\b;$&;g; + s;\bsmtp_enforce_requiretls\b;$&;g; + s;\blmtp_enforce_requiretls\b;$&;g; + s;\bfull_name_encoding_charset\b;$&;g; s;\bsmtpd_hide_client_session\b;$&;g; diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto index b1130e134..19cd7684d 100644 --- a/postfix/proto/postconf.proto +++ b/postfix/proto/postconf.proto @@ -3374,6 +3374,13 @@ postscreen_access_list smtpd_client_event_limit_exceptions +
Postfix version 3.11 and later
+ +
+smtp_enforce_requiretls, +lmtp_enforce_requiretls +
+ %PARAM propagate_unmatched_extensions canonical, virtual @@ -19586,12 +19593,124 @@ in RFC 8689. By adding this header to a message, a sender requests no enforcement of TLS policy. This limits the Postfix SMTP client TLS security level to "may", that is, do not verify remote SMTP server certificates, and fall back to plaintext if TLS is unavailable. -If a message contains a "TLS-Required: no" header, then Postfix -will add that header to a delivery status notification for that +If a message contains a "TLS-Required: no" header, then Postfix +will add that header to a delivery status notification for that message.

+

Note: REQUIRETLS overrides "TLS-Required: no".

+

This feature is available in Postfix ≥ 3.10.

+%PARAM requiretls_enable yes + +

Enable support for the ESMTP verb "REQUIRETLS", defined in RFC +8689. By issuing this verb in the "MAIL FROM" command, a sender +specifies that a message must be delivered over TLS connections +with a verified server certificate, to a server that announces +"REQUIRETLS" support. This corresponds to the Postfix SMTP client +TLS security levels "secure", "verify", "fingerprint", dane-only, +or opportunistic "dane", with a successful certificate match. The +Postfix SMTP client will try one or more servers, controlled with +the smtp_mx_address_limit parameter, until it finds a server that +satisfies requirements. Otherwise, Postfix returns the message as +undeliverable.

+ +

Notes:

+ +
    + +

  • REQUIRETLS enforcement is controlled with smtp_enforce_requiretls +or lmtp_enforce_requiretls.

    + +

  • REQUIRETLS overrides "TLS-Required: no".

    + +
+ +

This feature is available in Postfix ≥ 3.11.

+ +%PARAM smtp_enforce_requiretls empty + +

An optional list of next-hop destinations that the Postfix +SMTP/LMTP client will enforce REQUIRETLS for, when a message was +received with the REQUIRETLS option: the next-hop server must offer +a matching TLS server certificate, and the server must announce +REQUIRETLS support). Such a message will be returned to the sender +if some REQUIRETLS requirement cannot be satisfied. These "hard" +REQUIRETLS failures are logged as "REQUIRETLS failure".

+ +

Other messages that were received with the REQUIRETLS option +will be delivered with REQUIRETLS if possible. If not, a message +will be delivered as if it was received without the REQUIRETLS +option. This allows a mail sending site to discover when REQUIRETLS +can be enforced, without disrupting email deliveries. These "soft" +REQUIRETLS failures are logged with "REQUIRETLS Debug".

+ +

On a perimeter MTA, it can make sense to turn off REQUIRETLS +enforcement, or even to turn off REQUIRETLS support, when delivering +a message to an internal destination. The internal servers may not +support REQUIRETLS, and their connections may be secured with means +other than DANE, STS, and the like.

+ +

The supported syntax differs with SMTP and LMTP:

+ +
    + +

  • With SMTP, specify a list of next-hop domain names (without +the ":port" or ":service" suffix), "/file/name" patterns or +"type:table" lookup tables, separated by commas and/or whitespace. +Continue long lines by starting the next line with whitespace. A +"/file/name" pattern is replaced by its contents. A "type:table" +lookup table is matched when a domain appears as lookup key. Specify +"!pattern" to exclude a domain.

    + +

  • With LMTP, specify list of domain names (without the "inet": +prefix, or ":port" or ":service" suffix), or UNIX-domain socket +"/path/name" (without the "unix:" prefix), or "type:table" lookup +tables, separated by commas and/or whitespace. Continue long lines +by starting the next line with whitespace. A "type:table" lookup +table is matched when a domain appears as lookup key. Specify +"!pattern" to exclude a domain or socket path.

    + +
+ +

Specify the form ".domain" to match any name ending in ".domain". +To change this behavior, list "smtp_enforce_requiretls" or +"lmtp_enforce_requiretls" in the parent_domain_matches_subdomains +parameter value.

+ +

+SMTP Examples: +

+ +
+# Enforce REQUIRETLS for SMTP with selected next-hop domains.
+smtp_enforce_requiretls = example.com, foo.example
+

+# Enforce REQUIRETLS for SMTP with all but a few next-hop domains.
+smtp_enforce_requiretls = !foo.example, static:all
+
+ +

+LMTP examples: +

+ +
+# Don't enforce REQUIRETLS 
+lmtp_enforce_requiretls =
+

+# Enforce REQUIRETLS for specific destinations.
+lmtp_enforce_requiretls = /path/to/socket, message-store.example
+
+ +

This feature is available in Postfix ≥ 3.11.

+ +%PARAM lmtp_enforce_requiretls empty + +

The LMTP-specific version of the smtp_enforce_requiretls +configuration parameter. See there for details.

+ +

This feature is available in Postfix ≥ 3.11.

+ %PARAM smtpd_hide_client_session no

Do not include SMTP client session information in the Postfix diff --git a/postfix/proto/stop b/postfix/proto/stop index ef6aab0a2..c4b9fea98 100644 --- a/postfix/proto/stop +++ b/postfix/proto/stop @@ -1664,6 +1664,9 @@ REQUIRETLS RequireTLS requiretls sendopts +TODO +Onoop +Orequiretls tz GID SIGKILL diff --git a/postfix/proto/stop.double-history b/postfix/proto/stop.double-history index 782732fda..269895fb2 100644 --- a/postfix/proto/stop.double-history +++ b/postfix/proto/stop.double-history @@ -159,10 +159,17 @@ proto proto socketmap_table qmgr qmgr_deliver c qmgr qmgr_message c qmqpd qmqpd c smtp smtp_proto c smtpd smtpd c verify verify c operations Files cleanup cleanup h cleanup cleanup_message c - proto postconf proto pipe pipe c + global ehlo_mask_test c local forward c smtpd smtpd c + more alternate MX servers to try Files smtp smtp h + Files sendmail sendmail c global rec_types h + Files sendmail sendmail c + Files sendmail sendmail c global rec_types h pickup pickup c + pipe pipe c sendmail sendmail c + smtp smtp c smtp smtp_proto c bounce bounce c bounce bounce_notify_util c cleanup cleanup c cleanup cleanup_message c smtp smtp c smtp smtp_connect c Documentation edited for clarity Files pipe pipe c + servers to try Files smtp smtp h smtp smtp_proto c global mail_params h smtpd smtpd c global mail_params h proto postconf proto smtp smtp c proto postconf proto proto TLS_README html diff --git a/postfix/proto/stop.spell-cc b/postfix/proto/stop.spell-cc index 506c2d2c8..03ddd3aa7 100644 --- a/postfix/proto/stop.spell-cc +++ b/postfix/proto/stop.spell-cc @@ -1858,6 +1858,7 @@ TINYCDB getdata XXXSENDOPTS xtra +NODICT HAPROXY SRVR DGST diff --git a/postfix/proto/stop.spell-history b/postfix/proto/stop.spell-history index da067ab97..3e02b25a1 100644 --- a/postfix/proto/stop.spell-history +++ b/postfix/proto/stop.spell-history @@ -100,6 +100,7 @@ Roessner bitflags Schulze tlspol +TlsRequired Gueven Oemer Kozmenko diff --git a/postfix/src/bounce/bounce_notify_service.c b/postfix/src/bounce/bounce_notify_service.c index b8068f176..4f1a7b101 100644 --- a/postfix/src/bounce/bounce_notify_service.c +++ b/postfix/src/bounce/bounce_notify_service.c @@ -98,6 +98,15 @@ int bounce_notify_service(int flags, char *service, char *queue_name, char *postmaster; int count; + /* + * If the original sender requested REQUIRETLS, return headers only, and + * do not enforce REQUIRETLS for the delivery status notification. + */ + if ((sendopts & SOPT_REQUIRETLS_ESMTP) != 0) { + dsn_ret = DSN_RET_HDRS; + sendopts &= ~SOPT_REQUIRETLS_ESMTP; + } + /* * Initialize. Open queue file, bounce log, etc. * @@ -196,7 +205,8 @@ int bounce_notify_service(int flags, char *service, char *queue_name, && bounce_header_dsn(bounce, bounce_info) == 0 && bounce_diagnostic_dsn(bounce, bounce_info, DSN_NOTIFY_OVERRIDE) > 0) { - bounce_original(bounce, bounce_info, DSN_RET_FULL); + bounce_original(bounce, bounce_info, dsn_ret ? + dsn_ret : DSN_RET_FULL); bounce_status = post_mail_fclose(bounce); if (bounce_status == 0) msg_info("%s: postmaster non-delivery notification: %s", diff --git a/postfix/src/bounce/bounce_notify_util.c b/postfix/src/bounce/bounce_notify_util.c index f089e4c04..9f012709c 100644 --- a/postfix/src/bounce/bounce_notify_util.c +++ b/postfix/src/bounce/bounce_notify_util.c @@ -537,6 +537,7 @@ int bounce_header(VSTREAM *bounce, BOUNCE_INFO *bounce_info, * Trade confidentiality against availability. */ if (var_tls_required_enable + && (bounce_info->sendopts & SOPT_REQUIRETLS_ESMTP) == 0 && (bounce_info->sendopts & SOPT_REQUIRETLS_HEADER) != 0) post_mail_fprintf(bounce, "TLS-Required: no"); diff --git a/postfix/src/bounce/bounce_notify_verp.c b/postfix/src/bounce/bounce_notify_verp.c index 84e20b8e2..3fa2c2c08 100644 --- a/postfix/src/bounce/bounce_notify_verp.c +++ b/postfix/src/bounce/bounce_notify_verp.c @@ -111,6 +111,15 @@ int bounce_notify_verp(int flags, char *service, char *queue_name, if (strcasecmp_utf8(recipient, mail_addr_double_bounce()) == 0) msg_panic("%s: attempt to bounce a double bounce", myname); + /* + * If the original sender requested REQUIRETLS, return headers only, and + * do not enforce REQUIRETLS for the delivery status notification. + */ + if ((sendopts & SOPT_REQUIRETLS_ESMTP) != 0) { + dsn_ret = DSN_RET_HDRS; + sendopts &= ~SOPT_REQUIRETLS_ESMTP; + } + /* * Initialize. Open queue file, bounce log, etc. */ diff --git a/postfix/src/bounce/bounce_one_service.c b/postfix/src/bounce/bounce_one_service.c index ab6cac829..53442198b 100644 --- a/postfix/src/bounce/bounce_one_service.c +++ b/postfix/src/bounce/bounce_one_service.c @@ -96,6 +96,15 @@ int bounce_one_service(int flags, char *queue_name, char *queue_id, var_notify_classes); VSTRING *new_id = vstring_alloc(10); + /* + * If the original sender requested REQUIRETLS, return headers only, and + * do not enforce REQUIRETLS for the delivery status notification. + */ + if ((sendopts & SOPT_REQUIRETLS_ESMTP) != 0) { + dsn_ret = DSN_RET_HDRS; + sendopts &= ~SOPT_REQUIRETLS_ESMTP; + } + /* * Initialize. Open queue file, bounce log, etc. */ @@ -162,7 +171,8 @@ int bounce_one_service(int flags, char *queue_name, char *queue_id, && bounce_recipient_log(bounce, bounce_info) == 0 && bounce_header_dsn(bounce, bounce_info) == 0 && bounce_recipient_dsn(bounce, bounce_info) == 0) - bounce_original(bounce, bounce_info, DSN_RET_FULL); + bounce_original(bounce, bounce_info, dsn_ret ? + dsn_ret : DSN_RET_FULL); bounce_status = post_mail_fclose(bounce); if (bounce_status == 0) msg_info("%s: postmaster non-delivery notification: %s", diff --git a/postfix/src/bounce/bounce_trace_service.c b/postfix/src/bounce/bounce_trace_service.c index cb29bbb26..451f584f4 100644 --- a/postfix/src/bounce/bounce_trace_service.c +++ b/postfix/src/bounce/bounce_trace_service.c @@ -95,6 +95,15 @@ int bounce_trace_service(int flags, char *service, char *queue_name, int count; const char *sender; + /* + * If the original sender requested REQUIRETLS, do not enforce REQUIRETLS + * for the delivery status notification. The trace service always returns + * headers only. + */ + if ((sendopts & SOPT_REQUIRETLS_ESMTP) != 0) { + sendopts &= ~SOPT_REQUIRETLS_ESMTP; + } + /* * For consistency with fail/delay notifications, send notification for a * non-bounce message as a single-bounce message, send notification for a diff --git a/postfix/src/bounce/bounce_warn_service.c b/postfix/src/bounce/bounce_warn_service.c index f9fc7641b..62c263859 100644 --- a/postfix/src/bounce/bounce_warn_service.c +++ b/postfix/src/bounce/bounce_warn_service.c @@ -98,6 +98,15 @@ int bounce_warn_service(int unused_flags, char *service, char *queue_name, char *postmaster; int count; + /* + * If the original sender requested REQUIRETLS, return headers only, and + * do not enforce REQUIRETLS for the delivery status notification. + */ + if ((sendopts & SOPT_REQUIRETLS_ESMTP) != 0) { + dsn_ret = DSN_RET_HDRS; + sendopts &= ~SOPT_REQUIRETLS_ESMTP; + } + /* * Initialize. Open queue file, bounce log, etc. * @@ -185,7 +194,8 @@ int bounce_warn_service(int unused_flags, char *service, char *queue_name, && bounce_header_dsn(bounce, bounce_info) == 0 && bounce_diagnostic_dsn(bounce, bounce_info, DSN_NOTIFY_OVERRIDE) > 0) { - bounce_original(bounce, bounce_info, DSN_RET_FULL); + bounce_original(bounce, bounce_info, dsn_ret ? + dsn_ret : DSN_RET_FULL); bounce_status = post_mail_fclose(bounce); if (bounce_status == 0) msg_info("%s: postmaster delay notification: %s", diff --git a/postfix/src/cleanup/cleanup_api.c b/postfix/src/cleanup/cleanup_api.c index 6a0c6dac0..edebe70ec 100644 --- a/postfix/src/cleanup/cleanup_api.c +++ b/postfix/src/cleanup/cleanup_api.c @@ -80,6 +80,8 @@ /* .IP CLEANUP_FLAG_AUTOUTF8 /* Autodetection: request SMTPUTF8 support if the message /* contains an UTF8 message header, sender, or recipient. +/* .IP CLEANUP_FLAG_REQUIRETLS +/* The sender requested REQUIRETLS (RFC 8689) enforcement. /* DIAGNOSTICS /* Problems and transactions are logged to \fBsyslogd\fR(8) /* or \fBpostlogd\fR(8). @@ -208,9 +210,15 @@ void cleanup_control(CLEANUP_STATE *state, int flags) } else { state->err_mask = ~0; } + + /* + * Propagate requests that are specified at the envelope level. This may + * be augmented later with information derived from message content. + */ if (state->flags & CLEANUP_FLAG_SMTPUTF8) state->sendopts |= SMTPUTF8_FLAG_REQUESTED; - /* TODO(wietse) REQUIRETLS. */ + if (state->flags & CLEANUP_FLAG_REQUIRETLS) + state->sendopts |= SOPT_REQUIRETLS_ESMTP; if (msg_verbose) msg_info("server flags = %s", cleanup_strflags(state->flags)); } diff --git a/postfix/src/global/Makefile.in b/postfix/src/global/Makefile.in index dfc28b631..6e3902bc2 100644 --- a/postfix/src/global/Makefile.in +++ b/postfix/src/global/Makefile.in @@ -124,7 +124,7 @@ TESTPROG= domain_list dot_lockfile mail_addr_crunch mail_addr_find \ off_cvt quote_822_local rec2stream recdump resolve_clnt \ resolve_local rewrite_clnt stream2rec string_list tok822_parse \ quote_821_local mail_conf_time mime_state strip_addr \ - verify_clnt xtext anvil_clnt scache ehlo_mask \ + verify_clnt xtext anvil_clnt scache ehlo_mask_test \ valid_mailhost_addr own_inet_addr header_body_checks \ data_redirect addr_match_list safe_ultostr verify_sender_addr \ mail_version mail_dict server_acl uxtext mail_parm_split \ @@ -336,7 +336,7 @@ anvil_clnt: $(LIB) $(LIBS) scache: scache.c $(LIB) $(LIBS) $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) -ehlo_mask: ehlo_mask.c $(LIB) $(LIBS) +ehlo_mask_test: ehlo_mask_test.c $(LIB) $(LIBS) $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) valid_mailhost_addr: valid_mailhost_addr.c $(LIB) $(LIBS) @@ -416,7 +416,7 @@ config_known_tcp_ports: config_known_tcp_ports.c $(LIB) $(LIBS) $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIB) $(LIBS) $(SYSLIBS) tests: tok822_test mime_tests strip_addr_test tok822_limit_test \ - xtext_test scache_multi_test ehlo_mask_test \ + xtext_test scache_multi_test test_ehlo_mask \ namadr_list_test mail_conf_time_test header_body_checks_tests \ mail_version_test server_acl_test resolve_local_test maps_test \ safe_ultostr_test mail_parm_split_test fold_addr_test \ @@ -616,10 +616,8 @@ scache_multi_test: scache scache_multi.in scache_multi.ref diff scache_multi.ref scache_multi.tmp rm -f scache_multi.tmp -ehlo_mask_test: ehlo_mask ehlo_mask.in ehlo_mask.ref - $(SHLIB_ENV) $(VALGRIND) ./ehlo_mask ehlo_mask.tmp - diff ehlo_mask.ref ehlo_mask.tmp - rm -f ehlo_mask.tmp +test_ehlo_mask: ehlo_mask_test + $(SHLIB_ENV) $(VALGRIND) ./ehlo_mask_test namadr_list_test: namadr_list namadr_list.in namadr_list.ref -$(SHLIB_ENV) sh namadr_list.in >namadr_list.tmp 2>&1 @@ -1481,6 +1479,16 @@ ehlo_mask.o: ../../include/vbuf.h ehlo_mask.o: ../../include/vstring.h ehlo_mask.o: ehlo_mask.c ehlo_mask.o: ehlo_mask.h +ehlo_mask_test.o: ../../include/check_arg.h +ehlo_mask_test.o: ../../include/msg.h +ehlo_mask_test.o: ../../include/msg_vstream.h +ehlo_mask_test.o: ../../include/stringops.h +ehlo_mask_test.o: ../../include/sys_defs.h +ehlo_mask_test.o: ../../include/vbuf.h +ehlo_mask_test.o: ../../include/vstream.h +ehlo_mask_test.o: ../../include/vstring.h +ehlo_mask_test.o: ehlo_mask.h +ehlo_mask_test.o: ehlo_mask_test.c ext_prop.o: ../../include/check_arg.h ext_prop.o: ../../include/name_mask.h ext_prop.o: ../../include/sys_defs.h diff --git a/postfix/src/global/addr_match_list.c b/postfix/src/global/addr_match_list.c index 8008df203..136ce24b5 100644 --- a/postfix/src/global/addr_match_list.c +++ b/postfix/src/global/addr_match_list.c @@ -42,6 +42,10 @@ /* Request that addr_match_list_match() logs a warning and /* returns zero with list->error set to a non-zero dictionary /* error code, instead of raising a fatal error. +/* .IP MATCH_FLAG_NOFILE +/* Disable special handling for /file/name. +/* .IP MATCH_FLAG_NODICT +/* Disable special handling for type:name. /* .PP /* Specify MATCH_FLAG_NONE to request none of the above. /* The last argument is a list of patterns, or the absolute @@ -67,6 +71,9 @@ /* IBM T.J. Watson Research /* P.O. Box 704 /* Yorktown Heights, NY 10598, USA +/* +/* Wietse Venema +/* porcupine.org /*--*/ /* System library. */ diff --git a/postfix/src/global/cleanup_strflags.c b/postfix/src/global/cleanup_strflags.c index d281c4462..7045d5932 100644 --- a/postfix/src/global/cleanup_strflags.c +++ b/postfix/src/global/cleanup_strflags.c @@ -55,6 +55,7 @@ static struct cleanup_flag_map cleanup_flag_map[] = { CLEANUP_FLAG_SMTP_REPLY, "enable_smtp_reply", CLEANUP_FLAG_SMTPUTF8, "smtputf8_requested", CLEANUP_FLAG_AUTOUTF8, "smtputf8_autodetect", + CLEANUP_FLAG_REQUIRETLS, "requiretls_requested", }; /* cleanup_strflags - map flags code to printable string */ diff --git a/postfix/src/global/cleanup_user.h b/postfix/src/global/cleanup_user.h index 0b1985b70..fb7699771 100644 --- a/postfix/src/global/cleanup_user.h +++ b/postfix/src/global/cleanup_user.h @@ -25,6 +25,7 @@ #define CLEANUP_FLAG_SMTP_REPLY (1<<7) /* Enable SMTP reply */ #define CLEANUP_FLAG_SMTPUTF8 (1<<8) /* SMTPUTF8 requested */ #define CLEANUP_FLAG_AUTOUTF8 (1<<9) /* Autodetect SMTPUTF8 */ +#define CLEANUP_FLAG_REQUIRETLS (1<<10) /* REQUIRETLS requested */ #define CLEANUP_FLAG_FILTER_ALL (CLEANUP_FLAG_FILTER | CLEANUP_FLAG_MILTER) diff --git a/postfix/src/global/domain_list.c b/postfix/src/global/domain_list.c index d79beafd3..e3fe1caec 100644 --- a/postfix/src/global/domain_list.c +++ b/postfix/src/global/domain_list.c @@ -45,6 +45,10 @@ /* Request that domain_list_match() logs a warning and returns /* zero, with list->error set to a non-zero dictionary error /* code, instead of raising a fatal error. +/* .IP MATCH_FLAG_NOFILE +/* Disable special handling for /file/name. +/* .IP MATCH_FLAG_NODICT +/* Disable special handling for type:name. /* .PP /* Specify MATCH_FLAG_NONE to request none of the above. /* The last argument is a list of domain patterns, or the name of @@ -69,6 +73,9 @@ /* IBM T.J. Watson Research /* P.O. Box 704 /* Yorktown Heights, NY 10598, USA +/* +/* Wietse Venema +/* porcupine.org /*--*/ /* System library. */ diff --git a/postfix/src/global/ehlo_mask.c b/postfix/src/global/ehlo_mask.c index df905e13f..a111136e2 100644 --- a/postfix/src/global/ehlo_mask.c +++ b/postfix/src/global/ehlo_mask.c @@ -20,6 +20,7 @@ /* #define EHLO_MASK_DSN (1<<11) /* #define EHLO_MASK_SMTPUTF8 (1<<12) /* #define EHLO_MASK_CHUNKING (1<<13) +/* #define EHLO_MASK_REQUIRETLS (1<<14) /* #define EHLO_MASK_SILENT (1<<15) /* /* int ehlo_mask(keyword_list) @@ -70,22 +71,22 @@ * The lookup table. */ static const NAME_MASK ehlo_mask_table[] = { - "8BITMIME", EHLO_MASK_8BITMIME, - "AUTH", EHLO_MASK_AUTH, - "ETRN", EHLO_MASK_ETRN, - "PIPELINING", EHLO_MASK_PIPELINING, - "SIZE", EHLO_MASK_SIZE, - "VERP", EHLO_MASK_VERP, - "VRFY", EHLO_MASK_VRFY, - "XCLIENT", EHLO_MASK_XCLIENT, - "XFORWARD", EHLO_MASK_XFORWARD, - "STARTTLS", EHLO_MASK_STARTTLS, - "ENHANCEDSTATUSCODES", EHLO_MASK_ENHANCEDSTATUSCODES, - "DSN", EHLO_MASK_DSN, - "EHLO_MASK_SMTPUTF8", EHLO_MASK_SMTPUTF8, - "SMTPUTF8", EHLO_MASK_SMTPUTF8, - "CHUNKING", EHLO_MASK_CHUNKING, - "SILENT-DISCARD", EHLO_MASK_SILENT, /* XXX In-band signaling */ + EHLO_VERB_8BITMIME, EHLO_MASK_8BITMIME, + EHLO_VERB_AUTH, EHLO_MASK_AUTH, + EHLO_VERB_ETRN, EHLO_MASK_ETRN, + EHLO_VERB_PIPELINING, EHLO_MASK_PIPELINING, + EHLO_VERB_SIZE, EHLO_MASK_SIZE, + EHLO_VERB_VERP, EHLO_MASK_VERP, + EHLO_VERB_VRFY, EHLO_MASK_VRFY, + EHLO_VERB_XCLIENT, EHLO_MASK_XCLIENT, + EHLO_VERB_XFORWARD, EHLO_MASK_XFORWARD, + EHLO_VERB_STARTTLS, EHLO_MASK_STARTTLS, + EHLO_VERB_ENHANCEDSTATUSCODES, EHLO_MASK_ENHANCEDSTATUSCODES, + EHLO_VERB_DSN, EHLO_MASK_DSN, + EHLO_VERB_SMTPUTF8, EHLO_MASK_SMTPUTF8, + EHLO_VERB_CHUNKING, EHLO_MASK_CHUNKING, + EHLO_VERB_REQUIRETLS, EHLO_MASK_REQUIRETLS, + EHLO_VERB_SILENT, EHLO_MASK_SILENT, 0, }; @@ -114,32 +115,3 @@ const char *str_ehlo_mask(int mask_bits) */ return (str_name_mask("ehlo bitmask", ehlo_mask_table, mask_bits)); } - -#ifdef TEST - - /* - * Stand-alone test program. - */ -#include -#include -#include -#include - -int main(int unused_argc, char **unused_argv) -{ - int mask_bits; - VSTRING *buf = vstring_alloc(1); - const char *mask_string; - - while (vstring_get_nonl(buf, VSTREAM_IN) != VSTREAM_EOF) { - mask_bits = ehlo_mask(vstring_str(buf)); - mask_string = str_ehlo_mask(mask_bits); - vstream_printf("%s -> 0x%x -> %s\n", vstring_str(buf), mask_bits, - mask_string); - vstream_fflush(VSTREAM_OUT); - } - vstring_free(buf); - exit(0); -} - -#endif diff --git a/postfix/src/global/ehlo_mask.h b/postfix/src/global/ehlo_mask.h index 9a318970d..e300ba313 100644 --- a/postfix/src/global/ehlo_mask.h +++ b/postfix/src/global/ehlo_mask.h @@ -12,7 +12,7 @@ /* .nf /* - * External interface. + * Bit flags. */ #define EHLO_MASK_8BITMIME (1<<0) /* start of first byte */ #define EHLO_MASK_PIPELINING (1<<1) @@ -29,8 +29,32 @@ #define EHLO_MASK_DSN (1<<11) #define EHLO_MASK_SMTPUTF8 (1<<12) #define EHLO_MASK_CHUNKING (1<<13) -#define EHLO_MASK_SILENT (1<<15) +#define EHLO_MASK_REQUIRETLS (1<<14) +#define EHLO_MASK_SILENT (1<<15) /* in-band signaling */ + /* + * ESMTP verbs. + */ +#define EHLO_VERB_8BITMIME "8BITMIME" +#define EHLO_VERB_PIPELINING "PIPELINING" +#define EHLO_VERB_SIZE "SIZE" +#define EHLO_VERB_VRFY "VRFY" +#define EHLO_VERB_ETRN "ETRN" +#define EHLO_VERB_AUTH "AUTH" +#define EHLO_VERB_VERP "VERP" +#define EHLO_VERB_STARTTLS "STARTTLS" +#define EHLO_VERB_XCLIENT "XCLIENT" +#define EHLO_VERB_XFORWARD "XFORWARD" +#define EHLO_VERB_ENHANCEDSTATUSCODES "ENHANCEDSTATUSCODES" +#define EHLO_VERB_DSN "DSN" +#define EHLO_VERB_SMTPUTF8 "SMTPUTF8" +#define EHLO_VERB_CHUNKING "CHUNKING" +#define EHLO_VERB_REQUIRETLS "REQUIRETLS" +#define EHLO_VERB_SILENT "SILENT-DISCARD" /* in-band signaling */ + + /* + * Functions. + */ extern int ehlo_mask(const char *); extern const char *str_ehlo_mask(int); diff --git a/postfix/src/global/ehlo_mask.in b/postfix/src/global/ehlo_mask.in deleted file mode 100644 index 50fc24882..000000000 --- a/postfix/src/global/ehlo_mask.in +++ /dev/null @@ -1,3 +0,0 @@ -starttls, 8bitmime, verp, etrn, etrn -foobar, auth, pipelining, size, vrfy -xclient, xforward diff --git a/postfix/src/global/ehlo_mask.ref b/postfix/src/global/ehlo_mask.ref deleted file mode 100644 index e865ab65c..000000000 --- a/postfix/src/global/ehlo_mask.ref +++ /dev/null @@ -1,3 +0,0 @@ -starttls, 8bitmime, verp, etrn, etrn -> 0xd1 -> 8BITMIME ETRN VERP STARTTLS -foobar, auth, pipelining, size, vrfy -> 0x2e -> AUTH PIPELINING SIZE VRFY -xclient, xforward -> 0x300 -> XCLIENT XFORWARD diff --git a/postfix/src/global/ehlo_mask_test.c b/postfix/src/global/ehlo_mask_test.c new file mode 100644 index 000000000..cbb172bbb --- /dev/null +++ b/postfix/src/global/ehlo_mask_test.c @@ -0,0 +1,121 @@ + /* + * System library. + */ +#include +#include +#include +#include + + /* + * Utility library. + */ +#include +#include +#include +#include + + /* + * Global library. + */ +#include + + /* + * Tests and test cases. + */ +typedef struct TEST_CASE { + const char *label; /* identifies test case */ + int mask; + const char *want; +} TEST_CASE; + + /* + * Verify that each verb has its unique bit mask. + */ +static const TEST_CASE test_cases[] = { + {"EHLO_MASK_8BITMIME", + EHLO_MASK_8BITMIME, + "8BITMIME" + }, + {"EHLO_MASK_PIPELINING", + EHLO_MASK_PIPELINING, + "PIPELINING" + }, + {"EHLO_MASK_SIZE", + EHLO_MASK_SIZE, + "SIZE" + }, + {"EHLO_MASK_VRFY", + EHLO_MASK_VRFY, + "VRFY" + }, + {"EHLO_MASK_ETRN", + EHLO_MASK_ETRN, + "ETRN" + }, + {"EHLO_MASK_AUTH", + EHLO_MASK_AUTH, + "AUTH" + }, + {"EHLO_MASK_VERP", + EHLO_MASK_VERP, + "VERP" + }, + {"EHLO_MASK_STARTTLS", + EHLO_MASK_STARTTLS, + "STARTTLS" + }, + {"EHLO_MASK_XCLIENT", + EHLO_MASK_XCLIENT, + "XCLIENT" + }, + {"EHLO_MASK_ENHANCEDSTATUSCODES", + EHLO_MASK_ENHANCEDSTATUSCODES, + "ENHANCEDSTATUSCODES" + }, + {"EHLO_MASK_DSN", + EHLO_MASK_DSN, + "DSN" + }, + {"EHLO_MASK_SMTPUTF8", + EHLO_MASK_SMTPUTF8, + "SMTPUTF8" + }, + {"EHLO_MASK_CHUNKING", + EHLO_MASK_CHUNKING, + "CHUNKING" + }, + {"EHLO_MASK_REQUIRETLS", + EHLO_MASK_REQUIRETLS, + "REQUIRETLS" + }, + {"EHLO_MASK_SILENT", + EHLO_MASK_SILENT, + "SILENT-DISCARD" + }, + {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 = str_ehlo_mask(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); +} diff --git a/postfix/src/global/mail_params.c b/postfix/src/global/mail_params.c index 6032ea39a..a2f0d2101 100644 --- a/postfix/src/global/mail_params.c +++ b/postfix/src/global/mail_params.c @@ -128,6 +128,7 @@ /* int var_smtputf8_enable; /* int var_strict_smtputf8; /* char *var_smtputf8_autoclass; +/* int var_requiretls_enable; /* int var_tls_required_enable; /* int var_idna2003_compat; /* char *var_compatibility_level; @@ -370,6 +371,7 @@ char *var_dsn_filter; int var_smtputf8_enable; int var_strict_smtputf8; char *var_smtputf8_autoclass; +int var_requiretls_enable; int var_tls_required_enable; int var_idna2003_compat; char *var_compatibility_level; @@ -771,6 +773,7 @@ void mail_params_init() VAR_SMTPUTF8_ENABLE, DEF_SMTPUTF8_ENABLE, &var_smtputf8_enable, VAR_IDNA2003_COMPAT, DEF_IDNA2003_COMPAT, &var_idna2003_compat, VAR_RESPECTFUL_LOGGING, DEF_RESPECTFUL_LOGGING, &var_respectful_logging, + VAR_REQUIRETLS_ENABLE, DEF_REQUIRETLS_ENABLE, &var_requiretls_enable, VAR_TLSREQUIRED_ENABLE, DEF_TLSREQUIRED_ENABLE, &var_tls_required_enable, 0, }; diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h index 40aa5c2ba..5d3724541 100644 --- a/postfix/src/global/mail_params.h +++ b/postfix/src/global/mail_params.h @@ -4386,6 +4386,17 @@ extern int var_idna2003_compat; #define DEF_TLSREQUIRED_ENABLE "yes" extern int var_tls_required_enable; +#define VAR_REQUIRETLS_ENABLE "requiretls_enable" +#define DEF_REQUIRETLS_ENABLE "yes" +extern int var_requiretls_enable; + +#define VAR_SMTP_ENFORCE_REQUIRETLS "smtp_enforce_requiretls" +#define DEF_SMTP_ENFORCE_REQUIRETLS "" +extern char *var_smtp_enforce_requiretls; + +#define VAR_LMTP_ENFORCE_REQUIRETLS "lmtp_enforce_requiretls" +#define DEF_LMTP_ENFORCE_REQUIRETLS "" + /* * Workaround for future incompatibility. Our implementation of RFC 2308 * negative reply caching relies on the promise that res_query() and diff --git a/postfix/src/global/namadr_list.c b/postfix/src/global/namadr_list.c index 071a73341..0a9a9054f 100644 --- a/postfix/src/global/namadr_list.c +++ b/postfix/src/global/namadr_list.c @@ -51,6 +51,10 @@ /* Request that namadr_list_match() logs a warning and returns /* zero with list->error set to a non-zero dictionary error /* code, instead of raising a fatal error. +/* .IP MATCH_FLAG_NOFILE +/* Disable special handling for /file/name. +/* .IP MATCH_FLAG_NODICT +/* Disable special handling for type:name. /* .PP /* Specify MATCH_FLAG_NONE to request none of the above. /* The last argument is a list of patterns, or the absolute @@ -75,6 +79,9 @@ /* IBM T.J. Watson Research /* P.O. Box 704 /* Yorktown Heights, NY 10598, USA +/* +/* Wietse Venema +/* porcupine.org /*--*/ /* System library. */ diff --git a/postfix/src/global/post_mail.c b/postfix/src/global/post_mail.c index 1a41dfd6c..db1cc0ec6 100644 --- a/postfix/src/global/post_mail.c +++ b/postfix/src/global/post_mail.c @@ -225,8 +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) + | ((sendopts & SOPT_REQUIRETLS_ESMTP) ? CLEANUP_FLAG_REQUIRETLS : 0) | ((sendopts & SMTPUTF8_FLAG_REQUESTED) ? CLEANUP_FLAG_SMTPUTF8 : 0); - /* TODO(wietse) REQUIRETLS. */ GETTIMEOFDAY(&now); date = mail_date(now.tv_sec); diff --git a/postfix/src/global/rec_type.h b/postfix/src/global/rec_type.h index 32d939b9b..9452c003f 100644 --- a/postfix/src/global/rec_type.h +++ b/postfix/src/global/rec_type.h @@ -110,7 +110,7 @@ /* * The subset of inputs that the postdrop command allows. */ -#define REC_TYPE_POST_ENVELOPE "MFSRVAin" +#define REC_TYPE_POST_ENVELOPE "MCFSRVAin" #define REC_TYPE_POST_CONTENT "XLN" #define REC_TYPE_POST_EXTRACT "EAR" diff --git a/postfix/src/global/string_list.c b/postfix/src/global/string_list.c index ddd950a00..88a43fb1b 100644 --- a/postfix/src/global/string_list.c +++ b/postfix/src/global/string_list.c @@ -39,6 +39,10 @@ /* Request that string_list_match() logs a warning and returns /* zero with list->error set to a non-zero dictionary error /* code, instead of raising a fatal error. +/* .IP MATCH_FLAG_NOFILE +/* Disable special handling for /file/name. +/* .IP MATCH_FLAG_NODICT +/* Disable special handling for type:name. /* .PP /* Specify MATCH_FLAG_NONE to request none of the above. /* The last argument specifies a list of string patterns. @@ -61,6 +65,9 @@ /* IBM T.J. Watson Research /* P.O. Box 704 /* Yorktown Heights, NY 10598, USA +/* +/* Wietse Venema +/* porcupine.org /*--*/ /* System library. */ diff --git a/postfix/src/local/forward.c b/postfix/src/local/forward.c index 7e553ffa3..7f213fcdb 100644 --- a/postfix/src/local/forward.c +++ b/postfix/src/local/forward.c @@ -163,9 +163,10 @@ 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->sendopts & SOPT_REQUIRETLS_ESMTP) ? \ + CLEANUP_FLAG_REQUIRETLS : 0) \ | ((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), diff --git a/postfix/src/pickup/pickup.c b/postfix/src/pickup/pickup.c index 390329d1e..e639df13f 100644 --- a/postfix/src/pickup/pickup.c +++ b/postfix/src/pickup/pickup.c @@ -236,6 +236,7 @@ static int copy_segment(VSTREAM *qfile, VSTREAM *cleanup, PICKUP_INFO *info, char *attr_value; char *saved_attr; int skip_attr; + ssize_t count; /* * Limit the input record size. All front-end programs should protect the @@ -246,7 +247,7 @@ static int copy_segment(VSTREAM *qfile, VSTREAM *cleanup, PICKUP_INFO *info, * * We must allow PTR records here because of "postsuper -r". */ - for (;;) { + for (count = 0; /* void */; count++) { if ((type = rec_get(qfile, buf, var_line_limit)) < 0 || strchr(expected, type) == 0) return (file_read_error(info, type)); @@ -264,6 +265,9 @@ static int copy_segment(VSTREAM *qfile, VSTREAM *cleanup, PICKUP_INFO *info, } if (type == REC_TYPE_TIME) time_seen = 1; + if (type == REC_TYPE_SIZE && count > 5) + /* Discard SIZE record not at beginning of segment. */ + continue; /* * XXX Workaround: REC_TYPE_FILT (used in envelopes) == REC_TYPE_CONT diff --git a/postfix/src/pipe/Makefile.in b/postfix/src/pipe/Makefile.in index f2a682247..019922360 100644 --- a/postfix/src/pipe/Makefile.in +++ b/postfix/src/pipe/Makefile.in @@ -83,6 +83,7 @@ pipe.o: ../../include/pipe_command.h pipe.o: ../../include/quote_822_local.h pipe.o: ../../include/quote_flags.h pipe.o: ../../include/recipient_list.h +pipe.o: ../../include/sendopts.h pipe.o: ../../include/sent.h pipe.o: ../../include/set_eugid.h pipe.o: ../../include/split_addr.h diff --git a/postfix/src/pipe/pipe.c b/postfix/src/pipe/pipe.c index 58ff5e0e7..0107ef59a 100644 --- a/postfix/src/pipe/pipe.c +++ b/postfix/src/pipe/pipe.c @@ -284,6 +284,14 @@ /* .sp /* This information is modified by the \fBhqu\fR flags for quoting /* and case folding. +/* .IP \fB${requiretls}\fR +/* This feature should be used with content filters that pass +/* filtered mail to the Postfix sendmail(1) command. The macro +/* expands to the sendmail(1) command-line option \fB-Orequiretls\fR +/* if the sender requested REQUIRETLS, otherwise it expands to +/* \fB-Onoop\fR. +/* .sp +/* This feature is available as of Postfix 3.10. /* .IP \fB${sasl_method}\fR /* This macro expands to the name of the SASL authentication /* mechanism in the AUTH command when the Postfix SMTP server @@ -519,6 +527,7 @@ #include #include #include +#include /* Single server skeleton. */ @@ -553,6 +562,7 @@ #define PIPE_DICT_SASL_SENDER "sasl_sender" /* key */ #define PIPE_DICT_QUEUE_ID "queue_id" /* key */ #define PIPE_DICT_ENVID "envid" /* key */ +#define PIPE_DICT_REQUIRETLS "requiretls" /* key */ /* * Flags used to pass back the type of special parameter found by @@ -659,6 +669,7 @@ static int parse_callback(int type, VSTRING *buf, void *context) PIPE_DICT_SASL_SENDER, 0, PIPE_DICT_QUEUE_ID, 0, PIPE_DICT_ENVID, 0, + PIPE_DICT_REQUIRETLS, 0, 0, 0, }; struct cmd_flags *p; @@ -1290,6 +1301,9 @@ static int deliver_message(DELIVER_REQUEST *request, char *service, char **argv) request->queue_id); dict_update(PIPE_DICT_TABLE, PIPE_DICT_ENVID, request->dsn_envid); + dict_update(PIPE_DICT_TABLE, PIPE_DICT_REQUIRETLS, + (request->sendopts & SOPT_REQUIRETLS_ESMTP) + && var_requiretls_enable ? "-Orequiretls" : "-Onoop"); vstring_free(buf); if ((expanded_argv = expand_argv(service, attr.command, diff --git a/postfix/src/sendmail/Makefile.in b/postfix/src/sendmail/Makefile.in index 192faf82e..d8e0f0560 100644 --- a/postfix/src/sendmail/Makefile.in +++ b/postfix/src/sendmail/Makefile.in @@ -86,6 +86,7 @@ sendmail.o: ../../include/recipient_list.h sendmail.o: ../../include/record.h sendmail.o: ../../include/resolve_clnt.h sendmail.o: ../../include/safe.h +sendmail.o: ../../include/sendopts.h sendmail.o: ../../include/set_ugid.h sendmail.o: ../../include/split_at.h sendmail.o: ../../include/stringops.h diff --git a/postfix/src/sendmail/sendmail.c b/postfix/src/sendmail/sendmail.c index df052c5b0..54ac76843 100644 --- a/postfix/src/sendmail/sendmail.c +++ b/postfix/src/sendmail/sendmail.c @@ -152,10 +152,28 @@ /* comma-separated list with one or more of \fBfailure\fR (send /* notification when delivery fails), \fBdelay\fR (send /* notification when delivery is delayed), or \fBsuccess\fR -/* (send notification when the message is delivered); or specify +/* (send notification after the message is delivered); or specify /* \fBnever\fR (don't send any notifications at all). /* /* This feature is available in Postfix 2.3 and later. +/* .IP "\fB-O requiretls" +/* When delivering a message to an SMTP or LMTP server, the +/* connection must use TLS with a verified server certificate, +/* and the server must support REQUIRETLS. Try multiple servers if +/* possible, and return the message as undeliverable when these +/* requirements were not satisfied with any of the servers that +/* were tried. The "requiretls" option value is case-insensitive. +/* +/* This feature is available in Postfix 3.10 and later. +/* .IP "\fB-O smtputf8" +/* When delivering a message to an SMTP or LMTP server, the server +/* must support SMTPUTF8. Try multiple servers if possible, and +/* return the message as undeliverable when a message contains an +/* UTF8 envelope address or message header, but SMTPUTF8 was not +/* supported by any of the servers that were tried. The "smtputf8" +/* option value is case-insensitive. +/* +/* This feature is available in Postfix 3.10 and later. /* .IP "\fB-n\fR (ignored)" /* Backwards compatibility. /* .IP "\fB-oA\fIalias_database\fR" @@ -434,6 +452,11 @@ /* the Postfix executable files and documentation with the default /* Postfix instance, and that are started, stopped, etc., together /* with the default Postfix instance. +/* .PP +/* Postfix 3.10 and later: +/* .IP "\fBrequiretls_enable (yes)\fR" +/* Enable support for the ESMTP verb "REQUIRETLS", defined in RFC +/* 8689. /* FILES /* /var/spool/postfix, mail queue /* /etc/postfix, configuration files @@ -537,6 +560,7 @@ #include #include #include +#include /* Application-specific. */ @@ -589,6 +613,11 @@ static const CONFIG_STR_TABLE str_table[] = { 0, }; + /* + * Sender options. + */ +static int sm_sendopts; + /* * Silly little macros (SLMs). */ @@ -788,6 +817,14 @@ static void enqueue(const int flags, const char *encoding, * With "sendmail -N", instead of a per-message NOTIFY record we store one * per recipient so that we can simplify the implementation somewhat. */ + if (sm_sendopts) + rec_fprintf(dst, REC_TYPE_SIZE, 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) sm_sendopts); if (dsn_envid) rec_fprintf(dst, REC_TYPE_ATTR, "%s=%s", MAIL_ATTR_DSN_ENVID, dsn_envid); @@ -1251,7 +1288,20 @@ int main(int argc, char **argv) break; case 'N': if ((dsn_notify = dsn_notify_mask(optarg)) == 0) - msg_warn("bad -N option value -- ignored"); + msg_warn("bad -N option value: '%s' -- ignored", optarg); + break; + case 'O': + /* NOOP is used to implement ${requiretls} in pipe(8). */ + if (strcasecmp(optarg, "REQUIRETLS") == 0) { + sm_sendopts |= SOPT_REQUIRETLS_ESMTP; + if (var_requiretls_enable == 0) + msg_warn("'-O requiretls' was requested, but the " + "configuration is 'requiretls_enable = no'"); + } else if (strcasecmp(optarg, "SMTPUTF8") == 0) { + sm_sendopts |= SOPT_SMTPUTF8_REQUESTED; + } else if (strcasecmp(optarg, "NOOP") != 0) { + msg_warn("bad -O option value: '%s' -- ignored", optarg); + } break; case 'R': if ((dsn_ret = dsn_ret_code(optarg)) == 0) diff --git a/postfix/src/smtp/Makefile.in b/postfix/src/smtp/Makefile.in index 44add46b2..801e7ee0e 100644 --- a/postfix/src/smtp/Makefile.in +++ b/postfix/src/smtp/Makefile.in @@ -84,6 +84,7 @@ smtp.o: ../../include/deliver_request.h smtp.o: ../../include/delivered_hdr.h smtp.o: ../../include/dict.h smtp.o: ../../include/dns.h +smtp.o: ../../include/domain_list.h smtp.o: ../../include/dsn.h smtp.o: ../../include/dsn_buf.h smtp.o: ../../include/ext_prop.h @@ -134,6 +135,7 @@ smtp_addr.o: ../../include/check_arg.h smtp_addr.o: ../../include/deliver_request.h smtp_addr.o: ../../include/dict.h smtp_addr.o: ../../include/dns.h +smtp_addr.o: ../../include/domain_list.h smtp_addr.o: ../../include/dsn.h smtp_addr.o: ../../include/dsn_buf.h smtp_addr.o: ../../include/header_body_checks.h @@ -178,6 +180,7 @@ smtp_chat.o: ../../include/cleanup_user.h smtp_chat.o: ../../include/deliver_request.h smtp_chat.o: ../../include/dict.h smtp_chat.o: ../../include/dns.h +smtp_chat.o: ../../include/domain_list.h smtp_chat.o: ../../include/dsn.h smtp_chat.o: ../../include/dsn_buf.h smtp_chat.o: ../../include/dsn_util.h @@ -229,6 +232,7 @@ smtp_connect.o: ../../include/deliver_pass.h smtp_connect.o: ../../include/deliver_request.h smtp_connect.o: ../../include/dict.h smtp_connect.o: ../../include/dns.h +smtp_connect.o: ../../include/domain_list.h smtp_connect.o: ../../include/dsn.h smtp_connect.o: ../../include/dsn_buf.h smtp_connect.o: ../../include/header_body_checks.h @@ -284,6 +288,7 @@ smtp_key.o: ../../include/check_arg.h smtp_key.o: ../../include/deliver_request.h smtp_key.o: ../../include/dict.h smtp_key.o: ../../include/dns.h +smtp_key.o: ../../include/domain_list.h smtp_key.o: ../../include/dsn.h smtp_key.o: ../../include/dsn_buf.h smtp_key.o: ../../include/header_body_checks.h @@ -321,6 +326,7 @@ smtp_map11.o: ../../include/check_arg.h smtp_map11.o: ../../include/deliver_request.h smtp_map11.o: ../../include/dict.h smtp_map11.o: ../../include/dns.h +smtp_map11.o: ../../include/domain_list.h smtp_map11.o: ../../include/dsn.h smtp_map11.o: ../../include/dsn_buf.h smtp_map11.o: ../../include/header_body_checks.h @@ -361,6 +367,7 @@ smtp_misc.o: ../../include/check_arg.h smtp_misc.o: ../../include/deliver_request.h smtp_misc.o: ../../include/dict.h smtp_misc.o: ../../include/dns.h +smtp_misc.o: ../../include/domain_list.h smtp_misc.o: ../../include/dsn.h smtp_misc.o: ../../include/dsn_buf.h smtp_misc.o: ../../include/ext_prop.h @@ -404,6 +411,7 @@ smtp_proto.o: ../../include/defer.h smtp_proto.o: ../../include/deliver_request.h smtp_proto.o: ../../include/dict.h smtp_proto.o: ../../include/dns.h +smtp_proto.o: ../../include/domain_list.h smtp_proto.o: ../../include/dsn.h smtp_proto.o: ../../include/dsn_buf.h smtp_proto.o: ../../include/dsn_mask.h @@ -470,6 +478,7 @@ smtp_rcpt.o: ../../include/deliver_completed.h smtp_rcpt.o: ../../include/deliver_request.h smtp_rcpt.o: ../../include/dict.h smtp_rcpt.o: ../../include/dns.h +smtp_rcpt.o: ../../include/domain_list.h smtp_rcpt.o: ../../include/dsn.h smtp_rcpt.o: ../../include/dsn_buf.h smtp_rcpt.o: ../../include/dsn_mask.h @@ -510,6 +519,7 @@ smtp_reuse.o: ../../include/check_arg.h smtp_reuse.o: ../../include/deliver_request.h smtp_reuse.o: ../../include/dict.h smtp_reuse.o: ../../include/dns.h +smtp_reuse.o: ../../include/domain_list.h smtp_reuse.o: ../../include/dsn.h smtp_reuse.o: ../../include/dsn_buf.h smtp_reuse.o: ../../include/header_body_checks.h @@ -551,6 +561,7 @@ smtp_sasl_auth_cache.o: ../../include/deliver_request.h smtp_sasl_auth_cache.o: ../../include/dict.h smtp_sasl_auth_cache.o: ../../include/dict_proxy.h smtp_sasl_auth_cache.o: ../../include/dns.h +smtp_sasl_auth_cache.o: ../../include/domain_list.h smtp_sasl_auth_cache.o: ../../include/dsn.h smtp_sasl_auth_cache.o: ../../include/dsn_buf.h smtp_sasl_auth_cache.o: ../../include/dsn_util.h @@ -591,6 +602,7 @@ smtp_sasl_glue.o: ../../include/check_arg.h smtp_sasl_glue.o: ../../include/deliver_request.h smtp_sasl_glue.o: ../../include/dict.h smtp_sasl_glue.o: ../../include/dns.h +smtp_sasl_glue.o: ../../include/domain_list.h smtp_sasl_glue.o: ../../include/dsn.h smtp_sasl_glue.o: ../../include/dsn_buf.h smtp_sasl_glue.o: ../../include/header_body_checks.h @@ -636,6 +648,7 @@ smtp_sasl_proto.o: ../../include/check_arg.h smtp_sasl_proto.o: ../../include/deliver_request.h smtp_sasl_proto.o: ../../include/dict.h smtp_sasl_proto.o: ../../include/dns.h +smtp_sasl_proto.o: ../../include/domain_list.h smtp_sasl_proto.o: ../../include/dsn.h smtp_sasl_proto.o: ../../include/dsn_buf.h smtp_sasl_proto.o: ../../include/header_body_checks.h @@ -677,6 +690,7 @@ smtp_session.o: ../../include/debug_peer.h smtp_session.o: ../../include/deliver_request.h smtp_session.o: ../../include/dict.h smtp_session.o: ../../include/dns.h +smtp_session.o: ../../include/domain_list.h smtp_session.o: ../../include/dsn.h smtp_session.o: ../../include/dsn_buf.h smtp_session.o: ../../include/header_body_checks.h @@ -717,6 +731,7 @@ smtp_state.o: ../../include/debug_peer.h smtp_state.o: ../../include/deliver_request.h smtp_state.o: ../../include/dict.h smtp_state.o: ../../include/dns.h +smtp_state.o: ../../include/domain_list.h smtp_state.o: ../../include/dsn.h smtp_state.o: ../../include/dsn_buf.h smtp_state.o: ../../include/header_body_checks.h @@ -757,6 +772,7 @@ smtp_tls_policy.o: ../../include/ctable.h smtp_tls_policy.o: ../../include/deliver_request.h smtp_tls_policy.o: ../../include/dict.h smtp_tls_policy.o: ../../include/dns.h +smtp_tls_policy.o: ../../include/domain_list.h smtp_tls_policy.o: ../../include/dsn.h smtp_tls_policy.o: ../../include/dsn_buf.h smtp_tls_policy.o: ../../include/header_body_checks.h @@ -799,6 +815,7 @@ smtp_tlsrpt.o: ../../include/check_arg.h smtp_tlsrpt.o: ../../include/deliver_request.h smtp_tlsrpt.o: ../../include/dict.h smtp_tlsrpt.o: ../../include/dns.h +smtp_tlsrpt.o: ../../include/domain_list.h smtp_tlsrpt.o: ../../include/dsn.h smtp_tlsrpt.o: ../../include/dsn_buf.h smtp_tlsrpt.o: ../../include/header_body_checks.h @@ -843,6 +860,7 @@ smtp_trouble.o: ../../include/deliver_completed.h smtp_trouble.o: ../../include/deliver_request.h smtp_trouble.o: ../../include/dict.h smtp_trouble.o: ../../include/dns.h +smtp_trouble.o: ../../include/domain_list.h smtp_trouble.o: ../../include/dsn.h smtp_trouble.o: ../../include/dsn_buf.h smtp_trouble.o: ../../include/header_body_checks.h @@ -884,6 +902,7 @@ smtp_unalias.o: ../../include/check_arg.h smtp_unalias.o: ../../include/deliver_request.h smtp_unalias.o: ../../include/dict.h smtp_unalias.o: ../../include/dns.h +smtp_unalias.o: ../../include/domain_list.h smtp_unalias.o: ../../include/dsn.h smtp_unalias.o: ../../include/dsn_buf.h smtp_unalias.o: ../../include/header_body_checks.h diff --git a/postfix/src/smtp/lmtp_params.c b/postfix/src/smtp/lmtp_params.c index b77500326..8dfc5ace9 100644 --- a/postfix/src/smtp/lmtp_params.c +++ b/postfix/src/smtp/lmtp_params.c @@ -68,6 +68,7 @@ VAR_HFROM_FORMAT, DEF_HFROM_FORMAT, &var_hfrom_format, 1, 0, VAR_USE_SRV_LOOKUP, DEF_USE_SRV_LOOKUP, &var_use_srv_lookup, 0, 0, VAR_LMTP_TLSRPT_SOCKNAME, DEF_LMTP_TLSRPT_SOCKNAME, &var_smtp_tlsrpt_sockname, 0, 0, + VAR_LMTP_ENFORCE_REQUIRETLS, DEF_LMTP_ENFORCE_REQUIRETLS, &var_smtp_enforce_requiretls, 0, 0, 0, }; static const CONFIG_TIME_TABLE lmtp_time_table[] = { diff --git a/postfix/src/smtp/smtp.c b/postfix/src/smtp/smtp.c index e92696c75..a70b82280 100644 --- a/postfix/src/smtp/smtp.c +++ b/postfix/src/smtp/smtp.c @@ -172,7 +172,7 @@ /* RFC 6531 (Internationalized SMTP) /* RFC 6533 (Internationalized Delivery Status Notifications) /* RFC 7672 (SMTP security via opportunistic DANE TLS) -/* RFC 8689 (TLS-Required message header) +/* RFC 8689 (SMTP REQUIRETLS extension) /* DIAGNOSTICS /* Problems and transactions are logged to \fBsyslogd\fR(8) /* or \fBpostlogd\fR(8). @@ -453,7 +453,7 @@ /* .IP "\fBsmtp_sasl_password_result_delimiter (:)\fR" /* The delimiter between username and password in sasl_passwd_maps lookup /* results. -/* STARTTLS SUPPORT CONTROLS +/* TLS SUPPORT CONTROLS /* .ad /* .fi /* Detailed information about STARTTLS configuration may be found @@ -654,7 +654,16 @@ /* .IP "\fBtls_required_enable (yes)\fR" /* Enable support for the "TLS-Required: no" message header, defined /* in RFC 8689. -/* OBSOLETE STARTTLS CONTROLS +/* .IP "\fBrequiretls_enable (yes)\fR" +/* Enable support for the ESMTP verb "REQUIRETLS", defined in RFC +/* 8689. +/* .IP "\fBsmtp_enforce_requiretls (empty)\fR" +/* An optional list of next-hop destinations that the Postfix +/* SMTP/LMTP client will enforce REQUIRETLS for, when a message was +/* received with the REQUIRETLS option: the next-hop server must offer +/* a matching TLS server certificate, and the server must announce +/* REQUIRETLS support). +/* OBSOLETE TLS CONTROLS /* .ad /* .fi /* The following configuration parameters exist for compatibility @@ -1021,6 +1030,8 @@ #include #include #include +#include +#include /* DNS library. */ @@ -1165,6 +1176,7 @@ bool var_allow_srv_fallback; bool var_smtp_tlsrpt_enable; char *var_smtp_tlsrpt_sockname; bool var_smtp_tlsrpt_skip_reused_hs; +char *var_smtp_enforce_requiretls; /* Special handling of 535 AUTH errors. */ char *var_smtp_sasl_auth_cache_name; @@ -1192,6 +1204,7 @@ HBC_CHECKS *smtp_body_checks; /* limited body checks */ SMTP_CLI_ATTR smtp_cli_attr; /* parsed command-line */ int smtp_hfrom_format; /* postmaster notifications */ STRING_LIST *smtp_use_srv_lookup; +DOMAIN_LIST *smtp_enforce_requiretls; #ifdef USE_TLS @@ -1693,6 +1706,23 @@ static void pre_init(char *unused_name, char **unused_argv) if (*var_smtp_dns_re_filter) dns_rr_filter_compile(VAR_LMTP_SMTP(DNS_RE_FILTER), var_smtp_dns_re_filter); + + /* + * REQUIRETLS enforcement uses a match list. No MATCH_FLAG_RETURN after + * table lookup error, because fail-open is not a good option. We would + * have to defer all delivery requests anyway. Disable /file/name magic + * for LMTP, because that would break the handling of UNIX-domain socket + * pathnames. + */ + if (var_requiretls_enable && *var_smtp_enforce_requiretls) { + int flags = smtp_mode ? 0 : MATCH_FLAG_NOFILE; + const char *param_name = VAR_LMTP_SMTP(ENFORCE_REQUIRETLS); + + smtp_enforce_requiretls = + domain_list_init(param_name, + match_parent_style(param_name) | flags, + var_smtp_enforce_requiretls); + } } /* pre_accept - see if tables have changed */ diff --git a/postfix/src/smtp/smtp.h b/postfix/src/smtp/smtp.h index 8c5ee0a0f..9f36daeec 100644 --- a/postfix/src/smtp/smtp.h +++ b/postfix/src/smtp/smtp.h @@ -32,6 +32,7 @@ #include #include #include +#include /* * Postfix TLS library. @@ -200,6 +201,7 @@ typedef struct SMTP_STATE { #ifdef USE_TLSRPT struct TLSRPT_WRAPPER *tlsrpt; #endif + int enforce_requiretls; /* from smtp_enforce_requiretls */ #endif /* @@ -286,6 +288,7 @@ typedef struct SMTP_STATE { #define SMTP_FEATURE_XFORWARD_IDENT (1<<20) #define SMTP_FEATURE_SMTPUTF8 (1<<21) /* RFC 6531 */ #define SMTP_FEATURE_FROM_PROXY (1<<22) /* proxied connection */ +#define SMTP_FEATURE_REQUIRETLS (1<<23) /* RFC 8689 */ /* * Features that passivate under the endpoint. @@ -358,6 +361,7 @@ extern STRING_LIST *smtp_use_srv_lookup;/* services with SRV record lookup */ extern TLS_APPL_STATE *smtp_tls_ctx; /* client-side TLS engine */ extern int smtp_tls_insecure_mx_policy; /* DANE post insecure MX? */ +extern DOMAIN_LIST *smtp_enforce_requiretls; /* parsed list */ #endif @@ -637,8 +641,9 @@ extern void smtp_rcpt_done(SMTP_STATE *, SMTP_RESP *, RECIPIENT *); /* * smtp_trouble.c */ -#define SMTP_THROTTLE 1 -#define SMTP_NOTHROTTLE 0 +#define SMTP_MISC_FAIL_NONE 0 +#define SMTP_MISC_FAIL_THROTTLE (1<<0) +#define SMTP_MISC_FAIL_SOFT_NON_FINAL (1<<1) extern int smtp_sess_fail(SMTP_STATE *); extern int PRINTFLIKE(5, 6) smtp_misc_fail(SMTP_STATE *, int, const char *, SMTP_RESP *, const char *,...); @@ -648,9 +653,9 @@ extern void PRINTFLIKE(5, 6) smtp_rcpt_fail(SMTP_STATE *, RECIPIENT *, extern int smtp_stream_except(SMTP_STATE *, int, const char *); #define smtp_site_fail(state, mta, resp, ...) \ - smtp_misc_fail((state), SMTP_THROTTLE, (mta), (resp), __VA_ARGS__) + smtp_misc_fail((state), SMTP_MISC_FAIL_THROTTLE, (mta), (resp), __VA_ARGS__) #define smtp_mesg_fail(state, mta, resp, ...) \ - smtp_misc_fail((state), SMTP_NOTHROTTLE, (mta), (resp), __VA_ARGS__) + smtp_misc_fail((state), SMTP_MISC_FAIL_NONE, (mta), (resp), __VA_ARGS__) /* * smtp_unalias.c diff --git a/postfix/src/smtp/smtp_connect.c b/postfix/src/smtp/smtp_connect.c index 2bfff1c93..ff5efea27 100644 --- a/postfix/src/smtp/smtp_connect.c +++ b/postfix/src/smtp/smtp_connect.c @@ -106,6 +106,7 @@ #include #include #include +#include /* DNS library. */ @@ -515,19 +516,32 @@ static int smtp_get_effective_tls_level(DSN_BUF *why, SMTP_STATE *state) } /* - * If the sender requires verified TLS, the TLS level must enforce a - * server certificate match. + * If the sender requires TLS with server certificate verification, the + * TLS level must enforce a server certificate match. */ -#if 0 - else if ((state->request->sendopts & SOPT_REQUIRETLS_ESMTP)) { + else if (var_requiretls_enable + && (state->request->sendopts & SOPT_REQUIRETLS_ESMTP)) { if (TLS_MUST_MATCH(tls->level) == 0) { - dsb_simple(why, "5.7.10", "Sender requires verified TLS, " - " but my configured TLS security level is '%s %s'", - var_mail_name, str_tls_level(tls->level)); - return (0); + if (state->enforce_requiretls) { + dsb_simple(why, "5.7.10", "REQUIRETLS Failure: Sender " + "requires a TLS server certificate match, " + "but the configured %s TLS security level '%s' " + "does not support that. The last attempted " + "server was %s", + var_mail_name, str_tls_level(tls->level), + STR(iter->host)); + return (0); + } else { + msg_info("REQUIRETLS Debug: Sender requires a TLS server " + "certificate match, but the configured %s TLS " + "security level '%s' does not support that. " + "The last attempted server was %s", + var_mail_name, str_tls_level(tls->level), + STR(iter->host)); + return (0); + } } } -#endif /* * Otherwise, if the TLS level is not TLS_LEV_NONE or some non-level, and @@ -574,6 +588,18 @@ static void smtp_connect_local(SMTP_STATE *state, const char *path) if (state->misc_flags & SMTP_MISC_FLAG_CONN_CACHE_MASK) SET_SCACHE_REQUEST_NEXTHOP(state, path); + /* + * REQUIRETLS enforcement is based on the UNIX-domain pathname, without + * the "unix:" prefix. + */ +#ifdef USE_TLS + state->enforce_requiretls = + (var_requiretls_enable + && smtp_enforce_requiretls + && (state->request->sendopts & SOPT_REQUIRETLS_ESMTP) != 0 + && domain_list_match(smtp_enforce_requiretls, path)); +#endif + /* * Here we ensure that the iter->addr member refers to a copy of the * UNIX-domain pathname, so that smtp_save_session() will cache the @@ -978,6 +1004,18 @@ static void smtp_connect_inet(SMTP_STATE *state, const char *nexthop, state->tlsrpt = 0; #endif /* USE_TLSRPT */ + /* + * REQUIRETLS enforcement is based on the next-hop domain name + * without the service or port. + */ +#ifdef USE_TLS + state->enforce_requiretls = + (var_requiretls_enable + && smtp_enforce_requiretls + && (state->request->sendopts & SOPT_REQUIRETLS_ESMTP) != 0 + && domain_list_match(smtp_enforce_requiretls, domain)); +#endif + /* * Resolve an SMTP or LMTP server. Skip MX or SRV lookups when a * quoted domain is specified or when DNS lookups are disabled. diff --git a/postfix/src/smtp/smtp_params.c b/postfix/src/smtp/smtp_params.c index 6d80ef105..65940a61a 100644 --- a/postfix/src/smtp/smtp_params.c +++ b/postfix/src/smtp/smtp_params.c @@ -69,6 +69,7 @@ VAR_HFROM_FORMAT, DEF_HFROM_FORMAT, &var_hfrom_format, 1, 0, VAR_USE_SRV_LOOKUP, DEF_USE_SRV_LOOKUP, &var_use_srv_lookup, 0, 0, VAR_SMTP_TLSRPT_SOCKNAME, DEF_SMTP_TLSRPT_SOCKNAME, &var_smtp_tlsrpt_sockname, 0, 0, + VAR_SMTP_ENFORCE_REQUIRETLS, DEF_SMTP_ENFORCE_REQUIRETLS, &var_smtp_enforce_requiretls, 0, 0, 0, }; static const CONFIG_TIME_TABLE smtp_time_table[] = { diff --git a/postfix/src/smtp/smtp_proto.c b/postfix/src/smtp/smtp_proto.c index df2f74391..2f71a926a 100644 --- a/postfix/src/smtp/smtp_proto.c +++ b/postfix/src/smtp/smtp_proto.c @@ -604,6 +604,10 @@ int smtp_helo(SMTP_STATE *state) /* Ignored later if we already sent STARTTLS. */ if ((discard_mask & EHLO_MASK_STARTTLS) == 0) session->features |= SMTP_FEATURE_STARTTLS; + } else if (strcasecmp(word, "REQUIRETLS") == 0) { + if ((discard_mask & EHLO_MASK_REQUIRETLS) == 0 + && (state->misc_flags & SMTP_MISC_FLAG_IN_STARTTLS)) + session->features |= SMTP_FEATURE_REQUIRETLS; #endif #ifdef USE_SASL_AUTH } else if (var_smtp_sasl_enable @@ -661,7 +665,8 @@ int smtp_helo(SMTP_STATE *state) */ if ((session->features & SMTP_FEATURE_SMTPUTF8) == 0 && DELIVERY_REQUIRES_SMTPUTF8) - return (smtp_mesg_fail(state, DSN_BY_LOCAL_MTA, + return (smtp_misc_fail(state, SMTP_MISC_FAIL_SOFT_NON_FINAL, + DSN_BY_LOCAL_MTA, SMTP_RESP_FAKE(&fake, "5.6.7"), "SMTPUTF8 is required, " "but was not offered by host %s", @@ -679,6 +684,35 @@ int smtp_helo(SMTP_STATE *state) session->features |= SMTP_FEATURE_8BITMIME; } + /* + * Require that the server announces REQUIRETLS when the sender requested + * REQUIRETLS. Return the message as undeliverable only when there are no + * more alternative MX hosts. + */ +#ifdef USE_TLS + if (var_requiretls_enable + && (request->sendopts & SOPT_REQUIRETLS_ESMTP) != 0 + && (state->misc_flags & SMTP_MISC_FLAG_IN_STARTTLS) != 0 + && (session->features & SMTP_FEATURE_REQUIRETLS) == 0) { + if (state->enforce_requiretls) { + return (smtp_misc_fail(state, SMTP_MISC_FAIL_SOFT_NON_FINAL, + DSN_BY_LOCAL_MTA, + SMTP_RESP_FAKE(&fake, "5.7.30"), + "REQUIRETLS Failure: Sender requested " + "delivery wth REQUIRETLS, but no mail " + "server was found with REQUIRETLS " + "support. The last attempted server " + "was %s", session->namaddr)); + } else { + msg_info("REQUIRETLS Debug: Sender requested delivery wth " + "REQUIRETLS, but no mail server was found with " + "REQUIRETLS support. The last attempted server was " + "%s", session->namaddr); + } + + } +#endif + /* * We use SMTP command pipelining if the server said it supported it. * Since we use blocking I/O, RFC 2197 says that we should inspect the @@ -1143,7 +1177,7 @@ static int smtp_start_tls(SMTP_STATE *state) if (PLAINTEXT_FALLBACK_OK_AFTER_STARTTLS_FAILURE) RETRY_AS_PLAINTEXT; return (smtp_misc_fail(state, state->tls->level == TLS_LEV_MAY ? - SMTP_NOTHROTTLE : SMTP_THROTTLE, + SMTP_MISC_FAIL_NONE : SMTP_MISC_FAIL_THROTTLE, DSN_BY_LOCAL_MTA, SMTP_RESP_FAKE(&fake, "4.7.5"), "Cannot start TLS: handshake failure")); @@ -1188,6 +1222,31 @@ static int smtp_start_tls(SMTP_STATE *state) } } #endif + + /* + * Require a server certificate match when the sender requested + * REQUIRETLS. Return the message as undeliverable only when + * there are no more alternative MX hosts. + */ + if (var_requiretls_enable + && (state->request->sendopts & SOPT_REQUIRETLS_ESMTP)) { + if (state->enforce_requiretls) { + return (smtp_misc_fail(state, SMTP_MISC_FAIL_SOFT_NON_FINAL, + DSN_BY_LOCAL_MTA, + SMTP_RESP_FAKE(&fake, "5.7.10"), + "REQUIRETLS Failure: Sender " + "requested a TLS server " + "certificate match, but no " + "match was found. The last " + "attempted server was %s", + session->namaddr)); + } else { + msg_info("REQUIRETLS Debug: Sender requested a TLS " + "server certificate match, but no match was " + "found. The last attempted server was %s", + session->namaddr); + } + } return (smtp_site_fail(state, DSN_BY_LOCAL_MTA, SMTP_RESP_FAKE(&fake, "4.7.5"), "Server certificate not verified")); @@ -1778,7 +1837,22 @@ static int smtp_loop(SMTP_STATE *state, NOCLOBBER int send_state, if ((session->features & SMTP_FEATURE_SMTPUTF8) != 0 && (request->sendopts & SMTPUTF8_FLAG_REQUESTED) != 0) vstring_strcat(next_command, " SMTPUTF8"); - /* TODO(wietse) REQUIRETLS. */ + + /* + * Request REQUIRETLS when the remote SMTP server supports + * REQUIRETLS and the sender requested REQUIRETLS. + */ +#ifdef USE_TLS + if (var_requiretls_enable + && (request->sendopts & SOPT_REQUIRETLS_ESMTP) != 0) { + if ((session->features & SMTP_FEATURE_REQUIRETLS) != 0) + vstring_strcat(next_command, " REQUIRETLS"); + else if (state->enforce_requiretls) + msg_panic("Can't happen: must enforce REQUIRETLS, but " + "host %s did not announce REQUIRETLS support", + session->namaddr); + } +#endif /* * We authenticate the local MTA only, but not the sender. diff --git a/postfix/src/smtp/smtp_state.c b/postfix/src/smtp/smtp_state.c index ec8cc2df3..42f7dc7ba 100644 --- a/postfix/src/smtp/smtp_state.c +++ b/postfix/src/smtp/smtp_state.c @@ -82,6 +82,9 @@ SMTP_STATE *smtp_state_alloc(void) state->iterator->saved_dest = vstring_alloc(100); #ifdef USE_TLSRPT state->tlsrpt = 0; +#endif +#ifdef USE_TLS + state->enforce_requiretls = 0; #endif if (var_smtp_cache_conn) { state->dest_label = vstring_alloc(10); diff --git a/postfix/src/smtp/smtp_trouble.c b/postfix/src/smtp/smtp_trouble.c index 60880df6a..b5834c6fa 100644 --- a/postfix/src/smtp/smtp_trouble.c +++ b/postfix/src/smtp/smtp_trouble.c @@ -33,9 +33,9 @@ /* int exception; /* const char *description; /* AUXILIARY FUNCTIONS -/* int smtp_misc_fail(state, throttle, mta_name, resp, format, ...) +/* int smtp_misc_fail(state, flags, mta_name, resp, format, ...) /* SMTP_STATE *state; -/* int throttle; +/* int flags; /* const char *mta_name; /* SMTP_RESP *resp; /* const char *format; @@ -91,8 +91,11 @@ /* /* smtp_misc_fail() provides a more detailed interface than /* smtp_site_fail() and smtp_mesg_fail(), which are convenience -/* wrappers around smtp_misc_fail(). The throttle argument -/* is either SMTP_THROTTLE or SMTP_NOTHROTTLE; it is used only +/* wrappers around smtp_misc_fail(). The flags argument is either +/* SMTP_MISC_FAIL_NONE or the bitwise OR of SMTP_MISC_FAIL_THROTTLE +/* (throttle the destination) and/or SMTP_MISC_FAIL_SOFT_NON_FINAL +/* (if the server was not the last one to try, treat a hard error +/* as a soft error); SMTP_MISC_FAIL_THROTTLE is used only /* in the "soft error, final server" policy, and determines /* whether a destination will be marked as problematic. /* @@ -210,7 +213,7 @@ static void smtp_check_code(SMTP_SESSION *session, int code) /* smtp_bulk_fail - skip, defer or bounce recipients, maybe throttle queue */ -static int smtp_bulk_fail(SMTP_STATE *state, int throttle_queue) +static int smtp_bulk_fail(SMTP_STATE *state, int flags) { DELIVER_REQUEST *request = state->request; SMTP_SESSION *session = state->session; @@ -220,8 +223,21 @@ static int smtp_bulk_fail(SMTP_STATE *state, int throttle_queue) int aggregate_status; int soft_error = (STR(why->status)[0] == '4'); int soft_bounce_error = (STR(why->status)[0] == '5' && var_soft_bounce); + int throttle_queue = (flags & SMTP_MISC_FAIL_THROTTLE); int nrcpt; + /* + * Sanity check. + */ + if ((flags & SMTP_MISC_FAIL_SOFT_NON_FINAL) != 0) { + if (soft_error) { + msg_warn("smtp_bulk_fail: ignoring SMTP_MISC_FAIL_SOFT_NON_FINAL " + "for a soft error"); + } else { + soft_error = (state->misc_flags & SMTP_MISC_FLAG_FINAL_SERVER) == 0; + } + } + /* * Don't defer the recipients just yet when this error qualifies them for * delivery to a backup server. Just log something informative to show @@ -302,7 +318,7 @@ int smtp_sess_fail(SMTP_STATE *state) * because this error information is collected by a routine that * terminates BEFORE the error is reported. */ - return (smtp_bulk_fail(state, SMTP_THROTTLE)); + return (smtp_bulk_fail(state, SMTP_MISC_FAIL_THROTTLE)); } /* vsmtp_fill_dsn - fill in temporary DSN structure */ @@ -342,7 +358,7 @@ static void vsmtp_fill_dsn(SMTP_STATE *state, const char *mta_name, /* smtp_misc_fail - maybe throttle queue; skip/defer/bounce all recipients */ -int smtp_misc_fail(SMTP_STATE *state, int throttle, const char *mta_name, +int smtp_misc_fail(SMTP_STATE *state, int flags, const char *mta_name, SMTP_RESP *resp, const char *format,...) { va_list ap; @@ -360,7 +376,7 @@ int smtp_misc_fail(SMTP_STATE *state, int throttle, const char *mta_name, /* * Skip, defer or bounce recipients, and throttle this queue. */ - return (smtp_bulk_fail(state, throttle)); + return (smtp_bulk_fail(state, flags)); } /* smtp_rcpt_fail - skip, defer, or bounce recipient */ @@ -472,5 +488,5 @@ int smtp_stream_except(SMTP_STATE *state, int code, const char *description) * falling back to plaintext, because RETRY_AS_PLAINTEXT clears the * FINAL_SERVER flag. */ - return (smtp_bulk_fail(state, SMTP_THROTTLE)); + return (smtp_bulk_fail(state, SMTP_MISC_FAIL_THROTTLE)); } diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c index 9c11b18ca..649bede99 100644 --- a/postfix/src/smtpd/smtpd.c +++ b/postfix/src/smtpd/smtpd.c @@ -57,6 +57,7 @@ /* RFC 6531 (Internationalized SMTP) /* RFC 6533 (Internationalized Delivery Status Notifications) /* RFC 7505 ("Null MX" No Service Resource Record) +/* RFC 8689 (SMTP REQUIRETLS extension) /* DIAGNOSTICS /* Problems and transactions are logged to \fBsyslogd\fR(8) /* or \fBpostlogd\fR(8). @@ -370,7 +371,7 @@ /* .IP "\fBsmtpd_sasl_mechanism_filter (!external, static:rest)\fR" /* If non-empty, a filter for the SASL mechanism names that the /* Postfix SMTP server will announce in the EHLO response. -/* STARTTLS SUPPORT CONTROLS +/* TLS SUPPORT CONTROLS /* .ad /* .fi /* Detailed information about STARTTLS configuration may be @@ -544,7 +545,12 @@ /* Request that remote SMTP clients send an RFC7250 raw public key /* instead of an X.509 certificate, when asking for or requiring client /* authentication. -/* OBSOLETE STARTTLS CONTROLS +/* .PP +/* Available in Postfix version 3.10 and later: +/* .IP "\fBrequiretls_enable (yes)\fR" +/* Enable support for the ESMTP verb "REQUIRETLS", defined in RFC +/* 8689. +/* OBSOLETE TLS CONTROLS /* .ad /* .fi /* The following configuration parameters exist for compatibility @@ -2105,6 +2111,11 @@ static int ehlo_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv) EHLO_APPEND(state, "SMTPUTF8"); if ((discard_mask & EHLO_MASK_CHUNKING) == 0) EHLO_APPEND(state, "CHUNKING"); +#ifdef USE_TLS + if (var_requiretls_enable && (discard_mask & EHLO_MASK_REQUIRETLS) == 0 + && state->tls_context != 0) + EHLO_APPEND(state, "REQUIRETLS"); +#endif /* * Send the reply. @@ -2219,7 +2230,8 @@ 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. */ + if (state->flags & SMTPD_FLAG_REQUIRETLS) + cleanup_flags |= CLEANUP_FLAG_REQUIRETLS; state->dest = mail_stream_service(MAIL_CLASS_PUBLIC, var_cleanup_service); if (state->dest == 0 @@ -2679,6 +2691,13 @@ static int mail_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv) && (state->ehlo_discard_mask & EHLO_MASK_SMTPUTF8) == 0 && strcasecmp(arg, "SMTPUTF8") == 0) { /* RFC 6531 */ /* Already processed early. */ ; +#ifdef USE_TLS + } else if (var_requiretls_enable + && state->tls_context != 0 + && (state->ehlo_discard_mask & EHLO_MASK_REQUIRETLS) == 0 + && strcasecmp(arg, "REQUIRETLS") == 0) { /* RFC 8689 */ + state->flags |= SMTPD_FLAG_REQUIRETLS; +#endif #ifdef USE_SASL_AUTH } else if (strncasecmp(arg, "AUTH=", 5) == 0) { if ((err = smtpd_sasl_mail_opt(state, arg + 5)) != 0) { diff --git a/postfix/src/smtpd/smtpd.h b/postfix/src/smtpd/smtpd.h index c049194e2..caa3d0e7d 100644 --- a/postfix/src/smtpd/smtpd.h +++ b/postfix/src/smtpd/smtpd.h @@ -209,6 +209,7 @@ typedef struct { #define SMTPD_FLAG_AUTH_USED (1<<2) /* don't reuse SASL state */ #define SMTPD_FLAG_SMTPUTF8 (1<<3) /* RFC 6531/2 transaction */ #define SMTPD_FLAG_NEED_MILTER_ABORT (1<<4) /* undo milter_mail_event() */ +#define SMTPD_FLAG_REQUIRETLS (1<<5) /* RFC 8689 */ #define SMTPD_NOTE_BARE_LF (1<<0) /* saw at least one bare LF */ diff --git a/postfix/src/util/match_list.c b/postfix/src/util/match_list.c index fa533ba65..01dd37df2 100644 --- a/postfix/src/util/match_list.c +++ b/postfix/src/util/match_list.c @@ -60,6 +60,10 @@ /* Request that match_list_match() logs a warning and returns /* zero (with list->error set to a non-zero dictionary error /* code) instead of raising a fatal run-time error. +/* .IP MATCH_FLAG_NOFILE +/* Disable special handling for /file/name. +/* .IP MATCH_FLAG_NODICT +/* Disable special handling for type:name. /* .RE /* Specify MATCH_FLAG_NONE to request none of the above. /* .IP pattern_list @@ -84,6 +88,9 @@ /* IBM T.J. Watson Research /* P.O. Box 704 /* Yorktown Heights, NY 10598, USA +/* +/* Wietse Venema +/* porcupine.org /*--*/ /* System library. */ @@ -152,7 +159,8 @@ static ARGV *match_list_parse(MATCH_LIST *match_list, ARGV *pat_list, if (*item == 0) /* No graceful degradation for this... */ msg_fatal("%s: no pattern after '!'", match_list->pname); - if (*item == '/') { /* /file/name */ + if (*item == '/' /* /file/name */ + && (match_list->flags & MATCH_FLAG_NOFILE) == 0) { if ((fp = vstream_fopen(item, O_RDONLY, 0)) == 0) { /* Replace unusable pattern with pseudo table. */ vstring_sprintf(buf, "%s:%s", DICT_TYPE_NOFILE, item); @@ -169,7 +177,8 @@ static ARGV *match_list_parse(MATCH_LIST *match_list, ARGV *pat_list, if (vstream_fclose(fp)) msg_fatal("%s: read file %s: %m", myname, item); } - } else if (MATCH_DICTIONARY(item)) { /* type:table */ + } else if (MATCH_DICTIONARY(item) /* type:table */ + &&(match_list->flags & MATCH_FLAG_NODICT) == 0) { vstring_sprintf(buf, "%s%s(%o,%s)", match ? "" : "!", item, OPEN_FLAGS, dict_flags_str(DICT_FLAGS)); map_type_name_flags = STR(buf) + (match == 0); diff --git a/postfix/src/util/match_list.h b/postfix/src/util/match_list.h index d8b779430..e07d273eb 100644 --- a/postfix/src/util/match_list.h +++ b/postfix/src/util/match_list.h @@ -38,8 +38,10 @@ struct MATCH_LIST { #define MATCH_FLAG_NONE 0 #define MATCH_FLAG_PARENT (1<<0) #define MATCH_FLAG_RETURN (1<<1) -#define MATCH_FLAG_ALL (MATCH_FLAG_PARENT | MATCH_FLAG_RETURN) - +#define MATCH_FLAG_NOFILE (1<<2) +#define MATCH_FLAG_NODICT (1<<3) +#define MATCH_FLAG_ALL (MATCH_FLAG_PARENT | MATCH_FLAG_RETURN | \ + MATCH_FLAG_NOFILE | MATCH_FLAG_NODICT) extern MATCH_LIST *match_list_init(const char *, int, const char *, int,...); extern int match_list_match(MATCH_LIST *,...); extern void match_list_free(MATCH_LIST *);