c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(wcth): match legacy TH w/ empty DNS reply (#546)

Browse source 
See https://github.com/ooni/probe/issues/1707#issuecomment-944322725
This commit is contained in:
Simone Basso 2021-10-15 16:20:07 +02:00 • committed by GitHub
commit 2fa87f0e00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/cmd/oohelperd/internal/webconnectivity/dns.go
View file

@ -51,8 +51,13 @@ func dnsMapFailure(failure *string) *string {
// already checking for this specific error string.
s := webconnectivity.DNSNameError
return &s
case netxlite.FailureDNSNoAnswer,
netxlite.FailureDNSNonRecoverableFailure,
case netxlite.FailureDNSNoAnswer:
// In this case the legacy TH would produce an empty
// reply that is not attached to any error.
//
// See https://github.com/ooni/probe/issues/1707#issuecomment-944322725
return nil
case netxlite.FailureDNSNonRecoverableFailure,
netxlite.FailureDNSRefusedError,
netxlite.FailureDNSServerMisbehaving,
netxlite.FailureDNSTemporaryFailure:

2
internal/cmd/oohelperd/internal/webconnectivity/dns_test.go
View file

@ -31,7 +31,7 @@ func Test_dnsMapFailure(t *testing.T) {
}, {
name: "no answer",
failure: stringPointerForString(netxlite.FailureDNSNoAnswer),
want: stringPointerForString("dns_server_failure"),
want: nil,
}, {
name: "non recoverable failure",
failure: stringPointerForString(netxlite.FailureDNSNonRecoverableFailure),