From c6ffa96a8cbbc4e95f3540f4732047b8337cac83 Mon Sep 17 00:00:00 2001 From: Clinton Ebadi Date: Sun, 22 Apr 2018 06:10:07 -0400 Subject: [PATCH] Update base config to exim 4.89 --- ... => 20_exim4-config_local_deny_exceptions} | 37 +- conf.d/acl/30_exim4-config_check_mail | 11 + conf.d/acl/30_exim4-config_check_rcpt | 323 ++++++++++++------ conf.d/acl/40_exim4-config_check_data | 50 ++- conf.d/auth/30_exim4-config_examples | 189 +++++----- conf.d/main/01_exim4-config_listmacrosdefs | 237 ++++++------- conf.d/main/02_exim4-config_options | 99 ++++-- conf.d/main/03_exim4-config_tlsoptions | 36 +- conf.d/main/90_exim4-config_log_selector | 10 + conf.d/retry/30_exim4-config | 13 +- conf.d/rewrite/31_exim4-config_rewriting | 11 +- conf.d/router/100_exim4-config_domain_literal | 2 +- conf.d/router/150_exim4-config_hubbed_hosts | 49 +-- conf.d/router/200_exim4-config_primary | 5 +- conf.d/router/300_exim4-config_real_local | 8 +- conf.d/router/400_exim4-config_system_aliases | 9 +- conf.d/router/500_exim4-config_hubuser | 4 +- conf.d/router/600_exim4-config_userforward | 7 +- conf.d/router/850_exim4-config_lowuid | 29 ++ conf.d/router/900_exim4-config_local_user | 7 +- .../10_exim4-config_transport-macros | 16 + conf.d/transport/30_exim4-config_address_pipe | 4 +- conf.d/transport/30_exim4-config_maildir_home | 6 +- .../transport/30_exim4-config_maildrop_pipe | 2 + conf.d/transport/30_exim4-config_remote_smtp | 46 +++ .../30_exim4-config_remote_smtp_smarthost | 43 ++- .../35_exim4-config_address_directory | 5 +- local_domains.cfg | 1 - update-exim4.conf.conf | 11 +- 29 files changed, 826 insertions(+), 444 deletions(-) rename conf.d/acl/{20_exim4-config_whitelist_local_deny => 20_exim4-config_local_deny_exceptions} (51%) create mode 100644 conf.d/acl/30_exim4-config_check_mail rewrite conf.d/main/01_exim4-config_listmacrosdefs (64%) create mode 100644 conf.d/main/90_exim4-config_log_selector rewrite conf.d/router/150_exim4-config_hubbed_hosts (62%) create mode 100644 conf.d/router/850_exim4-config_lowuid create mode 100644 conf.d/transport/10_exim4-config_transport-macros delete mode 100644 local_domains.cfg diff --git a/conf.d/acl/20_exim4-config_whitelist_local_deny b/conf.d/acl/20_exim4-config_local_deny_exceptions similarity index 51% rename from conf.d/acl/20_exim4-config_whitelist_local_deny rename to conf.d/acl/20_exim4-config_local_deny_exceptions index 99abd27..2372795 100644 --- a/conf.d/acl/20_exim4-config_whitelist_local_deny +++ b/conf.d/acl/20_exim4-config_local_deny_exceptions @@ -1,29 +1,31 @@ -### acl/20_exim4-config_whitelist_local_deny +### acl/20_exim4-config_local_deny_exceptions ################################# # This is used to determine whitelisted senders and hosts. -# It checks for CONFDIR/local_host_whitelist and -# CONFDIR/local_sender_whitelist. +# It checks for CONFDIR/host_local_deny_exceptions and +# CONFDIR/sender_local_deny_exceptions. # # It is meant to be used from some other acl entry. # -# For example, -# deny -# message = local blacklist example -# !acl = acl_whitelist -# dnslist = some.dns.list.example -# will allow messages with envelope sender listed in local_sender_whitelist -# or messages coming in from hosts listed in local_host_whitelist to be -# accepted even if the delivering host is listed in the dns list. -# -# Whitelisting can also be configured by including negative items in the -# black list. See /usr/share/doc/exim4-config/default_acl for details. +# See exim4-config_files(5) for details. # # If the files do not exist, the white list never matches, which is # the desired behaviour. +# +# The old file names CONFDIR/local_host_whitelist and +# CONFDIR/local_sender_whitelist will continue to be honored for a +# transition period. Their use is deprecated. -acl_whitelist_local_deny: +acl_local_deny_exceptions: + accept + hosts = ${if exists{CONFDIR/host_local_deny_exceptions}\ + {CONFDIR/host_local_deny_exceptions}\ + {}} + accept + senders = ${if exists{CONFDIR/sender_local_deny_exceptions}\ + {CONFDIR/sender_local_deny_exceptions}\ + {}} accept hosts = ${if exists{CONFDIR/local_host_whitelist}\ {CONFDIR/local_host_whitelist}\ @@ -37,6 +39,11 @@ acl_whitelist_local_deny: # modify this file. If you do it like we suggest, you'll end up with # a small performance penalty since there is an additional file being # accessed. This doesn't happen if you leave the macro unset. + .ifdef LOCAL_DENY_EXCEPTIONS_LOCAL_ACL_FILE + .include LOCAL_DENY_EXCEPTIONS_LOCAL_ACL_FILE + .endif + + # this is still supported for a transition period and is deprecated. .ifdef WHITELIST_LOCAL_DENY_LOCAL_ACL_FILE .include WHITELIST_LOCAL_DENY_LOCAL_ACL_FILE .endif diff --git a/conf.d/acl/30_exim4-config_check_mail b/conf.d/acl/30_exim4-config_check_mail new file mode 100644 index 0000000..f8c53d6 --- /dev/null +++ b/conf.d/acl/30_exim4-config_check_mail @@ -0,0 +1,11 @@ + +### acl/30_exim4-config_check_mail +################################# + +# This access control list is used for every MAIL command in an incoming +# SMTP message. The tests are run in order until the address is either +# accepted or denied. +# +acl_check_mail: + + accept diff --git a/conf.d/acl/30_exim4-config_check_rcpt b/conf.d/acl/30_exim4-config_check_rcpt index 6c954dc..d616720 100644 --- a/conf.d/acl/30_exim4-config_check_rcpt +++ b/conf.d/acl/30_exim4-config_check_rcpt @@ -7,17 +7,24 @@ # accepted or denied. # acl_check_rcpt: + # Accept if the source is local SMTP (i.e. not over TCP/IP). We do this by # testing for an empty sending host field. accept hosts = : + control = dkim_disable_verify - - # Add missing Date and Message-ID header for relayed messages + # Do not try to verify DKIM signatures of incoming mail if DC_minimaldns + # or DISABLE_DKIM_VERIFY are set. +.ifdef DC_minimaldns warn - hosts = +relay_from_hosts - control = submission/sender_retain - + control = dkim_disable_verify +.else +.ifdef DISABLE_DKIM_VERIFY + warn + control = dkim_disable_verify +.endif +.endif # The following section of the ACL is concerned with local parts that contain # certain non-alphanumeric characters. Dots in unusual places are @@ -38,12 +45,24 @@ acl_check_rcpt: # contain slashes. A pipe symbol can also be troublesome if the local part is # incorporated unthinkingly into a shell command line. # + # These ACL components will block recipient addresses that are valid + # from an RFC2822 point of view. We chose to have them blocked by + # default for security reasons. + # + # If you feel that your site should have less strict recipient + # checking, please feel free to change the default values of the macros + # defined in main/01_exim4-config_listmacrosdefs or override them from a + # local configuration file. + # # Two different rules are used. The first one has a quite strict # default, and is applied to messages that are addressed to one of the # local domains handled by this host. - # If you have local accounts that include strange characters, you can - # use the macro provided to change the ACL range or to disable the - # check completely. + + # The default value of CHECK_RCPT_LOCAL_LOCALPARTS is defined in + # main/01_exim4-config_listmacrosdefs: + # CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%!/|`#&?] + # This blocks local parts that begin with a dot or contain a quite + # broad range of non-alphanumeric characters. .ifdef CHECK_RCPT_LOCAL_LOCALPARTS deny domains = +local_domains @@ -54,6 +73,20 @@ acl_check_rcpt: # The second rule applies to all other domains, and its default is # considerably less strict. + + # The default value of CHECK_RCPT_REMOTE_LOCALPARTS is defined in + # main/01_exim4-config_listmacrosdefs: + # CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%!`#&?] : ^.*/\\.\\./ + + # It allows local users to send outgoing messages to sites + # that use slashes and vertical bars in their local parts. It blocks + # local parts that begin with a dot, slash, or vertical bar, but allows + # these characters within the local part. However, the sequence /../ is + # barred. The use of some other non-alphanumeric characters is blocked. + # Single quotes might probably be dangerous as well, but they're + # allowed by the default regexps to avoid rejecting mails to Ireland. + # The motivation here is to prevent local users (or local users' malware) + # from mounting certain kinds of attack on remote sites. .ifdef CHECK_RCPT_REMOTE_LOCALPARTS deny domains = !+local_domains @@ -71,19 +104,116 @@ acl_check_rcpt: .else local_parts = CHECK_RCPT_POSTMASTER .endif - domains = +local_domains + domains = +local_domains : +relay_to_domains + + + # Deny unless the sender address can be verified. + # + # This is disabled by default so that DNSless systems don't break. If + # your system can do DNS lookups without delay or cost, you might want + # to enable this feature. + # + # This feature does not work in smarthost and satellite setups as + # with these setups all domains pass verification. See spec.txt section + # "Access control lists" subsection "Address verification" with the added + # information that a smarthost/satellite setup routes all non-local e-mail + # to the smarthost. + .ifdef CHECK_RCPT_VERIFY_SENDER + deny + message = Sender verification failed + !acl = acl_local_deny_exceptions + !verify = sender + .endif + + # Verify senders listed in local_sender_callout with a callout. + # + # In smarthost and satellite setups, this causes the callout to be + # done to the smarthost. Verification will thus only be reliable if the + # smarthost does reject illegal addresses in the SMTP dialog. + deny + !acl = acl_local_deny_exceptions + senders = ${if exists{CONFDIR/local_sender_callout}\ + {CONFDIR/local_sender_callout}\ + {}} + !verify = sender/callout + + + # Accept if the message comes from one of the hosts for which we are an + # outgoing relay. It is assumed that such hosts are most likely to be MUAs, + # so we set control=submission to make Exim treat the message as a + # submission. It will fix up various errors in the message, for example, the + # lack of a Date: header line. If you are actually relaying out out from + # MTAs, you may want to disable this. If you are handling both relaying from + # MTAs and submissions from MUAs you should probably split them into two + # lists, and handle them differently. + + # Recipient verification is omitted here, because in many cases the clients + # are dumb MUAs that don't cope well with SMTP error responses. If you are + # actually relaying out from MTAs, you should probably add recipient + # verification here. + + # Note that, by putting this test before any DNS black list checks, you will + # always accept from these hosts, even if they end up on a black list. The + # assumption is that they are your friends, and if they get onto black + # list, it is a mistake. + accept + hosts = +relay_from_hosts + control = submission/sender_retain + control = dkim_disable_verify + + + # Accept if the message arrived over an authenticated connection, from + # any host. Again, these messages are usually from MUAs, so recipient + # verification is omitted, and submission mode is set. And again, we do this + # check before any black list tests. + accept + authenticated = * + control = submission/sender_retain + control = dkim_disable_verify + + # Insist that a HELO/EHLO was accepted. + + require message = nice hosts say HELO first + condition = ${if def:sender_helo_name} + + # Insist that any other recipient address that we accept is either in one of + # our local domains, or is in a domain for which we explicitly allow + # relaying. Any other domain is rejected as being unacceptable for relaying. + require + message = relay not permitted + domains = +local_domains : +relay_to_domains + + + # We also require all accepted addresses to be verifiable. This check will + # do local part verification for local domains, but only check the domain + # for remote domains. + require + verify = recipient + + + # Verify recipients listed in local_rcpt_callout with a callout. + # This is especially handy for forwarding MX hosts (secondary MX or + # mail hubs) of domains that receive a lot of spam to non-existent + # addresses. The only way to check local parts for remote relay + # domains is to use a callout (add /callout), but please read the + # documentation about callouts before doing this. + deny + !acl = acl_local_deny_exceptions + recipients = ${if exists{CONFDIR/local_rcpt_callout}\ + {CONFDIR/local_rcpt_callout}\ + {}} + !verify = recipient/callout - # deny bad senders (envelope sender) # CONFDIR/local_sender_blacklist holds a list of envelope senders that # should have their access denied to the local host. Incoming messages # with one of these senders are rejected at RCPT time. # # The explicit white lists are honored as well as negative items in - # the black list. See /usr/share/doc/exim4-config/default_acl for details. + # the black list. See exim4-config_files(5) for details. deny message = sender envelope address $sender_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster - !acl = acl_whitelist_local_deny + !acl = acl_local_deny_exceptions senders = ${if exists{CONFDIR/local_sender_blacklist}\ {CONFDIR/local_sender_blacklist}\ {}} @@ -96,48 +226,15 @@ acl_check_rcpt: # RCPT statements rejected. # # The explicit white lists are honored as well as negative items in - # the black list. See /usr/share/doc/exim4-config/default_acl for details. + # the black list. See exim4-config_files(5) for details. deny message = sender IP address $sender_host_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster - !acl = acl_whitelist_local_deny + !acl = acl_local_deny_exceptions hosts = ${if exists{CONFDIR/local_host_blacklist}\ {CONFDIR/local_host_blacklist}\ {}} - # Deny unless the sender address can be verified. - # - # This is disabled by default so that DNSless systems don't break. If - # your system can do DNS lookups without delay or cost, you might want - # to enable this feature. - .ifdef CHECK_RCPT_VERIFY_SENDER - deny - message = Sender verification failed - !acl = acl_whitelist_local_deny - !verify = sender - .endif - - # For some sender domains, we do callout to verify if a sender - # exists. - deny - !acl = acl_whitelist_local_deny - senders = ${if exists{CONFDIR/local_sender_callout}\ - {CONFDIR/local_sender_callout}\ - {}} - !verify = sender/callout - - - # For some recipient domains, we do callout to verify if a recipient - # exists. This is especially handy for customers that receive a lot of - # spam to non-existent addresses. - deny - !acl = acl_whitelist_local_deny - recipients = ${if exists{CONFDIR/local_rcpt_callout}\ - {CONFDIR/local_rcpt_callout}\ - {}} - !verify = recipient/callout - - # Warn if the sender host does not have valid reverse DNS. # # If your system can do DNS lookups without delay or cost, you might want @@ -148,9 +245,57 @@ acl_check_rcpt: # as well as outright failures. .ifdef CHECK_RCPT_REVERSE_DNS warn - message = X-Host-Lookup-Failed: Reverse DNS lookup failed for $sender_host_address (${if eq{$host_lookup_failed}{1}{failed}{deferred}}) - condition = ${if and{{def:sender_host_address}{!def:sender_host_name}}\ + condition = ${if and{{def:sender_host_address}{!def:sender_host_name}}\ {yes}{no}} + add_header = X-Host-Lookup-Failed: Reverse DNS lookup failed for $sender_host_address (${if eq{$host_lookup_failed}{1}{failed}{deferred}}) + .endif + + + # Use spfquery to perform a pair of SPF checks (for details, see + # http://www.openspf.org/) + # + # This is quite costly in terms of DNS lookups (~6 lookups per mail). Do not + # enable if that's an issue. Also note that if you enable this, you must + # install "spf-tools-perl" which provides the spfquery command. + # Missing spf-tools-perl will trigger the "Unexpected error in + # SPF check" warning. + .ifdef CHECK_RCPT_SPF + deny + message = [SPF] $sender_host_address is not allowed to send mail from \ + ${if def:sender_address_domain {$sender_address_domain}{$sender_helo_name}}. \ + Please see \ + http://www.openspf.org/Why?scope=${if def:sender_address_domain \ + {mfrom}{helo}};identity=${if def:sender_address_domain \ + {$sender_address}{$sender_helo_name}};ip=$sender_host_address + log_message = SPF check failed. + !acl = acl_local_deny_exceptions + condition = ${run{/usr/bin/spfquery.mail-spf-perl --ip \ + ${quote:$sender_host_address} --identity \ + ${if def:sender_address_domain \ + {--scope mfrom --identity ${quote:$sender_address}}\ + {--scope helo --identity ${quote:$sender_helo_name}}}}\ + {no}{${if eq {$runrc}{1}{yes}{no}}}} + + defer + message = Temporary DNS error while checking SPF record. Try again later. + !acl = acl_local_deny_exceptions + condition = ${if eq {$runrc}{5}{yes}{no}} + + warn + condition = ${if <={$runrc}{6}{yes}{no}} + add_header = Received-SPF: ${if eq {$runrc}{0}{pass}\ + {${if eq {$runrc}{2}{softfail}\ + {${if eq {$runrc}{3}{neutral}\ + {${if eq {$runrc}{4}{permerror}\ + {${if eq {$runrc}{6}{none}{error}}}}}}}}}\ + } client-ip=$sender_host_address; \ + ${if def:sender_address_domain \ + {envelope-from=${sender_address}; }{}}\ + helo=$sender_helo_name + + warn + log_message = Unexpected error in SPF check. + condition = ${if >{$runrc}{6}{yes}{no}} .endif @@ -158,23 +303,27 @@ acl_check_rcpt: # sender IP addresses .ifdef CHECK_RCPT_IP_DNSBLS warn - message = X-Warning: $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - log_message = $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) dnslists = CHECK_RCPT_IP_DNSBLS + add_header = X-Warning: $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) + log_message = $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text) .endif # Check against DNSBLs which list sender domains, with an option to locally - # whitelist certain domains that might be blacklisted. If you want one - # blacklist per domain, you need to replicate the stanza for each DNSBL. + # whitelist certain domains that might be blacklisted. + # + # Note: If you define CHECK_RCPT_DOMAIN_DNSBLS, you must append + # "/$sender_address_domain" after each domain. For example: + # CHECK_RCPT_DOMAIN_DNSBLS = rhsbl.foo.org/$sender_address_domain \ + # : rhsbl.bar.org/$sender_address_domain .ifdef CHECK_RCPT_DOMAIN_DNSBLS warn - message = X-Warning: $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) - log_message = $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) !senders = ${if exists{CONFDIR/local_domain_dnsbl_whitelist}\ {CONFDIR/local_domain_dnsbl_whitelist}\ {}} - dnslists = CHECK_RCPT_DOMAIN_DNSBLS/$sender_address_domain + dnslists = CHECK_RCPT_DOMAIN_DNSBLS + add_header = X-Warning: $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) + log_message = $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text) .endif @@ -187,62 +336,28 @@ acl_check_rcpt: .endif - # Accept if the address is in a local domain, but only if the recipient can - # be verified. Otherwise deny. The "endpass" line is the border between - # passing on to the next ACL statement (if tests above it fail) or denying - # access (if tests below it fail). + ############################################################################# + # This check is commented out because it is recognized that not every + # sysadmin will want to do it. If you enable it, the check performs + # Client SMTP Authorization (csa) checks on the sending host. These checks + # do DNS lookups for SRV records. The CSA proposal is currently (May 2005) + # an Internet draft. You can, of course, add additional conditions to this + # ACL statement to restrict the CSA checks to certain hosts only. # - accept - domains = +local_domains - endpass - message = unknown user - verify = recipient + # require verify = csa + ############################################################################# - # Accept if the address is in a domain for which we are relaying, but again, - # only if the recipient can be verified. - # - # If you want to use the more conservative "unknown user" error - # message in case of a non-existing local part, you might want to - # set CHECK_RCPT_GIVE_UNKNOWN_USER. However, this might reveal - # local information, which is the cause for it not being enabled by - # default. + # Accept if the address is in a domain for which we are an incoming relay, + # but again, only if the recipient can be verified. + accept domains = +relay_to_domains endpass - .ifdef CHECK_RCPT_GIVE_UNKNOWN_USER - message = ${if eq{$acl_verify_message}{Unrouteable address}{unknown user}{$acl_verify_message}} - .else - message = unrouteable address - .endif verify = recipient - ############ - # If control reaches this point, the domain is neither in +local_domains - # nor in +relay_to_domains. - ############ + # At this point, the address has passed all the checks that have been + # configured, so we accept it unconditionally. - # Accept if the message comes from one of the hosts for which we are an - # outgoing relay. Recipient verification is omitted here, because in many - # cases the clients are dumb MUAs that don't cope well with SMTP error - # responses. If you are actually relaying out from MTAs, you should probably - # add recipient verification here. - # - accept - hosts = +relay_from_hosts - - - # Accept if the message arrived over an authenticated connection, from - # any host. Again, these messages are usually from MUAs, so recipient - # verification is omitted. - # accept - authenticated = * - - - # Reaching the end of the ACL causes a "deny", but we might as well give - # an explicit message. - # - deny - message = relay not permitted diff --git a/conf.d/acl/40_exim4-config_check_data b/conf.d/acl/40_exim4-config_check_data index 08c5382..abfa164 100644 --- a/conf.d/acl/40_exim4-config_check_data +++ b/conf.d/acl/40_exim4-config_check_data @@ -2,15 +2,28 @@ ### acl/40_exim4-config_check_data ################################# +# This ACL is used after the contents of a message have been received. This +# is the ACL in which you can test a message's headers or body, and in +# particular, this is where you can invoke external virus or spam scanners. + acl_check_data: + # Deny if the message contains an overlong line. Per the standards + # we should never receive one such via SMTP. + # + .ifndef IGNORE_SMTP_LINE_LENGTH_LIMIT + deny message = maximum allowed line length is 998 octets, \ + got $max_received_linelength + condition = ${if > {$max_received_linelength}{998}} + .endif + # Deny unless the address list headers are syntactically correct. # # If you enable this, you might reject legitimate mail. .ifdef CHECK_DATA_VERIFY_HEADER_SYNTAX deny message = Message headers fail syntax check - !acl = acl_whitelist_local_deny + !acl = acl_local_deny_exceptions !verify = header_syntax .endif @@ -20,11 +33,44 @@ acl_check_data: .ifdef CHECK_DATA_VERIFY_HEADER_SENDER deny message = No verifiable sender address in message headers - !acl = acl_whitelist_local_deny + !acl = acl_local_deny_exceptions !verify = header_sender .endif + # Deny if the message contains malware. Before enabling this check, you + # must install a virus scanner and set the av_scanner option in the + # main configuration. + # + # exim4-daemon-heavy must be used for this section to work. + # + # deny + # malware = * + # message = This message was detected as possible malware ($malware_name). + + + # Add headers to a message if it is judged to be spam. Before enabling this, + # you must install SpamAssassin. You also need to set the spamd_address + # option in the main configuration. + # + # exim4-daemon-heavy must be used for this section to work. + # + # Please note that this is only suiteable as an example. There are + # multiple issues with this configuration method. For example, if you go + # this way, you'll give your spamassassin daemon write access to the + # entire exim spool which might be a security issue in case of a + # spamassassin exploit. + # + # See the exim docs and the exim wiki for more suitable examples. + # + # warn + # spam = Debian-exim:true + # add_header = X-Spam_score: $spam_score\n\ + # X-Spam_score_int: $spam_score_int\n\ + # X-Spam_bar: $spam_bar\n\ + # X-Spam_report: $spam_report + + # This hook allows you to hook in your own ACLs without having to # modify this file. If you do it like we suggest, you'll end up with # a small performance penalty since there is an additional file being diff --git a/conf.d/auth/30_exim4-config_examples b/conf.d/auth/30_exim4-config_examples index 6278da6..b3b1ce6 100644 --- a/conf.d/auth/30_exim4-config_examples +++ b/conf.d/auth/30_exim4-config_examples @@ -2,71 +2,82 @@ ### auth/30_exim4-config_examples ################################# -# The examples below are for server side authentication +# The examples below are for server side authentication, when the +# local exim is SMTP server and clients authenticate to the local exim. # They allow two styles of plain-text authentication against an -# CONFDIR/passwd file which should have user names in the first column -# and crypted passwords in the second. The columns need to be separated -# by ':'. Please note that apache's htpasswd program generates a file -# in the correct format, but uses a different crypt scheme. So, -# htpassword will _NOT_ work for exim4. - -# For CRAM-MD5 exim needs access to the UNENCRYPTED passwd - the example -# below assumes it is available in the third column of CONFDIR/passwd +# CONFDIR/passwd file whose syntax is described in exim4_passwd(5). # Hosts that are allowed to use AUTH are defined by the # auth_advertise_hosts option in the main configuration. The default is # "*", which allows authentication to all hosts over all kinds of # connections if there is at least one authenticator defined here. # Authenticators which rely on unencrypted clear text passwords don't -# advertise on unencrypted connections by default. You can set -# AUTH_SERVER_ALLOW_NOTLS_PASSWORDS to advertise unencrypted clear text -# password based authenticators on all connections. +# advertise on unencrypted connections by default. Thus, it might be +# wise to set up TLS to allow encrypted connections. If TLS cannot be +# used for some reason, you can set AUTH_SERVER_ALLOW_NOTLS_PASSWORDS to +# advertise unencrypted clear text password based authenticators on all +# connections. As this is severely reducing security, using TLS is +# preferred over allowing clear text password based authenticators on +# unencrypted connections. + +# PLAIN authentication has no server prompts. The client sends its +# credentials in one lump, containing an authorization ID (which we do not +# use), an authentication ID, and a password. The latter two appear as +# $auth2 and $auth3 in the configuration and should be checked against a +# valid username and password. In a real configuration you would typically +# use $auth2 as a lookup key, and compare $auth3 against the result of the +# lookup, perhaps using the crypteq{}{} condition. # plain_server: # driver = plaintext # public_name = PLAIN -# server_condition = "${if crypteq{$3}{${extract{1}{:}{${lookup{$2}lsearch{CONFDIR/passwd}{$value}{*:*}}}}}{1}{0}}" -# server_set_id = $2 +# server_condition = "${if crypteq{$auth3}{${extract{1}{:}{${lookup{$auth2}lsearch{CONFDIR/passwd}{$value}{*:*}}}}}{1}{0}}" +# server_set_id = $auth2 # server_prompts = : # .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} +# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} # .endif -# + +# LOGIN authentication has traditional prompts and responses. There is no +# authorization ID in this mechanism, so unlike PLAIN the username and +# password are $auth1 and $auth2. Apart from that you can use the same +# server_condition setting for both authenticators. + # login_server: # driver = plaintext # public_name = LOGIN # server_prompts = "Username:: : Password::" -# server_condition = "${if crypteq{$2}{${extract{1}{:}{${lookup{$1}lsearch{CONFDIR/passwd}{$value}{*:*}}}}}{1}{0}}" -# server_set_id = $1 +# server_condition = "${if crypteq{$auth2}{${extract{1}{:}{${lookup{$auth1}lsearch{CONFDIR/passwd}{$value}{*:*}}}}}{1}{0}}" +# server_set_id = $auth1 # .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} +# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} # .endif # # cram_md5_server: # driver = cram_md5 # public_name = CRAM-MD5 -# server_secret = ${extract{2}{:}{${lookup{$1}lsearch{CONFDIR/passwd}{$value}fail}}} -# server_set_id = $1 +# server_secret = ${extract{2}{:}{${lookup{$auth1}lsearch{CONFDIR/passwd}{$value}fail}}} +# server_set_id = $auth1 # Here is an example of CRAM-MD5 authentication against PostgreSQL: # # psqldb_auth_server: # driver = cram_md5 # public_name = CRAM-MD5 -# server_secret = ${lookup pgsql{SELECT pw FROM users WHERE username = '${quote_pgsql:$1}'}{$value}fail} -# server_set_id = $1 +# server_secret = ${lookup pgsql{SELECT pw FROM users WHERE username = '${quote_pgsql:$auth1}'}{$value}fail} +# server_set_id = $auth1 # Authenticate against local passwords using sasl2-bin -# Requires exim_uid to be a member of sasl group, see README.SMTP-AUTH +# Requires exim_uid to be a member of sasl group, see README.Debian.gz # plain_saslauthd_server: # driver = plaintext # public_name = PLAIN -# server_condition = ${if saslauthd{{$2}{$3}}{1}{0}} -# server_set_id = $2 +# server_condition = ${if saslauthd{{$auth2}{$auth3}}{1}{0}} +# server_set_id = $auth2 # server_prompts = : # .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} +# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} # .endif # # login_saslauthd_server: @@ -74,92 +85,96 @@ # public_name = LOGIN # server_prompts = "Username:: : Password::" # # don't send system passwords over unencrypted connections -# server_advertise_condition = ${if eq{$tls_cipher}{}{0}{1}} -# server_condition = ${if saslauthd{{$1}{$2}}{1}{0}} -# server_set_id = $1 +# server_condition = ${if saslauthd{{$auth1}{$auth2}}{1}{0}} +# server_set_id = $auth1 # .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} +# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} # .endif # # ntlm_sasl_server: # driver = cyrus_sasl # public_name = NTLM # server_realm = -# server_set_id = $1 +# server_set_id = $auth1 # .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} +# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} # .endif # # digest_md5_sasl_server: # driver = cyrus_sasl # public_name = DIGEST-MD5 # server_realm = -# server_set_id = $1 +# server_set_id = $auth1 # .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} +# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} # .endif # Authentcate against cyrus-sasl # This is mainly untested, please report any problems to -# pkg-exim4-users@lists.alioth.debian.org. If you have success with -# using these authenticators until May 1 2005, please report as well. +# pkg-exim4-users@lists.alioth.debian.org. # cram_md5_sasl_server: # driver = cyrus_sasl # public_name = CRAM-MD5 # server_realm = -# server_set_id = $1 +# server_set_id = $auth1 # # plain_sasl_server: # driver = cyrus_sasl # public_name = PLAIN # server_realm = -# server_set_id = $1 +# server_set_id = $auth1 # .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} +# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} # .endif # # login_sasl_server: # driver = cyrus_sasl # public_name = LOGIN # server_realm = -# server_set_id = $1 +# server_set_id = $auth1 # .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} +# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} # .endif # Authenticate against courier authdaemon -# This has been copied from -# http://www.devco.net/archives/2004/06/10/smtp_auth_with_exim_and_courier_authdaemon.php -# (thanks to r. i. pienaar). This has been reported as "working" with -# the Debian packages by Sven Geggus. Possible pitfall: access rights -# on /var/run/courier/authdaemon/socket. - +# This is now the (working!) example from +# http://www.exim.org/eximwiki/FAQ/Policy_controls/Q0730 +# Possible pitfall: access rights on /var/run/courier/authdaemon/socket. # plain_courier_authdaemon: # driver = plaintext # public_name = PLAIN # server_condition = \ -# ${if eq {${readsocket{/var/run/courier/authdaemon/socket}\ -# {AUTH ${strlen:exim\nlogin\n$2\n$3\n}\nexim\nlogin\n$2\n$3\n}}}{FAIL\n}{no}{yes}} -# server_set_id = $2 +# ${extract {ADDRESS} \ +# {${readsocket{/var/run/courier/authdaemon/socket} \ +# {AUTH ${strlen:exim\nlogin\n$auth2\n$auth3\n}\nexim\nlogin\n$auth2\n$auth3\n} }} \ +# {yes} \ +# fail} +# server_set_id = $auth2 # .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} +# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} # .endif -# + # login_courier_authdaemon: # driver = plaintext # public_name = LOGIN # server_prompts = Username:: : Password:: -# server_condition = ${if eq {${readsocket{/var/run/courier/authdaemon/socket} \ -# {AUTH ${strlen:exim\nlogin\n$1\n$2\n}\nexim\nlogin\n$1\n$2\n}}}{FAIL\n}{no}{yes}} -# server_set_id = $1 +# server_condition = \ +# ${extract {ADDRESS} \ +# {${readsocket{/var/run/courier/authdaemon/socket} \ +# {AUTH ${strlen:exim\nlogin\n$auth1\n$auth2\n}\nexim\nlogin\n$auth1\n$auth2\n} }} \ +# {yes} \ +# fail} +# server_set_id = $auth1 # .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS -# server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}} +# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} # .endif # This one is a bad hack to support the broken version 4.xx of # Microsoft Outlook Express which violates the RFCs by demanding # "250-AUTH=" instead of "250-AUTH ". +# If your list of offered authenticators is other than PLAIN and LOGIN, +# you need to adapt the public_name line manually. # It has to be the last authenticator to work and has not been tested # well. Use at your own risk. # See the thread entry point from @@ -172,21 +187,17 @@ # public_name = "\r\n250-AUTH=PLAIN LOGIN" # server_prompts = User Name : Password # server_condition = no +# .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS +# server_advertise_condition = ${if eq{$tls_in_cipher}{}{}{*}} +# .endif ############## -# See /usr/share/doc/exim4-base/README.SMTP-AUTH +# See /usr/share/doc/exim4-base/README.Debian.gz ############## # These examples below are the equivalent for client side authentication. -# They get the passwords from CONFDIR/passwd.client. This file should have -# three columns separated by colons, the first contains the name of the -# mailserver to authenticate against, the second the username and the third -# contains the password. - -### # example for CONFDIR/passwd.client -### mail.server:blah:secret -### # default entry: -### *:bar:foo +# They get the passwords from CONFDIR/passwd.client, whose format is +# defined in exim4_passwd_client(5) # Because AUTH PLAIN and AUTH LOGIN send the password in clear, we # only allow these mechanisms over encrypted connections by default. @@ -196,32 +207,48 @@ cram_md5: driver = cram_md5 public_name = CRAM-MD5 - client_name = ${extract{1}{:}{${lookup{$host}lsearch*{CONFDIR/passwd.client}{$value}fail}}} - client_secret = ${extract{2}{:}{${lookup{$host}lsearch*{CONFDIR/passwd.client}{$value}fail}}} + client_name = ${extract{1}{:}{${lookup{$host}nwildlsearch{CONFDIR/passwd.client}{$value}fail}}} + client_secret = ${extract{2}{:}{${lookup{$host}nwildlsearch{CONFDIR/passwd.client}{$value}fail}}} + +# this returns the matching line from passwd.client and doubles all ^ +PASSWDLINE=${sg{\ + ${lookup{$host}nwildlsearch{CONFDIR/passwd.client}{$value}fail}\ + }\ + {\\N[\\^]\\N}\ + {^^}\ + } plain: driver = plaintext public_name = PLAIN .ifndef AUTH_CLIENT_ALLOW_NOTLS_PASSWORDS - client_send = "${if !eq{$tls_cipher}{}{\ - ^${extract{1}{::}\ - {${lookup{$host}lsearch*{CONFDIR/passwd.client}{$value}fail}}}\ - ^${extract{2}{::}\ - {${lookup{$host}lsearch*{CONFDIR/passwd.client}{$value}fail}}}\ + client_send = "<; ${if !eq{$tls_out_cipher}{}\ + {^${extract{1}{:}{PASSWDLINE}}\ + ^${sg{PASSWDLINE}{\\N([^:]+:)(.*)\\N}{\\$2}}\ }fail}" .else - client_send = "^${extract{1}{::}{${lookup{$host}lsearch*{CONFDIR/passwd.client}{$value}fail}}}^${extract{2}{::}{${lookup{$host}lsearch*{CONFDIR/passwd.client}{$value}fail}}}" + client_send = "<; ^${extract{1}{:}{PASSWDLINE}}\ + ^${sg{PASSWDLINE}{\\N([^:]+:)(.*)\\N}{\\$2}}" .endif login: driver = plaintext public_name = LOGIN .ifndef AUTH_CLIENT_ALLOW_NOTLS_PASSWORDS - client_send = "${if !eq{$tls_cipher}{}{}fail}\ - : ${extract{1}{::}\ - {${lookup{$host}lsearch*{CONFDIR/passwd.client}{$value}fail}}} \ - : ${extract{2}{::}\ - {${lookup{$host}lsearch*{CONFDIR/passwd.client}{$value}fail}}}" + # Return empty string if not non-TLS AND looking up $host in passwd-file + # yields a non-empty string; fail otherwise. + client_send = "<; ${if and{\ + {!eq{$tls_out_cipher}{}}\ + {!eq{PASSWDLINE}{}}\ + }\ + {}fail}\ + ; ${extract{1}{::}{PASSWDLINE}}\ + ; ${sg{PASSWDLINE}{\\N([^:]+:)(.*)\\N}{\\$2}}" .else - client_send = ": ${extract{1}{::}{${lookup{$host}lsearch*{CONFDIR/passwd.client}{$value}fail}}} : ${extract{2}{::}{${lookup{$host}lsearch*{CONFDIR/passwd.client}{$value}fail}}}" + # Return empty string if looking up $host in passwd-file yields a + # non-empty string; fail otherwise. + client_send = "<; ${if !eq{PASSWDLINE}{}\ + {}fail}\ + ; ${extract{1}{::}{PASSWDLINE}}\ + ; ${sg{PASSWDLINE}{\\N([^:]+:)(.*)\\N}{\\$2}}" .endif diff --git a/conf.d/main/01_exim4-config_listmacrosdefs b/conf.d/main/01_exim4-config_listmacrosdefs dissimilarity index 64% index 673792b..82b0d1f 100644 --- a/conf.d/main/01_exim4-config_listmacrosdefs +++ b/conf.d/main/01_exim4-config_listmacrosdefs @@ -1,136 +1,101 @@ - -###################################################################### -# Runtime configuration file for Exim 4 (Debian Packaging) # -###################################################################### - -###################################################################### -# Depending on where you find this file, this might be a template or -# an actual configuration file. Documentation about the Debian exim4 -# configuration scheme can be found in -# /usr/share/doc/exim4-base/README.Debian.gz. -# -# Strings like DEBCONFsomethingDEBCONF are replaced by installation -# dependent values by update-exim4.conf, the script which builds the -# actual configuration from the templates. -###################################################################### - -###################################################################### -# MAIN CONFIGURATION SETTINGS # -###################################################################### - -# Just for reference and scripts. -# On Debian systems, the main binary is installed as exim4 to avoid -# conflicts with the exim 3 packages. -exim_path = /usr/sbin/exim4 - -# Macro defining the main configuration directory. -# We do not use absolute paths. -.ifndef CONFDIR -CONFDIR = /etc/exim4 -.endif - -# This sets a macro DC_minimaldns if dc_minimaldns=true. If -# dc_minimaldns=false, this expands to an empty line. -.ifndef DC_minimaldns -DEBCONFminimaldnsDEBCONF -.endif - -# Create other macros from Debconf. Macros created here are used in -# other places in exim config. -.ifndef DC_visiblename -DC_visiblename=DEBCONFvisiblenameDEBCONF -.endif - -# Create domain and host lists for relay control -# '@' refers to 'the name of the local host' - -.ifndef MAIN_LOCAL_DOMAINS -MAIN_LOCAL_DOMAINS = DEBCONFlocal_domainsDEBCONF -.endif -domainlist local_domains = MAIN_LOCAL_DOMAINS - -.ifndef MAIN_RELAY_TO_DOMAINS -MAIN_RELAY_TO_DOMAINS = DEBCONFrelay_domainsDEBCONF -.endif -domainlist relay_to_domains = MAIN_RELAY_TO_DOMAINS - -.ifndef MAIN_RELAY_NETS -MAIN_RELAY_NETS = DEBCONFrelay_netsDEBCONF -.endif -hostlist relay_from_hosts = 127.0.0.1 : ::::1 : MAIN_RELAY_NETS - - -# Specify the domain you want to be added to all unqualified addresses -# here. Unqualified addresses are accepted only from local callers by -# default. The recipient_unqualified_hosts option can be used to permit -# unqualified addresses from remote sources. -# If qualify_domain is not set, the primary_hostname value is used for -# qualification. -# The ifdef bracket makes sure that an empty debconf value is correctly -# translated to "unset". -.ifdef DC_visiblename -qualify_domain = DC_visiblename -.endif - -# only used for satellite-system -.ifndef DCreadhost -DCreadhost = DEBCONFreadhostDEBCONF -.endif - -#for satellite and smarthost-systems -.ifndef DCsmarthost -DCsmarthost = DEBCONFsmarthostDEBCONF -.endif - -# listen on all all interfaces? -.ifdef MAIN_LOCAL_INTERFACES -local_interfaces = MAIN_LOCAL_INTERFACES -.else -DEBCONFlistenonpublicDEBCONF -.endif - -.ifndef LOCAL_DELIVERY -# The default transport, set in /etc/exim4/update-exim4.conf.conf, -# defaulting to mail_spool. See CONFDIR/conf.d/transport/ for possibilities -LOCAL_DELIVERY=DEBCONFlocaldeliveryDEBCONF -.endif - -# The gecos field in /etc/passwd holds not only the name. see passwd(5). -gecos_pattern = ^([^,:]*) -gecos_name = $1 - - -# define a macro DCconfig_smarthost, DCconfig_satellite, etc. we need this -# for .ifdef ... .endif -.ifndef DCconfig_satellite -.ifndef DCconfig_internet -.ifndef DCconfig_local -.ifndef DCconfig_smarthost -DCconfig_DEBCONFconfigtypeDEBCONF = 1 -.endif -.endif -.endif -.endif - - -# define macros to be used in acl/30_exim4-config_check_rcpt to check -# recipient local parts for strange characters - -# This macro is used to check local parts of recipients in local -# domains. It blocks local parts that begin with a dot or contain a -# quite broad range of non-alphanumeric characters. -.ifndef CHECK_RCPT_LOCAL_LOCALPARTS -CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%!/|\'`#&?] -.endif - -# This macro is used to check local parts of recipients in non-local -# domains. It thus allows your own users to send outgoing messages to -# sites that use slashes and vertical bars in their local parts. It blocks -# local parts that begin with a dot, slash, or vertical bar, but allows -# these characters within the local part. However, the sequence /../ is -# barred. The use of some other non-alphanumeric characters is blocked. -# The motivation here is to prevent your users (or your users' viruses) -# from mounting certain kinds of attack on remote sites. -.ifndef CHECK_RCPT_REMOTE_LOCALPARTS -CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%!\'`#&?] : ^.*/\\.\\./ -.endif +###################################################################### +# Runtime configuration file for Exim 4 (Debian Packaging) # +###################################################################### + +###################################################################### +# /etc/exim4/exim4.conf.template is only used with the non-split +# configuration scheme. +# /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs is only used +# with the split configuration scheme. +# If you find this comment anywhere else, somebody copied it there. +# Documentation about the Debian exim4 configuration scheme can be +# found in /usr/share/doc/exim4-base/README.Debian.gz. +###################################################################### + +###################################################################### +# MAIN CONFIGURATION SETTINGS # +###################################################################### + +# Just for reference and scripts. +# On Debian systems, the main binary is installed as exim4 to avoid +# conflicts with the exim 3 packages. +exim_path = /usr/sbin/exim4 + +# Macro defining the main configuration directory. +# We do not use absolute paths. +.ifndef CONFDIR +CONFDIR = /etc/exim4 +.endif + +# debconf-driven macro definitions get inserted after this line +UPEX4CmacrosUPEX4C = 1 + +# Create domain and host lists for relay control +# '@' refers to 'the name of the local host' + +# List of domains considered local for exim. Domains not listed here +# need to be deliverable remotely. +domainlist local_domains = MAIN_LOCAL_DOMAINS + +# List of recipient domains to relay _to_. Use this list if you're - +# for example - fallback MX or mail gateway for domains. +domainlist relay_to_domains = MAIN_RELAY_TO_DOMAINS + +# List of sender networks (IP addresses) to _unconditionally_ relay +# _for_. If you intend to be SMTP AUTH server, you do not need to enter +# anything here. +hostlist relay_from_hosts = MAIN_RELAY_NETS + + +# Decide which domain to use to add to all unqualified addresses. +# If MAIN_PRIMARY_HOSTNAME_AS_QUALIFY_DOMAIN is defined, the primary +# hostname is used. If not, but MAIN_QUALIFY_DOMAIN is set, the value +# of MAIN_QUALIFY_DOMAIN is used. If both macros are not defined, +# the first line of /etc/mailname is used. +.ifndef MAIN_PRIMARY_HOSTNAME_AS_QUALIFY_DOMAIN +.ifndef MAIN_QUALIFY_DOMAIN +qualify_domain = ETC_MAILNAME +.else +qualify_domain = MAIN_QUALIFY_DOMAIN +.endif +.endif + +# listen on all all interfaces? +.ifdef MAIN_LOCAL_INTERFACES +local_interfaces = MAIN_LOCAL_INTERFACES +.endif + +.ifndef LOCAL_DELIVERY +# The default transport, set in /etc/exim4/update-exim4.conf.conf, +# defaulting to mail_spool. See CONFDIR/conf.d/transport/ for possibilities +LOCAL_DELIVERY=mail_spool +.endif + +# The gecos field in /etc/passwd holds not only the name. see passwd(5). +gecos_pattern = ^([^,:]*) +gecos_name = $1 + +# define macros to be used in acl/30_exim4-config_check_rcpt to check +# recipient local parts for strange characters. + +# This macro definition really should be in +# acl/30_exim4-config_check_rcpt but cannot be there due to +# http://www.exim.org/bugzilla/show_bug.cgi?id=101 as of exim 4.62. + +# These macros are documented in acl/30_exim4-config_check_rcpt, +# can be changed here or overridden by a locally added configuration +# file as described in README.Debian section "Using Exim Macros to control +# the configuration". + +.ifndef CHECK_RCPT_LOCAL_LOCALPARTS +CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%!/|`#&?] +.endif + +.ifndef CHECK_RCPT_REMOTE_LOCALPARTS +CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%!`#&?] : ^.*/\\.\\./ +.endif + +# always log tls_peerdn as we use TLS for outgoing connects by default +.ifndef MAIN_LOG_SELECTOR +MAIN_LOG_SELECTOR = +smtp_protocol_error +smtp_syntax_error +tls_certificate_verified +tls_peerdn +.endif diff --git a/conf.d/main/02_exim4-config_options b/conf.d/main/02_exim4-config_options index 3bccacc..bf00d03 100644 --- a/conf.d/main/02_exim4-config_options +++ b/conf.d/main/02_exim4-config_options @@ -3,6 +3,15 @@ ################################# +# Defines the access control list that is run when an +# SMTP MAIL command is received. +# +.ifndef MAIN_ACL_CHECK_MAIL +MAIN_ACL_CHECK_MAIL = acl_check_mail +.endif +acl_smtp_mail = MAIN_ACL_CHECK_MAIL + + # Defines the access control list that is run when an # SMTP RCPT command is received. # @@ -28,6 +37,25 @@ message_size_limit = MESSAGE_SIZE_LIMIT .endif +# If you are running exim4-daemon-heavy or a custom version of Exim that +# was compiled with the content-scanning extension, you can cause incoming +# messages to be automatically scanned for viruses. You have to modify the +# configuration in two places to set this up. The first of them is here, +# where you define the interface to your scanner. This example is typical +# for ClamAV; see the manual for details of what to set for other virus +# scanners. The second modification is in the acl_check_data access +# control list. + +# av_scanner = clamd:/var/run/clamav/clamd.ctl + + +# For spam scanning, there is a similar option that defines the interface to +# SpamAssassin. You do not need to set this if you are using the default, which +# is shown in this commented example. As for virus scanning, you must also +# modify the acl_check_data access control list to enable spam scanning. + +# spamd_address = 127.0.0.1 783 + # Domain used to qualify unqualified recipient addresses # If this option is not set, the qualify_domain value is used. # qualify_recipient = @@ -36,9 +64,11 @@ message_size_limit = MESSAGE_SIZE_LIMIT # Allow Exim to recognize addresses of the form "user@[10.11.12.13]", # where the domain part is a "domain literal" (an IP address) instead # of a named domain. The RFCs require this facility, but it is disabled -# in the default config since it is seldomly used and frequently abused. +# in the default config since it is rarely used and frequently abused. # Domain literal support also needs a special router, which is automatically # enabled if you use the enable macro MAIN_ALLOW_DOMAIN_LITERALS. +# Additionally, you might want to make your local IP addresses (or @[]) +# local domains. .ifdef MAIN_ALLOW_DOMAIN_LITERALS allow_domain_literals .endif @@ -57,22 +87,43 @@ host_lookup = MAIN_HOST_LOOKUP # In a minimaldns setup, update-exim4.conf guesses the hostname and # dumps it here to avoid DNS lookups being done at Exim run time. -DEBCONF_hardcode_primary_hostname_DEBCONF +.ifdef MAIN_HARDCODE_PRIMARY_HOSTNAME +primary_hostname = MAIN_HARDCODE_PRIMARY_HOSTNAME +.endif +# The settings below cause Exim to make RFC 1413 (ident) callbacks +# for all incoming SMTP calls. You can limit the hosts to which these +# calls are made, and/or change the timeout that is used. If you set +# the timeout to zero, all RFC 1413 calls are disabled. RFC 1413 calls +# are cheap and can provide useful information for tracing problem +# messages, but some hosts and firewalls have problems with them. +# This can result in a timeout instead of an immediate refused +# connection, leading to delays on starting up SMTP sessions. +# (The default was reduced from 30s to 5s for release 4.61. and to +# disabled for release 4.86) +# +#rfc1413_hosts = * +#rfc1413_query_timeout = 5s -# Do RFC 1413 (ident) callbacks for incoming SMTP calls. The default -# is to do lookups for all hosts with a timeout of 30 seconds. -# The options can be used to limit the hosts to which these calls are -# made, and/or change the timeout that is used. If the timeout is zero, -# no RFC 1413 calls are made. RFC 1413 calls are cheap and can provide -# useful information for tracing problem messages, but some hosts and -# firewalls are misconfigured to drop the requests instead of either -# answering or rejecting them. This can result in timeouts, leading to -# delays on starting up an SMTP session and to strange behavior in -# settings where SMTP callouts are used. -# rfc1413_hosts = * -# rfc1413_query_timeout = 30s +# Enable an efficiency feature. We advertise the feature; clients +# may request to use it. For multi-recipient mails we then can +# reject or accept per-user after the message is received. +# +prdr_enable = true + +# When using an external relay tester (such as rt.njabl.org and/or the +# currently defunct relay-test.mail-abuse.org, the test may be aborted +# since exim complains about "too many nonmail commands". If you want +# the test to complete, add the host from where "your" relay tester +# connects from to the MAIN_SMTP_ACCEPT_MAX_NOMAIL_HOSTS macro. +# Please note that a non-empty setting may cause extra DNS lookups to +# happen, which is the reason why this option is commented out in the +# default settings. +# MAIN_SMTP_ACCEPT_MAX_NOMAIL_HOSTS = !rt.njabl.org +.ifdef MAIN_SMTP_ACCEPT_MAX_NOMAIL_HOSTS +smtp_accept_max_nonmail_hosts = MAIN_SMTP_ACCEPT_MAX_NOMAIL_HOSTS +.endif # By default, exim forces a Sender: header containing the local # account name at the local host name in all locally submitted messages @@ -152,14 +203,16 @@ trusted_groups = MAIN_TRUSTED_GROUPS # admin_groups = -# customize logging. See spec.txt 48.15. -# If you want to debug, it is probably a good idea to set this to -# "+all -subject -arguments". -# If you use TLS, it might be a good idea to set "+tls_cipher -# +tls_peerdn". -# log_selector = - - # SMTP Banner. The example includes the Debian version in the SMTP dialog -# MAIN_SMTP_BANNER = "${primary_hostname} ESMTP Exim ${version_number} (Debian package DEBCONFpackageversionDEBCONF) ${tod_full}" +# MAIN_SMTP_BANNER = "${primary_hostname} ESMTP Exim ${version_number} (Debian package MAIN_PACKAGE_VERSION) ${tod_full}" # smtp_banner = $smtp_active_hostname ESMTP Exim $version_number $tod_full + +.ifdef MAIN_KEEP_ENVIRONMENT +keep_environment = MAIN_KEEP_ENVIRONMENT +.else +# set option to empty value to avoid warning. +keep_environment = +.endif +.ifdef MAIN_ADD_ENVIRONMENT +add_environment = MAIN_ADD_ENVIRONMENT +.endif diff --git a/conf.d/main/03_exim4-config_tlsoptions b/conf.d/main/03_exim4-config_tlsoptions index d942dac..86299e1 100644 --- a/conf.d/main/03_exim4-config_tlsoptions +++ b/conf.d/main/03_exim4-config_tlsoptions @@ -2,10 +2,9 @@ ### main/03_exim4-config_tlsoptions ################################# -# TLS/SSL configuration. +# TLS/SSL configuration for exim as an SMTP server. # See /usr/share/doc/exim4-base/README.Debian.gz for explanations. - .ifdef MAIN_TLS_ENABLE # Defines what hosts to 'advertise' STARTTLS functionality to. The # default, *, will advertise to all hosts that connect with EHLO. @@ -18,6 +17,17 @@ tls_advertise_hosts = MAIN_TLS_ADVERTISE_HOSTS # Full paths to Certificate and Private Key. The Private Key file # must be kept 'secret' and should be owned by root.Debian-exim mode # 640 (-rw-r-----). exim-gencert takes care of these prerequisites. +# Normally, exim4 looks for certificate and key in different files: +# MAIN_TLS_CERTIFICATE - path to certificate file, +# CONFDIR/exim.crt if unset +# MAIN_TLS_PRIVATEKEY - path to private key file +# CONFDIR/exim.key if unset +# You can also configure exim to look for certificate and key in the +# same file, set MAIN_TLS_CERTKEY to that file to enable. This takes +# precedence over all other settings regarding certificate and key file. +.ifdef MAIN_TLS_CERTKEY +tls_certificate = MAIN_TLS_CERTKEY +.else .ifndef MAIN_TLS_CERTIFICATE MAIN_TLS_CERTIFICATE = CONFDIR/exim.crt .endif @@ -27,11 +37,13 @@ tls_certificate = MAIN_TLS_CERTIFICATE MAIN_TLS_PRIVATEKEY = CONFDIR/exim.key .endif tls_privatekey = MAIN_TLS_PRIVATEKEY +.endif - -# Pointer to the CA Certificates against which host certificates are +# Pointer to the CA Certificates against which client certificates are # checked. This is controlled by the `tls_verify_hosts' and # `tls_try_verify_hosts' lists below. +# If you want to check server certificates, you need to add an +# tls_verify_certificates statement to the smtp transport. # /etc/ssl/certs/ca-certificates.crt is generated by # the "ca-certificates" package's update-ca-certificates(8) command. .ifndef MAIN_TLS_VERIFY_CERTIFICATES @@ -55,9 +67,19 @@ tls_verify_hosts = MAIN_TLS_VERIFY_HOSTS # `tls_verify_certificates' but do not abort the connection if there is no # certificate or if the certificate presented does not match. (This # condition can be tested for in ACLs through `verify = certificate') -.ifndef MAIN_TLS_TRY_VERIFY_HOSTS -MAIN_TLS_TRY_VERIFY_HOSTS = * -.endif +# By default, this check is done for all hosts. It is known that some +# clients (including incredimail's version downloadable in February +# 2008) choke on this. To disable, set MAIN_TLS_TRY_VERIFY_HOSTS to an +# empty value. +.ifdef MAIN_TLS_TRY_VERIFY_HOSTS tls_try_verify_hosts = MAIN_TLS_TRY_VERIFY_HOSTS +.endif + +.ifdef _HAVE_GNUTLS +tls_dhparam = historic +.endif +.else +# Don't advertise TLS if MAIN_TLS_ENABLE is not set. +tls_advertise_hosts = .endif diff --git a/conf.d/main/90_exim4-config_log_selector b/conf.d/main/90_exim4-config_log_selector new file mode 100644 index 0000000..685c404 --- /dev/null +++ b/conf.d/main/90_exim4-config_log_selector @@ -0,0 +1,10 @@ + +### main/90_exim4-config_log_selector +################################# + +# uncomment this for debugging +# MAIN_LOG_SELECTOR == MAIN_LOG_SELECTOR +all -subject -arguments + +.ifdef MAIN_LOG_SELECTOR +log_selector = MAIN_LOG_SELECTOR +.endif diff --git a/conf.d/retry/30_exim4-config b/conf.d/retry/30_exim4-config index 3f12f9f..52b002f 100644 --- a/conf.d/retry/30_exim4-config +++ b/conf.d/retry/30_exim4-config @@ -1,18 +1,19 @@ +### retry/30_exim4-config +################################# + # This single retry rule applies to all domains and all errors. It specifies # retries every 15 minutes for 2 hours, then increasing retry intervals, # starting at 1 hour and increasing each time by a factor of 1.5, up to 16 # hours, then retries every 6 hours until 4 days have passed since the first # failed delivery. -# Please note that these rules only limit the frequenzy of retries, the -# effective retry-time depends on the frequenzy of queue-running, too. +# Please note that these rules only limit the frequency of retries, the +# effective retry-time depends on the frequency of queue-running, too. # See QUEUEINTERVAL in /etc/default/exim4. -# Domain Error Retries -# ------ ----- ------- +# Address or Domain Error Retries +# ----------------- ----- ------- * * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - diff --git a/conf.d/rewrite/31_exim4-config_rewriting b/conf.d/rewrite/31_exim4-config_rewriting index ddecd06..b7415b6 100644 --- a/conf.d/rewrite/31_exim4-config_rewriting +++ b/conf.d/rewrite/31_exim4-config_rewriting @@ -2,12 +2,15 @@ ### rewrite/31_exim4-config_rewriting ################################# -# This rewriting rule is particularily useful for dialup users who +# This rewriting rule is particularly useful for dialup users who # don't have their own domain, but could be useful for anyone. # It looks up the real address of all local users in a file -*@+local_domains ${lookup{${local_part}}lsearch{/etc/email-addresses}\ - {$value}fail} Ffrs +.ifndef NO_EAA_REWRITE_REWRITE +*@+local_domains "${lookup{${local_part}}lsearch{/etc/email-addresses}\ + {$value}fail}" Ffrs # identical rewriting rule for /etc/mailname -DEBCONFrewriteemailaddresses_mailnameDEBCONF +*@ETC_MAILNAME "${lookup{${local_part}}lsearch{/etc/email-addresses}\ + {$value}fail}" Ffrs +.endif diff --git a/conf.d/router/100_exim4-config_domain_literal b/conf.d/router/100_exim4-config_domain_literal index 244b479..d37fea6 100644 --- a/conf.d/router/100_exim4-config_domain_literal +++ b/conf.d/router/100_exim4-config_domain_literal @@ -4,7 +4,7 @@ # This router handles e-mail addresses in "domain literal" form like # . The RFCs require this facility, but it is disabled -# in the default config since it is seldomly used and frequently abused. +# in the default config since it is rarely used and frequently abused. # Domain literal support also needs to be enabled in the main config, # which is automatically done if you use the enable macro # MAIN_ALLOW_DOMAIN_LITERALS. diff --git a/conf.d/router/150_exim4-config_hubbed_hosts b/conf.d/router/150_exim4-config_hubbed_hosts dissimilarity index 62% index 1ae72b6..a0fcb26 100644 --- a/conf.d/router/150_exim4-config_hubbed_hosts +++ b/conf.d/router/150_exim4-config_hubbed_hosts @@ -1,31 +1,18 @@ - -# router/150_exim4-config_hubbed_hosts -################################# - -# route specific domains manually. -# -# The most common application of this router is to handle relaying to nonlocal -# domains that the local host is primary MX for. That means that local -# information needs to be present for a domain to be handled correctly. -# -# That information is put into the optional file /etc/exim4/hubbed_hosts -# which contains key-value pairs of domain pattern and route data. -# -# foo.example: internal.mail.example.com -# bar.example: 192.168.183.3 -# -# will cause mail for foo.example to be sent to the host -# internal.mail.example (IP address derived from A record only), and -# mail to bar.example to be sent to 192.168.183.3. -# -# If the file /etc/exim4/hubbed_hosts does not exist, this router is a -# no-op. - -hubbed_hosts: - debug_print = "R: hubbed_hosts for $domain" - driver = manualroute - domains = "${if exists{CONFDIR/hubbed_hosts}\ - {partial-lsearch;CONFDIR/hubbed_hosts}\ - fail}" - route_data = ${lookup{$domain}partial-lsearch{CONFDIR/hubbed_hosts}} - transport = remote_smtp + +# router/150_exim4-config_hubbed_hosts +################################# + +# route specific domains manually. +# +# see exim4-config_files(5) and spec.txt chapter 20.3 through 20.7 for +# more detailed documentation. + +hubbed_hosts: + debug_print = "R: hubbed_hosts for $domain" + driver = manualroute + domains = "${if exists{CONFDIR/hubbed_hosts}\ + {partial-lsearch;CONFDIR/hubbed_hosts}\ + fail}" + same_domain_copy_routing = yes + route_data = ${lookup{$domain}partial-lsearch{CONFDIR/hubbed_hosts}} + transport = remote_smtp diff --git a/conf.d/router/200_exim4-config_primary b/conf.d/router/200_exim4-config_primary index 3f9721e..7681d91 100644 --- a/conf.d/router/200_exim4-config_primary +++ b/conf.d/router/200_exim4-config_primary @@ -34,7 +34,8 @@ dnslookup: same_domain_copy_routing = yes # ignore private rfc1918 and APIPA addresses ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8 : 192.168.0.0/16 :\ - 172.16.0.0/12 : 10.0.0.0/8 : 169.254.0.0/16 + 172.16.0.0/12 : 10.0.0.0/8 : 169.254.0.0/16 :\ + 255.255.255.255 no_more .endif @@ -78,7 +79,7 @@ smarthost: domains = ! +local_domains transport = remote_smtp_smarthost route_list = * DCsmarthost byname - host_find_failed = defer + host_find_failed = ignore same_domain_copy_routing = yes no_more diff --git a/conf.d/router/300_exim4-config_real_local b/conf.d/router/300_exim4-config_real_local index b1c4a9d..34ea282 100644 --- a/conf.d/router/300_exim4-config_real_local +++ b/conf.d/router/300_exim4-config_real_local @@ -1,15 +1,21 @@ -### router/400_exim4-config_system_aliases +### router/300_exim4-config_real_local ################################# # This router allows reaching a local user while avoiding local # processing. This can be used to inform a user of a broken .forward # file, for example. The userforward router does this. +COND_LOCAL_SUBMITTER = "\ + ${if match_ip{$sender_host_address}{:@[]}\ + {1}{0}\ + }" + real_local: debug_print = "R: real_local for $local_part@$domain" driver = accept domains = +local_domains + condition = COND_LOCAL_SUBMITTER local_part_prefix = real- check_local_user transport = LOCAL_DELIVERY diff --git a/conf.d/router/400_exim4-config_system_aliases b/conf.d/router/400_exim4-config_system_aliases index e4ea7a8..f5f5f1c 100644 --- a/conf.d/router/400_exim4-config_system_aliases +++ b/conf.d/router/400_exim4-config_system_aliases @@ -14,14 +14,11 @@ # of case. If you decide to handle /etc/aliases in a caseful way, you # need to make arrangements for a caseless postmaster. # -# Piping to programs in /etc/aliases is disabled per default. +# Delivery to arbitrary directories, files, and piping to programs in +# /etc/aliases is disabled per default. # If that is a problem for you, see -# /usr/share/doc/exim4-config/README.system_aliases +# /usr/share/doc/exim4-base/README.Debian.gz # for explanation and some workarounds. -# -# Note that the transports listed below are the same as are used for -# .forward files; you might want to set up different ones for pipe and -# file deliveries from aliases. system_aliases: debug_print = "R: system_aliases for $local_part@$domain" diff --git a/conf.d/router/500_exim4-config_hubuser b/conf.d/router/500_exim4-config_hubuser index 52a8dc2..1884b21 100644 --- a/conf.d/router/500_exim4-config_hubuser +++ b/conf.d/router/500_exim4-config_hubuser @@ -4,7 +4,7 @@ .ifdef DCconfig_satellite # This router is only used for configtype=satellite. -# It takes care to route all mail targetted to +# It takes care to route all mail targeted to # to the host where we read our mail # hub_user: @@ -23,7 +23,7 @@ hub_user_smarthost: domains = DCreadhost transport = remote_smtp_smarthost route_list = * DCsmarthost byname - host_find_failed = defer + host_find_failed = ignore same_domain_copy_routing = yes check_local_user .endif diff --git a/conf.d/router/600_exim4-config_userforward b/conf.d/router/600_exim4-config_userforward index 2b71cc0..59259ca 100644 --- a/conf.d/router/600_exim4-config_userforward +++ b/conf.d/router/600_exim4-config_userforward @@ -1,9 +1,10 @@ -# router/600_exim4-config_userforward +### router/600_exim4-config_userforward ################################# # This router handles forwarding using traditional .forward files in users' -# home directories and filtering with exim's builtin filter language. +# home directories. It also allows mail filtering with a forward file +# starting with the string "# Exim filter" or "# Sieve filter". # # The no_verify setting means that this router is skipped when Exim is # verifying addresses. Similarly, no_expn means that this router is skipped if @@ -24,10 +25,12 @@ userforward: domains = +local_domains check_local_user file = $home/.forward + require_files = $local_part:$home/.forward no_verify no_expn check_ancestor allow_filter + forbid_smtp_code = true directory_transport = address_directory file_transport = address_file pipe_transport = address_pipe diff --git a/conf.d/router/850_exim4-config_lowuid b/conf.d/router/850_exim4-config_lowuid new file mode 100644 index 0000000..43741c6 --- /dev/null +++ b/conf.d/router/850_exim4-config_lowuid @@ -0,0 +1,29 @@ + +### router/850_exim4-config_lowuid +################################# + +.ifndef FIRST_USER_ACCOUNT_UID +FIRST_USER_ACCOUNT_UID = 0 +.endif + +.ifndef DEFAULT_SYSTEM_ACCOUNT_ALIAS +DEFAULT_SYSTEM_ACCOUNT_ALIAS = :fail: no mail to system accounts +.endif + +COND_SYSTEM_USER_AND_REMOTE_SUBMITTER = "\ + ${if and{{! match_ip{$sender_host_address}{:@[]}}\ + {<{$local_user_uid}{FIRST_USER_ACCOUNT_UID}}}\ + {1}{0}\ + }" + +lowuid_aliases: + debug_print = "R: lowuid_aliases for $local_part@$domain (UID $local_user_uid)" + check_local_user + driver = redirect + allow_fail + domains = +local_domains + condition = COND_SYSTEM_USER_AND_REMOTE_SUBMITTER + data = ${if exists{CONFDIR/lowuid-aliases}\ + {${lookup{$local_part}lsearch{CONFDIR/lowuid-aliases}\ + {$value}{DEFAULT_SYSTEM_ACCOUNT_ALIAS}}}\ + {DEFAULT_SYSTEM_ACCOUNT_ALIAS}} diff --git a/conf.d/router/900_exim4-config_local_user b/conf.d/router/900_exim4-config_local_user index 52e1897..423c729 100644 --- a/conf.d/router/900_exim4-config_local_user +++ b/conf.d/router/900_exim4-config_local_user @@ -2,6 +2,9 @@ ### router/900_exim4-config_local_user ################################# +# This router matches local user mailboxes. If the router fails, the error +# message is "Unknown user". + local_user: debug_print = "R: local_user for $local_part@$domain" driver = accept @@ -9,6 +12,4 @@ local_user: check_local_user local_parts = ! root transport = LOCAL_DELIVERY - - - + cannot_route_message = Unknown user diff --git a/conf.d/transport/10_exim4-config_transport-macros b/conf.d/transport/10_exim4-config_transport-macros new file mode 100644 index 0000000..449fb31 --- /dev/null +++ b/conf.d/transport/10_exim4-config_transport-macros @@ -0,0 +1,16 @@ + +### transport/10_exim4-config_transport-macros +################################# + +.ifdef HIDE_MAILNAME +REMOTE_SMTP_HEADERS_REWRITE=*@+local_domains $1@DCreadhost frs : *@ETC_MAILNAME $1@DCreadhost frs +REMOTE_SMTP_RETURN_PATH=${if match_domain{$sender_address_domain}{+local_domains}{${sender_address_local_part}@DCreadhost}{${if match_domain{$sender_address_domain}{ETC_MAILNAME}{${sender_address_local_part}@DCreadhost}fail}}} +.endif + +.ifdef REMOTE_SMTP_HELO_FROM_DNS +.ifdef REMOTE_SMTP_HELO_DATA +REMOTE_SMTP_HELO_DATA==${lookup dnsdb {ptr=$sending_ip_address}{$value}{$primary_hostname}} +.else +REMOTE_SMTP_HELO_DATA=${lookup dnsdb {ptr=$sending_ip_address}{$value}{$primary_hostname}} +.endif +.endif diff --git a/conf.d/transport/30_exim4-config_address_pipe b/conf.d/transport/30_exim4-config_address_pipe index cb01c37..c5f1828 100644 --- a/conf.d/transport/30_exim4-config_address_pipe +++ b/conf.d/transport/30_exim4-config_address_pipe @@ -1,10 +1,8 @@ -# This transport is used for handling pipe deliveries generated by alias or +# This transport is used for handling pipe deliveries generated by # .forward files. If the commands fails and produces any output on standard # output or standard error streams, the output is returned to the sender # of the message as a delivery error. -# You can set different transports for aliases and forwards if you want to -# - see the references to address_pipe in the routers section above. address_pipe: debug_print = "T: address_pipe for $local_part@$domain" driver = pipe diff --git a/conf.d/transport/30_exim4-config_maildir_home b/conf.d/transport/30_exim4-config_maildir_home index b8b56c8..a872acc 100644 --- a/conf.d/transport/30_exim4-config_maildir_home +++ b/conf.d/transport/30_exim4-config_maildir_home @@ -34,4 +34,8 @@ maildir_home: mode = 0600 .endif mode_fail_narrower = false - + # This transport always chdirs to $home before trying to deliver. If + # $home is not accessible, this chdir fails and prevents delivery. + # If you are in a setup where home directories might not be + # accessible, uncomment the current_directory line below. + # current_directory = / diff --git a/conf.d/transport/30_exim4-config_maildrop_pipe b/conf.d/transport/30_exim4-config_maildrop_pipe index 0ba27bc..3bd8924 100644 --- a/conf.d/transport/30_exim4-config_maildrop_pipe +++ b/conf.d/transport/30_exim4-config_maildrop_pipe @@ -4,6 +4,8 @@ maildrop_pipe: driver = pipe path = "/bin:/usr/bin:/usr/local/bin" command = "/usr/bin/maildrop" + message_prefix = + message_suffix = return_path_add delivery_date_add envelope_to_add diff --git a/conf.d/transport/30_exim4-config_remote_smtp b/conf.d/transport/30_exim4-config_remote_smtp index fd8838b..42bd601 100644 --- a/conf.d/transport/30_exim4-config_remote_smtp +++ b/conf.d/transport/30_exim4-config_remote_smtp @@ -2,6 +2,52 @@ ### transport/30_exim4-config_remote_smtp ################################# # This transport is used for delivering messages over SMTP connections. +# Refuse to send any message with over-long lines, which could have +# been received other than via SMTP. The use of message_size_limit to +# enforce this is a red herring. + remote_smtp: debug_print = "T: remote_smtp for $local_part@$domain" driver = smtp +.ifndef IGNORE_SMTP_LINE_LENGTH_LIMIT + message_size_limit = ${if > {$max_received_linelength}{998} {1}{0}} +.endif +.ifdef REMOTE_SMTP_HOSTS_AVOID_TLS + hosts_avoid_tls = REMOTE_SMTP_HOSTS_AVOID_TLS +.endif +.ifdef REMOTE_SMTP_HEADERS_REWRITE + headers_rewrite = REMOTE_SMTP_HEADERS_REWRITE +.endif +.ifdef REMOTE_SMTP_RETURN_PATH + return_path = REMOTE_SMTP_RETURN_PATH +.endif +.ifdef REMOTE_SMTP_HELO_DATA + helo_data=REMOTE_SMTP_HELO_DATA +.endif +.ifdef DKIM_DOMAIN +dkim_domain = DKIM_DOMAIN +.endif +.ifdef DKIM_SELECTOR +dkim_selector = DKIM_SELECTOR +.endif +.ifdef DKIM_PRIVATE_KEY +dkim_private_key = DKIM_PRIVATE_KEY +.endif +.ifdef DKIM_CANON +dkim_canon = DKIM_CANON +.endif +.ifdef DKIM_STRICT +dkim_strict = DKIM_STRICT +.endif +.ifdef DKIM_SIGN_HEADERS +dkim_sign_headers = DKIM_SIGN_HEADERS +.endif +.ifdef TLS_DH_MIN_BITS +tls_dh_min_bits = TLS_DH_MIN_BITS +.endif +.ifdef REMOTE_SMTP_TLS_CERTIFICATE +tls_certificate = REMOTE_SMTP_TLS_CERTIFICATE +.endif +.ifdef REMOTE_SMTP_PRIVATEKEY +tls_privatekey = REMOTE_SMTP_PRIVATEKEY +.endif diff --git a/conf.d/transport/30_exim4-config_remote_smtp_smarthost b/conf.d/transport/30_exim4-config_remote_smtp_smarthost index d7e1273..9c18305 100644 --- a/conf.d/transport/30_exim4-config_remote_smtp_smarthost +++ b/conf.d/transport/30_exim4-config_remote_smtp_smarthost @@ -3,14 +3,45 @@ ################################# # This transport is used for delivering messages over SMTP connections -# to a smarthost. The local host tries to authenticate and does some -# modification in headers and return-path. +# to a smarthost. The local host tries to authenticate. # This transport is used for smarthost and satellite configurations. +# Refuse to send any messsage with over-long lines, which could have +# been received other than via SMTP. The use of message_size_limit to +# enforce this is a red herring. remote_smtp_smarthost: debug_print = "T: remote_smtp_smarthost for $local_part@$domain" driver = smtp - hosts_try_auth = ${if exists {CONFDIR/passwd.client}{DCsmarthost}{}} - tls_tempfail_tryclear = false - DEBCONFheaders_rewriteDEBCONF - DEBCONFreturn_pathDEBCONF +.ifndef IGNORE_SMTP_LINE_LENGTH_LIMIT + message_size_limit = ${if > {$max_received_linelength}{998} {1}{0}} +.endif + hosts_try_auth = <; ${if exists{CONFDIR/passwd.client} \ + {\ + ${lookup{$host}nwildlsearch{CONFDIR/passwd.client}{$host_address}}\ + }\ + {} \ + } +.ifdef REMOTE_SMTP_SMARTHOST_HOSTS_AVOID_TLS + hosts_avoid_tls = REMOTE_SMTP_SMARTHOST_HOSTS_AVOID_TLS +.endif +.ifdef REMOTE_SMTP_SMARTHOST_HOSTS_REQUIRE_TLS + hosts_require_tls = REMOTE_SMTP_SMARTHOST_HOSTS_REQUIRE_TLS +.endif +.ifdef REMOTE_SMTP_HEADERS_REWRITE + headers_rewrite = REMOTE_SMTP_HEADERS_REWRITE +.endif +.ifdef REMOTE_SMTP_RETURN_PATH + return_path = REMOTE_SMTP_RETURN_PATH +.endif +.ifdef REMOTE_SMTP_HELO_DATA + helo_data=REMOTE_SMTP_HELO_DATA +.endif +.ifdef TLS_DH_MIN_BITS +tls_dh_min_bits = TLS_DH_MIN_BITS +.endif +.ifdef REMOTE_SMTP_SMARTHOST_TLS_CERTIFICATE +tls_certificate = REMOTE_SMTP_SMARTHOST_TLS_CERTIFICATE +.endif +.ifdef REMOTE_SMTP_SMARTHOST_PRIVATEKEY +tls_privatekey = REMOTE_SMTP_SMARTHOST_PRIVATEKEY +.endif diff --git a/conf.d/transport/35_exim4-config_address_directory b/conf.d/transport/35_exim4-config_address_directory index 94541a4..6861426 100644 --- a/conf.d/transport/35_exim4-config_address_directory +++ b/conf.d/transport/35_exim4-config_address_directory @@ -5,8 +5,9 @@ address_directory: debug_print = "T: address_directory for $local_part@$domain" driver = appendfile - envelope_to_add = true - return_path_add = true + delivery_date_add + envelope_to_add + return_path_add check_string = "" escape_string = "" maildir_format diff --git a/local_domains.cfg b/local_domains.cfg deleted file mode 100644 index 5db881e..0000000 --- a/local_domains.cfg +++ /dev/null @@ -1 +0,0 @@ -hprog.org:tpu.org:sub.pldb.net:pldb.net:schizomaniac.net:hcoop.net \ No newline at end of file diff --git a/update-exim4.conf.conf b/update-exim4.conf.conf index d54673e..a674bd8 100644 --- a/update-exim4.conf.conf +++ b/update-exim4.conf.conf @@ -8,17 +8,17 @@ # changes, so this is usually fine, but will break local schemes that mess # around with multiple versions of the file. # -# update-exim4.conf uses this file to determine variable values to replace -# the DEBCONFsomethingDEBCONF strings in the configuration template files. +# update-exim4.conf uses this file to determine variable values to generate +# exim configuration macros for the configuration file. # # Most settings found in here do have corresponding questions in the # Debconf configuration, but not all of them. # # This is a Debian specific file -dc_eximconfig_configtype='internet' -dc_other_hostnames='localhost.localdomain' -dc_local_interfaces='127.0.0.1' +dc_eximconfig_configtype='local' +dc_other_hostnames='hcoop.net' +dc_local_interfaces='127.0.0.1 ; ::1' dc_readhost='' dc_relay_domains='' dc_minimaldns='false' @@ -28,3 +28,4 @@ CFILEMODE='644' dc_use_split_config='false' dc_hide_mailname='' dc_mailname_in_oh='true' +dc_localdelivery='mail_spool' -- 2.20.1