From e107cbef5e4d0674df4d4de3836f1c72b84beccc Mon Sep 17 00:00:00 2001 From: andryyy Date: Wed, 11 Oct 2017 11:22:48 +0200 Subject: [PATCH] [Postfix] Fix sending as alias, when alias is in alias domains, cleanup --- data/Dockerfiles/postfix/postfix.sh | 122 ++++++++++++++++++++++++---- 1 file changed, 105 insertions(+), 17 deletions(-) diff --git a/data/Dockerfiles/postfix/postfix.sh b/data/Dockerfiles/postfix/postfix.sh index 2456f3d9..326a6d18 100755 --- a/data/Dockerfiles/postfix/postfix.sh +++ b/data/Dockerfiles/postfix/postfix.sh @@ -4,8 +4,8 @@ trap "postfix stop" EXIT [[ ! -d /opt/postfix/conf/sql/ ]] && mkdir -p /opt/postfix/conf/sql/ if [[ -z $(grep null /etc/aliases) ]]; then - echo null: /dev/null >> /etc/aliases; - newaliases; + echo null: /dev/null >> /etc/aliases; + newaliases; fi cat < /opt/postfix/conf/sql/mysql_relay_recipient_maps.cf @@ -13,7 +13,17 @@ user = ${DBUSER} password = ${DBPASS} hosts = mysql dbname = ${DBNAME} -query = SELECT DISTINCT CASE WHEN '%d' IN (SELECT domain FROM domain WHERE relay_all_recipients=1 AND domain='%d' AND backupmx=1) THEN '%s' ELSE (SELECT goto FROM alias WHERE address='%s' AND active='1') END AS result; +query = SELECT DISTINCT + CASE WHEN '%d' IN ( + SELECT domain FROM domain + WHERE relay_all_recipients=1 + AND domain='%d' + AND backupmx=1 + ) + THEN '%s' ELSE ( + SELECT goto FROM alias WHERE address='%s' AND active='1' + ) + END AS result; EOF cat < /opt/postfix/conf/sql/mysql_tls_enforce_in_policy.cf @@ -21,7 +31,16 @@ user = ${DBUSER} password = ${DBPASS} hosts = mysql dbname = ${DBNAME} -query = SELECT IF( EXISTS( SELECT 'TLS_ACTIVE' FROM alias LEFT OUTER JOIN mailbox ON mailbox.username = alias.goto WHERE (address='%s' OR address IN (SELECT CONCAT('%u', '@', target_domain) FROM alias_domain WHERE alias_domain='%d')) AND mailbox.tls_enforce_in = '1' AND mailbox.active = '1'), 'reject_plaintext_session', NULL) AS 'tls_enforce_in'; +query = SELECT IF(EXISTS( + SELECT 'TLS_ACTIVE' FROM alias + LEFT OUTER JOIN mailbox ON mailbox.username = alias.goto + WHERE (address='%s' + OR address IN ( + SELECT CONCAT('%u', '@', target_domain) FROM alias_domain + WHERE alias_domain='%d' + ) + ) AND mailbox.tls_enforce_in = '1' AND mailbox.active = '1' + ), 'reject_plaintext_session', NULL) AS 'tls_enforce_in'; EOF cat < /opt/postfix/conf/sql/mysql_sender_dependent_default_transport_maps.cf @@ -31,9 +50,26 @@ hosts = mysql dbname = ${DBNAME} query = SELECT GROUP_CONCAT(transport SEPARATOR '') AS transport_maps FROM ( - SELECT IF(EXISTS(SELECT 'smtp_type' FROM alias LEFT OUTER JOIN mailbox ON mailbox.username = alias.goto WHERE (address = '%s' OR address IN (SELECT CONCAT('%u', '@', target_domain) FROM alias_domain WHERE alias_domain = '%d')) AND mailbox.tls_enforce_out = '1' AND mailbox.active = '1'), 'smtp_enforced_tls:', 'smtp:') AS 'transport' + SELECT IF(EXISTS(SELECT 'smtp_type' FROM alias + LEFT OUTER JOIN mailbox ON mailbox.username = alias.goto + WHERE (address = '%s' + OR address IN ( + SELECT CONCAT('%u', '@', target_domain) FROM alias_domain + WHERE alias_domain = '%d' + ) + ) + AND mailbox.tls_enforce_out = '1' + AND mailbox.active = '1' + ), 'smtp_enforced_tls:', 'smtp:') AS 'transport' UNION ALL - SELECT hostname AS transport FROM relayhosts LEFT OUTER JOIN domain ON domain.relayhost = relayhosts.id WHERE relayhosts.active = '1' AND domain = '%d' OR domain IN (SELECT target_domain FROM alias_domain WHERE alias_domain = '%d') + SELECT hostname AS transport FROM relayhosts + LEFT OUTER JOIN domain ON domain.relayhost = relayhosts.id + WHERE relayhosts.active = '1' + AND domain = '%d' + OR domain IN ( + SELECT target_domain FROM alias_domain + WHERE alias_domain = '%d' + ) ) AS transport_view; EOF @@ -43,7 +79,11 @@ user = ${DBUSER} password = ${DBPASS} hosts = mysql dbname = ${DBNAME} -query = SELECT CONCAT_WS(':', username, password) AS auth_data FROM relayhosts WHERE id IN (SELECT relayhost FROM domain WHERE CONCAT('@', domain) = '%s'); +query = SELECT CONCAT_WS(':', username, password) AS auth_data FROM relayhosts + WHERE id IN ( + SELECT relayhost FROM domain + WHERE CONCAT('@', domain) = '%s' + ); EOF cat < /opt/postfix/conf/sql/mysql_virtual_alias_domain_catchall_maps.cf @@ -51,7 +91,10 @@ user = ${DBUSER} password = ${DBPASS} hosts = mysql dbname = ${DBNAME} -query = SELECT goto FROM alias,alias_domain WHERE alias_domain.alias_domain = '%d' and alias.address = CONCAT('@', alias_domain.target_domain) AND alias.active = 1 AND alias_domain.active='1' +query = SELECT goto FROM alias, alias_domain + WHERE alias_domain.alias_domain = '%d' + AND alias.address = CONCAT('@', alias_domain.target_domain) + AND alias.active = 1 AND alias_domain.active='1' EOF cat < /opt/postfix/conf/sql/mysql_virtual_alias_domain_maps.cf @@ -59,7 +102,11 @@ user = ${DBUSER} password = ${DBPASS} hosts = mysql dbname = ${DBNAME} -query = SELECT username FROM mailbox,alias_domain WHERE alias_domain.alias_domain = '%d' and mailbox.username = CONCAT('%u', '@', alias_domain.target_domain) AND mailbox.active = 1 AND alias_domain.active='1' +query = SELECT username FROM mailbox, alias_domain + WHERE alias_domain.alias_domain = '%d' + AND mailbox.username = CONCAT('%u', '@', alias_domain.target_domain) + AND mailbox.active = '1' + AND alias_domain.active='1' EOF cat < /opt/postfix/conf/sql/mysql_virtual_alias_maps.cf @@ -67,7 +114,9 @@ user = ${DBUSER} password = ${DBPASS} hosts = mysql dbname = ${DBNAME} -query = SELECT goto FROM alias WHERE address='%s' AND active='1'; +query = SELECT goto FROM alias + WHERE address='%s' + AND active='1'; EOF cat < /opt/postfix/conf/sql/mysql_virtual_domains_maps.cf @@ -75,7 +124,12 @@ user = ${DBUSER} password = ${DBPASS} hosts = mysql dbname = ${DBNAME} -query = SELECT alias_domain from alias_domain WHERE alias_domain='%s' AND active='1' UNION SELECT domain FROM domain WHERE domain='%s' AND active = '1' AND backupmx = '0' +query = SELECT alias_domain from alias_domain WHERE alias_domain='%s' AND active='1' + UNION + SELECT domain FROM domain + WHERE domain='%s' + AND active = '1' + AND backupmx = '0' EOF cat < /opt/postfix/conf/sql/mysql_virtual_mailbox_maps.cf @@ -99,7 +153,39 @@ user = ${DBUSER} password = ${DBPASS} hosts = mysql dbname = ${DBNAME} -query = SELECT goto FROM alias WHERE address='%s' AND active='1' AND (domain IN (SELECT domain FROM domain WHERE domain='%d' AND active='1') OR domain in (SELECT target_domain FROM alias_domain WHERE alias_domain='%d' AND active='1')) UNION SELECT logged_in_as FROM sender_acl WHERE send_as='@%d' OR send_as='%s' OR send_as IN ( SELECT CONCAT ('@',target_domain) FROM alias_domain WHERE alias_domain = '%d') OR send_as IN ( SELECT CONCAT ('%u','@',target_domain) FROM alias_domain WHERE alias_domain = '%d' ) AND logged_in_as NOT IN (SELECT goto FROM alias WHERE address='%s') UNION SELECT username FROM mailbox,alias_domain WHERE alias_domain.alias_domain = '%d' AND mailbox.username = CONCAT('%u','@',alias_domain.target_domain) AND mailbox.active ='1' AND alias_domain.active='1' +# First select queries domain and alias_domain to determine if domains are active. +query = SELECT goto FROM alias + WHERE address='%s' + AND active='1' + AND (domain IN + (SELECT domain FROM domain + WHERE domain='%d' + AND active='1') + OR domain in ( + SELECT alias_domain FROM alias_domain + WHERE alias_domain='%d' + AND active='1' + ) + ) + UNION + SELECT logged_in_as FROM sender_acl + WHERE send_as='@%d' + OR send_as='%s' + OR send_as IN ( + SELECT CONCAT('@',target_domain) FROM alias_domain + WHERE alias_domain = '%d') + OR send_as IN ( + SELECT CONCAT('%u','@',target_domain) FROM alias_domain + WHERE alias_domain = '%d') + AND logged_in_as NOT IN ( + SELECT goto FROM alias + WHERE address='%s') + UNION + SELECT username FROM mailbox, alias_domain + WHERE alias_domain.alias_domain = '%d' + AND mailbox.username = CONCAT('%u','@',alias_domain.target_domain) + AND mailbox.active ='1' + AND alias_domain.active='1' EOF cat < /opt/postfix/conf/sql/mysql_virtual_spamalias_maps.cf @@ -107,7 +193,9 @@ user = ${DBUSER} password = ${DBPASS} hosts = mysql dbname = ${DBNAME} -query = SELECT goto FROM spamalias WHERE address='%s' AND validity >= UNIX_TIMESTAMP() +query = SELECT goto FROM spamalias + WHERE address='%s' + AND validity >= UNIX_TIMESTAMP() EOF # Reset GPG key permissions @@ -124,9 +212,9 @@ postfix set-permissions postconf -c /opt/postfix/conf if [[ $? != 0 ]]; then - echo "Postfix configuration error, refusing to start." - exit 1 + echo "Postfix configuration error, refusing to start." + exit 1 else - postfix -c /opt/postfix/conf start - sleep 126144000 + postfix -c /opt/postfix/conf start + sleep 126144000 fi