Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

[BUG] remove 127.0.0.1 from default hosts configs #996

Closed
wants to merge 3 commits into from
Closed

[BUG] remove 127.0.0.1 from default hosts configs #996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35289eb
removing 127.0.0.1 from the whitelists
Errorific Feb 27, 2019
57b892a
Switch defaults of 127.0.0.1 to localhost
Errorific Feb 27, 2019
f4e3171
Merge branch '1.0.0' into bug/127_jsonrpc_is_exploitable
Errorific Feb 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...um/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
package tech.pegasys.pantheon.ethereum.jsonrpc;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;

Expand All @@ -22,15 +21,15 @@
import com.google.common.collect.Lists;

public class JsonRpcConfiguration {
private static final String DEFAULT_JSON_RPC_HOST = "127.0.0.1";
private static final String DEFAULT_JSON_RPC_HOST = "localhost";
public static final int DEFAULT_JSON_RPC_PORT = 8545;

private boolean enabled;
private int port;
private String host;
private Collection<String> corsAllowedDomains = Collections.emptyList();
private Collection<RpcApi> rpcApis;
private Collection<String> hostsWhitelist = Arrays.asList("localhost", "127.0.0.1");;
private Collection<String> hostsWhitelist = Collections.singletonList("localhost");
private boolean authenticationEnabled = false;
private String authenticationCredentialsFile;

Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import com.google.common.collect.Lists;

public class WebSocketConfiguration {
public static final String DEFAULT_WEBSOCKET_HOST = "127.0.0.1";
public static final String DEFAULT_WEBSOCKET_HOST = "localhost";
public static final int DEFAULT_WEBSOCKET_PORT = 8546;
public static final Collection<RpcApi> DEFAULT_WEBSOCKET_APIS =
Arrays.asList(RpcApis.ETH, RpcApis.NET, RpcApis.WEB3);
Expand Down
2 changes: 1 addition & 1 deletion ...sonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public void defaultConfiguration() {
final JsonRpcConfiguration configuration = JsonRpcConfiguration.createDefault();

assertThat(configuration.isEnabled()).isFalse();
assertThat(configuration.getHost()).isEqualTo("127.0.0.1");
assertThat(configuration.getHost()).isEqualTo("localhost");
assertThat(configuration.getPort()).isEqualTo(8545);
assertThat(configuration.getCorsAllowedDomains()).isEmpty();
assertThat(configuration.getRpcApis())
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public void defaultConfiguration() {
final WebSocketConfiguration configuration = WebSocketConfiguration.createDefault();

assertThat(configuration.isEnabled()).isFalse();
assertThat(configuration.getHost()).isEqualTo("127.0.0.1");
assertThat(configuration.getHost()).isEqualTo("localhost");
assertThat(configuration.getPort()).isEqualTo(8546);
assertThat(configuration.getRpcApis())
.containsExactlyInAnyOrder(RpcApis.ETH, RpcApis.NET, RpcApis.WEB3);
Expand Down
7 changes: 3 additions & 4 deletions metrics/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,17 @@
*/
package tech.pegasys.pantheon.metrics.prometheus;

import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Objects;

import com.google.common.collect.Lists;

public class MetricsConfiguration {
private static final String DEFAULT_METRICS_HOST = "127.0.0.1";
private static final String DEFAULT_METRICS_HOST = "localhost";
public static final int DEFAULT_METRICS_PORT = 9545;

private static final String DEFAULT_METRICS_PUSH_HOST = "127.0.0.1";
private static final String DEFAULT_METRICS_PUSH_HOST = "localhost";
public static final int DEFAULT_METRICS_PUSH_PORT = 9001;

private boolean enabled;
Expand All @@ -34,7 +33,7 @@ public class MetricsConfiguration {
private String pushHost;
private int pushInterval;
private String prometheusJob;
private Collection<String> hostsWhitelist = Arrays.asList("localhost", "127.0.0.1");
private Collection<String> hostsWhitelist = Collections.singletonList("localhost");

public static MetricsConfiguration createDefault() {
final MetricsConfiguration metricsConfiguration = new MetricsConfiguration();
Expand Down
10 changes: 5 additions & 5 deletions pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ public static class RpcApisConversionException extends Exception {
paramLabel = MANDATORY_HOST_FORMAT_HELP,
description = "Host for JSON-RPC HTTP to listen on (default: ${DEFAULT-VALUE})",
arity = "1")
private String rpcHttpHost = autoDiscoverDefaultIP().getHostAddress();
private String rpcHttpHost = autoDiscoverDefaultIP().getHostName();

@Option(
names = {"--rpc-http-port"},
Expand Down Expand Up @@ -288,7 +288,7 @@ public static class RpcApisConversionException extends Exception {
paramLabel = MANDATORY_HOST_FORMAT_HELP,
description = "Host for JSON-RPC WebSocket service to listen on (default: ${DEFAULT-VALUE})",
arity = "1")
private String rpcWsHost = autoDiscoverDefaultIP().getHostAddress();
private String rpcWsHost = autoDiscoverDefaultIP().getHostName();

@Option(
names = {"--rpc-ws-port"},
Expand Down Expand Up @@ -346,7 +346,7 @@ private Long configureRefreshDelay(final Long refreshDelay) {
paramLabel = MANDATORY_HOST_FORMAT_HELP,
description = "Host for the metrics exporter to listen on (default: ${DEFAULT-VALUE})",
arity = "1")
private String metricsHost = autoDiscoverDefaultIP().getHostAddress();
private String metricsHost = autoDiscoverDefaultIP().getHostName();

@Option(
names = {"--metrics-port"},
Expand All @@ -365,7 +365,7 @@ private Long configureRefreshDelay(final Long refreshDelay) {
paramLabel = MANDATORY_HOST_FORMAT_HELP,
description = "Host of the Prometheus Push Gateway for push mode (default: ${DEFAULT-VALUE})",
arity = "1")
private String metricsPushHost = autoDiscoverDefaultIP().getHostAddress();
private String metricsPushHost = autoDiscoverDefaultIP().getHostName();

@Option(
names = {"--metrics-push-port"},
Expand Down Expand Up @@ -393,7 +393,7 @@ private Long configureRefreshDelay(final Long refreshDelay) {
paramLabel = "<hostname>[,<hostname>...]... or * or all",
description =
"Comma separated list of hostnames to whitelist for JSON-RPC access, or * or all to accept any host (default: ${DEFAULT-VALUE})",
defaultValue = "localhost,127.0.0.1")
defaultValue = "localhost")
private final JsonRPCWhitelistHostsProperty hostsWhitelist = new JsonRPCWhitelistHostsProperty();

@Option(
Expand Down