2e0118d1a6## Description This PR continues the refactoring of `netx` under the following principles: 1. do not break the rest of the tree and do not engage in extensive tree-wide refactoring yet 2. move under `netxlite` clearly related subpackages (e.g., `iox`, `netxmocks`) 3. move into `internal/netxlite/internal` stuff that is clearly private of `netxlite` 4. hide implementation details in `netxlite` pending new factories 5. refactor `tls` code in `netxlite` to clearly separate `crypto/tls` code from `utls` code After each commit, I run `go test -short -race ./...` locally. Each individual commit explains what it does. I will squash, but this operation will preserve the original commit titles, so this will give further insight on each step. ## Commits * refactor: rename netxmocks -> netxlite/mocks Part of https://github.com/ooni/probe/issues/1591 * refactor: rename quicx -> netxlite/quicx See https://github.com/ooni/probe/issues/1591 * refactor: rename iox -> netxlite/iox Regenerate sources and make sure the tests pass. See https://github.com/ooni/probe/issues/1591. * refactor(iox): move MockableReader to netxlite/mocks See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): generator is an implementation detail See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): separate tls and utls code See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): hide most types but keep old names as legacy With this change we avoid breaking the rest of the tree, but we start hiding some implementation details a bit. Factories will follow. See https://github.com/ooni/probe/issues/1591
54 lines
1.4 KiB
Go
54 lines
1.4 KiB
Go
package webconnectivity
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
|
|
"github.com/ooni/probe-cli/v3/internal/runtimex"
|
|
"github.com/ooni/probe-cli/v3/internal/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
|
|
}
|
|
reader := &io.LimitedReader{R: req.Body, N: h.MaxAcceptableBody}
|
|
data, err := iox.ReadAllContext(req.Context(), 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(h)
|
|
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, err = json.Marshal(cresp)
|
|
runtimex.PanicOnError(err, "json.Marshal failed")
|
|
w.Header().Add("Content-Type", "application/json")
|
|
w.Write(data)
|
|
}
|