c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(oohelperd): refuse to measure bogons (#898)

Browse Source 
See the explanatory newly-added comment for more information.

Closes https://github.com/ooni/probe/issues/2064
This commit is contained in:
Simone Basso 2022-08-29 00:06:57 +02:00 committed by GitHub
parent dcdd8fb712
commit 9bd1c5ff20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/cmd/oohelperd/main.go
View File

@ -61,7 +61,25 @@ func main() {
Indexer: &atomicx.Int64{}, Indexer: &atomicx.Int64{},
MaxAcceptableBody: maxAcceptableBody, MaxAcceptableBody: maxAcceptableBody,
NewClient: func(logger model.Logger) model.HTTPClient { NewClient: func(logger model.Logger) model.HTTPClient {
return netxlite.NewHTTPClientWithResolver(logger, newResolver(logger)) // If the DoH resolver we're using insists that a given domain maps to
// bogons, make sure we're going to fail the HTTP measurement.
//
// The TCP measurements scheduler in ipinfo.go will also refuse to
// schedule TCP measurements for bogons.
//
// While this seems theoretical, as of 2022-08-28, I see:
//
// % host polito.it
// polito.it has address 192.168.59.6
// polito.it has address 192.168.40.1
// polito.it mail is handled by 10 mx.polito.it.
//
// So, it's better to consider this as a possible corner case.
reso := netxlite.MaybeWrapWithBogonResolver(
true, // enabled
newResolver(logger),
)
return netxlite.NewHTTPClientWithResolver(logger, reso)
}, },
NewDialer: func(logger model.Logger) model.Dialer { NewDialer: func(logger model.Logger) model.Dialer {
return netxlite.NewDialerWithResolver(logger, newResolver(logger)) return netxlite.NewDialerWithResolver(logger, newResolver(logger))