Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#fix 1478

This commit is contained in:
youtous 2020-04-30 12:05:36 +02:00
parent 35f473ad12
commit d45e6b1c22
No known key found for this signature in database
GPG Key ID: 592173AE8CD254A5
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/start-mailserver.sh
View File

@ -637,6 +637,9 @@ function _setup_dovecot_quota() {
if [ "$ENABLE_LDAP" = 1 ]; then if [ "$ENABLE_LDAP" = 1 ]; then
notify 'inf' "Dovecot quota is not implemented with LDAP." notify 'inf' "Dovecot quota is not implemented with LDAP."
# LDAP => postfix service for dovecot quota not enabled
sed -i "s/check_policy_service inet:localhost:65265//g" /etc/postfix/main.cf
if [ -f /etc/dovecot/conf.d/90-quota.conf ]; then if [ -f /etc/dovecot/conf.d/90-quota.conf ]; then
mv /etc/dovecot/conf.d/90-quota.conf /etc/dovecot/conf.d/90-quota.conf.disab mv /etc/dovecot/conf.d/90-quota.conf /etc/dovecot/conf.d/90-quota.conf.disab
sed -i "s/mail_plugins = \$mail_plugins quota/mail_plugins = \$mail_plugins/g" /etc/dovecot/conf.d/10-mail.conf sed -i "s/mail_plugins = \$mail_plugins quota/mail_plugins = \$mail_plugins/g" /etc/dovecot/conf.d/10-mail.conf
@ -659,12 +662,12 @@ function _setup_dovecot_quota() {
notify 'inf' "'config/docker-mailserver/dovecot-quotas.cf' is not provided. Using default quotas." notify 'inf' "'config/docker-mailserver/dovecot-quotas.cf' is not provided. Using default quotas."
echo -n >/tmp/docker-mailserver/dovecot-quotas.cf echo -n >/tmp/docker-mailserver/dovecot-quotas.cf
fi fi
fi
if [ "$SMTP_ONLY" = 1 ]; then if [ "$SMTP_ONLY" = 1 ]; then
sed -i "s/check_policy_service inet:localhost:65265//g" /etc/postfix/main.cf sed -i "s/check_policy_service inet:localhost:65265//g" /etc/postfix/main.cf
else else
sed -i "s/reject_unknown_recipient_domain, reject_rbl_client zen.spamhaus.org/reject_unknown_recipient_domain, check_policy_service inet:localhost:65265, reject_rbl_client zen.spamhaus.org/g" /etc/postfix/main.cf sed -i "s/reject_unknown_recipient_domain, reject_rbl_client zen.spamhaus.org/reject_unknown_recipient_domain, check_policy_service inet:localhost:65265, reject_rbl_client zen.spamhaus.org/g" /etc/postfix/main.cf
fi
fi fi
} }

5
test/mail_with_ldap.bats
View File

@ -179,6 +179,11 @@ function teardown_file() {
assert_success assert_success
} }
@test "checking postfix: dovecot quota absent in postconf" {
run docker exec mail_with_ldap /bin/bash -c "postconf | grep 'check_policy_service inet:localhost:65265'"
assert_failure
}
@test "checking spoofing: rejects sender forging" { @test "checking spoofing: rejects sender forging" {
run docker exec mail_with_ldap /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/auth/ldap-smtp-auth-spoofed.txt | grep 'Sender address rejected: not owned by user'" run docker exec mail_with_ldap /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/auth/ldap-smtp-auth-spoofed.txt | grep 'Sender address rejected: not owned by user'"
assert_success assert_success