pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-23 22:31:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable --no-private-ipv4 by default for live chains (#8642)

Browse Source 
* Enable --no-private-ipv4 by default for live chains

* Make the selection a bit easier to read

* Update client/cli/src/params/network_params.rs

Co-authored-by: Andronik Ordian <write@reusable.software>

Co-authored-by: Andronik Ordian <write@reusable.software>
This commit is contained in:
Pierre Krieger
2021-04-20 15:42:11 +02:00
committed by GitHub
parent a52adf448b
commit 3a72631439
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/cli/src/params/network_params.rs
+18 -4
View File
@@ -64,12 +64,19 @@ pub struct NetworkParams {
#[structopt(long = "port", value_name = "PORT", conflicts_with_all = &[ "listen-addr" ])] #[structopt(long = "port", value_name = "PORT", conflicts_with_all = &[ "listen-addr" ])]
pub port: Option<u16>, pub port: Option<u16>,
/// Forbid connecting to private IPv4 addresses (as specified in /// Always forbid connecting to private IPv4 addresses (as specified in
/// [RFC1918](https://tools.ietf.org/html/rfc1918)), unless the address was passed with /// [RFC1918](https://tools.ietf.org/html/rfc1918)), unless the address was passed with
/// `--reserved-nodes` or `--bootnodes`. /// `--reserved-nodes` or `--bootnodes`. Enabled by default for chains marked as "live" in
#[structopt(long = "no-private-ipv4")] /// their chain specifications.
#[structopt(long = "no-private-ipv4", conflicts_with_all = &["allow-private-ipv4"])]
pub no_private_ipv4: bool, pub no_private_ipv4: bool,
/// Always accept connecting to private IPv4 addresses (as specified in
/// [RFC1918](https://tools.ietf.org/html/rfc1918)). Enabled by default for chains marked as
/// "local" in their chain specifications, or when `--dev` is passed.
#[structopt(long = "allow-private-ipv4", conflicts_with_all = &["no-private-ipv4"])]
pub allow_private_ipv4: bool,
/// Specify the number of outgoing connections we're trying to maintain. /// Specify the number of outgoing connections we're trying to maintain.
#[structopt(long = "out-peers", value_name = "COUNT", default_value = "25")] #[structopt(long = "out-peers", value_name = "COUNT", default_value = "25")]
pub out_peers: u32, pub out_peers: u32,
@@ -173,6 +180,13 @@ impl NetworkParams {
|| is_dev || is_dev
|| matches!(chain_type, ChainType::Local | ChainType::Development); || matches!(chain_type, ChainType::Local | ChainType::Development);
let allow_private_ipv4 = match (self.allow_private_ipv4, self.no_private_ipv4) {
(true, true) => unreachable!("`*_private_ipv4` flags are mutually exclusive; qed"),
(true, false) => true,
(false, true) => false,
(false, false) => is_dev || matches!(chain_type, ChainType::Local | ChainType::Development),
};
NetworkConfiguration { NetworkConfiguration {
boot_nodes, boot_nodes,
net_config_path, net_config_path,
@@ -195,7 +209,7 @@ impl NetworkParams {
client_version: client_id.to_string(), client_version: client_id.to_string(),
transport: TransportConfig::Normal { transport: TransportConfig::Normal {
enable_mdns: !is_dev && !self.no_mdns, enable_mdns: !is_dev && !self.no_mdns,
allow_private_ipv4: !self.no_private_ipv4, allow_private_ipv4,
wasm_external_transport: None, wasm_external_transport: None,
}, },
max_parallel_downloads: self.max_parallel_downloads, max_parallel_downloads: self.max_parallel_downloads,