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
47 lines
1.2 KiB
Go
47 lines
1.2 KiB
Go
//go:build ooni_psiphon_config
|
|
// +build ooni_psiphon_config
|
|
|
|
package engine
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
_ "embed"
|
|
|
|
"filippo.io/age"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
|
|
)
|
|
|
|
//go:embed psiphon-config.json.age
|
|
var psiphonConfigJSONAge []byte
|
|
|
|
//go:embed psiphon-config.key
|
|
var psiphonConfigSecretKey string
|
|
|
|
// sessionTunnelEarlySession is the early session that we pass
|
|
// to tunnel.Start to fetch the Psiphon configuration.
|
|
type sessionTunnelEarlySession struct{}
|
|
|
|
// FetchPsiphonConfig decrypts psiphonConfigJSONAge using
|
|
// filippo.io/age _and_ psiphonConfigSecretKey.
|
|
func (s *sessionTunnelEarlySession) FetchPsiphonConfig(ctx context.Context) ([]byte, error) {
|
|
key := "AGE-SECRET-KEY-1" + psiphonConfigSecretKey
|
|
identity, err := age.ParseX25519Identity(key)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
input := bytes.NewReader(psiphonConfigJSONAge)
|
|
output, err := age.Decrypt(input, identity)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return iox.ReadAllContext(ctx, output)
|
|
}
|
|
|
|
// FetchPsiphonConfig decrypts psiphonConfigJSONAge using
|
|
// filippo.io/age _and_ psiphonConfigSecretKey.
|
|
func (s *Session) FetchPsiphonConfig(ctx context.Context) ([]byte, error) {
|
|
child := &sessionTunnelEarlySession{}
|
|
return child.FetchPsiphonConfig(ctx)
|
|
}
|