9523753b87
I need to run test on Windows and I just discovered that: 1. the `errno_unix.go` filename does not mean anything because `unix` is not a valid platform, so we need a filename for each platform that we care about; 2. on Windows we need to use WSA prefixed names; 3. `i/e/session_psiphon.go` was not building because of the migration from `netxlite/iox` to `netxlite`. This diff attempts to fix all three issues. The reference issue is https://github.com/ooni/probe/issues/1733, because I was working on such an issue.
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"
|
|
)
|
|
|
|
//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 netxlite.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)
|
|
}
|