cc44ae9cb5
* `duration_ns: u64 -> duration: Duration` (#8457) * duration_ns: u64 -> duration: Duration * format on millis {:.2} -> {} * Keep all enacted blocks notify in order (#8524) * Keep all enacted blocks notify in order * Collect is unnecessary * Update ChainNotify to use ChainRouteType * Fix all ethcore fn defs * Wrap the type within ChainRoute * Fix private-tx and sync api * Fix secret_store API * Fix updater API * Fix rpc api * Fix informant api * Eagerly cache enacted/retracted and remove contain_enacted/retracted * Fix indent * tests: should use full expr form for struct constructor * Use into_enacted_retracted to further avoid copy * typo: not a function * rpc/tests: ChainRoute -> ChainRoute::new * Handle removed logs in filter changes and add geth compatibility field (#8796) * Add removed geth compatibility field in log * Fix mocked tests * Add field block hash in PollFilter * Store last block hash info for log filters * Implement canon route * Use canon logs for fetching reorg logs Light client removed logs fetching is disabled. It looks expensive. * Make sure removed flag is set * Address grumbles * Fixed AuthorityRound deadlock on shutdown, closes #8088 (#8803) * CI: Fix docker tags (#8822) * scripts: enable docker builds for beta and stable * scripts: docker latest should be beta not master * scripts: docker latest is master * ethcore: fix ancient block error msg handling (#8832) * Disable parallel verification and skip verifiying already imported txs. (#8834) * Reject transactions that are already in pool without verifying them. * Avoid verifying already imported transactions. * Fix concurrent access to signer queue (#8854) * Fix concurrent access to signer queue * Put request back to the queue if confirmation failed * typo: fix docs and rename functions to be more specific `request_notify` does not need to be public, and it's renamed to `notify_result`. `notify` is renamed to `notify_message`. * Change trace info "Transaction" -> "Request" * Don't allocate in expect_valid_rlp unless necessary (#8867) * don't allocate via format! in case there's no error * fix test? * fixed ipc leak, closes #8774 (#8876) * Add new ovh bootnodes and fix port for foundation bootnode 3.2 (#8886) * Add new ovh bootnodes and fix port for foundation bootnode 3.2 * Remove old bootnodes. * Remove duplicate 1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082 * Block 0 is valid in queries (#8891) Early exit for block nr 0 leads to spurious error about pruning: `…your node is running with state pruning…`. Fixes #7547, #8762 * Add ETC Cooperative-run load balanced parity node (#8892) * Minor fix in chain supplier and light provider (#8906) * fix chain supplier increment * fix light provider block_headers * Check whether we need resealing in miner and unwrap has_account in account_provider (#8853) * Remove unused Result wrap in has_account * Check whether we need to reseal for external transactions * Fix reference to has_account interface * typo: missing ) * Refactor duplicates to prepare_and_update_sealing * Fix build * Allow disabling local-by-default for transactions with new config entry (#8882) * Add tx_queue_allow_unknown_local config option - Previous commit messages: dispatcher checks if we have the sender account Add `tx_queue_allow_unknown_local` to MinerOptions Add `tx_queue_allow_unknown_local` to config fix order in MinerOptions to match Configuration add cli flag for tx_queue_allow_unknown_local Update refs to `tx_queue_allow_unknown_local` Add tx_queue_allow_unknown_local to config test revert changes to dispatcher Move tx_queue_allow_unknown_local to `import_own_transaction` Fix var name if statement should return the values derp de derp derp derp semicolons Reset dispatch file to how it was before fix compile issues + change from FLAG to ARG add test and use `into` import MinerOptions, clone the secret Fix tests? Compiler/linter issues fixed Fix linter msg - case of constants IT LIVES refactor to omit yucky explict return update comments Fix based on diff AccountProvider.has_account method * Refactor flag name + don't change import_own_tx behaviour fix arg name Note: force commit to try and get gitlab tests working again 😠 * Add fn to TestMinerService * Avoid race condition from trusted sources - refactor the miner tests a bit to cut down on code reuse - add `trusted` param to dispatch_transaction and import_claimed_local_transaction Add param to `import_claimed_local_transaction` Fix fn sig in tests
243 lines
8.3 KiB
Rust
243 lines
8.3 KiB
Rust
// Copyright 2015-2017 Parity Technologies (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::collections::BTreeMap;
|
|
use std::sync::Arc;
|
|
use dir::default_data_path;
|
|
use dir::helpers::replace_home;
|
|
use ethcore::account_provider::AccountProvider;
|
|
use ethcore::client::Client;
|
|
use ethcore::miner::Miner;
|
|
use ethkey::{Secret, Public};
|
|
use sync::SyncProvider;
|
|
use ethereum_types::Address;
|
|
|
|
/// This node secret key.
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub enum NodeSecretKey {
|
|
/// Stored as plain text in configuration file.
|
|
Plain(Secret),
|
|
/// Stored as account in key store.
|
|
KeyStore(Address),
|
|
}
|
|
|
|
/// Secret store service contract address.
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub enum ContractAddress {
|
|
/// Contract address is read from registry.
|
|
Registry,
|
|
/// Contract address is specified.
|
|
Address(Address),
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
/// Secret store configuration
|
|
pub struct Configuration {
|
|
/// Is secret store functionality enabled?
|
|
pub enabled: bool,
|
|
/// Is HTTP API enabled?
|
|
pub http_enabled: bool,
|
|
/// Is ACL check enabled.
|
|
pub acl_check_enabled: bool,
|
|
/// Is auto migrate enabled.
|
|
pub auto_migrate_enabled: bool,
|
|
/// Service contract address.
|
|
pub service_contract_address: Option<ContractAddress>,
|
|
/// Server key generation service contract address.
|
|
pub service_contract_srv_gen_address: Option<ContractAddress>,
|
|
/// Server key retrieval service contract address.
|
|
pub service_contract_srv_retr_address: Option<ContractAddress>,
|
|
/// Document key store service contract address.
|
|
pub service_contract_doc_store_address: Option<ContractAddress>,
|
|
/// Document key shadow retrieval service contract address.
|
|
pub service_contract_doc_sretr_address: Option<ContractAddress>,
|
|
/// This node secret.
|
|
pub self_secret: Option<NodeSecretKey>,
|
|
/// Other nodes IDs + addresses.
|
|
pub nodes: BTreeMap<Public, (String, u16)>,
|
|
/// Interface to listen to
|
|
pub interface: String,
|
|
/// Port to listen to
|
|
pub port: u16,
|
|
/// Interface to listen to
|
|
pub http_interface: String,
|
|
/// Port to listen to
|
|
pub http_port: u16,
|
|
/// Data directory path for secret store
|
|
pub data_path: String,
|
|
/// Administrator public key.
|
|
pub admin_public: Option<Public>,
|
|
}
|
|
|
|
/// Secret store dependencies
|
|
pub struct Dependencies<'a> {
|
|
/// Blockchain client.
|
|
pub client: Arc<Client>,
|
|
/// Sync provider.
|
|
pub sync: Arc<SyncProvider>,
|
|
/// Miner service.
|
|
pub miner: Arc<Miner>,
|
|
/// Account provider.
|
|
pub account_provider: Arc<AccountProvider>,
|
|
/// Passed accounts passwords.
|
|
pub accounts_passwords: &'a [String],
|
|
}
|
|
|
|
#[cfg(not(feature = "secretstore"))]
|
|
mod server {
|
|
use super::{Configuration, Dependencies};
|
|
|
|
/// Noop key server implementation
|
|
pub struct KeyServer;
|
|
|
|
impl KeyServer {
|
|
/// Create new noop key server
|
|
pub fn new(_conf: Configuration, _deps: Dependencies) -> Result<Self, String> {
|
|
Ok(KeyServer)
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(feature="secretstore")]
|
|
mod server {
|
|
use std::sync::Arc;
|
|
use ethcore_secretstore;
|
|
use ethkey::KeyPair;
|
|
use ansi_term::Colour::Red;
|
|
use db;
|
|
use super::{Configuration, Dependencies, NodeSecretKey, ContractAddress};
|
|
|
|
fn into_service_contract_address(address: ContractAddress) -> ethcore_secretstore::ContractAddress {
|
|
match address {
|
|
ContractAddress::Registry => ethcore_secretstore::ContractAddress::Registry,
|
|
ContractAddress::Address(address) => ethcore_secretstore::ContractAddress::Address(address),
|
|
}
|
|
}
|
|
|
|
/// Key server
|
|
pub struct KeyServer {
|
|
_key_server: Box<ethcore_secretstore::KeyServer>,
|
|
}
|
|
|
|
impl KeyServer {
|
|
/// Create new key server
|
|
pub fn new(mut conf: Configuration, deps: Dependencies) -> Result<Self, String> {
|
|
if !conf.acl_check_enabled {
|
|
warn!("Running SecretStore with disabled ACL check: {}", Red.bold().paint("everyone has access to stored keys"));
|
|
}
|
|
|
|
let self_secret: Arc<ethcore_secretstore::NodeKeyPair> = match conf.self_secret.take() {
|
|
Some(NodeSecretKey::Plain(secret)) => Arc::new(ethcore_secretstore::PlainNodeKeyPair::new(
|
|
KeyPair::from_secret(secret).map_err(|e| format!("invalid secret: {}", e))?)),
|
|
Some(NodeSecretKey::KeyStore(account)) => {
|
|
// Check if account exists
|
|
if !deps.account_provider.has_account(account.clone()) {
|
|
return Err(format!("Account {} passed as secret store node key is not found", account));
|
|
}
|
|
|
|
// Check if any passwords have been read from the password file(s)
|
|
if deps.accounts_passwords.is_empty() {
|
|
return Err(format!("No password found for the secret store node account {}", account));
|
|
}
|
|
|
|
// Attempt to sign in the engine signer.
|
|
let password = deps.accounts_passwords.iter()
|
|
.find(|p| deps.account_provider.sign(account.clone(), Some((*p).clone()), Default::default()).is_ok())
|
|
.ok_or_else(|| format!("No valid password for the secret store node account {}", account))?;
|
|
Arc::new(ethcore_secretstore::KeyStoreNodeKeyPair::new(deps.account_provider, account, password.clone())
|
|
.map_err(|e| format!("{}", e))?)
|
|
},
|
|
None => return Err("self secret is required when using secretstore".into()),
|
|
};
|
|
|
|
let key_server_name = format!("{}:{}", conf.interface, conf.port);
|
|
let mut cconf = ethcore_secretstore::ServiceConfiguration {
|
|
listener_address: if conf.http_enabled { Some(ethcore_secretstore::NodeAddress {
|
|
address: conf.http_interface.clone(),
|
|
port: conf.http_port,
|
|
}) } else { None },
|
|
service_contract_address: conf.service_contract_address.map(into_service_contract_address),
|
|
service_contract_srv_gen_address: conf.service_contract_srv_gen_address.map(into_service_contract_address),
|
|
service_contract_srv_retr_address: conf.service_contract_srv_retr_address.map(into_service_contract_address),
|
|
service_contract_doc_store_address: conf.service_contract_doc_store_address.map(into_service_contract_address),
|
|
service_contract_doc_sretr_address: conf.service_contract_doc_sretr_address.map(into_service_contract_address),
|
|
acl_check_enabled: conf.acl_check_enabled,
|
|
cluster_config: ethcore_secretstore::ClusterConfiguration {
|
|
threads: 4,
|
|
listener_address: ethcore_secretstore::NodeAddress {
|
|
address: conf.interface.clone(),
|
|
port: conf.port,
|
|
},
|
|
nodes: conf.nodes.into_iter().map(|(p, (ip, port))| (p, ethcore_secretstore::NodeAddress {
|
|
address: ip,
|
|
port: port,
|
|
})).collect(),
|
|
allow_connecting_to_higher_nodes: true,
|
|
admin_public: conf.admin_public,
|
|
auto_migrate_enabled: conf.auto_migrate_enabled,
|
|
},
|
|
};
|
|
|
|
cconf.cluster_config.nodes.insert(self_secret.public().clone(), cconf.cluster_config.listener_address.clone());
|
|
|
|
let db = db::open_secretstore_db(&conf.data_path)?;
|
|
let key_server = ethcore_secretstore::start(deps.client, deps.sync, deps.miner, self_secret, cconf, db)
|
|
.map_err(|e| format!("Error starting KeyServer {}: {}", key_server_name, e))?;
|
|
|
|
Ok(KeyServer {
|
|
_key_server: key_server,
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
pub use self::server::KeyServer;
|
|
|
|
impl Default for Configuration {
|
|
fn default() -> Self {
|
|
let data_dir = default_data_path();
|
|
Configuration {
|
|
enabled: true,
|
|
http_enabled: true,
|
|
acl_check_enabled: true,
|
|
auto_migrate_enabled: true,
|
|
service_contract_address: None,
|
|
service_contract_srv_gen_address: None,
|
|
service_contract_srv_retr_address: None,
|
|
service_contract_doc_store_address: None,
|
|
service_contract_doc_sretr_address: None,
|
|
self_secret: None,
|
|
admin_public: None,
|
|
nodes: BTreeMap::new(),
|
|
interface: "127.0.0.1".to_owned(),
|
|
port: 8083,
|
|
http_interface: "127.0.0.1".to_owned(),
|
|
http_port: 8082,
|
|
data_path: replace_home(&data_dir, "$BASE/secretstore"),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Start secret store-related functionality
|
|
pub fn start(conf: Configuration, deps: Dependencies) -> Result<Option<KeyServer>, String> {
|
|
if !conf.enabled {
|
|
return Ok(None);
|
|
}
|
|
|
|
KeyServer::new(conf, deps)
|
|
.map(|s| Some(s))
|
|
}
|