2021-03-04 11:51:07 +01:00
|
|
|
package ooapi
|
|
|
|
|
|
|
|
import (
|
|
|
|
"encoding/json"
|
|
|
|
"net/http"
|
|
|
|
"strings"
|
|
|
|
"sync"
|
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
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/atomicx"
|
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-04 11:51:07 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
// LoginHandler is an http.Handler to test login
|
|
|
|
type LoginHandler struct {
|
|
|
|
failCallWith []int // ignored by login and register
|
|
|
|
mu sync.Mutex
|
|
|
|
noRegister bool
|
|
|
|
state []*loginState
|
|
|
|
t *testing.T
|
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
|
|
|
logins *atomicx.Int64
|
|
|
|
registers *atomicx.Int64
|
2021-03-04 11:51:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func (lh *LoginHandler) forgetLogins() {
|
|
|
|
defer lh.mu.Unlock()
|
|
|
|
lh.mu.Lock()
|
|
|
|
lh.state = nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (lh *LoginHandler) forgetTokens() {
|
|
|
|
defer lh.mu.Unlock()
|
|
|
|
lh.mu.Lock()
|
|
|
|
for _, entry := range lh.state {
|
|
|
|
// This should be enough to cause all tokens to
|
|
|
|
// be expired and force clients to relogin.
|
|
|
|
//
|
|
|
|
// (It does not matter much whether the client
|
|
|
|
// clock is off, or the server clock is off,
|
|
|
|
// thanks Galileo for explaining this to us <3.)
|
|
|
|
entry.Expire = time.Now().Add(-3600 * time.Second)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (lh *LoginHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
|
// Implementation note: we don't check for the method
|
|
|
|
// for simplicity since it's already tested.
|
|
|
|
switch r.URL.Path {
|
|
|
|
case "/api/v1/register":
|
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
|
|
|
if lh.registers != nil {
|
|
|
|
lh.registers.Add(1)
|
|
|
|
}
|
2021-03-04 11:51:07 +01:00
|
|
|
lh.register(w, r)
|
|
|
|
case "/api/v1/login":
|
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
|
|
|
if lh.logins != nil {
|
|
|
|
lh.logins.Add(1)
|
|
|
|
}
|
2021-03-04 11:51:07 +01:00
|
|
|
lh.login(w, r)
|
|
|
|
case "/api/v1/test-list/psiphon-config":
|
|
|
|
lh.psiphon(w, r)
|
|
|
|
case "/api/v1/test-list/tor-targets":
|
|
|
|
lh.tor(w, r)
|
|
|
|
default:
|
|
|
|
w.WriteHeader(500)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (lh *LoginHandler) register(w http.ResponseWriter, r *http.Request) {
|
|
|
|
if r.Body == nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
2021-09-28 12:42:01 +02:00
|
|
|
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
|
2021-03-04 11:51:07 +01:00
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
var req apimodel.RegisterRequest
|
|
|
|
if err := json.Unmarshal(data, &req); err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if req.Password == "" {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
defer lh.mu.Unlock()
|
|
|
|
lh.mu.Lock()
|
|
|
|
if lh.noRegister {
|
|
|
|
// We have been asked to stop registering clients so
|
|
|
|
// we're going to make a boo boo.
|
|
|
|
w.WriteHeader(500)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
var resp apimodel.RegisterResponse
|
|
|
|
ff := &fakeFill{}
|
2022-01-05 14:49:31 +01:00
|
|
|
ff.Fill(&resp)
|
2021-03-04 11:51:07 +01:00
|
|
|
lh.state = append(lh.state, &loginState{
|
|
|
|
ClientID: resp.ClientID, Password: req.Password})
|
|
|
|
data, err = json.Marshal(&resp)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(500)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lh.t.Logf("register: %+v", string(data))
|
|
|
|
w.Write(data)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (lh *LoginHandler) login(w http.ResponseWriter, r *http.Request) {
|
|
|
|
if r.Body == nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
2021-09-28 12:42:01 +02:00
|
|
|
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
|
2021-03-04 11:51:07 +01:00
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
var req apimodel.LoginRequest
|
|
|
|
if err := json.Unmarshal(data, &req); err != nil {
|
|
|
|
w.WriteHeader(400)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
defer lh.mu.Unlock()
|
|
|
|
lh.mu.Lock()
|
|
|
|
for _, s := range lh.state {
|
|
|
|
if req.ClientID == s.ClientID && req.Password == s.Password {
|
|
|
|
var resp apimodel.LoginResponse
|
|
|
|
ff := &fakeFill{}
|
2022-01-05 14:49:31 +01:00
|
|
|
ff.Fill(&resp)
|
2021-03-04 11:51:07 +01:00
|
|
|
// We want the token to be many seconds in the future while
|
|
|
|
// ff.fill only sets the tokent to now plus a small delta.
|
|
|
|
resp.Expire = time.Now().Add(3600 * time.Second)
|
|
|
|
s.Expire = resp.Expire
|
|
|
|
s.Token = resp.Token
|
|
|
|
data, err = json.Marshal(&resp)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(500)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lh.t.Logf("login: %+v", string(data))
|
|
|
|
w.Write(data)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
lh.t.Log("login: 401")
|
|
|
|
w.WriteHeader(401)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (lh *LoginHandler) psiphon(w http.ResponseWriter, r *http.Request) {
|
|
|
|
defer lh.mu.Unlock()
|
|
|
|
lh.mu.Lock()
|
|
|
|
if len(lh.failCallWith) > 0 {
|
|
|
|
code := lh.failCallWith[0]
|
|
|
|
lh.failCallWith = lh.failCallWith[1:]
|
|
|
|
w.WriteHeader(code)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
token := strings.Replace(r.Header.Get("Authorization"), "Bearer ", "", 1)
|
|
|
|
for _, s := range lh.state {
|
|
|
|
if token == s.Token && time.Now().Before(s.Expire) {
|
|
|
|
var resp apimodel.PsiphonConfigResponse
|
|
|
|
ff := &fakeFill{}
|
2022-01-05 14:49:31 +01:00
|
|
|
ff.Fill(&resp)
|
2021-03-04 11:51:07 +01:00
|
|
|
data, err := json.Marshal(&resp)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(500)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lh.t.Logf("psiphon: %+v", string(data))
|
|
|
|
w.Write(data)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
lh.t.Log("psiphon: 401")
|
|
|
|
w.WriteHeader(401)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (lh *LoginHandler) tor(w http.ResponseWriter, r *http.Request) {
|
|
|
|
defer lh.mu.Unlock()
|
|
|
|
lh.mu.Lock()
|
|
|
|
if len(lh.failCallWith) > 0 {
|
|
|
|
code := lh.failCallWith[0]
|
|
|
|
lh.failCallWith = lh.failCallWith[1:]
|
|
|
|
w.WriteHeader(code)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
token := strings.Replace(r.Header.Get("Authorization"), "Bearer ", "", 1)
|
|
|
|
for _, s := range lh.state {
|
|
|
|
if token == s.Token && time.Now().Before(s.Expire) {
|
|
|
|
var resp apimodel.TorTargetsResponse
|
|
|
|
ff := &fakeFill{}
|
2022-01-05 14:49:31 +01:00
|
|
|
ff.Fill(&resp)
|
2021-03-04 11:51:07 +01:00
|
|
|
data, err := json.Marshal(&resp)
|
|
|
|
if err != nil {
|
|
|
|
w.WriteHeader(500)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lh.t.Logf("tor: %+v", string(data))
|
|
|
|
w.Write(data)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
lh.t.Log("tor: 401")
|
|
|
|
w.WriteHeader(401)
|
|
|
|
}
|