From beb6438ef525e8565b810b43bba9979796bb207a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Mon, 19 Mar 2018 18:11:00 +0100 Subject: [PATCH] Disable UI by default. (#8105) --- parity/configuration.rs | 33 ++++++++++++++++++++++++++------- parity/rpc.rs | 4 ++-- parity/run.rs | 5 +++++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/parity/configuration.rs b/parity/configuration.rs index 9898f358d..bbf27601e 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -1114,7 +1114,7 @@ impl Configuration { self.args.flag_geth || self.args.flag_no_ui; - !ui_disabled && cfg!(feature = "ui-enabled") + self.args.cmd_ui && !ui_disabled && cfg!(feature = "ui-enabled") } fn verifier_settings(&self) -> VerifierSettings { @@ -1339,11 +1339,11 @@ mod tests { origins: Some(vec!["parity://*".into(),"chrome-extension://*".into(), "moz-extension://*".into()]), hosts: Some(vec![]), signer_path: expected.into(), - ui_address: Some("127.0.0.1:8180".into()), + ui_address: None, dapps_address: Some("127.0.0.1:8545".into()), support_token_api: true }, UiConfiguration { - enabled: true, + enabled: false, interface: "127.0.0.1".into(), port: 8180, hosts: Some(vec![]), @@ -1619,19 +1619,38 @@ mod tests { let conf1 = parse(&["parity", "--ui-path=signer", "--ui-no-validation"]); let conf2 = parse(&["parity", "--ui-path=signer", "--ui-port", "3123"]); let conf3 = parse(&["parity", "--ui-path=signer", "--ui-interface", "test"]); + let conf4 = parse(&["parity", "--ui-path=signer", "--force-ui"]); + let conf5 = parse(&["parity", "--ui-path=signer", "ui"]); // then assert_eq!(conf0.directories().signer, "signer".to_owned()); assert_eq!(conf0.ui_config(), UiConfiguration { + enabled: false, + interface: "127.0.0.1".into(), + port: 8180, + hosts: Some(vec![]), + }); + assert!(conf4.ws_config().unwrap().hosts.is_some()); + assert_eq!(conf4.directories().signer, "signer".to_owned()); + assert_eq!(conf4.ui_config(), UiConfiguration { enabled: true, interface: "127.0.0.1".into(), port: 8180, hosts: Some(vec![]), }); - assert!(conf0.ws_config().unwrap().hosts.is_some()); + assert!(conf5.ws_config().unwrap().hosts.is_some()); + assert!(conf5.ws_config().unwrap().hosts.is_some()); + assert_eq!(conf5.directories().signer, "signer".to_owned()); + assert_eq!(conf5.ui_config(), UiConfiguration { + enabled: true, + interface: "127.0.0.1".into(), + port: 8180, + hosts: Some(vec![]), + }); + assert!(conf5.ws_config().unwrap().hosts.is_some()); assert_eq!(conf1.directories().signer, "signer".to_owned()); assert_eq!(conf1.ui_config(), UiConfiguration { - enabled: true, + enabled: false, interface: "127.0.0.1".into(), port: 8180, hosts: Some(vec![]), @@ -1640,7 +1659,7 @@ mod tests { assert_eq!(conf1.ws_config().unwrap().origins, None); assert_eq!(conf2.directories().signer, "signer".to_owned()); assert_eq!(conf2.ui_config(), UiConfiguration { - enabled: true, + enabled: false, interface: "127.0.0.1".into(), port: 3123, hosts: Some(vec![]), @@ -1648,7 +1667,7 @@ mod tests { assert!(conf2.ws_config().unwrap().hosts.is_some()); assert_eq!(conf3.directories().signer, "signer".to_owned()); assert_eq!(conf3.ui_config(), UiConfiguration { - enabled: true, + enabled: false, interface: "test".into(), port: 8180, hosts: Some(vec![]), diff --git a/parity/rpc.rs b/parity/rpc.rs index 7bda20f72..2940e178e 100644 --- a/parity/rpc.rs +++ b/parity/rpc.rs @@ -110,7 +110,7 @@ impl From for HttpConfiguration { impl Default for UiConfiguration { fn default() -> Self { UiConfiguration { - enabled: true && cfg!(feature = "ui-enabled"), + enabled: false, port: 8180, interface: "127.0.0.1".into(), hosts: Some(vec![]), @@ -166,7 +166,7 @@ impl Default for WsConfiguration { hosts: Some(Vec::new()), signer_path: replace_home(&data_dir, "$BASE/signer").into(), support_token_api: true, - ui_address: Some("127.0.0.1:8180".into()), + ui_address: None, dapps_address: Some("127.0.0.1:8545".into()), } } diff --git a/parity/run.rs b/parity/run.rs index 5198b5a30..03a5d6f80 100644 --- a/parity/run.rs +++ b/parity/run.rs @@ -892,6 +892,11 @@ pub fn execute_impl(cmd: RunCmd, can_restart: bool, logger: Arc) } pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc) -> Result<(bool, Option), String> { + if cmd.ui_conf.enabled { + warn!("Parity browser interface is deprecated. It's going to be removed in the next version, use standalone Parity Wallet instead."); + warn!("Standalone Parity Wallet: https://github.com/Parity-JS/shell/releases"); + } + if cmd.ui && cmd.dapps_conf.enabled { // Check if Parity is already running let addr = format!("{}:{}", cmd.ui_conf.interface, cmd.ui_conf.port);