226fe8e0bb
* cli commands * cleanup parity/signer * cleanup parity/signer * remove redundant import of signer crate from main.rs * cli cleanup in progress * cli cleanup in progress * moved few commonly used functions to separate methods with tests * cleaning up blockchain import in progress * cleaning up blockchain import in progress2 * cleaning up blockchain import in progress3 * tests for database compaction profile parsing * cleaning up blockchain import in progress4 * cleaning up blockchain import in progress5 * blockchain import * export blockchain in progress * cleanup execute_export * Configuration::to_duration cleaned up * removed unused code, tests for to_duration * cleanup Configuration::mode function * parsing some of the cli params in params.rs * rpc and signer are no longer optional * move importing extern crates to main.rs file * swipe dies from rpc module * swipe dies from dapps * finding deprecated * several tests and fixes for parity * parity cleanup in progress * cleanup price parsing * parity cleanup in progress * swiped all dies * parity cleanup in progress * replace usages of from_str with parse() in parity/params.rs * removed few more from_str * split parity/params.rs into params and helpers * removed wildcard import from configuration.rs * cleanup directories/path creation * cleaning up run cmd * moved LoggerConfig * defaults for cli params * fixed indention in raise_fd_limit * tests for rpc_apis * tests for default ipc and rpc settings * ipc socket * cleanup in progress * account service * cleanup miner config * BlockChain commands use Directiores structure now * client_config * network settings and dapps configuration * removing warnings * default logger config * fixed client_path * overhaul * fixing export && import * default export DataFormat * import and export also upgrade db * fixed export && import * polishing pr * polishing pr * fixed custom bootnodes * fixed daemonize on windows * fixed setting up enable network * finished pr * fixed compiling on windows * Fixed warning; windows build * Better cache management * Fixed tests on windows * Fixed test * Restored pruning method names * --cache alias * Fixed more tests * Ensure default options actually listed as valid [ci:skip]
107 lines
3.0 KiB
Rust
107 lines
3.0 KiB
Rust
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
|
// This file is part of Parity.
|
|
|
|
// Parity is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
use std::io;
|
|
use std::sync::Arc;
|
|
use std::path::PathBuf;
|
|
use ansi_term::Colour;
|
|
use util::panics::{ForwardPanic, PanicHandler};
|
|
use util::path::restrict_permissions_owner;
|
|
use rpc_apis;
|
|
use ethcore_signer as signer;
|
|
use helpers::replace_home;
|
|
pub use ethcore_signer::Server as SignerServer;
|
|
|
|
const CODES_FILENAME: &'static str = "authcodes";
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub struct Configuration {
|
|
pub enabled: bool,
|
|
pub port: u16,
|
|
pub signer_path: String,
|
|
}
|
|
|
|
impl Default for Configuration {
|
|
fn default() -> Self {
|
|
Configuration {
|
|
enabled: true,
|
|
port: 8180,
|
|
signer_path: replace_home("$HOME/.parity/signer"),
|
|
}
|
|
}
|
|
}
|
|
|
|
pub struct Dependencies {
|
|
pub panic_handler: Arc<PanicHandler>,
|
|
pub apis: Arc<rpc_apis::Dependencies>,
|
|
}
|
|
|
|
pub fn start(conf: Configuration, deps: Dependencies) -> Result<Option<SignerServer>, String> {
|
|
if !conf.enabled {
|
|
Ok(None)
|
|
} else {
|
|
Ok(Some(try!(do_start(conf, deps))))
|
|
}
|
|
}
|
|
|
|
fn codes_path(path: String) -> PathBuf {
|
|
let mut p = PathBuf::from(path);
|
|
p.push(CODES_FILENAME);
|
|
let _ = restrict_permissions_owner(&p);
|
|
p
|
|
}
|
|
|
|
pub fn new_token(path: String) -> Result<String, String> {
|
|
generate_new_token(path)
|
|
.map(|code| format!("This key code will authorise your System Signer UI: {}", Colour::White.bold().paint(code)))
|
|
.map_err(|err| format!("Error generating token: {:?}", err))
|
|
}
|
|
|
|
fn generate_new_token(path: String) -> io::Result<String> {
|
|
let path = codes_path(path);
|
|
let mut codes = try!(signer::AuthCodes::from_file(&path));
|
|
let code = try!(codes.generate_new());
|
|
try!(codes.to_file(&path));
|
|
trace!("New key code created: {}", Colour::White.bold().paint(&code[..]));
|
|
Ok(code)
|
|
}
|
|
|
|
fn do_start(conf: Configuration, deps: Dependencies) -> Result<SignerServer, String> {
|
|
let addr = try!(format!("127.0.0.1:{}", conf.port)
|
|
.parse()
|
|
.map_err(|_| format!("Invalid port specified: {}", conf.port)));
|
|
|
|
let start_result = {
|
|
let server = signer::ServerBuilder::new(
|
|
deps.apis.signer_queue.clone(),
|
|
codes_path(conf.signer_path),
|
|
);
|
|
let server = rpc_apis::setup_rpc(server, deps.apis, rpc_apis::ApiSet::SafeContext);
|
|
server.start(addr)
|
|
};
|
|
|
|
match start_result {
|
|
Err(signer::ServerError::IoError(err)) => Err(format!("Trusted Signer Error: {}", err)),
|
|
Err(e) => Err(format!("Trusted Signer Error: {:?}", e)),
|
|
Ok(server) => {
|
|
deps.panic_handler.forward_from(&server);
|
|
Ok(server)
|
|
},
|
|
}
|
|
}
|
|
|
|
|