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(webconnectivity@v0.5): fetch HTTP only using system-resolver addrs (#935)

Browse source 
While there, change the emoji logger to emit whitespace on info logs. This makes warnings stand out even more.

Closes https://github.com/ooni/probe/issues/2258
This commit is contained in:
Simone Basso 2022-09-05 13:33:59 +02:00 • committed by GitHub
commit 3b24b1196d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 92 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/experiment/webconnectivity/control.go
View file

@ -23,11 +23,11 @@ type EndpointMeasurementsStarter interface {
// nonblocking read fails. Hence, you must create a [sema] channel with buffer equal
// to N and N elements inside it to allow N flows to perform HTTP measurements. Passing
// a nil [sema] causes no flow to attempt HTTP measurements.
startCleartextFlowsWithSema(ctx context.Context, sema <-chan any, addresses []string)
startCleartextFlowsWithSema(ctx context.Context, sema <-chan any, addresses []DNSEntry)
// startSecureFlowsWithSema starts a TCP+TLS measurement flow for each IP addr. See
// the docs of startCleartextFlowsWithSema for more info on the [sema] arg.
startSecureFlowsWithSema(ctx context.Context, sema <-chan any, addresses []string)
startSecureFlowsWithSema(ctx context.Context, sema <-chan any, addresses []DNSEntry)
}
// Control issues a Control request and saves the results
@ -157,12 +157,22 @@ func (c *Control) maybeStartExtraMeasurements(ctx context.Context, thAddrs []str
}
// obtain the TH-only addresses
var thOnly []string
var thOnlyAddrs []string
for addr, flags := range mapping {
if (flags & inProbe) != 0 {
continue // discovered by the probe => already tested
}
thOnly = append(thOnly, addr)
thOnlyAddrs = append(thOnlyAddrs, addr)
}
c.Logger.Infof("measuring additional addrs from TH: %+v", thOnlyAddrs)
var thOnly []DNSEntry
for _, addr := range thOnlyAddrs {
thOnly = append(thOnly, DNSEntry{
Addr: addr,
Flags: 0, // neither system, nor udp, nor doh
})
}
// Start extra measurements for TH-only addresses. Because we already