d57c78bc71This 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
61 lines
1.5 KiB
Go
61 lines
1.5 KiB
Go
package internal
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
"net/http"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/version"
|
|
)
|
|
|
|
// Handler implements the Web Connectivity test helper HTTP API.
|
|
type Handler struct {
|
|
Client *http.Client
|
|
Dialer netx.Dialer
|
|
MaxAcceptableBody int64
|
|
Resolver netx.Resolver
|
|
}
|
|
|
|
func (h Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
|
|
w.Header().Add("Server", fmt.Sprintf(
|
|
"oohelperd/%s ooniprobe-engine/%s", version.Version, version.Version,
|
|
))
|
|
if req.Method != "POST" {
|
|
w.WriteHeader(400)
|
|
return
|
|
}
|
|
if req.Header.Get("content-type") != "application/json" {
|
|
w.WriteHeader(400)
|
|
return
|
|
}
|
|
reader := &io.LimitedReader{R: req.Body, N: h.MaxAcceptableBody}
|
|
data, err := ioutil.ReadAll(reader)
|
|
if err != nil {
|
|
w.WriteHeader(400)
|
|
return
|
|
}
|
|
var creq CtrlRequest
|
|
if err := json.Unmarshal(data, &creq); err != nil {
|
|
w.WriteHeader(400)
|
|
return
|
|
}
|
|
measureConfig := MeasureConfig{
|
|
Client: h.Client,
|
|
Dialer: h.Dialer,
|
|
MaxAcceptableBody: h.MaxAcceptableBody,
|
|
Resolver: h.Resolver,
|
|
}
|
|
cresp, err := Measure(req.Context(), measureConfig, &creq)
|
|
if err != nil {
|
|
w.WriteHeader(400)
|
|
return
|
|
}
|
|
// We assume that the following call cannot fail because it's a
|
|
// clearly serializable data structure.
|
|
data, _ = json.Marshal(cresp)
|
|
w.Header().Add("Content-Type", "application/json")
|
|
w.Write(data)
|
|
}
|