Accept ToS: fix (#7539)

* fix create datadir on fresh run * add test Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com> Co-authored-by: Raul Jordan <raul@prysmaticlabs.com>
prysmaticlabs · Oct 15, 2020 · 7aaefd1 · 7aaefd1
1 parent 7abc1fe
commit 7aaefd1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/shared/tos/BUILD.bazel b/shared/tos/BUILD.bazel
@@ -9,6 +9,7 @@ go_library(
     deps = [
         "//shared/cmd:go_default_library",
         "//shared/fileutil:go_default_library",
+        "//shared/params:go_default_library",
         "//shared/promptutil:go_default_library",
         "@com_github_logrusorgru_aurora//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",

diff --git a/shared/tos/tos.go b/shared/tos/tos.go
@@ -3,12 +3,14 @@ package tos
 import (
 	"errors"
 	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/logrusorgru/aurora"
 	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
+	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/promptutil"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
@@ -61,6 +63,9 @@ func VerifyTosAcceptedOrPrompt(ctx *cli.Context) error {
 
 // saveTosAccepted creates a file when Tos accepted.
 func saveTosAccepted(ctx *cli.Context) {
+	if err := os.MkdirAll(ctx.String(cmd.DataDirFlag.Name), params.BeaconIoConfig().ReadWriteExecutePermissions); err != nil {
+		log.WithError(err).Warnf("error creating directory: %s", ctx.String(cmd.DataDirFlag.Name))
+	}
 	err := ioutil.WriteFile(filepath.Join(ctx.String(cmd.DataDirFlag.Name), acceptTosFilename), []byte(""), 0644)
 	if err != nil {
 		log.WithError(err).Warnf("error writing %s to file: %s", cmd.AcceptTosFlag.Name, filepath.Join(ctx.String(cmd.DataDirFlag.Name), acceptTosFilename))

diff --git a/shared/tos/tos_test.go b/shared/tos/tos_test.go
@@ -15,7 +15,7 @@ import (
 func TestVerifyTosAcceptedOrPrompt(t *testing.T) {
 	app := cli.App{}
 	set := flag.NewFlagSet("test", 0)
-	set.String(cmd.DataDirFlag.Name, ".", "")
+	set.String(cmd.DataDirFlag.Name, "./tmpdir/", "")
 	context := cli.NewContext(&app, set, nil)
 
 	// replacing stdin
@@ -50,10 +50,10 @@ func TestVerifyTosAcceptedOrPrompt(t *testing.T) {
 	// saved in file
 	require.NoError(t, ioutil.WriteFile(filepath.Join(context.String(cmd.DataDirFlag.Name), acceptTosFilename), []byte(""), 0666))
 	require.NoError(t, VerifyTosAcceptedOrPrompt(context))
-	require.NoError(t, os.Remove(filepath.Join(context.String(cmd.DataDirFlag.Name), acceptTosFilename)))
+	require.NoError(t, os.RemoveAll(context.String(cmd.DataDirFlag.Name)))
 
 	// flag is set
 	set.Bool(cmd.AcceptTosFlag.Name, true, "")
 	require.NoError(t, VerifyTosAcceptedOrPrompt(context))
-	require.NoError(t, os.Remove(filepath.Join(context.String(cmd.DataDirFlag.Name), acceptTosFilename)))
+	require.NoError(t, os.RemoveAll(context.String(cmd.DataDirFlag.Name)))
 }