Add SensitiveUrl to redact user secrets from endpoints (#2326)

## Issue Addressed

#2276 

## Proposed Changes

Add the `SensitiveUrl` struct which wraps `Url` and implements custom `Display` and `Debug` traits to redact user secrets from being logged in eth1 endpoints, beacon node endpoints and metrics.

## Additional Info

This also includes a small rewrite of the eth1 crate to make requests using `Url` instead of `&str`. 
Some error messages have also been changed to remove `Url` data.

testing/node_test_rig/Cargo.toml

@@ -18,3 +18,4 @@ genesis = { path = "../../beacon_node/genesis" }
 eth2 = { path = "../../common/eth2" }
 validator_client = { path = "../../validator_client" }
 validator_dir = { path = "../../common/validator_dir", features = ["insecure_keys"] }
+sensitive_url = { path = "../../common/sensitive_url" }

testing/node_test_rig/src/lib.rs

@@ -4,10 +4,8 @@
 
 use beacon_node::ProductionBeaconNode;
 use environment::RuntimeContext;
-use eth2::{
-    reqwest::{ClientBuilder, Url},
-    BeaconNodeHttpClient,
-};
+use eth2::{reqwest::ClientBuilder, BeaconNodeHttpClient};
+use sensitive_url::SensitiveUrl;
 use std::path::PathBuf;
 use std::time::Duration;
 use std::time::{SystemTime, UNIX_EPOCH};
@@ -68,9 +66,10 @@ impl<E: EthSpec> LocalBeaconNode<E> {
             .http_api_listen_addr()
             .ok_or("A remote beacon node must have a http server")?;
 
-        let beacon_node_url: Url = format!("http://{}:{}", listen_addr.ip(), listen_addr.port())
-            .parse()
-            .map_err(|e| format!("Unable to parse beacon node URL: {:?}", e))?;
+        let beacon_node_url: SensitiveUrl = SensitiveUrl::parse(
+            format!("http://{}:{}", listen_addr.ip(), listen_addr.port()).as_str(),
+        )
+        .map_err(|e| format!("Unable to parse beacon node URL: {:?}", e))?;
         let beacon_node_http_client = ClientBuilder::new()
             .timeout(HTTP_TIMEOUT)
             .build()

testing/remote_signer_test/Cargo.toml

@@ -17,3 +17,4 @@ serde_json = "1.0.58"
 tempfile = "3.1.0"
 tokio = { version = "1.1.0", features = ["time"] }
 types = { path = "../../consensus/types" }
+sensitive_url = { path = "../../common/sensitive_url" }

testing/remote_signer_test/src/consumer.rs

@@ -1,7 +1,8 @@
 use crate::*;
 use remote_signer_client::api_response::SignatureApiResponse;
-use remote_signer_consumer::{Error, RemoteSignerHttpConsumer, RemoteSignerObject, Url};
+use remote_signer_consumer::{Error, RemoteSignerHttpConsumer, RemoteSignerObject};
 use reqwest::ClientBuilder;
+use sensitive_url::SensitiveUrl;
 use serde::Serialize;
 use tokio::runtime::Builder;
 use tokio::time::Duration;
@@ -15,7 +16,7 @@ pub fn set_up_test_consumer_with_timeout(
     test_signer_address: &str,
     timeout: u64,
 ) -> RemoteSignerHttpConsumer {
-    let url: Url = test_signer_address.parse().unwrap();
+    let url = SensitiveUrl::parse(test_signer_address).unwrap();
     let reqwest_client = ClientBuilder::new()
         .timeout(Duration::from_secs(timeout))
         .build()

testing/simulator/Cargo.toml

@@ -18,3 +18,4 @@ eth1_test_rig = { path = "../eth1_test_rig" }
 env_logger = "0.8.2"
 clap = "2.33.3"
 rayon = "1.4.1"
+sensitive_url  = { path = "../../common/sensitive_url" }

testing/simulator/src/eth1_sim.rs

@@ -10,6 +10,7 @@ use node_test_rig::{
     ClientGenesis, ValidatorFiles,
 };
 use rayon::prelude::*;
+use sensitive_url::SensitiveUrl;
 use std::cmp::max;
 use std::net::{IpAddr, Ipv4Addr};
 use std::time::Duration;
@@ -84,7 +85,8 @@ pub fn run_eth1_sim(matches: &ArgMatches) -> Result<(), String> {
         let network_id = ganache_eth1_instance.ganache.network_id();
         let chain_id = ganache_eth1_instance.ganache.chain_id();
         let ganache = ganache_eth1_instance.ganache;
-        let eth1_endpoint = ganache.endpoint();
+        let eth1_endpoint = SensitiveUrl::parse(ganache.endpoint().as_str())
+            .expect("Unable to parse ganache endpoint.");
         let deposit_contract_address = deposit_contract.address();
 
         // Start a timer that produces eth1 blocks on an interval.
@@ -133,7 +135,10 @@ pub fn run_eth1_sim(matches: &ArgMatches) -> Result<(), String> {
         for i in 0..node_count - 1 {
             let mut config = beacon_config.clone();
             if i % 2 == 0 {
-                config.eth1.endpoints.insert(0, INVALID_ADDRESS.to_string());
+                config.eth1.endpoints.insert(
+                    0,
+                    SensitiveUrl::parse(INVALID_ADDRESS).expect("Unable to parse invalid address"),
+                );
             }
             network.add_beacon_node(config).await?;
         }

testing/simulator/src/local_network.rs

@@ -4,6 +4,7 @@ use node_test_rig::{
     ClientConfig, LocalBeaconNode, LocalValidatorClient, ValidatorConfig, ValidatorFiles,
 };
 use parking_lot::RwLock;
+use sensitive_url::SensitiveUrl;
 use std::{
     ops::Deref,
     time::{SystemTime, UNIX_EPOCH},
@@ -140,9 +141,12 @@ impl<E: EthSpec> LocalNetwork<E> {
                 .expect("Must have http started")
         };
 
-        let beacon_node = format!("http://{}:{}", socket_addr.ip(), socket_addr.port());
+        let beacon_node = SensitiveUrl::parse(
+            format!("http://{}:{}", socket_addr.ip(), socket_addr.port()).as_str(),
+        )
+        .unwrap();
         validator_config.beacon_nodes = if invalid_first_beacon_node {
-            vec![INVALID_ADDRESS.to_string(), beacon_node]
+            vec![SensitiveUrl::parse(INVALID_ADDRESS).unwrap(), beacon_node]
         } else {
             vec![beacon_node]
         };