Fix w3endpoint file relative path (#7557)

* add expandpath

* fix error description

* fix bazel & deepsource

* fix

* fix gofmt

* fix refactor

* add tests

* gofmt

* fix

Co-authored-by: Ivan Martinez <ivanthegreatdev@gmail.com>
Co-authored-by: Raul Jordan <raul@prysmaticlabs.com>

beacon-chain/main.go

@@ -151,6 +151,10 @@ func main() {
 			}
 		}
 
+		if err := cmd.ExpandWeb3EndpointIfFile(ctx, flags.HTTPWeb3ProviderFlag); err != nil {
+			return err
+		}
+
 		if ctx.IsSet(flags.SetGCPercent.Name) {
 			runtimeDebug.SetGCPercent(ctx.Int(flags.SetGCPercent.Name))
 		}

shared/cmd/helpers.go

@@ -7,7 +7,9 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli/v2"
 )
 
 var log = logrus.WithField("prefix", "node")
@@ -70,3 +72,21 @@ func EnterPassword(confirmPassword bool, pr PasswordReader) (string, error) {
 	}
 	return passphrase, nil
 }
+
+// ExpandWeb3EndpointIfFile expands the path for --http-web3provider if specified as a file.
+func ExpandWeb3EndpointIfFile(ctx *cli.Context, flag *cli.StringFlag) error {
+	web3endpoint := ctx.String(flag.Name)
+	if !strings.HasPrefix(web3endpoint, "http://") &&
+		!strings.HasPrefix(web3endpoint, "https://") &&
+		!strings.HasPrefix(web3endpoint, "ws://") &&
+		!strings.HasPrefix(web3endpoint, "wss://") {
+		web3endpoint, err := fileutil.ExpandPath(ctx.String(flag.Name))
+		if err != nil {
+			return errors.Wrapf(err, "could not expand path for %s", web3endpoint)
+		}
+		if err := ctx.Set(flag.Name, web3endpoint); err != nil {
+			return errors.Wrapf(err, "could not set %s to %s", flag.Name, web3endpoint)
+		}
+	}
+	return nil
+}

shared/cmd/helpers_test.go

@@ -1,11 +1,16 @@
 package cmd
 
 import (
+	"flag"
+	"os"
+	"os/user"
 	"testing"
 
 	"github.com/golang/mock/gomock"
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
+	"github.com/prysmaticlabs/prysm/shared/testutil/require"
+	"github.com/urfave/cli/v2"
 )
 
 func TestEnterPassword(t *testing.T) {
@@ -74,3 +79,30 @@ func TestEnterPassword(t *testing.T) {
 		})
 	}
 }
+
+func TestExpandWeb3EndpointIfFile(t *testing.T) {
+	app := cli.App{}
+	set := flag.NewFlagSet("test", 0)
+	HTTPWeb3ProviderFlag := &cli.StringFlag{Name: "http-web3provider", Value: ""}
+	set.String(HTTPWeb3ProviderFlag.Name, "http://localhost:8545", "")
+	context := cli.NewContext(&app, set, nil)
+
+	// with url scheme
+	require.NoError(t, context.Set(HTTPWeb3ProviderFlag.Name, "http://localhost:8545"))
+	require.NoError(t, ExpandWeb3EndpointIfFile(context, HTTPWeb3ProviderFlag))
+	require.Equal(t, "http://localhost:8545", context.String(HTTPWeb3ProviderFlag.Name))
+
+	// relative user home path
+	usr, err := user.Current()
+	require.NoError(t, err)
+	require.NoError(t, context.Set(HTTPWeb3ProviderFlag.Name, "~/relative/path.ipc"))
+	require.NoError(t, ExpandWeb3EndpointIfFile(context, HTTPWeb3ProviderFlag))
+	require.Equal(t, usr.HomeDir+"/relative/path.ipc", context.String(HTTPWeb3ProviderFlag.Name))
+
+	// current dir path
+	curentdir, err := os.Getwd()
+	require.NoError(t, err)
+	require.NoError(t, context.Set(HTTPWeb3ProviderFlag.Name, "./path.ipc"))
+	require.NoError(t, ExpandWeb3EndpointIfFile(context, HTTPWeb3ProviderFlag))
+	require.Equal(t, curentdir+"/path.ipc", context.String(HTTPWeb3ProviderFlag.Name))
+}