mirror of
https://blitiri.com.ar/repos/chasquid
synced 2026-01-05 17:37:03 +00:00
ed38945fca
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.
59 lines
1.4 KiB
Bash
Executable File
59 lines
1.4 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -e
|
|
. $(dirname ${0})/../util/lib.sh
|
|
|
|
init
|
|
check_hostaliases
|
|
|
|
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-ü
|
|
|
|
CONFDIR=A generate_certs_for srv-ñ
|
|
CONFDIR=A add_user ñangapirí@srv-ñ antaño
|
|
CONFDIR=A add_user nadaA@nadaA nadaA
|
|
|
|
CONFDIR=B generate_certs_for srv-ü
|
|
CONFDIR=B add_user pingüino@srv-ü velóz
|
|
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 \
|
|
< from_A_to_B
|
|
|
|
wait_for_file .mail/pingüino@srv-ü
|
|
mail_diff from_A_to_B .mail/pingüino@srv-ü
|
|
|
|
# Send from B to A.
|
|
smtpc.py --server=localhost:2025 --user=nadaB@nadaB --password=nadaB \
|
|
< from_B_to_A
|
|
|
|
wait_for_file .mail/ñangapirí@srv-ñ
|
|
mail_diff from_B_to_A .mail/ñangapirí@srv-ñ
|
|
|
|
success
|