hotfix(sessionresolver): prevent data race inside http3 (#809)

See https://github.com/ooni/probe/issues/2135#issuecomment-1149840579
This commit is contained in:
Simone Basso 2022-06-08 15:06:15 +02:00 committed by GitHub
commit f1b8071c65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 41 deletions

View file

@ -22,27 +22,16 @@ func timeLimitedLookup(ctx context.Context, re model.Resolver, hostname string)
return timeLimitedLookupWithTimeout(ctx, re, hostname, defaultTimeLimitedLookupTimeout)
}
// timeLimitedLookupResult is the result of a timeLimitedLookup
type timeLimitedLookupResult struct {
addrs []string
err error
}
// timeLimitedLookupWithTimeout is like timeLimitedLookup but with explicit timeout.
func timeLimitedLookupWithTimeout(ctx context.Context, re model.Resolver,
hostname string, timeout time.Duration) ([]string, error) {
outch := make(chan *timeLimitedLookupResult, 1) // buffer
// In https://github.com/ooni/probe-cli/pull/807, I modified this code to
// run in a background goroutine and this resulted in a data race, see
// https://github.com/ooni/probe/issues/2135#issuecomment-1149840579. While
// I could not reproduce the data race in a simple way, the race itself
// seems to happen inside the http3 package. For now, I am going to revert
// the change causing the race and I'll investigate later.
ctx, cancel := context.WithTimeout(ctx, timeout)
defer cancel()
go func() {
out := &timeLimitedLookupResult{}
out.addrs, out.err = re.LookupHost(ctx, hostname)
outch <- out
}()
select {
case <-ctx.Done():
return nil, ctx.Err()
case out := <-outch:
return out.addrs, out.err
}
return re.LookupHost(ctx, hostname)
}