2021-03-19 09:30:42 +01:00
|
|
|
// Code generated by go generate; DO NOT EDIT.
|
2021-10-20 18:16:40 +02:00
|
|
|
// 2021-10-20 14:12:57.571045 +0200 CEST m=+0.000218459
|
2021-03-19 09:30:42 +01:00
|
|
|
|
|
|
|
package ooapi
|
|
|
|
|
|
|
|
//go:generate go run ./internal/generator -file clientcall_test.go
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"encoding/json"
|
|
|
|
"net/http"
|
|
|
|
"net/http/httptest"
|
|
|
|
"net/url"
|
|
|
|
"sync"
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/google/go-cmp/cmp"
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/kvstore"
|
2021-09-28 12:42:01 +02:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
|
2021-03-19 09:30:42 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
type handleClientCallCheckReportID struct {
|
|
|
|
accept string
|
|
|
|
body []byte
|
|
|
|
contentType string
|
|
|
|
count int32
|
|
|
|
method string
|
|
|
|
mu sync.Mutex
|
|
|
|
resp *apimodel.CheckReportIDResponse
|
|
|
|
url *url.URL
|
|
|
|
userAgent string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *handleClientCallCheckReportID) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
ff := fakeFill{}
|
|
|
|
defer h.mu.Unlock()
|
|
|
|
h.mu.Lock()
|
|
|
|
if h.count > 0 {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.count++
|
|
|
|
if r.Body != nil {
|
2021-09-28 12:42:01 +02:00
|
|
|
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
|
2021-03-19 09:30:42 +01:00
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.body = data
|
|
|
|
}
|
|
|
|
h.method = r.Method
|
|
|
|
h.url = r.URL
|
|
|
|
h.accept = r.Header.Get("Accept")
|
|
|
|
h.contentType = r.Header.Get("Content-Type")
|
|
|
|
h.userAgent = r.Header.Get("User-Agent")
|
|
|
|
var out *apimodel.CheckReportIDResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
h.resp = out
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestCheckReportIDClientCallRoundTrip(t *testing.T) {
|
|
|
|
// setup
|
|
|
|
handler := &handleClientCallCheckReportID{}
|
|
|
|
srvr := httptest.NewServer(handler)
|
|
|
|
defer srvr.Close()
|
|
|
|
req := &apimodel.CheckReportIDRequest{}
|
|
|
|
ff := &fakeFill{}
|
|
|
|
ff.fill(&req)
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
clnt := &Client{KVStore: &kvstore.Memory{}, BaseURL: srvr.URL}
|
2021-03-19 09:30:42 +01:00
|
|
|
ff.fill(&clnt.UserAgent)
|
|
|
|
// issue request
|
|
|
|
ctx := context.Background()
|
|
|
|
resp, err := clnt.CheckReportID(ctx, req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected non-nil response here")
|
|
|
|
}
|
|
|
|
// compare our response and server's one
|
|
|
|
if diff := cmp.Diff(handler.resp, resp); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
// check whether headers are OK
|
|
|
|
if handler.accept != "application/json" {
|
|
|
|
t.Fatal("invalid accept header")
|
|
|
|
}
|
|
|
|
if handler.userAgent != clnt.UserAgent {
|
|
|
|
t.Fatal("invalid user-agent header")
|
|
|
|
}
|
|
|
|
// check whether the method is OK
|
|
|
|
if handler.method != "GET" {
|
|
|
|
t.Fatal("invalid method")
|
|
|
|
}
|
|
|
|
// check the query
|
|
|
|
api := &simpleCheckReportIDAPI{BaseURL: srvr.URL}
|
|
|
|
httpReq, err := api.newRequest(context.Background(), req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(handler.url.Path, httpReq.URL.Path); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(handler.url.RawQuery, httpReq.URL.RawQuery); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type handleClientCallCheckIn struct {
|
|
|
|
accept string
|
|
|
|
body []byte
|
|
|
|
contentType string
|
|
|
|
count int32
|
|
|
|
method string
|
|
|
|
mu sync.Mutex
|
|
|
|
resp *apimodel.CheckInResponse
|
|
|
|
url *url.URL
|
|
|
|
userAgent string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *handleClientCallCheckIn) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
ff := fakeFill{}
|
|
|
|
defer h.mu.Unlock()
|
|
|
|
h.mu.Lock()
|
|
|
|
if h.count > 0 {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.count++
|
|
|
|
if r.Body != nil {
|
2021-09-28 12:42:01 +02:00
|
|
|
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
|
2021-03-19 09:30:42 +01:00
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.body = data
|
|
|
|
}
|
|
|
|
h.method = r.Method
|
|
|
|
h.url = r.URL
|
|
|
|
h.accept = r.Header.Get("Accept")
|
|
|
|
h.contentType = r.Header.Get("Content-Type")
|
|
|
|
h.userAgent = r.Header.Get("User-Agent")
|
|
|
|
var out *apimodel.CheckInResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
h.resp = out
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestCheckInClientCallRoundTrip(t *testing.T) {
|
|
|
|
// setup
|
|
|
|
handler := &handleClientCallCheckIn{}
|
|
|
|
srvr := httptest.NewServer(handler)
|
|
|
|
defer srvr.Close()
|
|
|
|
req := &apimodel.CheckInRequest{}
|
|
|
|
ff := &fakeFill{}
|
|
|
|
ff.fill(&req)
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
clnt := &Client{KVStore: &kvstore.Memory{}, BaseURL: srvr.URL}
|
2021-03-19 09:30:42 +01:00
|
|
|
ff.fill(&clnt.UserAgent)
|
|
|
|
// issue request
|
|
|
|
ctx := context.Background()
|
|
|
|
resp, err := clnt.CheckIn(ctx, req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected non-nil response here")
|
|
|
|
}
|
|
|
|
// compare our response and server's one
|
|
|
|
if diff := cmp.Diff(handler.resp, resp); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
// check whether headers are OK
|
|
|
|
if handler.accept != "application/json" {
|
|
|
|
t.Fatal("invalid accept header")
|
|
|
|
}
|
|
|
|
if handler.userAgent != clnt.UserAgent {
|
|
|
|
t.Fatal("invalid user-agent header")
|
|
|
|
}
|
|
|
|
// check whether the method is OK
|
|
|
|
if handler.method != "POST" {
|
|
|
|
t.Fatal("invalid method")
|
|
|
|
}
|
|
|
|
// check the body
|
|
|
|
if handler.contentType != "application/json" {
|
|
|
|
t.Fatal("invalid content-type header")
|
|
|
|
}
|
|
|
|
got := &apimodel.CheckInRequest{}
|
|
|
|
if err := json.Unmarshal(handler.body, &got); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(req, got); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type handleClientCallMeasurementMeta struct {
|
|
|
|
accept string
|
|
|
|
body []byte
|
|
|
|
contentType string
|
|
|
|
count int32
|
|
|
|
method string
|
|
|
|
mu sync.Mutex
|
|
|
|
resp *apimodel.MeasurementMetaResponse
|
|
|
|
url *url.URL
|
|
|
|
userAgent string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *handleClientCallMeasurementMeta) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
ff := fakeFill{}
|
|
|
|
defer h.mu.Unlock()
|
|
|
|
h.mu.Lock()
|
|
|
|
if h.count > 0 {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.count++
|
|
|
|
if r.Body != nil {
|
2021-09-28 12:42:01 +02:00
|
|
|
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
|
2021-03-19 09:30:42 +01:00
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.body = data
|
|
|
|
}
|
|
|
|
h.method = r.Method
|
|
|
|
h.url = r.URL
|
|
|
|
h.accept = r.Header.Get("Accept")
|
|
|
|
h.contentType = r.Header.Get("Content-Type")
|
|
|
|
h.userAgent = r.Header.Get("User-Agent")
|
|
|
|
var out *apimodel.MeasurementMetaResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
h.resp = out
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestMeasurementMetaClientCallRoundTrip(t *testing.T) {
|
|
|
|
// setup
|
|
|
|
handler := &handleClientCallMeasurementMeta{}
|
|
|
|
srvr := httptest.NewServer(handler)
|
|
|
|
defer srvr.Close()
|
|
|
|
req := &apimodel.MeasurementMetaRequest{}
|
|
|
|
ff := &fakeFill{}
|
|
|
|
ff.fill(&req)
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
clnt := &Client{KVStore: &kvstore.Memory{}, BaseURL: srvr.URL}
|
2021-03-19 09:30:42 +01:00
|
|
|
ff.fill(&clnt.UserAgent)
|
|
|
|
// issue request
|
|
|
|
ctx := context.Background()
|
|
|
|
resp, err := clnt.MeasurementMeta(ctx, req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected non-nil response here")
|
|
|
|
}
|
|
|
|
// compare our response and server's one
|
|
|
|
if diff := cmp.Diff(handler.resp, resp); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
// check whether headers are OK
|
|
|
|
if handler.accept != "application/json" {
|
|
|
|
t.Fatal("invalid accept header")
|
|
|
|
}
|
|
|
|
if handler.userAgent != clnt.UserAgent {
|
|
|
|
t.Fatal("invalid user-agent header")
|
|
|
|
}
|
|
|
|
// check whether the method is OK
|
|
|
|
if handler.method != "GET" {
|
|
|
|
t.Fatal("invalid method")
|
|
|
|
}
|
|
|
|
// check the query
|
|
|
|
api := &simpleMeasurementMetaAPI{BaseURL: srvr.URL}
|
|
|
|
httpReq, err := api.newRequest(context.Background(), req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(handler.url.Path, httpReq.URL.Path); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(handler.url.RawQuery, httpReq.URL.RawQuery); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type handleClientCallTestHelpers struct {
|
|
|
|
accept string
|
|
|
|
body []byte
|
|
|
|
contentType string
|
|
|
|
count int32
|
|
|
|
method string
|
|
|
|
mu sync.Mutex
|
|
|
|
resp apimodel.TestHelpersResponse
|
|
|
|
url *url.URL
|
|
|
|
userAgent string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *handleClientCallTestHelpers) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
ff := fakeFill{}
|
|
|
|
defer h.mu.Unlock()
|
|
|
|
h.mu.Lock()
|
|
|
|
if h.count > 0 {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.count++
|
|
|
|
if r.Body != nil {
|
2021-09-28 12:42:01 +02:00
|
|
|
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
|
2021-03-19 09:30:42 +01:00
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.body = data
|
|
|
|
}
|
|
|
|
h.method = r.Method
|
|
|
|
h.url = r.URL
|
|
|
|
h.accept = r.Header.Get("Accept")
|
|
|
|
h.contentType = r.Header.Get("Content-Type")
|
|
|
|
h.userAgent = r.Header.Get("User-Agent")
|
|
|
|
var out apimodel.TestHelpersResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
h.resp = out
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestTestHelpersClientCallRoundTrip(t *testing.T) {
|
|
|
|
// setup
|
|
|
|
handler := &handleClientCallTestHelpers{}
|
|
|
|
srvr := httptest.NewServer(handler)
|
|
|
|
defer srvr.Close()
|
|
|
|
req := &apimodel.TestHelpersRequest{}
|
|
|
|
ff := &fakeFill{}
|
|
|
|
ff.fill(&req)
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
clnt := &Client{KVStore: &kvstore.Memory{}, BaseURL: srvr.URL}
|
2021-03-19 09:30:42 +01:00
|
|
|
ff.fill(&clnt.UserAgent)
|
|
|
|
// issue request
|
|
|
|
ctx := context.Background()
|
|
|
|
resp, err := clnt.TestHelpers(ctx, req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected non-nil response here")
|
|
|
|
}
|
|
|
|
// compare our response and server's one
|
|
|
|
if diff := cmp.Diff(handler.resp, resp); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
// check whether headers are OK
|
|
|
|
if handler.accept != "application/json" {
|
|
|
|
t.Fatal("invalid accept header")
|
|
|
|
}
|
|
|
|
if handler.userAgent != clnt.UserAgent {
|
|
|
|
t.Fatal("invalid user-agent header")
|
|
|
|
}
|
|
|
|
// check whether the method is OK
|
|
|
|
if handler.method != "GET" {
|
|
|
|
t.Fatal("invalid method")
|
|
|
|
}
|
|
|
|
// check the query
|
|
|
|
api := &simpleTestHelpersAPI{BaseURL: srvr.URL}
|
|
|
|
httpReq, err := api.newRequest(context.Background(), req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(handler.url.Path, httpReq.URL.Path); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(handler.url.RawQuery, httpReq.URL.RawQuery); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type handleClientCallPsiphonConfig struct {
|
|
|
|
accept string
|
|
|
|
body []byte
|
|
|
|
contentType string
|
|
|
|
count int32
|
|
|
|
method string
|
|
|
|
mu sync.Mutex
|
|
|
|
resp apimodel.PsiphonConfigResponse
|
|
|
|
url *url.URL
|
|
|
|
userAgent string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *handleClientCallPsiphonConfig) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
ff := fakeFill{}
|
|
|
|
if r.URL.Path == "/api/v1/register" {
|
|
|
|
var out apimodel.RegisterResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if r.URL.Path == "/api/v1/login" {
|
|
|
|
var out apimodel.LoginResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
defer h.mu.Unlock()
|
|
|
|
h.mu.Lock()
|
|
|
|
if h.count > 0 {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.count++
|
|
|
|
if r.Body != nil {
|
2021-09-28 12:42:01 +02:00
|
|
|
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
|
2021-03-19 09:30:42 +01:00
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.body = data
|
|
|
|
}
|
|
|
|
h.method = r.Method
|
|
|
|
h.url = r.URL
|
|
|
|
h.accept = r.Header.Get("Accept")
|
|
|
|
h.contentType = r.Header.Get("Content-Type")
|
|
|
|
h.userAgent = r.Header.Get("User-Agent")
|
|
|
|
var out apimodel.PsiphonConfigResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
h.resp = out
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestPsiphonConfigClientCallRoundTrip(t *testing.T) {
|
|
|
|
// setup
|
|
|
|
handler := &handleClientCallPsiphonConfig{}
|
|
|
|
srvr := httptest.NewServer(handler)
|
|
|
|
defer srvr.Close()
|
|
|
|
req := &apimodel.PsiphonConfigRequest{}
|
|
|
|
ff := &fakeFill{}
|
|
|
|
ff.fill(&req)
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
clnt := &Client{KVStore: &kvstore.Memory{}, BaseURL: srvr.URL}
|
2021-03-19 09:30:42 +01:00
|
|
|
ff.fill(&clnt.UserAgent)
|
|
|
|
// issue request
|
|
|
|
ctx := context.Background()
|
|
|
|
resp, err := clnt.PsiphonConfig(ctx, req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected non-nil response here")
|
|
|
|
}
|
|
|
|
// compare our response and server's one
|
|
|
|
if diff := cmp.Diff(handler.resp, resp); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
// check whether headers are OK
|
|
|
|
if handler.accept != "application/json" {
|
|
|
|
t.Fatal("invalid accept header")
|
|
|
|
}
|
|
|
|
if handler.userAgent != clnt.UserAgent {
|
|
|
|
t.Fatal("invalid user-agent header")
|
|
|
|
}
|
|
|
|
// check whether the method is OK
|
|
|
|
if handler.method != "GET" {
|
|
|
|
t.Fatal("invalid method")
|
|
|
|
}
|
|
|
|
// check the query
|
|
|
|
api := &simplePsiphonConfigAPI{BaseURL: srvr.URL}
|
|
|
|
httpReq, err := api.newRequest(context.Background(), req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(handler.url.Path, httpReq.URL.Path); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(handler.url.RawQuery, httpReq.URL.RawQuery); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type handleClientCallTorTargets struct {
|
|
|
|
accept string
|
|
|
|
body []byte
|
|
|
|
contentType string
|
|
|
|
count int32
|
|
|
|
method string
|
|
|
|
mu sync.Mutex
|
|
|
|
resp apimodel.TorTargetsResponse
|
|
|
|
url *url.URL
|
|
|
|
userAgent string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *handleClientCallTorTargets) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
ff := fakeFill{}
|
|
|
|
if r.URL.Path == "/api/v1/register" {
|
|
|
|
var out apimodel.RegisterResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if r.URL.Path == "/api/v1/login" {
|
|
|
|
var out apimodel.LoginResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
defer h.mu.Unlock()
|
|
|
|
h.mu.Lock()
|
|
|
|
if h.count > 0 {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.count++
|
|
|
|
if r.Body != nil {
|
2021-09-28 12:42:01 +02:00
|
|
|
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
|
2021-03-19 09:30:42 +01:00
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.body = data
|
|
|
|
}
|
|
|
|
h.method = r.Method
|
|
|
|
h.url = r.URL
|
|
|
|
h.accept = r.Header.Get("Accept")
|
|
|
|
h.contentType = r.Header.Get("Content-Type")
|
|
|
|
h.userAgent = r.Header.Get("User-Agent")
|
|
|
|
var out apimodel.TorTargetsResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
h.resp = out
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestTorTargetsClientCallRoundTrip(t *testing.T) {
|
|
|
|
// setup
|
|
|
|
handler := &handleClientCallTorTargets{}
|
|
|
|
srvr := httptest.NewServer(handler)
|
|
|
|
defer srvr.Close()
|
|
|
|
req := &apimodel.TorTargetsRequest{}
|
|
|
|
ff := &fakeFill{}
|
|
|
|
ff.fill(&req)
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
clnt := &Client{KVStore: &kvstore.Memory{}, BaseURL: srvr.URL}
|
2021-03-19 09:30:42 +01:00
|
|
|
ff.fill(&clnt.UserAgent)
|
|
|
|
// issue request
|
|
|
|
ctx := context.Background()
|
|
|
|
resp, err := clnt.TorTargets(ctx, req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected non-nil response here")
|
|
|
|
}
|
|
|
|
// compare our response and server's one
|
|
|
|
if diff := cmp.Diff(handler.resp, resp); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
// check whether headers are OK
|
|
|
|
if handler.accept != "application/json" {
|
|
|
|
t.Fatal("invalid accept header")
|
|
|
|
}
|
|
|
|
if handler.userAgent != clnt.UserAgent {
|
|
|
|
t.Fatal("invalid user-agent header")
|
|
|
|
}
|
|
|
|
// check whether the method is OK
|
|
|
|
if handler.method != "GET" {
|
|
|
|
t.Fatal("invalid method")
|
|
|
|
}
|
|
|
|
// check the query
|
|
|
|
api := &simpleTorTargetsAPI{BaseURL: srvr.URL}
|
|
|
|
httpReq, err := api.newRequest(context.Background(), req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(handler.url.Path, httpReq.URL.Path); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(handler.url.RawQuery, httpReq.URL.RawQuery); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type handleClientCallURLs struct {
|
|
|
|
accept string
|
|
|
|
body []byte
|
|
|
|
contentType string
|
|
|
|
count int32
|
|
|
|
method string
|
|
|
|
mu sync.Mutex
|
|
|
|
resp *apimodel.URLsResponse
|
|
|
|
url *url.URL
|
|
|
|
userAgent string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *handleClientCallURLs) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
ff := fakeFill{}
|
|
|
|
defer h.mu.Unlock()
|
|
|
|
h.mu.Lock()
|
|
|
|
if h.count > 0 {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.count++
|
|
|
|
if r.Body != nil {
|
2021-09-28 12:42:01 +02:00
|
|
|
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
|
2021-03-19 09:30:42 +01:00
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.body = data
|
|
|
|
}
|
|
|
|
h.method = r.Method
|
|
|
|
h.url = r.URL
|
|
|
|
h.accept = r.Header.Get("Accept")
|
|
|
|
h.contentType = r.Header.Get("Content-Type")
|
|
|
|
h.userAgent = r.Header.Get("User-Agent")
|
|
|
|
var out *apimodel.URLsResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
h.resp = out
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestURLsClientCallRoundTrip(t *testing.T) {
|
|
|
|
// setup
|
|
|
|
handler := &handleClientCallURLs{}
|
|
|
|
srvr := httptest.NewServer(handler)
|
|
|
|
defer srvr.Close()
|
|
|
|
req := &apimodel.URLsRequest{}
|
|
|
|
ff := &fakeFill{}
|
|
|
|
ff.fill(&req)
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
clnt := &Client{KVStore: &kvstore.Memory{}, BaseURL: srvr.URL}
|
2021-03-19 09:30:42 +01:00
|
|
|
ff.fill(&clnt.UserAgent)
|
|
|
|
// issue request
|
|
|
|
ctx := context.Background()
|
|
|
|
resp, err := clnt.URLs(ctx, req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected non-nil response here")
|
|
|
|
}
|
|
|
|
// compare our response and server's one
|
|
|
|
if diff := cmp.Diff(handler.resp, resp); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
// check whether headers are OK
|
|
|
|
if handler.accept != "application/json" {
|
|
|
|
t.Fatal("invalid accept header")
|
|
|
|
}
|
|
|
|
if handler.userAgent != clnt.UserAgent {
|
|
|
|
t.Fatal("invalid user-agent header")
|
|
|
|
}
|
|
|
|
// check whether the method is OK
|
|
|
|
if handler.method != "GET" {
|
|
|
|
t.Fatal("invalid method")
|
|
|
|
}
|
|
|
|
// check the query
|
|
|
|
api := &simpleURLsAPI{BaseURL: srvr.URL}
|
|
|
|
httpReq, err := api.newRequest(context.Background(), req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(handler.url.Path, httpReq.URL.Path); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(handler.url.RawQuery, httpReq.URL.RawQuery); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type handleClientCallOpenReport struct {
|
|
|
|
accept string
|
|
|
|
body []byte
|
|
|
|
contentType string
|
|
|
|
count int32
|
|
|
|
method string
|
|
|
|
mu sync.Mutex
|
|
|
|
resp *apimodel.OpenReportResponse
|
|
|
|
url *url.URL
|
|
|
|
userAgent string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *handleClientCallOpenReport) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
ff := fakeFill{}
|
|
|
|
defer h.mu.Unlock()
|
|
|
|
h.mu.Lock()
|
|
|
|
if h.count > 0 {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.count++
|
|
|
|
if r.Body != nil {
|
2021-09-28 12:42:01 +02:00
|
|
|
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
|
2021-03-19 09:30:42 +01:00
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.body = data
|
|
|
|
}
|
|
|
|
h.method = r.Method
|
|
|
|
h.url = r.URL
|
|
|
|
h.accept = r.Header.Get("Accept")
|
|
|
|
h.contentType = r.Header.Get("Content-Type")
|
|
|
|
h.userAgent = r.Header.Get("User-Agent")
|
|
|
|
var out *apimodel.OpenReportResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
h.resp = out
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestOpenReportClientCallRoundTrip(t *testing.T) {
|
|
|
|
// setup
|
|
|
|
handler := &handleClientCallOpenReport{}
|
|
|
|
srvr := httptest.NewServer(handler)
|
|
|
|
defer srvr.Close()
|
|
|
|
req := &apimodel.OpenReportRequest{}
|
|
|
|
ff := &fakeFill{}
|
|
|
|
ff.fill(&req)
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
clnt := &Client{KVStore: &kvstore.Memory{}, BaseURL: srvr.URL}
|
2021-03-19 09:30:42 +01:00
|
|
|
ff.fill(&clnt.UserAgent)
|
|
|
|
// issue request
|
|
|
|
ctx := context.Background()
|
|
|
|
resp, err := clnt.OpenReport(ctx, req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected non-nil response here")
|
|
|
|
}
|
|
|
|
// compare our response and server's one
|
|
|
|
if diff := cmp.Diff(handler.resp, resp); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
// check whether headers are OK
|
|
|
|
if handler.accept != "application/json" {
|
|
|
|
t.Fatal("invalid accept header")
|
|
|
|
}
|
|
|
|
if handler.userAgent != clnt.UserAgent {
|
|
|
|
t.Fatal("invalid user-agent header")
|
|
|
|
}
|
|
|
|
// check whether the method is OK
|
|
|
|
if handler.method != "POST" {
|
|
|
|
t.Fatal("invalid method")
|
|
|
|
}
|
|
|
|
// check the body
|
|
|
|
if handler.contentType != "application/json" {
|
|
|
|
t.Fatal("invalid content-type header")
|
|
|
|
}
|
|
|
|
got := &apimodel.OpenReportRequest{}
|
|
|
|
if err := json.Unmarshal(handler.body, &got); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(req, got); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type handleClientCallSubmitMeasurement struct {
|
|
|
|
accept string
|
|
|
|
body []byte
|
|
|
|
contentType string
|
|
|
|
count int32
|
|
|
|
method string
|
|
|
|
mu sync.Mutex
|
|
|
|
resp *apimodel.SubmitMeasurementResponse
|
|
|
|
url *url.URL
|
|
|
|
userAgent string
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *handleClientCallSubmitMeasurement) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
ff := fakeFill{}
|
|
|
|
defer h.mu.Unlock()
|
|
|
|
h.mu.Lock()
|
|
|
|
if h.count > 0 {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.count++
|
|
|
|
if r.Body != nil {
|
2021-09-28 12:42:01 +02:00
|
|
|
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
|
2021-03-19 09:30:42 +01:00
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
h.body = data
|
|
|
|
}
|
|
|
|
h.method = r.Method
|
|
|
|
h.url = r.URL
|
|
|
|
h.accept = r.Header.Get("Accept")
|
|
|
|
h.contentType = r.Header.Get("Content-Type")
|
|
|
|
h.userAgent = r.Header.Get("User-Agent")
|
|
|
|
var out *apimodel.SubmitMeasurementResponse
|
|
|
|
ff.fill(&out)
|
|
|
|
h.resp = out
|
|
|
|
data, err := json.Marshal(out)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Write(data)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestSubmitMeasurementClientCallRoundTrip(t *testing.T) {
|
|
|
|
// setup
|
|
|
|
handler := &handleClientCallSubmitMeasurement{}
|
|
|
|
srvr := httptest.NewServer(handler)
|
|
|
|
defer srvr.Close()
|
|
|
|
req := &apimodel.SubmitMeasurementRequest{}
|
|
|
|
ff := &fakeFill{}
|
|
|
|
ff.fill(&req)
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
clnt := &Client{KVStore: &kvstore.Memory{}, BaseURL: srvr.URL}
|
2021-03-19 09:30:42 +01:00
|
|
|
ff.fill(&clnt.UserAgent)
|
|
|
|
// issue request
|
|
|
|
ctx := context.Background()
|
|
|
|
resp, err := clnt.SubmitMeasurement(ctx, req)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected non-nil response here")
|
|
|
|
}
|
|
|
|
// compare our response and server's one
|
|
|
|
if diff := cmp.Diff(handler.resp, resp); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
// check whether headers are OK
|
|
|
|
if handler.accept != "application/json" {
|
|
|
|
t.Fatal("invalid accept header")
|
|
|
|
}
|
|
|
|
if handler.userAgent != clnt.UserAgent {
|
|
|
|
t.Fatal("invalid user-agent header")
|
|
|
|
}
|
|
|
|
// check whether the method is OK
|
|
|
|
if handler.method != "POST" {
|
|
|
|
t.Fatal("invalid method")
|
|
|
|
}
|
|
|
|
// check the body
|
|
|
|
if handler.contentType != "application/json" {
|
|
|
|
t.Fatal("invalid content-type header")
|
|
|
|
}
|
|
|
|
got := &apimodel.SubmitMeasurementRequest{}
|
|
|
|
if err := json.Unmarshal(handler.body, &got); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if diff := cmp.Diff(req, got); diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
}
|