043ca21863
* Use ethcore_dappsPort when constructing URLs (#3139) * Upon connect, retrieve the available api ports * Update dapps to load from dappsPort * Update dapps summary with dappsPort * Allow proxy to use dappsPort * Replace /api/ping with HEAD / * Dynamic port for available apps * Retrieve content images with dappsPort * Fix / * Transfer token dropdown image fix * IdentityIcon loads images via contentHash * Update apps fetch to cater for dev & prod * DRY up 127.0.0.1:${dappsPort} with ${dappsUrl} * Cleaning up polluted namespaces (#3143) * Renaming ethcore_ to parity_ * Renaming files * Renaming poluted EthSigning * Tidy up the namespaces * Renaming files to match new structure * Splitting EthSigning into separate traits * jsapi move ethcore.* -> parity.* * Move jsonrpc parity definitions * Update UI API calls for parity interfaces * Move jsapi signer interfaces from personal to signer * Update UI to use signer.* where applicable * Updsate jsapi subscriptions for signer * Fix dodgy merge. * Update README. * Fix some tests. * Move parity-only personal.* to parity.* * Update UI for personal -> parity API moves * Update subscription APIs after personal -> parity move * personal. generateAuthorizationToken -> parity. generateAuthorizationToken (UI) * enode, dappsPort & signerPort (UI) * Update subscription tests (accountsInfo) * subscription update * personal -> parity * Additional error logging on method failures * move postTransaction to parity * Additional debug info with method failures * Fix personal tests. * Console wrning shows parameters, error object does not * Include parity_ signing methods. * Console log http transport info * Fix failing tests * Add RPC stubs for parity_accounts. * Allow some secure built-in dapps * Use parity_accounts in place of accountsInfo * Improve error reporting * Cleanup GHH error handling Former-commit-id: 5a094ccb9f0596d0e07abc23504b80dc099ad584
317 lines
8.7 KiB
Rust
317 lines
8.7 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::collections::BTreeMap;
|
|
use std::collections::HashSet;
|
|
use std::cmp::PartialEq;
|
|
use std::str::FromStr;
|
|
use std::sync::Arc;
|
|
use util::RotatingLogger;
|
|
use ethcore::miner::{Miner, ExternalMiner};
|
|
use ethcore::client::Client;
|
|
use ethcore::account_provider::AccountProvider;
|
|
use ethcore::snapshot::SnapshotService;
|
|
use ethsync::{ManageNetwork, SyncProvider};
|
|
use ethcore_rpc::{Extendable, NetworkSettings};
|
|
pub use ethcore_rpc::SignerService;
|
|
|
|
|
|
#[derive(Debug, PartialEq, Clone, Eq, Hash)]
|
|
pub enum Api {
|
|
/// Web3 (Safe)
|
|
Web3,
|
|
/// Net (Safe)
|
|
Net,
|
|
/// Eth (Safe)
|
|
Eth,
|
|
/// Geth-compatible "personal" API (DEPRECATED; only used in `--geth` mode.)
|
|
Personal,
|
|
/// Signer - Confirm transactions in Signer (UNSAFE: Passwords, List of transactions)
|
|
Signer,
|
|
/// Parity - Custom extensions (Safe)
|
|
Parity,
|
|
/// Parity Accounts extensions (UNSAFE: Passwords, Side Effects (new account))
|
|
ParityAccounts,
|
|
/// Parity - Set methods (UNSAFE: Side Effects affecting node operation)
|
|
ParitySet,
|
|
/// Traces (Safe)
|
|
Traces,
|
|
/// Rpc (Safe)
|
|
Rpc,
|
|
}
|
|
|
|
impl FromStr for Api {
|
|
type Err = String;
|
|
|
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
|
use self::Api::*;
|
|
|
|
match s {
|
|
"web3" => Ok(Web3),
|
|
"net" => Ok(Net),
|
|
"eth" => Ok(Eth),
|
|
"personal" => Ok(Personal),
|
|
"signer" => Ok(Signer),
|
|
"parity" => Ok(Parity),
|
|
"parity_accounts" => Ok(ParityAccounts),
|
|
"parity_set" => Ok(ParitySet),
|
|
"traces" => Ok(Traces),
|
|
"rpc" => Ok(Rpc),
|
|
api => Err(format!("Unknown api: {}", api))
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub enum ApiSet {
|
|
SafeContext,
|
|
UnsafeContext,
|
|
IpcContext,
|
|
List(HashSet<Api>),
|
|
}
|
|
|
|
impl Default for ApiSet {
|
|
fn default() -> Self {
|
|
ApiSet::UnsafeContext
|
|
}
|
|
}
|
|
|
|
impl PartialEq for ApiSet {
|
|
fn eq(&self, other: &Self) -> bool {
|
|
self.list_apis() == other.list_apis()
|
|
}
|
|
}
|
|
|
|
impl FromStr for ApiSet {
|
|
type Err = String;
|
|
|
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
|
s.split(',')
|
|
.map(Api::from_str)
|
|
.collect::<Result<_, _>>()
|
|
.map(ApiSet::List)
|
|
}
|
|
}
|
|
|
|
pub struct Dependencies {
|
|
pub signer_service: Arc<SignerService>,
|
|
pub client: Arc<Client>,
|
|
pub snapshot: Arc<SnapshotService>,
|
|
pub sync: Arc<SyncProvider>,
|
|
pub net: Arc<ManageNetwork>,
|
|
pub secret_store: Arc<AccountProvider>,
|
|
pub miner: Arc<Miner>,
|
|
pub external_miner: Arc<ExternalMiner>,
|
|
pub logger: Arc<RotatingLogger>,
|
|
pub settings: Arc<NetworkSettings>,
|
|
pub net_service: Arc<ManageNetwork>,
|
|
pub geth_compatibility: bool,
|
|
pub dapps_port: Option<u16>,
|
|
}
|
|
|
|
fn to_modules(apis: &[Api]) -> BTreeMap<String, String> {
|
|
let mut modules = BTreeMap::new();
|
|
for api in apis {
|
|
let (name, version) = match *api {
|
|
Api::Web3 => ("web3", "1.0"),
|
|
Api::Net => ("net", "1.0"),
|
|
Api::Eth => ("eth", "1.0"),
|
|
Api::Personal => ("personal", "1.0"),
|
|
Api::Signer => ("signer", "1.0"),
|
|
Api::Parity => ("parity", "1.0"),
|
|
Api::ParityAccounts => ("parity_accounts", "1.0"),
|
|
Api::ParitySet => ("parity_set", "1.0"),
|
|
Api::Traces => ("traces", "1.0"),
|
|
Api::Rpc => ("rpc", "1.0"),
|
|
};
|
|
modules.insert(name.into(), version.into());
|
|
}
|
|
modules
|
|
}
|
|
|
|
impl ApiSet {
|
|
pub fn list_apis(&self) -> HashSet<Api> {
|
|
let mut safe_list = vec![Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc]
|
|
.into_iter().collect();
|
|
match *self {
|
|
ApiSet::List(ref apis) => apis.clone(),
|
|
ApiSet::UnsafeContext => safe_list,
|
|
ApiSet::IpcContext => {
|
|
safe_list.insert(Api::ParityAccounts);
|
|
safe_list
|
|
},
|
|
ApiSet::SafeContext => {
|
|
safe_list.insert(Api::ParityAccounts);
|
|
safe_list.insert(Api::ParitySet);
|
|
safe_list.insert(Api::Signer);
|
|
safe_list
|
|
},
|
|
}
|
|
}
|
|
}
|
|
|
|
macro_rules! add_signing_methods {
|
|
($namespace:ident, $server:expr, $deps:expr) => {
|
|
let server = &$server;
|
|
let deps = &$deps;
|
|
if deps.signer_service.is_enabled() {
|
|
server.add_delegate($namespace::to_delegate(SigningQueueClient::new(&deps.signer_service, &deps.client, &deps.miner, &deps.secret_store)))
|
|
} else {
|
|
server.add_delegate($namespace::to_delegate(SigningUnsafeClient::new(&deps.client, &deps.secret_store, &deps.miner)))
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn setup_rpc<T: Extendable>(server: T, deps: Arc<Dependencies>, apis: ApiSet) -> T {
|
|
use ethcore_rpc::v1::*;
|
|
|
|
// it's turned into vector, cause ont of the cases requires &[]
|
|
let apis = apis.list_apis().into_iter().collect::<Vec<_>>();
|
|
for api in &apis {
|
|
match *api {
|
|
Api::Web3 => {
|
|
server.add_delegate(Web3Client::new().to_delegate());
|
|
},
|
|
Api::Net => {
|
|
server.add_delegate(NetClient::new(&deps.sync).to_delegate());
|
|
},
|
|
Api::Eth => {
|
|
let client = EthClient::new(
|
|
&deps.client,
|
|
&deps.snapshot,
|
|
&deps.sync,
|
|
&deps.secret_store,
|
|
&deps.miner,
|
|
&deps.external_miner,
|
|
EthClientOptions {
|
|
allow_pending_receipt_query: !deps.geth_compatibility,
|
|
send_block_number_in_get_work: !deps.geth_compatibility,
|
|
}
|
|
);
|
|
server.add_delegate(client.to_delegate());
|
|
|
|
let filter_client = EthFilterClient::new(&deps.client, &deps.miner);
|
|
server.add_delegate(filter_client.to_delegate());
|
|
|
|
add_signing_methods!(EthSigning, server, deps);
|
|
},
|
|
Api::Personal => {
|
|
server.add_delegate(PersonalClient::new(&deps.secret_store, &deps.client, &deps.miner, deps.geth_compatibility).to_delegate());
|
|
},
|
|
Api::Signer => {
|
|
server.add_delegate(SignerClient::new(&deps.secret_store, &deps.client, &deps.miner, &deps.signer_service).to_delegate());
|
|
},
|
|
Api::Parity => {
|
|
let signer = match deps.signer_service.is_enabled() {
|
|
true => Some(deps.signer_service.clone()),
|
|
false => None,
|
|
};
|
|
server.add_delegate(ParityClient::new(
|
|
&deps.client,
|
|
&deps.miner,
|
|
&deps.sync,
|
|
&deps.net_service,
|
|
&deps.secret_store,
|
|
deps.logger.clone(),
|
|
deps.settings.clone(),
|
|
signer,
|
|
deps.dapps_port,
|
|
).to_delegate());
|
|
|
|
add_signing_methods!(EthSigning, server, deps);
|
|
add_signing_methods!(ParitySigning, server, deps);
|
|
},
|
|
Api::ParityAccounts => {
|
|
server.add_delegate(ParityAccountsClient::new(&deps.secret_store, &deps.client).to_delegate());
|
|
},
|
|
Api::ParitySet => {
|
|
server.add_delegate(ParitySetClient::new(&deps.client, &deps.miner, &deps.net_service).to_delegate())
|
|
},
|
|
Api::Traces => {
|
|
server.add_delegate(TracesClient::new(&deps.client, &deps.miner).to_delegate())
|
|
},
|
|
Api::Rpc => {
|
|
let modules = to_modules(&apis);
|
|
server.add_delegate(RpcClient::new(modules).to_delegate());
|
|
}
|
|
}
|
|
}
|
|
server
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::{Api, ApiSet};
|
|
|
|
#[test]
|
|
fn test_api_parsing() {
|
|
assert_eq!(Api::Web3, "web3".parse().unwrap());
|
|
assert_eq!(Api::Net, "net".parse().unwrap());
|
|
assert_eq!(Api::Eth, "eth".parse().unwrap());
|
|
assert_eq!(Api::Personal, "personal".parse().unwrap());
|
|
assert_eq!(Api::Signer, "signer".parse().unwrap());
|
|
assert_eq!(Api::Parity, "parity".parse().unwrap());
|
|
assert_eq!(Api::ParityAccounts, "parity_accounts".parse().unwrap());
|
|
assert_eq!(Api::ParitySet, "parity_set".parse().unwrap());
|
|
assert_eq!(Api::Traces, "traces".parse().unwrap());
|
|
assert_eq!(Api::Rpc, "rpc".parse().unwrap());
|
|
assert!("rp".parse::<Api>().is_err());
|
|
}
|
|
|
|
#[test]
|
|
fn test_api_set_default() {
|
|
assert_eq!(ApiSet::UnsafeContext, ApiSet::default());
|
|
}
|
|
|
|
#[test]
|
|
fn test_api_set_parsing() {
|
|
assert_eq!(ApiSet::List(vec![Api::Web3, Api::Eth].into_iter().collect()), "web3,eth".parse().unwrap());
|
|
}
|
|
|
|
#[test]
|
|
fn test_api_set_unsafe_context() {
|
|
let expected = vec![
|
|
// make sure this list contains only SAFE methods
|
|
Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc
|
|
].into_iter().collect();
|
|
assert_eq!(ApiSet::UnsafeContext.list_apis(), expected);
|
|
}
|
|
|
|
#[test]
|
|
fn test_api_set_ipc_context() {
|
|
let expected = vec![
|
|
// safe
|
|
Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc,
|
|
// semi-safe
|
|
Api::ParityAccounts
|
|
].into_iter().collect();
|
|
assert_eq!(ApiSet::IpcContext.list_apis(), expected);
|
|
}
|
|
|
|
#[test]
|
|
fn test_api_set_safe_context() {
|
|
let expected = vec![
|
|
// safe
|
|
Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc,
|
|
// semi-safe
|
|
Api::ParityAccounts,
|
|
// Unsafe
|
|
Api::ParitySet, Api::Signer,
|
|
].into_iter().collect();
|
|
assert_eq!(ApiSet::SafeContext.list_apis(), expected);
|
|
}
|
|
}
|