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
100 lines
2.0 KiB
Go
100 lines
2.0 KiB
Go
package config
|
|
|
|
import (
|
|
"context"
|
|
"crypto/sha256"
|
|
"encoding/hex"
|
|
"io/ioutil"
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
|
|
)
|
|
|
|
func getShasum(path string) (string, error) {
|
|
hasher := sha256.New()
|
|
|
|
f, err := os.Open(path)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
defer f.Close()
|
|
if _, err := iox.CopyContext(context.Background(), hasher, f); err != nil {
|
|
return "", err
|
|
}
|
|
return hex.EncodeToString(hasher.Sum(nil)), nil
|
|
}
|
|
|
|
func TestParseConfig(t *testing.T) {
|
|
config, err := ReadConfig("testdata/valid-config.json")
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
if config.Sharing.UploadResults != true {
|
|
t.Fatal("not the expected value for UploadResults")
|
|
}
|
|
}
|
|
|
|
func TestUpdateConfig(t *testing.T) {
|
|
tmpFile, err := ioutil.TempFile(os.TempDir(), "ooniconfig-")
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
configPath := tmpFile.Name()
|
|
defer os.Remove(configPath)
|
|
|
|
data, err := os.ReadFile("testdata/config-v0.json")
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
err = os.WriteFile(configPath, data, 0644)
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
|
|
origShasum, err := getShasum(configPath)
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
config, err := ReadConfig(configPath)
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
origUploadResults := config.Sharing.UploadResults
|
|
origInformedConsent := config.InformedConsent
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
|
|
config.MaybeMigrate()
|
|
migratedShasum, err := getShasum(configPath)
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
if migratedShasum == origShasum {
|
|
t.Fatal("the config was not migrated")
|
|
}
|
|
|
|
newConfig, err := ReadConfig(configPath)
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
if newConfig.Sharing.UploadResults != origUploadResults {
|
|
t.Error("UploadResults differs")
|
|
}
|
|
if newConfig.InformedConsent != origInformedConsent {
|
|
t.Error("InformedConsent differs")
|
|
}
|
|
|
|
// Check that the config file stays the same if it's already the most up to
|
|
// date version
|
|
config.MaybeMigrate()
|
|
finalShasum, err := getShasum(configPath)
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
if migratedShasum != finalShasum {
|
|
t.Fatal("the config was migrated again")
|
|
}
|
|
}
|