7b7df2c6af
This PR starts to implement the refactoring described at https://github.com/ooni/probe/issues/1951. I originally wrote more patches than the ones in this PR, but overall they were not readable. Since I want to squash and merge, here's a reasonable subset of the original patches that will still be readable and understandable in the future.
32 lines
698 B
Go
32 lines
698 B
Go
package geolocate
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
func ipConfigIPLookup(
|
|
ctx context.Context,
|
|
httpClient *http.Client,
|
|
logger model.Logger,
|
|
userAgent string,
|
|
) (string, error) {
|
|
data, err := (&httpx.APIClient{
|
|
BaseURL: "https://ipconfig.io",
|
|
HTTPClient: httpClient,
|
|
Logger: logger,
|
|
UserAgent: httpheader.CLIUserAgent(),
|
|
}).FetchResource(ctx, "/")
|
|
if err != nil {
|
|
return DefaultProbeIP, err
|
|
}
|
|
ip := strings.Trim(string(data), "\r\n\t ")
|
|
logger.Debugf("ipconfig: body: %s", ip)
|
|
return ip, nil
|
|
}
|