d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
39 lines
753 B
Go
39 lines
753 B
Go
package geolocate
|
|
|
|
import (
|
|
"context"
|
|
"encoding/xml"
|
|
"net/http"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpx"
|
|
)
|
|
|
|
type ubuntuResponse struct {
|
|
XMLName xml.Name `xml:"Response"`
|
|
IP string `xml:"Ip"`
|
|
}
|
|
|
|
func ubuntuIPLookup(
|
|
ctx context.Context,
|
|
httpClient *http.Client,
|
|
logger Logger,
|
|
userAgent string,
|
|
) (string, error) {
|
|
data, err := (httpx.Client{
|
|
BaseURL: "https://geoip.ubuntu.com/",
|
|
HTTPClient: httpClient,
|
|
Logger: logger,
|
|
UserAgent: userAgent,
|
|
}).FetchResource(ctx, "/lookup")
|
|
if err != nil {
|
|
return DefaultProbeIP, err
|
|
}
|
|
logger.Debugf("ubuntu: body: %s", string(data))
|
|
var v ubuntuResponse
|
|
err = xml.Unmarshal(data, &v)
|
|
if err != nil {
|
|
return DefaultProbeIP, err
|
|
}
|
|
return v.IP, nil
|
|
}
|