16f7407b13
This diff introduces support for observing additional DNS-over-UDP responses in some censored environments (e.g. China). After some uncertainty around whether to use connected or unconnected UDP sockets, I eventually settled for connected. Here's a recap: | | connected | unconnected | | ----------------------- | --------- | ----------- | | see ICMP errors | ✔️ | ❌ | | responses from any server | ❌ | ✔️ | Because most if not all DNS resolvers expect answers from exactly the same servers to which they sent the query, I would say that it's more important to have some limited ability of observing the effect of ICMP errors (e.g., host_unreachable when we set a low TTL and send out a query to a server). Therefore, my choice was to modify the existing DNS-over-UDP transport. Here's an overview of the changes: 1. introduce a new API for performing an async round trip that returns a channel wrapper where all responses are posted. The channel will not ever be closed, so the reader needs to use select for safely reading. If the reader users the wrapper's Next or TryNextResponses methods, these details do not matter because they already implement a safe reading pattern. 2. the async round trip API performs the round trip in the background and stops processing when it sees the first error. 3. the background running code will use an overall deadline derived from the DNSTransport.IOTimeout field to know when to stop. 4. the background running code will additionally stop running if noone is reading the channel and there are no empty slots in the channel's buffer. 5. the RoundTrip method has been rewritten in terms of the async API. The design I'm using here implements the proposal for async round trips defined at https://github.com/ooni/probe/issues/2099. I have chosen not to make all transports async because the DNS transport seems the only transport that needs to also work in async mode. While there, I noticed that we were not propagating CloseIdleConnection to the underlying dialer, which was potentially wrong, so I did it.
34 lines
1.0 KiB
Bash
Executable File
34 lines
1.0 KiB
Bash
Executable File
#!/bin/bash
|
|
set -euo pipefail
|
|
exitcode=0
|
|
for file in $(find . -type f -name \*.go); do
|
|
if [ "$file" = "./internal/netxlite/iox.go" ]; then
|
|
# We're allowed to use ReadAll and Copy in this file to
|
|
# implement safer wrappers for these functions.
|
|
continue
|
|
fi
|
|
if [ "$file" = "./internal/netxlite/filtering/tls.go" ]; then
|
|
# We're allowed to use ReadAll and Copy in this file to
|
|
# avoid depending on netxlite, so we can use filtering
|
|
# inside of netxlite's own test suite.
|
|
continue
|
|
fi
|
|
if grep -q 'io\.ReadAll' $file; then
|
|
echo "in $file: do not use io.ReadAll, use netxlite.ReadAllContext" 1>&2
|
|
exitcode=1
|
|
fi
|
|
if grep -q 'ioutil\.ReadAll' $file; then
|
|
echo "in $file: do not use ioutil.ReadAll, use netxlite.ReadAllContext" 1>&2
|
|
exitcode=1
|
|
fi
|
|
if grep -q 'io\.Copy' $file; then
|
|
echo "in $file: do not use io.Copy, use netxlite.CopyContext" 1>&2
|
|
exitcode=1
|
|
fi
|
|
if grep -q 'ioutil\.Copy' $file; then
|
|
echo "in $file: do not use ioutil.Copy, use netxlite.CopyContext" 1>&2
|
|
exitcode=1
|
|
fi
|
|
done
|
|
exit $exitcode
|