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

cleanup: use NewHTTPTransportWithResolver more often (#808)

Browse Source 
We can simplify code in a bunch of places using a useful factory.

Part of https://github.com/ooni/probe/issues/2121.
This commit is contained in:
Simone Basso
2022-06-08 15:13:01 +02:00
committed by GitHub
parent f1b8071c65
commit beba543b98
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cmd/oohelper/oohelper.go
+1 -4
View File
@@ -29,10 +29,7 @@ func init() {
// puzzling https://github.com/ooni/probe/issues/1409 issue.
const resolverURL = "https://8.8.8.8/dns-query"
resolver = netxlite.NewParallelDNSOverHTTPSResolver(log.Log, resolverURL)
thx := netxlite.NewTLSHandshakerStdlib(log.Log)
dialer := netxlite.NewDialerWithResolver(log.Log, resolver)
tlsDialer := netxlite.NewTLSDialer(dialer, thx)
txp := netxlite.NewHTTPTransport(log.Log, dialer, tlsDialer)
txp := netxlite.NewHTTPTransportWithResolver(log.Log, resolver)
httpClient = netxlite.NewHTTPClient(txp)
}
internal/cmd/oohelperd/oohelperd.go
+1 -4
View File
@@ -32,10 +32,7 @@ func init() {
// default resolver configured by the box. Also, use an encrypted transport thus
// we're less vulnerable to any policy implemented by the box's provider.
resolver = netxlite.NewParallelDNSOverHTTPSResolver(log.Log, "https://8.8.8.8/dns-query")
thx := netxlite.NewTLSHandshakerStdlib(log.Log)
dialer = netxlite.NewDialerWithResolver(log.Log, resolver)
tlsDialer := netxlite.NewTLSDialer(dialer, thx)
txp := netxlite.NewHTTPTransport(log.Log, dialer, tlsDialer)
txp := netxlite.NewHTTPTransportWithResolver(log.Log, resolver)
httpClient = netxlite.NewHTTPClient(txp)
}