mirror of
https://blitiri.com.ar/repos/chasquid
synced 2025-12-23 15:37:01 +00:00
courier: Use DNSError.IsNotFound to identify NXDOMAIN
When resolving MX records, we need to distinguish between "no such domain" and other kinds of errors. Before Go 1.13, this was not possible, so we had a workaround that assumed any permanent error was a "no such domain", which is not great, but functional. Now that our minimum supported version is Go 1.15, we can remove the workaround. This patch replaces the workaround with proper logic using DNSError.IsNotFound to identify NXDOMAIN results when resolving MX records. This requires to adjust a few tests, that used to work on environments where resolving unknown domains (used for testing) returned a permanent error, and now they no longer do so. Instead of relying on this environmental property, we make the affected tests use our own DNS server, which should make them more hermetic and reproducible.
This commit is contained in:
@@ -38,6 +38,12 @@ fi
|
||||
mkdir -p .exim4
|
||||
EXIMDIR="$PWD/.exim4" envsubst < config/exim4.in > .exim4/config
|
||||
|
||||
# Build with the DNS override, so we can fake DNS records.
|
||||
export GOTAGS="dnsoverride"
|
||||
|
||||
# Launch minidns in the background using our configuration.
|
||||
minidns_bg --addr=":9053" -zones=zones >> .minidns.log 2>&1
|
||||
|
||||
generate_certs_for srv-chasquid
|
||||
add_user user@srv-chasquid secretpassword
|
||||
add_user someone@srv-chasquid secretpassword
|
||||
@@ -47,9 +53,11 @@ add_user someone@srv-chasquid secretpassword
|
||||
# Bypass MX lookup, so it can find srv-exim (via our host alias).
|
||||
mkdir -p .logs
|
||||
chasquid -v=2 --logfile=.logs/chasquid.log --config_dir=config \
|
||||
--testing__dns_addr=127.0.0.1:9053 \
|
||||
--testing__outgoing_smtp_port=2025 &
|
||||
|
||||
wait_until_ready 1025
|
||||
wait_until_ready 9053
|
||||
|
||||
# Launch exim at port 2025
|
||||
.exim4/exim4 -bd -d -C "$PWD/.exim4/config" > .exim4/log 2>&1 &
|
||||
|
||||
6
test/t-02-exim/zones
Normal file
6
test/t-02-exim/zones
Normal file
@@ -0,0 +1,6 @@
|
||||
# srv-chasquid and srv-exim to localhost.
|
||||
# Neither have an MX record, but that's okay.
|
||||
srv-chasquid A 127.0.0.1
|
||||
srv-chasquid AAAA ::1
|
||||
srv-exim A 127.0.0.1
|
||||
srv-exim AAAA ::1
|
||||
@@ -1,2 +0,0 @@
|
||||
xn--srv--3ra localhost
|
||||
xn--srv--jqa localhost
|
||||
@@ -10,6 +10,12 @@ rm -rf .data-A .data-B .mail
|
||||
|
||||
skip_if_python_is_too_old
|
||||
|
||||
# Build with the DNS override, so we can fake DNS records.
|
||||
export GOTAGS="dnsoverride"
|
||||
|
||||
# Launch minidns in the background using our configuration.
|
||||
minidns_bg --addr=":9053" -zones=zones >> .minidns.log 2>&1
|
||||
|
||||
# Two servers:
|
||||
# A - listens on :1025, hosts srv-ñ
|
||||
# B - listens on :2015, hosts srv-ü
|
||||
@@ -25,12 +31,15 @@ CONFDIR=B add_user nadaB@nadaB nadaB
|
||||
mkdir -p .logs-A .logs-B
|
||||
|
||||
chasquid -v=2 --logfile=.logs-A/chasquid.log --config_dir=A \
|
||||
--testing__dns_addr=127.0.0.1:9053 \
|
||||
--testing__outgoing_smtp_port=2025 &
|
||||
chasquid -v=2 --logfile=.logs-B/chasquid.log --config_dir=B \
|
||||
--testing__dns_addr=127.0.0.1:9053 \
|
||||
--testing__outgoing_smtp_port=1025 &
|
||||
|
||||
wait_until_ready 1025
|
||||
wait_until_ready 2025
|
||||
wait_until_ready 9053
|
||||
|
||||
# Send from A to B.
|
||||
smtpc.py --server=localhost:1025 --user=nadaA@nadaA --password=nadaA \
|
||||
|
||||
4
test/t-06-idna/zones
Normal file
4
test/t-06-idna/zones
Normal file
@@ -0,0 +1,4 @@
|
||||
xn--srv--3ra A 127.0.0.1
|
||||
xn--srv--3ra AAAA ::1
|
||||
xn--srv--jqa A 127.0.0.1
|
||||
xn--srv--jqa AAAA ::1
|
||||
@@ -8,6 +8,12 @@ check_hostaliases
|
||||
|
||||
rm -rf .data-A .data-B .mail
|
||||
|
||||
# Build with the DNS override, so we can fake DNS records.
|
||||
export GOTAGS="dnsoverride"
|
||||
|
||||
# Launch minidns in the background using our configuration.
|
||||
minidns_bg --addr=":9053" -zones=zones >> .minidns.log 2>&1
|
||||
|
||||
# Two servers:
|
||||
# A - listens on :1025, hosts srv-A
|
||||
# B - listens on :2015, hosts srv-B
|
||||
@@ -23,13 +29,16 @@ CONFDIR=B generate_certs_for srv-B
|
||||
mkdir -p .logs-A .logs-B
|
||||
|
||||
chasquid -v=2 --logfile=.logs-A/chasquid.log --config_dir=A \
|
||||
--testing__dns_addr=127.0.0.1:9053 \
|
||||
--testing__max_received_headers=5 \
|
||||
--testing__outgoing_smtp_port=2025 &
|
||||
chasquid -v=2 --logfile=.logs-B/chasquid.log --config_dir=B \
|
||||
--testing__dns_addr=127.0.0.1:9053 \
|
||||
--testing__outgoing_smtp_port=1025 &
|
||||
|
||||
wait_until_ready 1025
|
||||
wait_until_ready 2025
|
||||
wait_until_ready 9053
|
||||
|
||||
run_msmtp aliasB@srv-B < content
|
||||
|
||||
|
||||
4
test/t-09-loop/zones
Normal file
4
test/t-09-loop/zones
Normal file
@@ -0,0 +1,4 @@
|
||||
srv-a A 127.0.0.1
|
||||
srv-a AAAA ::1
|
||||
srv-b A 127.0.0.1
|
||||
srv-b AAAA ::1
|
||||
@@ -209,6 +209,11 @@ func (m *miniDNS) handle(msg *dnsmessage.Message) *dnsmessage.Message {
|
||||
ID: msg.ID,
|
||||
Response: true,
|
||||
RCode: dnsmessage.RCodeSuccess,
|
||||
|
||||
// We're authoritative for the zones we're serving.
|
||||
// We should either set this, or RecursionAvailable, otherwise
|
||||
// some client libraries will complain.
|
||||
Authoritative: true,
|
||||
},
|
||||
Questions: msg.Questions,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user