grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1417 from ethcore/ui

Browse Source 
Signer enabled by default for UI
This commit is contained in:
Arkadiy Paronyan 2016-06-24 16:31:14 +02:00 committed by GitHub
commit 313d9048bf
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
parity/cli.rs
View File

@ -117,7 +117,9 @@ API and Console Options:
[default: $HOME/.parity/dapps] [default: $HOME/.parity/dapps]
--signer Enable Trusted Signer WebSocket endpoint used by --signer Enable Trusted Signer WebSocket endpoint used by
Signer UIs. Signer UIs. Default if run with ui command.
--no-signer Disable Trusted Signer WebSocket endpoint used by
Signer UIs. Default if no command is specified.
--signer-port PORT Specify the port of Trusted Signer server --signer-port PORT Specify the port of Trusted Signer server
[default: 8180]. [default: 8180].
--signer-path PATH Specify directory where Signer UIs tokens should --signer-path PATH Specify directory where Signer UIs tokens should
@ -276,6 +278,7 @@ pub struct Args {
pub flag_dapps_pass: Option<String>, pub flag_dapps_pass: Option<String>,
pub flag_dapps_path: String, pub flag_dapps_path: String,
pub flag_signer: bool, pub flag_signer: bool,
pub flag_no_signer: bool,
pub flag_signer_port: u16, pub flag_signer_port: u16,
pub flag_signer_path: String, pub flag_signer_path: String,
pub flag_no_token: bool, pub flag_no_token: bool,

7
parity/configuration.rs
View File

@ -441,7 +441,7 @@ impl Configuration {
} }
pub fn signer_port(&self) -> Option<u16> { pub fn signer_port(&self) -> Option<u16> {
if !self.args.flag_signer { if !self.signer_enabled() {
None None
} else { } else {
Some(self.args.flag_signer_port) Some(self.args.flag_signer_port)
@ -467,6 +467,11 @@ impl Configuration {
pub fn dapps_enabled(&self) -> bool { pub fn dapps_enabled(&self) -> bool {
!self.args.flag_dapps_off && !self.args.flag_no_dapps !self.args.flag_dapps_off && !self.args.flag_no_dapps
} }
pub fn signer_enabled(&self) -> bool {
(self.args.cmd_ui && !self.args.flag_no_signer) ||
(!self.args.cmd_ui && self.args.flag_signer)
}
} }
#[cfg(test)] #[cfg(test)]

6
parity/main.rs
View File

@ -192,14 +192,14 @@ fn execute_client(conf: Configuration, spec: Spec, client_config: ClientConfig)
let sync_config = conf.sync_config(&spec); let sync_config = conf.sync_config(&spec);
// Create and display a new token for UIs. // Create and display a new token for UIs.
if conf.args.flag_signer && !conf.args.flag_no_token { if conf.signer_enabled() && !conf.args.flag_no_token {
new_token(conf.directories().signer).unwrap_or_else(|e| { new_token(conf.directories().signer).unwrap_or_else(|e| {
die!("Error generating token: {:?}", e) die!("Error generating token: {:?}", e)
}); });
} }
// Display warning about using unlock with signer // Display warning about using unlock with signer
if conf.args.flag_signer && conf.args.flag_unlock.is_some() { if conf.signer_enabled() && conf.args.flag_unlock.is_some() {
warn!("Using Trusted Signer and --unlock is not recommended!"); warn!("Using Trusted Signer and --unlock is not recommended!");
warn!("NOTE that Signer will not ask you to confirm transactions from unlocked account."); warn!("NOTE that Signer will not ask you to confirm transactions from unlocked account.");
} }
@ -278,7 +278,7 @@ fn execute_client(conf: Configuration, spec: Spec, client_config: ClientConfig)
// Set up a signer // Set up a signer
let signer_server = signer::start(signer::Configuration { let signer_server = signer::start(signer::Configuration {
enabled: deps_for_rpc_apis.signer_port.is_some(), enabled: conf.signer_enabled(),
port: conf.args.flag_signer_port, port: conf.args.flag_signer_port,
signer_path: conf.directories().signer, signer_path: conf.directories().signer,
}, signer::Dependencies { }, signer::Dependencies {