aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Holst Swende <martin@swende.se>2018-03-05 19:02:32 +0800
committerPéter Szilágyi <peterke@gmail.com>2018-03-05 19:02:32 +0800
commit478143d69a13103a6809ef41a64b25db8c2438ee (patch)
tree456ea29d86563aa7265ca8f96b3b389e92115b7e
parentabed63c38fe817e73ccbc8f123aee044d10d1711 (diff)
downloaddexon-478143d69a13103a6809ef41a64b25db8c2438ee.tar.gz
dexon-478143d69a13103a6809ef41a64b25db8c2438ee.tar.zst
dexon-478143d69a13103a6809ef41a64b25db8c2438ee.zip
utils: fix #16138 by checking if vhosts flag is set (#16141)
* utils: fix #16138 by checking if vhosts flag is set * utils,node: fix defaults for rpcvhosts * node,utils: address review concerns
-rw-r--r--cmd/utils/flags.go7
-rw-r--r--node/defaults.go11
2 files changed, 10 insertions, 8 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 5fd5013f0..dbf26b8e0 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -400,7 +400,7 @@ var (
RPCVirtualHostsFlag = cli.StringFlag{
Name: "rpcvhosts",
Usage: "Comma separated list of virtual hostnames from which to accept requests (server enforced). Accepts '*' wildcard.",
- Value: "localhost",
+ Value: strings.Join(node.DefaultConfig.HTTPVirtualHosts, ","),
}
RPCApiFlag = cli.StringFlag{
Name: "rpcapi",
@@ -695,8 +695,9 @@ func setHTTP(ctx *cli.Context, cfg *node.Config) {
if ctx.GlobalIsSet(RPCApiFlag.Name) {
cfg.HTTPModules = splitAndTrim(ctx.GlobalString(RPCApiFlag.Name))
}
-
- cfg.HTTPVirtualHosts = splitAndTrim(ctx.GlobalString(RPCVirtualHostsFlag.Name))
+ if ctx.GlobalIsSet(RPCVirtualHostsFlag.Name) {
+ cfg.HTTPVirtualHosts = splitAndTrim(ctx.GlobalString(RPCVirtualHostsFlag.Name))
+ }
}
// setWS creates the WebSocket RPC listener interface string from the set
diff --git a/node/defaults.go b/node/defaults.go
index d4e148683..887560580 100644
--- a/node/defaults.go
+++ b/node/defaults.go
@@ -35,11 +35,12 @@ const (
// DefaultConfig contains reasonable default settings.
var DefaultConfig = Config{
- DataDir: DefaultDataDir(),
- HTTPPort: DefaultHTTPPort,
- HTTPModules: []string{"net", "web3"},
- WSPort: DefaultWSPort,
- WSModules: []string{"net", "web3"},
+ DataDir: DefaultDataDir(),
+ HTTPPort: DefaultHTTPPort,
+ HTTPModules: []string{"net", "web3"},
+ HTTPVirtualHosts: []string{"localhost"},
+ WSPort: DefaultWSPort,
+ WSModules: []string{"net", "web3"},
P2P: p2p.Config{
ListenAddr: ":30303",
MaxPeers: 25,