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
193 lines
5.3 KiB
Go
193 lines
5.3 KiB
Go
// Code generated by go generate; DO NOT EDIT.
|
|
// 2021-09-05 13:54:22.226116 +0200 CEST m=+0.000176793
|
|
|
|
package ooapi
|
|
|
|
//go:generate go run ./internal/generator -file requests.go
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"net/http"
|
|
"net/url"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
|
|
)
|
|
|
|
func (api *simpleCheckReportIDAPI) newRequest(ctx context.Context, req *apimodel.CheckReportIDRequest) (*http.Request, error) {
|
|
URL, err := url.Parse(api.baseURL())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
URL.Path = "/api/_/check_report_id"
|
|
q := url.Values{}
|
|
if req.ReportID == "" {
|
|
return nil, newErrEmptyField("ReportID")
|
|
}
|
|
q.Add("report_id", req.ReportID)
|
|
URL.RawQuery = q.Encode()
|
|
return api.requestMaker().NewRequest(ctx, "GET", URL.String(), nil)
|
|
}
|
|
|
|
func (api *simpleCheckInAPI) newRequest(ctx context.Context, req *apimodel.CheckInRequest) (*http.Request, error) {
|
|
URL, err := url.Parse(api.baseURL())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
URL.Path = "/api/v1/check-in"
|
|
body, err := api.jsonCodec().Encode(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out, err := api.requestMaker().NewRequest(ctx, "POST", URL.String(), bytes.NewReader(body))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out.Header.Set("Content-Type", "application/json")
|
|
return out, nil
|
|
}
|
|
|
|
func (api *simpleLoginAPI) newRequest(ctx context.Context, req *apimodel.LoginRequest) (*http.Request, error) {
|
|
URL, err := url.Parse(api.baseURL())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
URL.Path = "/api/v1/login"
|
|
body, err := api.jsonCodec().Encode(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out, err := api.requestMaker().NewRequest(ctx, "POST", URL.String(), bytes.NewReader(body))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out.Header.Set("Content-Type", "application/json")
|
|
return out, nil
|
|
}
|
|
|
|
func (api *simpleMeasurementMetaAPI) newRequest(ctx context.Context, req *apimodel.MeasurementMetaRequest) (*http.Request, error) {
|
|
URL, err := url.Parse(api.baseURL())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
URL.Path = "/api/v1/measurement_meta"
|
|
q := url.Values{}
|
|
if req.ReportID == "" {
|
|
return nil, newErrEmptyField("ReportID")
|
|
}
|
|
q.Add("report_id", req.ReportID)
|
|
if req.Full {
|
|
q.Add("full", "true")
|
|
}
|
|
if req.Input != "" {
|
|
q.Add("input", req.Input)
|
|
}
|
|
URL.RawQuery = q.Encode()
|
|
return api.requestMaker().NewRequest(ctx, "GET", URL.String(), nil)
|
|
}
|
|
|
|
func (api *simpleRegisterAPI) newRequest(ctx context.Context, req *apimodel.RegisterRequest) (*http.Request, error) {
|
|
URL, err := url.Parse(api.baseURL())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
URL.Path = "/api/v1/register"
|
|
body, err := api.jsonCodec().Encode(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out, err := api.requestMaker().NewRequest(ctx, "POST", URL.String(), bytes.NewReader(body))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out.Header.Set("Content-Type", "application/json")
|
|
return out, nil
|
|
}
|
|
|
|
func (api *simpleTestHelpersAPI) newRequest(ctx context.Context, req *apimodel.TestHelpersRequest) (*http.Request, error) {
|
|
URL, err := url.Parse(api.baseURL())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
URL.Path = "/api/v1/test-helpers"
|
|
return api.requestMaker().NewRequest(ctx, "GET", URL.String(), nil)
|
|
}
|
|
|
|
func (api *simplePsiphonConfigAPI) newRequest(ctx context.Context, req *apimodel.PsiphonConfigRequest) (*http.Request, error) {
|
|
URL, err := url.Parse(api.baseURL())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
URL.Path = "/api/v1/test-list/psiphon-config"
|
|
return api.requestMaker().NewRequest(ctx, "GET", URL.String(), nil)
|
|
}
|
|
|
|
func (api *simpleTorTargetsAPI) newRequest(ctx context.Context, req *apimodel.TorTargetsRequest) (*http.Request, error) {
|
|
URL, err := url.Parse(api.baseURL())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
URL.Path = "/api/v1/test-list/tor-targets"
|
|
return api.requestMaker().NewRequest(ctx, "GET", URL.String(), nil)
|
|
}
|
|
|
|
func (api *simpleURLsAPI) newRequest(ctx context.Context, req *apimodel.URLsRequest) (*http.Request, error) {
|
|
URL, err := url.Parse(api.baseURL())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
URL.Path = "/api/v1/test-list/urls"
|
|
q := url.Values{}
|
|
if req.CategoryCodes != "" {
|
|
q.Add("category_codes", req.CategoryCodes)
|
|
}
|
|
if req.CountryCode != "" {
|
|
q.Add("country_code", req.CountryCode)
|
|
}
|
|
if req.Limit != 0 {
|
|
q.Add("limit", newQueryFieldInt64(req.Limit))
|
|
}
|
|
URL.RawQuery = q.Encode()
|
|
return api.requestMaker().NewRequest(ctx, "GET", URL.String(), nil)
|
|
}
|
|
|
|
func (api *simpleOpenReportAPI) newRequest(ctx context.Context, req *apimodel.OpenReportRequest) (*http.Request, error) {
|
|
URL, err := url.Parse(api.baseURL())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
URL.Path = "/report"
|
|
body, err := api.jsonCodec().Encode(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out, err := api.requestMaker().NewRequest(ctx, "POST", URL.String(), bytes.NewReader(body))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out.Header.Set("Content-Type", "application/json")
|
|
return out, nil
|
|
}
|
|
|
|
func (api *simpleSubmitMeasurementAPI) newRequest(ctx context.Context, req *apimodel.SubmitMeasurementRequest) (*http.Request, error) {
|
|
URL, err := url.Parse(api.baseURL())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
up, err := api.templateExecutor().Execute("/report/{{ .ReportID }}", req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
URL.Path = up
|
|
body, err := api.jsonCodec().Encode(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out, err := api.requestMaker().NewRequest(ctx, "POST", URL.String(), bytes.NewReader(body))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out.Header.Set("Content-Type", "application/json")
|
|
return out, nil
|
|
}
|