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
32 lines
914 B
Go
32 lines
914 B
Go
//go:build !ooni_psiphon_config
|
|
// +build !ooni_psiphon_config
|
|
|
|
package engine
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
)
|
|
|
|
// FetchPsiphonConfig fetches psiphon config from the API.
|
|
func (s *Session) FetchPsiphonConfig(ctx context.Context) ([]byte, error) {
|
|
clnt, err := s.NewOrchestraClient(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return clnt.FetchPsiphonConfig(ctx)
|
|
}
|
|
|
|
// sessionTunnelEarlySession is the early session that we pass
|
|
// to tunnel.Start to fetch the Psiphon configuration.
|
|
type sessionTunnelEarlySession struct{}
|
|
|
|
// errPsiphonNoEmbeddedConfig indicates that there is no
|
|
// embedded psiphong config file in this binary.
|
|
var errPsiphonNoEmbeddedConfig = errors.New("no embedded configuration file")
|
|
|
|
// FetchPsiphonConfig implements tunnel.Session.FetchPsiphonConfig.
|
|
func (s *sessionTunnelEarlySession) FetchPsiphonConfig(ctx context.Context) ([]byte, error) {
|
|
return nil, errPsiphonNoEmbeddedConfig
|
|
}
|