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
69 lines
1.9 KiB
Go
69 lines
1.9 KiB
Go
package dash
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"io"
|
|
"net/http"
|
|
"net/url"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
|
)
|
|
|
|
type negotiateDeps interface {
|
|
HTTPClient() *http.Client
|
|
JSONMarshal(v interface{}) ([]byte, error)
|
|
Logger() model.Logger
|
|
NewHTTPRequest(method string, url string, body io.Reader) (*http.Request, error)
|
|
ReadAll(r io.Reader) ([]byte, error)
|
|
Scheme() string
|
|
UserAgent() string
|
|
}
|
|
|
|
func negotiate(
|
|
ctx context.Context, fqdn string, deps negotiateDeps) (negotiateResponse, error) {
|
|
var negotiateResp negotiateResponse
|
|
data, err := deps.JSONMarshal(negotiateRequest{DASHRates: defaultRates})
|
|
if err != nil {
|
|
return negotiateResp, err
|
|
}
|
|
deps.Logger().Debugf("dash: body: %s", string(data))
|
|
var URL url.URL
|
|
URL.Scheme = deps.Scheme()
|
|
URL.Host = fqdn
|
|
URL.Path = negotiatePath
|
|
req, err := deps.NewHTTPRequest("POST", URL.String(), bytes.NewReader(data))
|
|
if err != nil {
|
|
return negotiateResp, err
|
|
}
|
|
req.Header.Set("User-Agent", deps.UserAgent())
|
|
req.Header.Set("Content-Type", "application/json")
|
|
req.Header.Set("Authorization", "")
|
|
resp, err := deps.HTTPClient().Do(req.WithContext(ctx))
|
|
if err != nil {
|
|
return negotiateResp, err
|
|
}
|
|
if resp.StatusCode != 200 {
|
|
return negotiateResp, errHTTPRequestFailed
|
|
}
|
|
defer resp.Body.Close()
|
|
data, err = deps.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return negotiateResp, err
|
|
}
|
|
deps.Logger().Debugf("dash: body: %s", string(data))
|
|
err = json.Unmarshal(data, &negotiateResp)
|
|
if err != nil {
|
|
return negotiateResp, err
|
|
}
|
|
// Implementation oddity: Neubot is using an integer rather than a
|
|
// boolean for the unchoked, with obvious semantics. I wonder why
|
|
// I choose an integer over a boolean, given that Python does have
|
|
// support for booleans. I don't remember 🤷.
|
|
if negotiateResp.Authorization == "" || negotiateResp.Unchoked == 0 {
|
|
return negotiateResp, errServerBusy
|
|
}
|
|
return negotiateResp, nil
|
|
}
|