c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implement informed consent migration using the config file

Browse source
This commit is contained in:
Arturo Filastò 2021-01-08 14:14:14 +01:00
commit 5cfce6acd0
2 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/ooni/ooni.go
View file

@ -257,14 +257,24 @@ func InitDefaultConfig(home string) (*config.Config, error) {
if err != nil {
return nil, err
}
err = ioutil.WriteFile(
configPath,
data,
0644,
)
if err != nil {
if err = ioutil.WriteFile(configPath, data, 0644); err != nil {
return nil, err
}
// If the user did the informed consent procedure in
// probe-legacy, migrate it over.
if utils.DidLegacyInformedConsent() {
c, err := config.ReadConfig(configPath)
if err != nil {
return nil, err
}
c.Lock()
c.InformedConsent = true
c.Unlock()
if err := c.Write(); err != nil {
return nil, err
}
}
return InitDefaultConfig(home)
}
return nil, err