mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-17 18:30:45 +00:00
This commit is contained in:
parent
230a2f09ba
commit
80547a50d9
5 changed files with 20 additions and 6 deletions
|
|
@ -123,6 +123,7 @@ var (
|
||||||
utils.EnableXDCPrefixFlag,
|
utils.EnableXDCPrefixFlag,
|
||||||
utils.NetworkIdFlag,
|
utils.NetworkIdFlag,
|
||||||
utils.HTTPCORSDomainFlag,
|
utils.HTTPCORSDomainFlag,
|
||||||
|
utils.AuthHostFlag,
|
||||||
utils.AuthPortFlag,
|
utils.AuthPortFlag,
|
||||||
utils.JWTSecretFlag,
|
utils.JWTSecretFlag,
|
||||||
utils.HTTPVirtualHostsFlag,
|
utils.HTTPVirtualHostsFlag,
|
||||||
|
|
|
||||||
|
|
@ -392,7 +392,13 @@ var (
|
||||||
Value: ethconfig.Defaults.RPCTxFeeCap,
|
Value: ethconfig.Defaults.RPCTxFeeCap,
|
||||||
Category: flags.APICategory,
|
Category: flags.APICategory,
|
||||||
}
|
}
|
||||||
// Authenticated port settings
|
// Authenticated RPC HTTP settings
|
||||||
|
AuthHostFlag = &cli.StringFlag{
|
||||||
|
Name: "authrpc.host",
|
||||||
|
Usage: "Listening address for authenticated APIs",
|
||||||
|
Value: node.DefaultConfig.AuthHost,
|
||||||
|
Category: flags.APICategory,
|
||||||
|
}
|
||||||
AuthPortFlag = &cli.IntFlag{
|
AuthPortFlag = &cli.IntFlag{
|
||||||
Name: "authrpc.port",
|
Name: "authrpc.port",
|
||||||
Usage: "Listening port for authenticated APIs",
|
Usage: "Listening port for authenticated APIs",
|
||||||
|
|
@ -1016,6 +1022,9 @@ func setHTTP(ctx *cli.Context, cfg *node.Config) {
|
||||||
if ctx.IsSet(HTTPPortFlag.Name) {
|
if ctx.IsSet(HTTPPortFlag.Name) {
|
||||||
cfg.HTTPPort = ctx.Int(HTTPPortFlag.Name)
|
cfg.HTTPPort = ctx.Int(HTTPPortFlag.Name)
|
||||||
}
|
}
|
||||||
|
if ctx.IsSet(AuthHostFlag.Name) {
|
||||||
|
cfg.AuthHost = ctx.String(AuthHostFlag.Name)
|
||||||
|
}
|
||||||
if ctx.IsSet(AuthPortFlag.Name) {
|
if ctx.IsSet(AuthPortFlag.Name) {
|
||||||
cfg.AuthPort = ctx.Int(AuthPortFlag.Name)
|
cfg.AuthPort = ctx.Int(AuthPortFlag.Name)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -109,9 +109,6 @@ type Config struct {
|
||||||
// for ephemeral nodes).
|
// for ephemeral nodes).
|
||||||
HTTPPort int `toml:",omitempty"`
|
HTTPPort int `toml:",omitempty"`
|
||||||
|
|
||||||
// Authport is the port number on which the authenticated API is provided.
|
|
||||||
AuthPort int `toml:",omitempty"`
|
|
||||||
|
|
||||||
// HTTPCors is the Cross-Origin Resource Sharing header to send to requesting
|
// HTTPCors is the Cross-Origin Resource Sharing header to send to requesting
|
||||||
// clients. Please be aware that CORS is a browser enforced security, it's fully
|
// clients. Please be aware that CORS is a browser enforced security, it's fully
|
||||||
// useless for custom HTTP clients.
|
// useless for custom HTTP clients.
|
||||||
|
|
@ -138,6 +135,12 @@ type Config struct {
|
||||||
// HTTPPathPrefix specifies a path prefix on which http-rpc is to be served.
|
// HTTPPathPrefix specifies a path prefix on which http-rpc is to be served.
|
||||||
HTTPPathPrefix string `toml:",omitempty"`
|
HTTPPathPrefix string `toml:",omitempty"`
|
||||||
|
|
||||||
|
// AuthHost is the listening address on which authenticated APIs are provided.
|
||||||
|
AuthHost string `toml:",omitempty"`
|
||||||
|
|
||||||
|
// AuthPort is the port number on which authenticated APIs are provided.
|
||||||
|
AuthPort int `toml:",omitempty"`
|
||||||
|
|
||||||
// WSHost is the host interface on which to start the websocket RPC server. If
|
// WSHost is the host interface on which to start the websocket RPC server. If
|
||||||
// this field is empty, no websocket API endpoint will be started.
|
// this field is empty, no websocket API endpoint will be started.
|
||||||
WSHost string
|
WSHost string
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@ var (
|
||||||
var DefaultConfig = Config{
|
var DefaultConfig = Config{
|
||||||
DataDir: DefaultDataDir(),
|
DataDir: DefaultDataDir(),
|
||||||
HTTPPort: DefaultHTTPPort,
|
HTTPPort: DefaultHTTPPort,
|
||||||
|
AuthHost: DefaultAuthHost,
|
||||||
AuthPort: DefaultAuthPort,
|
AuthPort: DefaultAuthPort,
|
||||||
HTTPModules: []string{"net", "web3"},
|
HTTPModules: []string{"net", "web3"},
|
||||||
HTTPVirtualHosts: []string{"localhost"},
|
HTTPVirtualHosts: []string{"localhost"},
|
||||||
|
|
|
||||||
|
|
@ -446,7 +446,7 @@ func (n *Node) startRPC() error {
|
||||||
initAuth := func(apis []rpc.API, port int, secret []byte) error {
|
initAuth := func(apis []rpc.API, port int, secret []byte) error {
|
||||||
// Enable auth via HTTP
|
// Enable auth via HTTP
|
||||||
server := n.httpAuth
|
server := n.httpAuth
|
||||||
if err := server.setListenAddr(DefaultAuthHost, port); err != nil {
|
if err := server.setListenAddr(n.config.AuthHost, port); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := server.enableRPC(apis, httpConfig{
|
if err := server.enableRPC(apis, httpConfig{
|
||||||
|
|
@ -461,7 +461,7 @@ func (n *Node) startRPC() error {
|
||||||
servers = append(servers, server)
|
servers = append(servers, server)
|
||||||
// Enable auth via WS
|
// Enable auth via WS
|
||||||
server = n.wsServerForPort(port, true)
|
server = n.wsServerForPort(port, true)
|
||||||
if err := server.setListenAddr(DefaultAuthHost, port); err != nil {
|
if err := server.setListenAddr(n.config.AuthHost, port); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := server.enableWS(apis, wsConfig{
|
if err := server.enableWS(apis, wsConfig{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue