566c6b246a
This diff addresses another point of https://github.com/ooni/probe/issues/1956: > - [ ] observe that we're still using a bunch of private interfaces for common interfaces such as the `Dialer`, so we can get rid of these private interfaces and always use the ones in `model`, which allows us to remove a bunch of legacy wrappers Additional cleanups may still be possible. The more I cleanup, the more I see there's extra legacy code we can dispose of (which seems good?).
55 lines
1.4 KiB
Go
55 lines
1.4 KiB
Go
package webconnectivity
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
"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 model.Dialer
|
|
MaxAcceptableBody int64
|
|
Resolver model.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 := netxlite.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)
|
|
}
|